Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove qt3 remains from uic tool

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-01-09 19:21:58 +02:00
parent 19c3d3439c
commit 1ba689a9cd
4 changed files with 15 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/tools/uic/cpp/cppwriteincludes.cpp
View file

@ -129,14 +129,6 @@ void WriteIncludes::acceptUI(DomUI *node)
qWarning("%s: Warning: The form file has external pixmaps or qPixmapFromMimeSource() set as a pixmap function. "
"This requires Qt 3 support, which is disabled. The resulting code will not compile.",
qPrintable(m_uic->option().messagePrefix()));
add(QLatin1String("Q3MimeSourceFactory"));
}
if (m_uic->databaseInfo()->connections().size()) {
add(QLatin1String("QSqlDatabase"));
add(QLatin1String("Q3SqlCursor"));
add(QLatin1String("QSqlRecord"));
add(QLatin1String("Q3SqlForm"));
}
TreeWalker::acceptUI(node);
@ -244,10 +236,6 @@ void WriteIncludes::add(const QString &className, bool determineHeader, const QS
return;
}
if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("Q3ListView")) ||
m_uic->customWidgetsInfo()->extends(className, QLatin1String("Q3Table"))) {
add(QLatin1String("Q3Header"));
}
if (determineHeader)
insertIncludeForClass(className, header, global);
}

179
src/tools/uic/cpp/cppwriteinitialization.cpp
View file

@ -636,7 +636,7 @@ void WriteInitialization::acceptWidget(DomWidget *node)
const QString savedParentWidget = parentWidget;
if (m_uic->isContainer(parentClass) || m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("Q3ToolBar")))
if (m_uic->isContainer(parentClass))
parentWidget.clear();
if (m_widgetChain.size() != 1)
@ -652,8 +652,6 @@ void WriteInitialization::acceptWidget(DomWidget *node)
initializeTreeWidget(node);
} else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTableWidget"))) {
initializeTableWidget(node);
} else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("Q3DataBrowser"))) {
initializeQ3SqlDataBrowser(node);
}
if (m_uic->isButton(className))
@ -694,12 +692,10 @@ void WriteInitialization::acceptWidget(DomWidget *node)
id = pid->elementNumber();
}
if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QMainWindow"))
|| m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("Q3MainWindow"))) {
if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QMainWindow"))) {
if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QMenuBar"))) {
if (!m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("Q3MainWindow")))
m_output << m_indent << parentWidget << "->setMenuBar(" << varName <<");\n";
m_output << m_indent << parentWidget << "->setMenuBar(" << varName <<");\n";
} else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QToolBar"))) {
m_output << m_indent << parentWidget << "->addToolBar("
<< toolBarAreaStringFromDOMAttributes(attributes) << varName << ");\n";
@ -721,9 +717,8 @@ void WriteInitialization::acceptWidget(DomWidget *node)
m_output << m_indent << parentWidget << "->addDockWidget(" << area << varName << ");\n";
} else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QStatusBar"))) {
m_output << m_indent << parentWidget << "->setStatusBar(" << varName << ");\n";
} else if (!m_uic->customWidgetsInfo()->extends(className, QLatin1String("Q3DockWindow"))
&& !m_uic->customWidgetsInfo()->extends(className, QLatin1String("Q3ToolBar"))) {
m_output << m_indent << parentWidget << "->setCentralWidget(" << varName << ");\n";
} else {
m_output << m_indent << parentWidget << "->setCentralWidget(" << varName << ");\n";
}
}
@ -735,8 +730,6 @@ void WriteInitialization::acceptWidget(DomWidget *node)
m_output << m_indent << parentWidget << "->addWidget(" << varName << ");\n";
} else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QToolBar"))) {
m_output << m_indent << parentWidget << "->addWidget(" << varName << ");\n";
} else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("Q3WidgetStack"))) {
m_output << m_indent << parentWidget << "->addWidget(" << varName << ", " << id << ");\n";
} else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QDockWidget"))) {
m_output << m_indent << parentWidget << "->setWidget(" << varName << ");\n";
} else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QScrollArea"))) {
@ -797,15 +790,6 @@ void WriteInitialization::acceptWidget(DomWidget *node)
<< parentWidget << "->indexOf(" << varName << "), " << autoTrCall(pwhatsThis->elementString()) << ");\n";
}
#endif // QT_NO_WHATSTHIS
} else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("Q3Wizard"))) {
const DomProperty *ptitle = attributes.value(QLatin1String("title"));
DomString *ptitleString = ptitle ? ptitle->elementString() : 0;
m_output << m_indent << parentWidget << "->addPage(" << varName << ", " << noTrCall(ptitleString, pageDefaultString) << ");\n";
autoTrOutput(ptitleString, pageDefaultString) << m_indent << parentWidget << "->setTitle("
<< varName << ", " << autoTrCall(ptitleString, pageDefaultString) << ");\n";
}
//
@ -923,55 +907,19 @@ void WriteInitialization::acceptLayout(DomLayout *node)
const DomPropertyMap properties = propertyMap(node->elementProperty());
const bool oldLayoutProperties = properties.constFind(QLatin1String("margin")) != properties.constEnd();
bool isGroupBox = false;
if (m_widgetChain.top()) {
const QString parentWidget = m_widgetChain.top()->attributeClass();
if (!m_layoutChain.top() && (m_uic->customWidgetsInfo()->extends(parentWidget, QLatin1String("Q3GroupBox"))
|| m_uic->customWidgetsInfo()->extends(parentWidget, QLatin1String("Q3ButtonGroup")))) {
const QString parent = m_driver->findOrInsertWidget(m_widgetChain.top());
isGroupBox = true;
// special case for group box
m_output << m_indent << parent << "->setColumnLayout(0, Qt::Vertical);\n";
QString objectName = parent;
objectName += QLatin1String("->layout()");
int marginType = Use43UiFile;
if (oldLayoutProperties)
marginType = m_layoutMarginType;
m_LayoutDefaultHandler.writeProperties(m_indent,
objectName, properties, marginType, false, m_output);
}
}
m_output << m_indent << varName << " = new " << className << '(';
if (!m_layoutChain.top() && !isGroupBox)
if (!m_layoutChain.top())
m_output << m_driver->findOrInsertWidget(m_widgetChain.top());
m_output << ");\n";
if (isGroupBox) {
const QString tempName = m_driver->unique(QLatin1String("boxlayout"));
m_output << m_indent << "QBoxLayout *" << tempName << " = qobject_cast<QBoxLayout *>(" <<
m_driver->findOrInsertWidget(m_widgetChain.top()) << "->layout());\n";
m_output << m_indent << "if (" << tempName << ")\n";
m_output << m_dindent << tempName << "->addLayout(" << varName << ");\n";
}
if (isGroupBox) {
m_output << m_indent << varName << "->setAlignment(Qt::AlignTop);\n";
} else {
// Suppress margin on a read child layout
const bool suppressMarginDefault = m_layoutChain.top();
int marginType = Use43UiFile;
if (oldLayoutProperties)
marginType = m_layoutMarginType;
m_LayoutDefaultHandler.writeProperties(m_indent, varName, properties, marginType, suppressMarginDefault, m_output);
}
// Suppress margin on a read child layout
const bool suppressMarginDefault = m_layoutChain.top();
int marginType = Use43UiFile;
if (oldLayoutProperties)
marginType = m_layoutMarginType;
m_LayoutDefaultHandler.writeProperties(m_indent, varName, properties, marginType, suppressMarginDefault, m_output);
m_layoutMarginType = SubLayoutMargin;
@ -1165,11 +1113,6 @@ void WriteInitialization::acceptActionRef(DomActionRef *node)
return;
} else if (DomWidget *w = m_driver->widgetByName(actionName)) {
isMenu = m_uic->isMenu(w->attributeClass());
bool inQ3ToolBar = m_uic->customWidgetsInfo()->extends(m_widgetChain.top()->attributeClass(), QLatin1String("Q3ToolBar"));
if (!isMenu && inQ3ToolBar) {
m_actionOut << m_indent << actionName << "->setParent(" << varName << ");\n";
return;
}
} else if (!(m_driver->actionByName(actionName) || isSeparator)) {
fprintf(stderr, "%s: Warning: action `%s' not declared\n",
qPrintable(m_option.messagePrefix()),
@ -1205,8 +1148,6 @@ void WriteInitialization::writeProperties(const QString &varName,
}
}
DomWidget *buttonGroupWidget = findWidget(QLatin1String("Q3ButtonGroup"));
QString indent;
if (!m_widgetChain.top()) {
indent = m_option.indent;
@ -1232,11 +1173,6 @@ void WriteInitialization::writeProperties(const QString &varName,
const DomRect *r = p->elementRect();
m_output << m_indent << varName << "->resize(" << r->elementWidth() << ", " << r->elementHeight() << ");\n";
continue;
} else if (propertyName == QLatin1String("buttonGroupId")) { // Q3ButtonGroup support
if (buttonGroupWidget)
m_output << m_indent << m_driver->findOrInsertWidget(buttonGroupWidget) << "->insert("
<< varName << ", " << p->elementNumber() << ");\n";
continue;
} else if (propertyName == QLatin1String("currentRow") // QListWidget::currentRow
&& m_uic->customWidgetsInfo()->extends(className, QLatin1String("QListWidget"))) {
m_delayedOut << m_indent << varName << "->setCurrentRow("
@ -1552,16 +1488,7 @@ void WriteInitialization::writeProperties(const QString &varName,
}
}
if (leftMargin != -1 || topMargin != -1 || rightMargin != -1 || bottomMargin != -1) {
QString objectName = varName;
if (m_widgetChain.top()) {
const QString parentWidget = m_widgetChain.top()->attributeClass();
if (!m_layoutChain.top() && (m_uic->customWidgetsInfo()->extends(parentWidget, QLatin1String("Q3GroupBox"))
|| m_uic->customWidgetsInfo()->extends(parentWidget, QLatin1String("Q3ButtonGroup")))) {
objectName = m_driver->findOrInsertWidget(m_widgetChain.top()) + QLatin1String("->layout()");
}
}
m_output << m_indent << objectName << QLatin1String("->setContentsMargins(")
m_output << m_indent << varName << QLatin1String("->setContentsMargins(")
<< leftMargin << QLatin1String(", ")
<< topMargin << QLatin1String(", ")
<< rightMargin << QLatin1String(", ")
@ -2388,86 +2315,6 @@ QString WriteInitialization::trCall(const QString &str, const QString &commentHi
return result;
}
void WriteInitialization::initializeQ3SqlDataTable(DomWidget *w)
{
const DomPropertyMap properties = propertyMap(w->elementProperty());
const DomProperty *frameworkCode = properties.value(QLatin1String("frameworkCode"), 0);
if (frameworkCode && toBool(frameworkCode->elementBool()) == false)
return;
QString connection;
QString table;
QString field;
const DomProperty *db = properties.value(QLatin1String("database"), 0);
if (db && db->elementStringList()) {
const QStringList info = db->elementStringList()->elementString();
connection = info.size() > 0 ? info.at(0) : QString();
table = info.size() > 1 ? info.at(1) : QString();
field = info.size() > 2 ? info.at(2) : QString();
}
if (table.isEmpty() || connection.isEmpty()) {
fprintf(stderr, "%s: Warning: Invalid database connection\n", qPrintable(m_option.messagePrefix()));
return;
}
const QString varName = m_driver->findOrInsertWidget(w);
m_output << m_indent << "if (!" << varName << "->sqlCursor()) {\n";
m_output << m_dindent << varName << "->setSqlCursor(";
if (connection == QLatin1String("(default)")) {
m_output << "new Q3SqlCursor(" << fixString(table, m_dindent) << "), false, true);\n";
} else {
m_output << "new Q3SqlCursor(" << fixString(table, m_dindent) << ", true, " << connection << "Connection" << "), false, true);\n";
}
m_output << m_dindent << varName << "->refresh(Q3DataTable::RefreshAll);\n";
m_output << m_indent << "}\n";
}
void WriteInitialization::initializeQ3SqlDataBrowser(DomWidget *w)
{
const DomPropertyMap properties = propertyMap(w->elementProperty());
const DomProperty *frameworkCode = properties.value(QLatin1String("frameworkCode"), 0);
if (frameworkCode && toBool(frameworkCode->elementBool()) == false)
return;
QString connection;
QString table;
QString field;
const DomProperty *db = properties.value(QLatin1String("database"), 0);
if (db && db->elementStringList()) {
const QStringList info = db->elementStringList()->elementString();
connection = info.size() > 0 ? info.at(0) : QString();
table = info.size() > 1 ? info.at(1) : QString();
field = info.size() > 2 ? info.at(2) : QString();
}
if (table.isEmpty() || connection.isEmpty()) {
fprintf(stderr, "%s: Warning: Invalid database connection\n", qPrintable(m_option.messagePrefix()));
return;
}
const QString varName = m_driver->findOrInsertWidget(w);
m_output << m_indent << "if (!" << varName << "->sqlCursor()) {\n";
m_output << m_dindent << varName << "->setSqlCursor(";
if (connection == QLatin1String("(default)")) {
m_output << "new Q3SqlCursor(" << fixString(table, m_dindent) << "), true);\n";
} else {
m_output << "new Q3SqlCursor(" << fixString(table, m_dindent) << ", true, " << connection << "Connection" << "), false, true);\n";
}
m_output << m_dindent << varName << "->refresh();\n";
m_output << m_indent << "}\n";
}
void WriteInitialization::initializeMenu(DomWidget *w, const QString &/*parentWidget*/)
{
const QString menuName = m_driver->findOrInsertWidget(w);

6
src/tools/uic/cpp/cppwriteinitialization.h
View file

@ -250,12 +250,6 @@ private:
QString disableSorting(DomWidget *w, const QString &varName);
void enableSorting(DomWidget *w, const QString &varName, const QString &tempName);
//
// Sql
//
void initializeQ3SqlDataTable(DomWidget *w);
void initializeQ3SqlDataBrowser(DomWidget *w);
QString findDeclaration(const QString &name);
DomWidget *findWidget(const QLatin1String &widgetClass);
DomImage *findImage(const QString &name) const;

6
src/tools/uic/uic.cpp
View file

@ -332,14 +332,12 @@ void Uic::writeHeaderProtectionEnd()
bool Uic::isMainWindow(const QString &className) const
{
return customWidgetsInfo()->extends(className, QLatin1String("Q3MainWindow"))
|| customWidgetsInfo()->extends(className, QLatin1String("QMainWindow"));
return customWidgetsInfo()->extends(className, QLatin1String("QMainWindow"));
}
bool Uic::isToolBar(const QString &className) const
{
return customWidgetsInfo()->extends(className, QLatin1String("Q3ToolBar"))
|| customWidgetsInfo()->extends(className, QLatin1String("QToolBar"));
return customWidgetsInfo()->extends(className, QLatin1String("QToolBar"));
}
bool Uic::isButton(const QString &className) const