diff options
Diffstat (limited to 'kdevdesigner/shared')
| -rw-r--r-- | kdevdesigner/shared/parser.cpp | 2 | ||||
| -rw-r--r-- | kdevdesigner/shared/ui2uib.cpp | 4 | ||||
| -rw-r--r-- | kdevdesigner/shared/uib.cpp | 4 | ||||
| -rw-r--r-- | kdevdesigner/shared/uib.h | 2 | ||||
| -rw-r--r-- | kdevdesigner/shared/widgetdatabase.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/kdevdesigner/shared/parser.cpp b/kdevdesigner/shared/parser.cpp index 1ba246bd..1fb2c5a7 100644 --- a/kdevdesigner/shared/parser.cpp +++ b/kdevdesigner/shared/parser.cpp @@ -68,5 +68,5 @@ TQString Parser::cleanArgs( const TQString &func ) } res += ")"; - return TQString::tqfromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); + return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); } diff --git a/kdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp index d4645eaa..5cff46e0 100644 --- a/kdevdesigner/shared/ui2uib.cpp +++ b/kdevdesigner/shared/ui2uib.cpp @@ -470,11 +470,11 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies, if ( subLayoutNo != -1 ) { /* - Remove the sub-tqlayout's Object_End marker, append the grid + Remove the sub-layout's Object_End marker, append the grid cell and the correct name property, and put the Object_End marker back. */ - out.tqdevice()->at( out.tqdevice()->at() - 1 ); + out.device()->at( out.device()->at() - 1 ); outputGridCell( out, elem ); outputProperty( buddies, subLayoutNo, strings, out, nameElem ); out << (TQ_UINT8) Object_End; diff --git a/kdevdesigner/shared/uib.cpp b/kdevdesigner/shared/uib.cpp index 443df331..7072626a 100644 --- a/kdevdesigner/shared/uib.cpp +++ b/kdevdesigner/shared/uib.cpp @@ -31,8 +31,8 @@ static const char commonStrings[] = "TQComboBox\0TQDialog\0TQFrame\0TQGridLayout\0TQGroupBox\0TQHBoxLayout\0TQLabel\0" "TQLineEdit\0TQListView\0TQPushButton\0TQRadioButton\0TQVBoxLayout\0TQWidget\0" "TextLabel1\0XPM.GZ\0accept\0autoDefault\0buddy\0caption\0clicked\0" - "default\0destroy\0frameShadow\0frameShape\0tqgeometry\0init\0margin\0" - "tqmaximumSize\0tqminimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0" + "default\0destroy\0frameShadow\0frameShape\0geometry\0init\0margin\0" + "maximumSize\0minimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0" "toolTip\0unnamed\0whatsThis"; UibStrTable::UibStrTable() diff --git a/kdevdesigner/shared/uib.h b/kdevdesigner/shared/uib.h index 9f2090f7..e6a6b05f 100644 --- a/kdevdesigner/shared/uib.h +++ b/kdevdesigner/shared/uib.h @@ -128,7 +128,7 @@ inline TQString UibStrTable::asString( int offset ) const { if ( table[offset] == 0x7f ) { TQDataStream in( table, IO_ReadOnly ); - in.tqdevice()->at( offset + 1 ); + in.device()->at( offset + 1 ); TQString str; in >> str; return str; diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp index 80e8c131..a37f5260 100644 --- a/kdevdesigner/shared/widgetdatabase.cpp +++ b/kdevdesigner/shared/widgetdatabase.cpp @@ -38,7 +38,7 @@ #include <tqstrlist.h> #include <tqdict.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqcleanuphandler.h> #include <tqfeatures.h> @@ -735,7 +735,7 @@ bool WidgetDatabase::isForm( int id ) return r->isForm; } -/*! Returns whether the widget registered as \a id can have tqchildren. +/*! Returns whether the widget registered as \a id can have children. */ bool WidgetDatabase::isContainer( int id ) |