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 redundant QFORMINTERNAL_NAMESPACE definition checks

Browse source 
it is no longer defined

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-10-28 20:38:40 +03:00
parent 49f0becf27
commit 6a6f9d5cc0
17 changed files with 3 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/designer/data/generate_header.xsl
View file

@ -379,11 +379,6 @@ QT_BEGIN_NAMESPACE
#define QUI_EXPORT Q_DECL_EXPORT #define QUI_EXPORT Q_DECL_EXPORT
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal
{
#endif
</xsl:text> </xsl:text>
<xsl:text>&endl;</xsl:text> <xsl:text>&endl;</xsl:text>
@ -408,9 +403,6 @@ namespace QFormInternal
</xsl:call-template> </xsl:call-template>
</xsl:for-each> </xsl:for-each>
<xsl:text> <xsl:text>
#ifdef QFORMINTERNAL_NAMESPACE
}
#endif
QT_END_NAMESPACE QT_END_NAMESPACE

8
src/designer/data/generate_impl.xsl
View file

@ -1063,13 +1063,7 @@
</xsl:text> </xsl:text>
<xsl:text>#include "ui4.h"&endl;</xsl:text> <xsl:text>#include "ui4.h"&endl;</xsl:text>
<xsl:text>&endl;</xsl:text> <xsl:text>&endl;</xsl:text>
<xsl:text>QT_BEGIN_NAMESPACE&endl;</xsl:text> <xsl:text>QT_BEGIN_NAMESPACE&endl;&endl;</xsl:text>
<xsl:text>#ifdef QFORMINTERNAL_NAMESPACE&endl;</xsl:text>
<xsl:text>using namespace QFormInternal;&endl;</xsl:text>
<xsl:text>#endif&endl;</xsl:text>
<xsl:text>&endl;</xsl:text>
<xsl:text>/*******************************************************************************&endl;</xsl:text> <xsl:text>/*******************************************************************************&endl;</xsl:text>
<xsl:text>** Implementations&endl;</xsl:text> <xsl:text>** Implementations&endl;</xsl:text>
<xsl:text>*/&endl;&endl;</xsl:text> <xsl:text>*/&endl;&endl;</xsl:text>

5
src/tools/uic/ui4.cpp
View file

@ -18,13 +18,10 @@
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#include "ui4.h" #include "ui4.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef QFORMINTERNAL_NAMESPACE
using namespace QFormInternal;
#endif
/******************************************************************************* /*******************************************************************************
** Implementations ** Implementations

11
src/tools/uic/ui4.h
View file

@ -44,12 +44,6 @@ QT_BEGIN_NAMESPACE
#define QUI_EXPORT Q_DECL_EXPORT #define QUI_EXPORT Q_DECL_EXPORT
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal
{
#endif
/******************************************************************************* /*******************************************************************************
** Forward declarations ** Forward declarations
*/ */
@ -3310,11 +3304,6 @@ private:
void operator = (const DomStringPropertySpecification&other); void operator = (const DomStringPropertySpecification&other);
}; };
#ifdef QFORMINTERNAL_NAMESPACE
}
#endif
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // UI4_H #endif // UI4_H

18
src/uitools/abstractformbuilder.cpp
View file

@ -56,9 +56,7 @@
#include <QtGui/QAbstractButton> #include <QtGui/QAbstractButton>
#include <QtGui/QAbstractItemView> #include <QtGui/QAbstractItemView>
#include <QtGui/QHeaderView> #include <QtGui/QHeaderView>
#ifndef QFORMINTERNAL_NAMESPACE #include "qlayout_p.h"
# include "qlayout_p.h" // Compiling within Designer
#endif
#include <QtXml/QXmlStreamReader> #include <QtXml/QXmlStreamReader>
@ -82,20 +80,12 @@ static const char *buttonGroupPropertyC = "buttonGroup";
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef QFORMINTERNAL_NAMESPACE
using namespace QFormInternal;
#endif
class QFriendlyLayout: public QLayout class QFriendlyLayout: public QLayout
{ {
public: public:
inline QFriendlyLayout() { Q_ASSERT(false); } inline QFriendlyLayout() { Q_ASSERT(false); }
#ifdef QFORMINTERNAL_NAMESPACE
friend class QFormInternal::QAbstractFormBuilder;
#else
friend class QAbstractFormBuilder; friend class QAbstractFormBuilder;
#endif
}; };
/*! /*!
@ -837,11 +827,7 @@ QLayoutItem *QAbstractFormBuilder::create(DomLayoutItem *ui_layoutItem, QLayout
switch (ui_layoutItem->kind()) { switch (ui_layoutItem->kind()) {
case DomLayoutItem::Widget: { case DomLayoutItem::Widget: {
if (QWidget *w = create(ui_layoutItem->elementWidget(), parentWidget)) { if (QWidget *w = create(ui_layoutItem->elementWidget(), parentWidget)) {
#ifdef QFORMINTERNAL_NAMESPACE // uilib
QWidgetItem *item = new QWidgetItemV2(w);
#else // Within Designer: Use factory method that returns special items that refuse to shrink to 0,0
QWidgetItem *item = QLayoutPrivate::createWidgetItem(layout, w); QWidgetItem *item = QLayoutPrivate::createWidgetItem(layout, w);
#endif
item->setAlignment(alignmentFromDom(ui_layoutItem->attributeAlignment())); item->setAlignment(alignmentFromDom(ui_layoutItem->attributeAlignment()));
return item; return item;
} }
@ -2394,9 +2380,7 @@ void QAbstractFormBuilder::loadButtonExtraInfo(const DomWidget *ui_widget, QAbst
ButtonGroupHash &buttonGroups = extra->buttonGroups(); ButtonGroupHash &buttonGroups = extra->buttonGroups();
ButtonGroupHash::iterator it = buttonGroups.find(groupName); ButtonGroupHash::iterator it = buttonGroups.find(groupName);
if (it == buttonGroups.end()) { if (it == buttonGroups.end()) {
#ifdef QFORMINTERNAL_NAMESPACE // Suppress the warning when copying in Designer
uiLibWarning(QCoreApplication::translate("QAbstractFormBuilder", "Invalid QButtonGroup reference '%1' referenced by '%2'.").arg(groupName, button->objectName())); uiLibWarning(QCoreApplication::translate("QAbstractFormBuilder", "Invalid QButtonGroup reference '%1' referenced by '%2'.").arg(groupName, button->objectName()));
#endif
return; return;
} }
// Create button group on demand? // Create button group on demand?

10
src/uitools/abstractformbuilder.h
View file

@ -50,11 +50,6 @@ class QWidget;
class QAbstractButton; class QAbstractButton;
class QAbstractItemView; class QAbstractItemView;
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal
{
#endif
class DomAction; class DomAction;
class DomActionGroup; class DomActionGroup;
class DomButtonGroup; class DomButtonGroup;
@ -238,11 +233,6 @@ private:
friend Q_UITOOLS_EXPORT QVariant domPropertyToVariant(QAbstractFormBuilder *abstractFormBuilder,const QMetaObject *meta, const DomProperty *property); friend Q_UITOOLS_EXPORT QVariant domPropertyToVariant(QAbstractFormBuilder *abstractFormBuilder,const QMetaObject *meta, const DomProperty *property);
}; };
#ifdef QFORMINTERNAL_NAMESPACE
}
#endif
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // ABSTRACTFORMBUILDER_H #endif // ABSTRACTFORMBUILDER_H

8
src/uitools/formbuilder.cpp
View file

@ -31,10 +31,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal {
#endif
/*! /*!
\class QFormBuilder \class QFormBuilder
@ -511,8 +507,4 @@ void QFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &proper
} }
} }
#ifdef QFORMINTERNAL_NAMESPACE
} // namespace QFormInternal
#endif
QT_END_NAMESPACE QT_END_NAMESPACE

10
src/uitools/formbuilder.h
View file

@ -32,11 +32,6 @@ QT_BEGIN_NAMESPACE
class QCustomWidget; class QCustomWidget;
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal
{
#endif
class Q_UITOOLS_EXPORT QFormBuilder: public QAbstractFormBuilder class Q_UITOOLS_EXPORT QFormBuilder: public QAbstractFormBuilder
{ {
public: public:
@ -77,11 +72,6 @@ private:
QMap<QString, QCustomWidget*> m_customWidgets; QMap<QString, QCustomWidget*> m_customWidgets;
}; };
#ifdef QFORMINTERNAL_NAMESPACE
}
#endif
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // FORMBUILDER_H #endif // FORMBUILDER_H

9
src/uitools/formbuilderextra.cpp
View file

@ -28,7 +28,6 @@
#include <QtGui/QLabel> #include <QtGui/QLabel>
#include <QtGui/QBoxLayout> #include <QtGui/QBoxLayout>
#include <QtGui/QGridLayout> #include <QtGui/QGridLayout>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
@ -37,10 +36,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal {
#endif
void uiLibWarning(const QString &message) { void uiLibWarning(const QString &message) {
qWarning("Designer: %s", qPrintable(message)); qWarning("Designer: %s", qPrintable(message));
} }
@ -498,8 +493,4 @@ const QFormBuilderStrings &QFormBuilderStrings::instance()
return rc; return rc;
} }
#ifdef QFORMINTERNAL_NAMESPACE
} // namespace QFormInternal
#endif
QT_END_NAMESPACE QT_END_NAMESPACE

9
src/uitools/formbuilderextra_p.h
View file

@ -45,15 +45,9 @@ class QWidget;
class QObject; class QObject;
class QLabel; class QLabel;
class QButtonGroup; class QButtonGroup;
class QBoxLayout; class QBoxLayout;
class QGridLayout; class QGridLayout;
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal
{
#endif
class DomButtonGroups; class DomButtonGroups;
class DomButtonGroup; class DomButtonGroup;
class DomCustomWidget; class DomCustomWidget;
@ -216,9 +210,6 @@ struct Q_UITOOLS_EXPORT QFormBuilderStrings {
QList<TextRoleNName> itemTextRoles; QList<TextRoleNName> itemTextRoles;
QHash<QString, QPair<Qt::ItemDataRole, Qt::ItemDataRole> > treeItemTextRoleHash; QHash<QString, QPair<Qt::ItemDataRole, Qt::ItemDataRole> > treeItemTextRoleHash;
}; };
#ifdef QFORMINTERNAL_NAMESPACE
}
#endif
QT_END_NAMESPACE QT_END_NAMESPACE

10
src/uitools/properties.cpp
View file

@ -28,7 +28,6 @@
#include <QtCore/QDateTime> #include <QtCore/QDateTime>
#include <QtCore/QUrl> #include <QtCore/QUrl>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtGui/QIcon> #include <QtGui/QIcon>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <QtGui/QFont> #include <QtGui/QFont>
@ -37,11 +36,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal
{
#endif
static inline void fixEnum(QString &s) static inline void fixEnum(QString &s)
{ {
int qualifierIndex = s.lastIndexOf(QLatin1Char(':')); int qualifierIndex = s.lastIndexOf(QLatin1Char(':'));
@ -649,10 +643,6 @@ DomProperty *variantToDomProperty(QAbstractFormBuilder *afb, const QMetaObject *
return dom_prop; return dom_prop;
} }
#ifdef QFORMINTERNAL_NAMESPACE
}
#endif
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_properties_p.h" #include "moc_properties_p.h"

9
src/uitools/properties_p.h
View file

@ -43,11 +43,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal
{
#endif
class QAbstractFormBuilder; class QAbstractFormBuilder;
class DomProperty; class DomProperty;
@ -142,10 +137,6 @@ inline EnumType enumKeyOfObjectToValue(const char *enumName, const char *key, co
return enumKeyToValue<EnumType>(me, key); return enumKeyToValue<EnumType>(me, key);
} }
#ifdef QFORMINTERNAL_NAMESPACE
}
#endif
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // UILIBPROPERTIES_H #endif // UILIBPROPERTIES_H

13
src/uitools/quiloader.cpp
View file

@ -52,11 +52,6 @@ Q_GLOBAL_STATIC(QStringList, g_widgets)
class QUiLoader; class QUiLoader;
class QUiLoaderPrivate; class QUiLoaderPrivate;
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal
{
#endif
class TranslatingTextBuilder : public QTextBuilder class TranslatingTextBuilder : public QTextBuilder
{ {
public: public:
@ -506,18 +501,10 @@ bool FormBuilderPrivate::addItem(DomWidget *ui_widget, QWidget *widget, QWidget
return true; return true;
} }
#ifdef QFORMINTERNAL_NAMESPACE
}
#endif
class QUiLoaderPrivate class QUiLoaderPrivate
{ {
public: public:
#ifdef QFORMINTERNAL_NAMESPACE
QFormInternal::FormBuilderPrivate builder;
#else
FormBuilderPrivate builder; FormBuilderPrivate builder;
#endif
void setupWidgetMap() const; void setupWidgetMap() const;
}; };

8
src/uitools/resourcebuilder.cpp
View file

@ -30,10 +30,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal {
#endif
enum { themeDebug = 0 }; enum { themeDebug = 0 };
QResourceBuilder::QResourceBuilder() QResourceBuilder::QResourceBuilder()
@ -153,8 +149,4 @@ bool QResourceBuilder::isResourceType(const QVariant &value) const
return false; return false;
} }
#ifdef QFORMINTERNAL_NAMESPACE
} // namespace QFormInternal
#endif
QT_END_NAMESPACE QT_END_NAMESPACE

10
src/uitools/resourcebuilder_p.h
View file

@ -41,11 +41,6 @@ QT_BEGIN_NAMESPACE
class QDir; class QDir;
class QVariant; class QVariant;
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal
{
#endif
class DomProperty; class DomProperty;
class DomResourceIcon; class DomResourceIcon;
@ -73,11 +68,6 @@ public:
static int iconStateFlags(const DomResourceIcon *resIcon); static int iconStateFlags(const DomResourceIcon *resIcon);
}; };
#ifdef QFORMINTERNAL_NAMESPACE
}
#endif
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // RESOURCEBUILDER_H #endif // RESOURCEBUILDER_H

10
src/uitools/textbuilder.cpp
View file

@ -25,18 +25,12 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal {
#endif
QTextBuilder::QTextBuilder() QTextBuilder::QTextBuilder()
{ {
} }
QTextBuilder::~QTextBuilder() QTextBuilder::~QTextBuilder()
{ {
} }
QVariant QTextBuilder::loadText(const DomProperty *property) const QVariant QTextBuilder::loadText(const DomProperty *property) const
@ -57,8 +51,4 @@ DomProperty *QTextBuilder::saveText(const QVariant &value) const
return 0; return 0;
} }
#ifdef QFORMINTERNAL_NAMESPACE
} // namespace QFormInternal
#endif
QT_END_NAMESPACE QT_END_NAMESPACE

10
src/uitools/textbuilder_p.h
View file

@ -40,11 +40,6 @@ QT_BEGIN_NAMESPACE
class QVariant; class QVariant;
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal
{
#endif
class DomProperty; class DomProperty;
class DomString; class DomString;
@ -61,11 +56,6 @@ public:
virtual DomProperty *saveText(const QVariant &value) const; virtual DomProperty *saveText(const QVariant &value) const;
}; };
#ifdef QFORMINTERNAL_NAMESPACE
}
#endif
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // TEXTBUILDER_H #endif // TEXTBUILDER_H