summaryrefslogtreecommitdiffstats
path: root/tools/designer/uic
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 22:04:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 22:04:08 -0600
commite02e31c8b9d854cd62cbe9799228f6e08e882773 (patch)
tree53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /tools/designer/uic
parent143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff)
downloadtqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz
tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip
Sync with latest script
Diffstat (limited to 'tools/designer/uic')
-rw-r--r--tools/designer/uic/embed.cpp2
-rw-r--r--tools/designer/uic/form.cpp20
-rw-r--r--tools/designer/uic/main.cpp2
-rw-r--r--tools/designer/uic/object.cpp4
-rw-r--r--tools/designer/uic/subclassing.cpp2
-rw-r--r--tools/designer/uic/uic.cpp2
-rw-r--r--tools/designer/uic/uic.h2
7 files changed, 17 insertions, 17 deletions
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index 4baabd91c..555b20a81 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -13,7 +13,7 @@
** and the KDE Free TQt Foundation.
**
** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
** http://trolltech.com/products/qt/licenses/licensing/opensource/.
** If you are unsure which license is appropriate for your use, please
** review the following information:
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index 7945865d0..be21ee9e0 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -13,7 +13,7 @@
** and the KDE Free TQt Foundation.
**
** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
** http://trolltech.com/products/qt/licenses/licensing/opensource/.
** If you are unsure which license is appropriate for your use, please
** review the following information:
@@ -141,7 +141,7 @@ void Uic::createFormDecl( const TQDomElement &e )
/*
We are generating a few TQImage members that are not strictly
- necessary in some cases. Ideally, we would use retquiredImage,
+ necessary in some cases. Ideally, we would use requiredImage,
which is computed elsewhere, to keep the generated .h and .cpp
files synchronized.
*/
@@ -666,7 +666,7 @@ void Uic::createFormImpl( const TQDomElement &e )
return;
TQString objName = getObjectName( e );
- // generate local and local includes retquired
+ // generate local and local includes required
TQStringList globalIncludes, localIncludes;
TQStringList::Iterator it;
@@ -836,8 +836,8 @@ void Uic::createFormImpl( const TQDomElement &e )
out << "#include <qtoolbar.h>" << endl;
}
- // find out what images are retquired
- TQStringList retquiredImages;
+ // find out what images are required
+ TQStringList requiredImages;
static const char *imgTags[] = { "pixmap", "iconset", 0 };
for ( i = 0; imgTags[i] != 0; i++ ) {
nl = e.parentNode().toElement().elementsByTagName( imgTags[i] );
@@ -846,11 +846,11 @@ void Uic::createFormImpl( const TQDomElement &e )
while ( nn.parentNode() != e.parentNode() )
nn = nn.parentNode();
if ( nn.nodeName() != "customwidgets" )
- retquiredImages += nl.item(j).firstChild().toText().data();
+ requiredImages += nl.item(j).firstChild().toText().data();
}
}
- if ( !retquiredImages.isEmpty() || externPixmaps ) {
+ if ( !requiredImages.isEmpty() || externPixmaps ) {
out << "#include <qimage.h>" << endl;
out << "#include <qpixmap.h>" << endl << endl;
}
@@ -884,7 +884,7 @@ void Uic::createFormImpl( const TQDomElement &e )
nl = n.elementsByTagName( "image" );
for ( i = 0; i < (int) nl.length(); i++ ) {
TQString img = registerObject( nl.item(i).toElement().attribute("name") );
- if ( !retquiredImages.contains( img ) )
+ if ( !requiredImages.contains( img ) )
continue;
TQDomElement tmp = nl.item(i).firstChild().toElement();
if ( tmp.tagName() != "data" )
@@ -1042,7 +1042,7 @@ void Uic::createFormImpl( const TQDomElement &e )
}
}
- // create all children, some forms have special retquirements
+ // create all children, some forms have special requirements
if ( objClass == "TQWizard" ) {
for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
@@ -1231,7 +1231,7 @@ void Uic::createFormImpl( const TQDomElement &e )
out << "}" << endl;
out << endl;
- // handle application events if retquired
+ // handle application events if required
bool needFontEventHandler = FALSE;
bool needSqlTableEventHandler = FALSE;
bool needSqlDataBrowserEventHandler = FALSE;
diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp
index 3a20b471c..19a4854d8 100644
--- a/tools/designer/uic/main.cpp
+++ b/tools/designer/uic/main.cpp
@@ -13,7 +13,7 @@
** and the KDE Free TQt Foundation.
**
** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
** http://trolltech.com/products/qt/licenses/licensing/opensource/.
** If you are unsure which license is appropriate for your use, please
** review the following information:
diff --git a/tools/designer/uic/object.cpp b/tools/designer/uic/object.cpp
index d27c14f0c..87dbd3b31 100644
--- a/tools/designer/uic/object.cpp
+++ b/tools/designer/uic/object.cpp
@@ -13,7 +13,7 @@
** and the KDE Free TQt Foundation.
**
** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
** http://trolltech.com/products/qt/licenses/licensing/opensource/.
** If you are unsure which license is appropriate for your use, please
** review the following information:
@@ -284,7 +284,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
}
}
- // create all children, some widgets have special retquirements
+ // create all children, some widgets have special requirements
if ( objClass == "TQTabWidget" ) {
for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp
index bdfa23b02..d5da48f91 100644
--- a/tools/designer/uic/subclassing.cpp
+++ b/tools/designer/uic/subclassing.cpp
@@ -13,7 +13,7 @@
** and the KDE Free TQt Foundation.
**
** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
** http://trolltech.com/products/qt/licenses/licensing/opensource/.
** If you are unsure which license is appropriate for your use, please
** review the following information:
diff --git a/tools/designer/uic/uic.cpp b/tools/designer/uic/uic.cpp
index 6baadec7f..8faea579d 100644
--- a/tools/designer/uic/uic.cpp
+++ b/tools/designer/uic/uic.cpp
@@ -13,7 +13,7 @@
** and the KDE Free TQt Foundation.
**
** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
** http://trolltech.com/products/qt/licenses/licensing/opensource/.
** If you are unsure which license is appropriate for your use, please
** review the following information:
diff --git a/tools/designer/uic/uic.h b/tools/designer/uic/uic.h
index 90f8cdf5b..35d9ed0ab 100644
--- a/tools/designer/uic/uic.h
+++ b/tools/designer/uic/uic.h
@@ -13,7 +13,7 @@
** and the KDE Free TQt Foundation.
**
** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
** http://trolltech.com/products/qt/licenses/licensing/opensource/.
** If you are unsure which license is appropriate for your use, please
** review the following information: