diff options
author | Timothy Pearson <[email protected]> | 2012-02-13 17:43:39 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2012-02-13 17:43:39 -0600 |
commit | 359640943bcf155faa9a067dde9e00a123276290 (patch) | |
tree | fb3d55ea5e18949042fb0064123fb73d2b1eb932 /tools | |
parent | a829bcdc533e154000803d517200d32fe762e85c (diff) | |
download | tqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz tqt3-359640943bcf155faa9a067dde9e00a123276290.zip |
Automated update from Qt3
Diffstat (limited to 'tools')
124 files changed, 240 insertions, 240 deletions
diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp index 9a8295893..e47e38bdc 100644 --- a/tools/assistant/config.cpp +++ b/tools/assistant/config.cpp @@ -46,8 +46,8 @@ static Config *static_configuration = 0; inline TQString getVersionString() { - return TQString::number( (QT_VERSION >> 16) & 0xff ) - + "." + TQString::number( (QT_VERSION >> 8) & 0xff ); + return TQString::number( (TQT_VERSION >> 16) & 0xff ) + + "." + TQString::number( (TQT_VERSION >> 8) & 0xff ); } Config::Config() @@ -193,7 +193,7 @@ void Config::loadDefaultProfile() { TQSettings settings; settings.insertSearchPath( TQSettings::Windows, "/Trolltech" ); - const TQString key = "/TQt Assistant/" + TQString(QT_VERSION_STR) + "/Profile"; + const TQString key = "/TQt Assistant/" + TQString(TQT_VERSION_STR) + "/Profile"; const TQString profKey = key + "/default/"; if( settings.entryList( key + "/default" ).count() == 0 ) { @@ -242,7 +242,7 @@ void Config::saveProfile( Profile *profile ) TQSettings settings; settings.insertSearchPath( TQSettings::Windows, "/Trolltech" ); TQString versionString = (profile->props["name"] == "default") - ? TQString(QT_VERSION_STR) + ? TQString(TQT_VERSION_STR) : getVersionString(); const TQString key = "/TQt Assistant/" + versionString + "/"; const TQString profKey = key + "Profile/" + profile->props["name"] + "/"; diff --git a/tools/assistant/docuparser.cpp b/tools/assistant/docuparser.cpp index 158d10d97..c819b766d 100644 --- a/tools/assistant/docuparser.cpp +++ b/tools/assistant/docuparser.cpp @@ -57,7 +57,7 @@ TQDataStream &operator<<( TQDataStream &s, const ContentItem &ci ) return s; } -const TQString DocuParser::DocumentKey = "/TQt Assistant/" + TQString(QT_VERSION_STR) + "/"; +const TQString DocuParser::DocumentKey = "/TQt Assistant/" + TQString(TQT_VERSION_STR) + "/"; DocuParser *DocuParser::createParser( const TQString &fileName ) { diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp index f299ee8e2..c447c4cb4 100644 --- a/tools/assistant/helpdialogimpl.cpp +++ b/tools/assistant/helpdialogimpl.cpp @@ -288,7 +288,7 @@ void HelpDialog::timerEvent(TQTimerEvent *e) { static int opacity = 255; // To allow patching of 3.2.3 assistant for qsa. -#if QT_VERSION >= 0x030300 +#if TQT_VERSION >= 0x030300 help->setWindowOpacity((opacity-=4)/255.0); if (opacity<=0) #endif diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h index 04faa1f56..ecb3bf3e2 100644 --- a/tools/assistant/helpdialogimpl.h +++ b/tools/assistant/helpdialogimpl.h @@ -66,7 +66,7 @@ private: class SearchValidator : public TQValidator { - Q_OBJECT + TQ_OBJECT public: SearchValidator( TQObject *parent, const char *name = 0 ) : TQValidator( parent, name ) {} @@ -89,7 +89,7 @@ private: class HelpDialog : public HelpDialogBase { - Q_OBJECT + TQ_OBJECT public: HelpDialog( TQWidget *parent, MainWindow *h ); diff --git a/tools/assistant/helpwindow.h b/tools/assistant/helpwindow.h index db89947d2..8ec8f04a6 100644 --- a/tools/assistant/helpwindow.h +++ b/tools/assistant/helpwindow.h @@ -43,7 +43,7 @@ class TQMouseEvent; class HelpWindow : public TQTextBrowser { - Q_OBJECT + TQ_OBJECT public: HelpWindow( MainWindow *m, TQWidget *parent = 0, const char *name = 0 ); void setSource( const TQString &name ); diff --git a/tools/assistant/index.h b/tools/assistant/index.h index 333e41b77..2bd32f20e 100644 --- a/tools/assistant/index.h +++ b/tools/assistant/index.h @@ -63,7 +63,7 @@ TQDataStream &operator<<( TQDataStream &s, const Document &l ); class Index : public TQObject { - Q_OBJECT + TQ_OBJECT public: struct Entry { Entry( int d ) { documents.append( Document( d, 1 ) ); } diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h index 28fd6693e..a30c72b0e 100644 --- a/tools/assistant/lib/ntqassistantclient.h +++ b/tools/assistant/lib/ntqassistantclient.h @@ -41,7 +41,7 @@ class TQProcess; class TQAssistantClient : public TQObject { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( bool open READ isOpen ) public: diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp index dc99b7a1a..64bb8ee98 100644 --- a/tools/assistant/main.cpp +++ b/tools/assistant/main.cpp @@ -58,7 +58,7 @@ static bool allowFirstRun = TRUE; class AssistantSocket : public TQSocket { - Q_OBJECT + TQ_OBJECT public: AssistantSocket( int sock, TQObject *parent = 0 ); ~AssistantSocket() {} @@ -74,7 +74,7 @@ private slots: class AssistantServer : public TQServerSocket { - Q_OBJECT + TQ_OBJECT public: AssistantServer( TQObject* parent = 0 ); void newConnection( int socket ); diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h index a0824271f..d257c7cf9 100644 --- a/tools/assistant/mainwindow.ui.h +++ b/tools/assistant/mainwindow.ui.h @@ -253,7 +253,7 @@ void MainWindow::about() { TQMessageBox box( this ); box.setText( "<center><img src=\"splash.png\">" - "<p>Version " + TQString(QT_VERSION_STR) + "</p>" + "<p>Version " + TQString(TQT_VERSION_STR) + "</p>" "<p>Copyright (C) 2000-2008 Trolltech ASA. All rights reserved." "</p></center><p></p>" "<p>TQt Commercial Edition license holders: This program is" diff --git a/tools/assistant/settingsdialogimpl.h b/tools/assistant/settingsdialogimpl.h index 77273dc81..6402dc619 100644 --- a/tools/assistant/settingsdialogimpl.h +++ b/tools/assistant/settingsdialogimpl.h @@ -42,7 +42,7 @@ class SettingsDialog : public SettingsDialogBase { - Q_OBJECT + TQ_OBJECT public: SettingsDialog( TQWidget *parent, const char* name = 0 ); diff --git a/tools/assistant/topicchooserimpl.h b/tools/assistant/topicchooserimpl.h index bc3fbd411..11216fa0a 100644 --- a/tools/assistant/topicchooserimpl.h +++ b/tools/assistant/topicchooserimpl.h @@ -40,7 +40,7 @@ class TopicChooser : public TopicChooserBase { - Q_OBJECT + TQ_OBJECT public: TopicChooser( TQWidget *parent, const TQStringList &lnkNames, diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp index 1f9e8328a..def64548a 100644 --- a/tools/designer/designer/actiondnd.cpp +++ b/tools/designer/designer/actiondnd.cpp @@ -138,7 +138,7 @@ void TQDesignerAction::remove() class TQDesignerIndicatorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TQDesignerIndicatorWidget( TQWidget *p ) diff --git a/tools/designer/designer/actiondnd.h b/tools/designer/designer/actiondnd.h index ba21ff5ae..415784248 100644 --- a/tools/designer/designer/actiondnd.h +++ b/tools/designer/designer/actiondnd.h @@ -52,7 +52,7 @@ class TQPopupMenu; class ActionDrag : public TQStoredDrag { - Q_OBJECT + TQ_OBJECT public: ActionDrag(const TQString &type, TQAction *action, TQWidget *source); @@ -74,7 +74,7 @@ private: class TQDesignerActionGroup : public TQActionGroup { - Q_OBJECT + TQ_OBJECT public: TQDesignerActionGroup( TQObject *parent ) @@ -109,7 +109,7 @@ private: class TQDesignerAction : public TQAction { - Q_OBJECT + TQ_OBJECT public: TQDesignerAction( TQObject *parent ) @@ -145,7 +145,7 @@ private: class TQDesignerToolBarSeparator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TQDesignerToolBarSeparator( Orientation, TQToolBar *parent, const char* name=0 ); @@ -164,7 +164,7 @@ private: class TQSeparatorAction : public TQAction { - Q_OBJECT + TQ_OBJECT public: TQSeparatorAction( TQObject *parent ); @@ -183,7 +183,7 @@ private: class TQDesignerToolBar : public TQToolBar { - Q_OBJECT + TQ_OBJECT public: TQDesignerToolBar( TQMainWindow *mw ); diff --git a/tools/designer/designer/actioneditorimpl.h b/tools/designer/designer/actioneditorimpl.h index a04b2e480..d12792719 100644 --- a/tools/designer/designer/actioneditorimpl.h +++ b/tools/designer/designer/actioneditorimpl.h @@ -42,7 +42,7 @@ class ActionItem; class ActionEditor : public ActionEditorBase { - Q_OBJECT + TQ_OBJECT public: ActionEditor( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/tools/designer/designer/actionlistview.h b/tools/designer/designer/actionlistview.h index d96633688..59f769ab4 100644 --- a/tools/designer/designer/actionlistview.h +++ b/tools/designer/designer/actionlistview.h @@ -65,7 +65,7 @@ private: class ActionListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: ActionListView( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tools/designer/designer/asciivalidator.h b/tools/designer/designer/asciivalidator.h index d3afdfd26..ee6aca398 100644 --- a/tools/designer/designer/asciivalidator.h +++ b/tools/designer/designer/asciivalidator.h @@ -40,7 +40,7 @@ class AsciiValidator: public TQValidator { - Q_OBJECT + TQ_OBJECT public: AsciiValidator( TQObject * parent, const char *name = 0 ); AsciiValidator( bool funcName, TQObject * parent, const char *name = 0 ); diff --git a/tools/designer/designer/command.h b/tools/designer/designer/command.h index d6eef4fe5..6fc0aa5cd 100644 --- a/tools/designer/designer/command.h +++ b/tools/designer/designer/command.h @@ -156,7 +156,7 @@ private: class CommandHistory : public TQObject { - Q_OBJECT + TQ_OBJECT public: CommandHistory( int s ); diff --git a/tools/designer/designer/connectionitems.h b/tools/designer/designer/connectionitems.h index 60407ae55..40878c442 100644 --- a/tools/designer/designer/connectionitems.h +++ b/tools/designer/designer/connectionitems.h @@ -48,7 +48,7 @@ class ConnectionContainer; class ConnectionItem : public TQObject, public TQComboTableItem { - Q_OBJECT + TQ_OBJECT public: ConnectionItem( TQTable *table, FormWindow *fw ); @@ -83,7 +83,7 @@ private: class SenderItem : public ConnectionItem { - Q_OBJECT + TQ_OBJECT public: SenderItem( TQTable *table, FormWindow *fw ); @@ -102,7 +102,7 @@ private slots: class ReceiverItem : public ConnectionItem { - Q_OBJECT + TQ_OBJECT public: ReceiverItem( TQTable *table, FormWindow *fw ); @@ -121,7 +121,7 @@ private slots: class SignalItem : public ConnectionItem { - Q_OBJECT + TQ_OBJECT public: SignalItem( TQTable *table, FormWindow *fw ); @@ -138,7 +138,7 @@ signals: class SlotItem : public ConnectionItem { - Q_OBJECT + TQ_OBJECT public: SlotItem( TQTable *table, FormWindow *fw ); @@ -166,7 +166,7 @@ private: class ConnectionContainer : public TQObject { - Q_OBJECT + TQ_OBJECT public: ConnectionContainer( TQObject *parent, SenderItem *i1, SignalItem *i2, diff --git a/tools/designer/designer/connectiontable.h b/tools/designer/designer/connectiontable.h index 6a11ce9f4..9e5564475 100644 --- a/tools/designer/designer/connectiontable.h +++ b/tools/designer/designer/connectiontable.h @@ -38,7 +38,7 @@ class ConnectionTable : public TQTable { - Q_OBJECT + TQ_OBJECT public: ConnectionTable( TQWidget *parent, const char *name ); diff --git a/tools/designer/designer/customwidgeteditorimpl.h b/tools/designer/designer/customwidgeteditorimpl.h index fd645976b..49f28027c 100644 --- a/tools/designer/designer/customwidgeteditorimpl.h +++ b/tools/designer/designer/customwidgeteditorimpl.h @@ -46,7 +46,7 @@ class MainWindow; class CustomWidgetEditor : public CustomWidgetEditorBase { - Q_OBJECT + TQ_OBJECT public: CustomWidgetEditor( TQWidget *parent , MainWindow *mw); diff --git a/tools/designer/designer/database.h b/tools/designer/designer/database.h index 3008f7835..0af7a92f9 100644 --- a/tools/designer/designer/database.h +++ b/tools/designer/designer/database.h @@ -65,7 +65,7 @@ protected: class TQDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport { - Q_OBJECT + TQ_OBJECT public: TQDesignerDataBrowser( TQWidget *parent, const char *name ); @@ -76,7 +76,7 @@ protected: class TQDesignerDataView : public TQDataView, public DatabaseSupport { - Q_OBJECT + TQ_OBJECT public: TQDesignerDataView( TQWidget *parent, const char *name ); diff --git a/tools/designer/designer/database2.h b/tools/designer/designer/database2.h index fade3b8e9..df7c294b1 100644 --- a/tools/designer/designer/database2.h +++ b/tools/designer/designer/database2.h @@ -65,7 +65,7 @@ protected: class TQDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2 { - Q_OBJECT + TQ_OBJECT public: TQDesignerDataBrowser2( TQWidget *parent, const char *name ); @@ -76,7 +76,7 @@ protected: class TQDesignerDataView2 : public TQDataView, public DatabaseSupport2 { - Q_OBJECT + TQ_OBJECT public: TQDesignerDataView2( TQWidget *parent, const char *name ); diff --git a/tools/designer/designer/dbconnectionimpl.h b/tools/designer/designer/dbconnectionimpl.h index c3c7b7f98..fbf379d3b 100644 --- a/tools/designer/designer/dbconnectionimpl.h +++ b/tools/designer/designer/dbconnectionimpl.h @@ -42,7 +42,7 @@ class TQGridLayout; class DatabaseConnectionEditor : public DatabaseConnectionEditorBase { - Q_OBJECT + TQ_OBJECT public: DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent = 0, diff --git a/tools/designer/designer/dbconnectionsimpl.h b/tools/designer/designer/dbconnectionsimpl.h index ef3e50bd1..3b65ed60a 100644 --- a/tools/designer/designer/dbconnectionsimpl.h +++ b/tools/designer/designer/dbconnectionsimpl.h @@ -41,7 +41,7 @@ class Project; class DatabaseConnectionsEditor : public DatabaseConnectionBase { - Q_OBJECT + TQ_OBJECT public: DatabaseConnectionsEditor( Project *pro, TQWidget* parent = 0, diff --git a/tools/designer/designer/designerapp.cpp b/tools/designer/designer/designerapp.cpp index 06e8edab9..f3347446b 100644 --- a/tools/designer/designer/designerapp.cpp +++ b/tools/designer/designer/designerapp.cpp @@ -105,16 +105,16 @@ TQString DesignerApplication::settingsKey() { if ( !settings_key ) settings_key = new TQString( "/TQt Designer/" + - TQString::number( (QT_VERSION >> 16) & 0xff ) + - "." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" ); + TQString::number( (TQT_VERSION >> 16) & 0xff ) + + "." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" ); return *settings_key; } TQString DesignerApplication::oldSettingsKey() { if ( !old_settings_key ) { - int majorVer = (QT_VERSION >> 16) & 0xff; - int minorVer = (QT_VERSION >> 8) & 0xff; + int majorVer = (TQT_VERSION >> 16) & 0xff; + int minorVer = (TQT_VERSION >> 8) & 0xff; // If minorVer is 0 (e.g. 4.0) then we don't want to read the // old settings, too much might have changed. diff --git a/tools/designer/designer/editfunctionsimpl.h b/tools/designer/designer/editfunctionsimpl.h index d852afcfb..e661dedd8 100644 --- a/tools/designer/designer/editfunctionsimpl.h +++ b/tools/designer/designer/editfunctionsimpl.h @@ -44,7 +44,7 @@ class TQListViewItem; class EditFunctions : public EditFunctionsBase { - Q_OBJECT + TQ_OBJECT public: EditFunctions( TQWidget *parent, FormWindow *fw, bool showOnlySlots = FALSE ); diff --git a/tools/designer/designer/formfile.h b/tools/designer/designer/formfile.h index 8cc493c3b..d0dbe5374 100644 --- a/tools/designer/designer/formfile.h +++ b/tools/designer/designer/formfile.h @@ -44,7 +44,7 @@ class SourceEditor; class FormFile : public TQObject { - Q_OBJECT + TQ_OBJECT friend class SourceEditor; public: diff --git a/tools/designer/designer/formsettingsimpl.h b/tools/designer/designer/formsettingsimpl.h index 950b2f213..4b7973904 100644 --- a/tools/designer/designer/formsettingsimpl.h +++ b/tools/designer/designer/formsettingsimpl.h @@ -40,7 +40,7 @@ class FormWindow; class FormSettings : public FormSettingsBase { - Q_OBJECT + TQ_OBJECT public: FormSettings( TQWidget *parent, FormWindow *fw ); diff --git a/tools/designer/designer/formwindow.h b/tools/designer/designer/formwindow.h index b294d6794..130d719a3 100644 --- a/tools/designer/designer/formwindow.h +++ b/tools/designer/designer/formwindow.h @@ -71,7 +71,7 @@ class OrderIndicator; class FormWindow : public TQWidget { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( TQString fileName READ fileName WRITE setFileName ) public: diff --git a/tools/designer/designer/hierarchyview.h b/tools/designer/designer/hierarchyview.h index 29c200556..faa097e08 100644 --- a/tools/designer/designer/hierarchyview.h +++ b/tools/designer/designer/hierarchyview.h @@ -104,7 +104,7 @@ private: class HierarchyList : public TQListView { - Q_OBJECT + TQ_OBJECT public: HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects = TRUE ); @@ -156,7 +156,7 @@ protected: class FormDefinitionView : public HierarchyList { - Q_OBJECT + TQ_OBJECT public: FormDefinitionView( TQWidget *parent, FormWindow *fw ); @@ -189,7 +189,7 @@ private: class HierarchyView : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: HierarchyView( TQWidget *parent ); diff --git a/tools/designer/designer/iconvieweditorimpl.h b/tools/designer/designer/iconvieweditorimpl.h index dc995147c..d9e04a9ad 100644 --- a/tools/designer/designer/iconvieweditorimpl.h +++ b/tools/designer/designer/iconvieweditorimpl.h @@ -40,7 +40,7 @@ class FormWindow; class IconViewEditor : public IconViewEditorBase { - Q_OBJECT + TQ_OBJECT public: IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); diff --git a/tools/designer/designer/layout.h b/tools/designer/designer/layout.h index 97bd997bf..85b5b6af8 100644 --- a/tools/designer/designer/layout.h +++ b/tools/designer/designer/layout.h @@ -47,7 +47,7 @@ class TQPaintEvent; class Layout : public TQObject { - Q_OBJECT + TQ_OBJECT public: Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE ); @@ -124,7 +124,7 @@ protected: class Spacer : public TQWidget { - Q_OBJECT + TQ_OBJECT Q_OVERRIDE( TQCString name ) Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) @@ -168,7 +168,7 @@ protected: class TQDesignerGridLayout : public TQGridLayout { - Q_OBJECT + TQ_OBJECT public: TQDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){}; TQDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){}; diff --git a/tools/designer/designer/listboxdnd.h b/tools/designer/designer/listboxdnd.h index 50e8db899..546f6a2a3 100644 --- a/tools/designer/designer/listboxdnd.h +++ b/tools/designer/designer/listboxdnd.h @@ -42,7 +42,7 @@ typedef TQPtrList<TQListBoxItem> ListBoxItemList; class ListBoxDnd : public ListDnd { - Q_OBJECT + TQ_OBJECT public: // dragModes are enumerated in ListDnd ListBoxDnd( TQListBox * eventSource, const char * name = 0 ); diff --git a/tools/designer/designer/listboxeditorimpl.h b/tools/designer/designer/listboxeditorimpl.h index d4375fb80..2f84eaf95 100644 --- a/tools/designer/designer/listboxeditorimpl.h +++ b/tools/designer/designer/listboxeditorimpl.h @@ -41,7 +41,7 @@ class FormWindow; class ListBoxEditor : public ListBoxEditorBase { - Q_OBJECT + TQ_OBJECT public: ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); diff --git a/tools/designer/designer/listboxrename.h b/tools/designer/designer/listboxrename.h index e857fcfe1..8606dea42 100644 --- a/tools/designer/designer/listboxrename.h +++ b/tools/designer/designer/listboxrename.h @@ -41,7 +41,7 @@ class TQLineEdit; class ListBoxRename : public TQObject { - Q_OBJECT + TQ_OBJECT public: ListBoxRename( TQListBox * eventSource, const char * name = 0 ); bool eventFilter( TQObject *, TQEvent * event ); diff --git a/tools/designer/designer/listdnd.h b/tools/designer/designer/listdnd.h index 08820f707..df93f5cce 100644 --- a/tools/designer/designer/listdnd.h +++ b/tools/designer/designer/listdnd.h @@ -39,7 +39,7 @@ class ListDnd : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum DragMode { None = 0, External = 1, Internal = 2, Both = 3, Move = 4, NullDrop = 8 }; ListDnd( TQScrollView * eventSource, const char * name = 0 ); diff --git a/tools/designer/designer/listviewdnd.h b/tools/designer/designer/listviewdnd.h index dee4ce43f..a58773d72 100644 --- a/tools/designer/designer/listviewdnd.h +++ b/tools/designer/designer/listviewdnd.h @@ -44,7 +44,7 @@ typedef TQPtrList<TQListViewItem> ListViewItemList; class ListViewDnd : public ListDnd { - Q_OBJECT + TQ_OBJECT public: enum DragMode { Flat = 16 }; // see ListDnd::DragMode diff --git a/tools/designer/designer/listvieweditorimpl.h b/tools/designer/designer/listvieweditorimpl.h index f3258fb60..194e1f81f 100644 --- a/tools/designer/designer/listvieweditorimpl.h +++ b/tools/designer/designer/listvieweditorimpl.h @@ -44,7 +44,7 @@ class FormWindow; class ListViewEditor : public ListViewEditorBase { - Q_OBJECT + TQ_OBJECT public: ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ); diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index 822f35eba..4f22fb8b5 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -820,7 +820,7 @@ void MainWindow::helpAbout() LanguageInterface *iface = MetaDataBase::languageInterface( eProject->language() ); dlg.aboutLicense->setText( iface->aboutText() ); } - dlg.aboutVersion->setText(TQString("Version ") + TQString(QT_VERSION_STR)); + dlg.aboutVersion->setText(TQString("Version ") + TQString(TQT_VERSION_STR)); dlg.resize( dlg.width(), dlg.layout()->heightForWidth(dlg.width()) ); dlg.exec(); } @@ -1306,7 +1306,7 @@ void MainWindow::insertFormWindow( FormWindow *fw ) } fw->show(); fw->currentToolChanged(); - if ( fw->caption().isEmpty() && qstrlen( fw->name() ) ) + if ( fw->caption().isEmpty() && tqstrlen( fw->name() ) ) fw->setCaption( fw->name() ); fw->mainContainer()->setCaption( fw->caption() ); WidgetFactory::saveDefaultProperties( fw->mainContainer(), diff --git a/tools/designer/designer/mainwindow.h b/tools/designer/designer/mainwindow.h index 602f8a563..b18618a98 100644 --- a/tools/designer/designer/mainwindow.h +++ b/tools/designer/designer/mainwindow.h @@ -83,7 +83,7 @@ class Preferences; class MainWindow : public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: enum LineMode { Error, Step, StackFrame }; @@ -481,7 +481,7 @@ public: class SenderObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: SenderObject( TQUnknownInterface *i ) : iface( i ) { iface->addRef(); } diff --git a/tools/designer/designer/menubareditor.h b/tools/designer/designer/menubareditor.h index 495d4112a..f1d87f206 100644 --- a/tools/designer/designer/menubareditor.h +++ b/tools/designer/designer/menubareditor.h @@ -43,7 +43,7 @@ class TQActionGroup; class MenuBarEditorItem : public TQObject { - Q_OBJECT + TQ_OBJECT friend class MenuBarEditor; @@ -87,7 +87,7 @@ class FormWindow; class MenuBarEditor : public TQMenuBar { - Q_OBJECT + TQ_OBJECT public: MenuBarEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 ); diff --git a/tools/designer/designer/multilineeditorimpl.h b/tools/designer/designer/multilineeditorimpl.h index 603578dbf..11c7233c7 100644 --- a/tools/designer/designer/multilineeditorimpl.h +++ b/tools/designer/designer/multilineeditorimpl.h @@ -45,7 +45,7 @@ class TQTextDocument; class TextEdit : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: TextEdit( TQWidget *parent = 0, const char *name = 0 ); @@ -56,7 +56,7 @@ public: class ToolBarItem : public TQAction { - Q_OBJECT + TQ_OBJECT public: ToolBarItem( TQWidget *parent, TQWidget *toolBar, @@ -75,7 +75,7 @@ private: class MultiLineEditor : public MultiLineEditorBase { - Q_OBJECT + TQ_OBJECT public: MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget, diff --git a/tools/designer/designer/newformimpl.h b/tools/designer/designer/newformimpl.h index ba9a21c83..3b9413387 100644 --- a/tools/designer/designer/newformimpl.h +++ b/tools/designer/designer/newformimpl.h @@ -149,7 +149,7 @@ private: class NewForm : public NewFormBase { - Q_OBJECT + TQ_OBJECT public: NewForm( TQIconView *templateView, const TQString &templatePath ); diff --git a/tools/designer/designer/orderindicator.h b/tools/designer/designer/orderindicator.h index 49b144f64..1e7c88829 100644 --- a/tools/designer/designer/orderindicator.h +++ b/tools/designer/designer/orderindicator.h @@ -40,7 +40,7 @@ class FormWindow; class OrderIndicator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: OrderIndicator( int i, TQWidget* w, FormWindow* fw ); diff --git a/tools/designer/designer/outputwindow.h b/tools/designer/designer/outputwindow.h index 991e75723..a523793b2 100644 --- a/tools/designer/designer/outputwindow.h +++ b/tools/designer/designer/outputwindow.h @@ -68,7 +68,7 @@ private: class OutputWindow : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: OutputWindow( TQWidget *parent ); diff --git a/tools/designer/designer/paletteeditoradvancedimpl.h b/tools/designer/designer/paletteeditoradvancedimpl.h index 3abd0fc12..ab61b33e2 100644 --- a/tools/designer/designer/paletteeditoradvancedimpl.h +++ b/tools/designer/designer/paletteeditoradvancedimpl.h @@ -40,7 +40,7 @@ class FormWindow; class PaletteEditorAdvanced : public PaletteEditorAdvancedBase { - Q_OBJECT + TQ_OBJECT public: PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); diff --git a/tools/designer/designer/paletteeditorimpl.h b/tools/designer/designer/paletteeditorimpl.h index a4cd675a3..8ae59843d 100644 --- a/tools/designer/designer/paletteeditorimpl.h +++ b/tools/designer/designer/paletteeditorimpl.h @@ -40,7 +40,7 @@ class FormWindow; class PaletteEditor : public PaletteEditorBase { - Q_OBJECT + TQ_OBJECT public: PaletteEditor( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); diff --git a/tools/designer/designer/pixmapchooser.h b/tools/designer/designer/pixmapchooser.h index 4ac0cba50..220502162 100644 --- a/tools/designer/designer/pixmapchooser.h +++ b/tools/designer/designer/pixmapchooser.h @@ -44,7 +44,7 @@ class FormWindow; class PixmapView : public TQScrollView, public TQFilePreview { - Q_OBJECT + TQ_OBJECT public: PixmapView( TQWidget *parent ); @@ -59,7 +59,7 @@ private: class ImageIconProvider : public TQFileIconProvider { - Q_OBJECT + TQ_OBJECT public: ImageIconProvider( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tools/designer/designer/popupmenueditor.h b/tools/designer/designer/popupmenueditor.h index b4335905f..8143b9fa7 100644 --- a/tools/designer/designer/popupmenueditor.h +++ b/tools/designer/designer/popupmenueditor.h @@ -43,7 +43,7 @@ class TQMenuItem; class PopupMenuEditorItem : public TQObject { - Q_OBJECT + TQ_OBJECT friend class PopupMenuEditor; @@ -106,7 +106,7 @@ class TQLineEdit; class PopupMenuEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class PopupMenuEditorItem; friend class MenuBarEditor; diff --git a/tools/designer/designer/previewframe.h b/tools/designer/designer/previewframe.h index 679f20813..67fabbf52 100644 --- a/tools/designer/designer/previewframe.h +++ b/tools/designer/designer/previewframe.h @@ -41,7 +41,7 @@ class PreviewWorkspace : public TQWorkspace { - Q_OBJECT + TQ_OBJECT public: PreviewWorkspace( TQWidget* parent = 0, const char* name = 0 ) : TQWorkspace( parent, name ) {} @@ -53,7 +53,7 @@ protected: class PreviewFrame : public TQVBox { - Q_OBJECT + TQ_OBJECT public: PreviewFrame( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tools/designer/designer/previewwidgetimpl.h b/tools/designer/designer/previewwidgetimpl.h index 0fff9d15d..aaf511546 100644 --- a/tools/designer/designer/previewwidgetimpl.h +++ b/tools/designer/designer/previewwidgetimpl.h @@ -38,7 +38,7 @@ class PreviewWidget : public PreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: PreviewWidget( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tools/designer/designer/project.h b/tools/designer/designer/project.h index 066712c12..810e5b005 100644 --- a/tools/designer/designer/project.h +++ b/tools/designer/designer/project.h @@ -117,7 +117,7 @@ private: class Project : public TQObject { - Q_OBJECT + TQ_OBJECT friend class DatabaseConnection; public: diff --git a/tools/designer/designer/projectsettingsimpl.h b/tools/designer/designer/projectsettingsimpl.h index cff46e91b..639dab147 100644 --- a/tools/designer/designer/projectsettingsimpl.h +++ b/tools/designer/designer/projectsettingsimpl.h @@ -43,7 +43,7 @@ class SourceFile; class ProjectSettings : public ProjectSettingsBase { - Q_OBJECT + TQ_OBJECT public: ProjectSettings( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); diff --git a/tools/designer/designer/propertyeditor.h b/tools/designer/designer/propertyeditor.h index ca7228ac2..45f22481c 100644 --- a/tools/designer/designer/propertyeditor.h +++ b/tools/designer/designer/propertyeditor.h @@ -145,7 +145,7 @@ private: class PropertyTextItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyTextItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, @@ -181,7 +181,7 @@ private: class PropertyBoolItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyBoolItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ); @@ -205,7 +205,7 @@ private: class PropertyIntItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyIntItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, @@ -230,7 +230,7 @@ private: class PropertyLayoutItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyLayoutItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, @@ -254,7 +254,7 @@ private: class PropertyDoubleItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyDoubleItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, @@ -277,7 +277,7 @@ private: class PropertyListItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyListItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, @@ -312,7 +312,7 @@ private: class PropertyFontItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyFontItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ); @@ -341,7 +341,7 @@ private: class PropertyCoordItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: enum Type { Rect, Size, Point }; @@ -370,7 +370,7 @@ private: class PropertyColorItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, @@ -404,7 +404,7 @@ private: class PropertyPixmapItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: enum Type { Pixmap, IconSet, Image }; @@ -436,7 +436,7 @@ private: class PropertySizePolicyItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertySizePolicyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, @@ -462,7 +462,7 @@ private: class PropertyPaletteItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyPaletteItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, @@ -490,7 +490,7 @@ private: class PropertyCursorItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyCursorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, @@ -514,7 +514,7 @@ private: class PropertyKeysequenceItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyKeysequenceItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, @@ -544,7 +544,7 @@ private: class PropertyDatabaseItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyDatabaseItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName, bool wField ); @@ -581,7 +581,7 @@ struct EnumItem { class EnumPopup : public TQFrame { - Q_OBJECT + TQ_OBJECT public: EnumPopup( TQWidget *parent, const char *name, WFlags f=0 ); @@ -605,7 +605,7 @@ private: class EnumBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: EnumBox( TQWidget *parent, const char *name = 0 ); @@ -639,7 +639,7 @@ private: class PropertyEnumItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyEnumItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, @@ -665,7 +665,7 @@ private: class PropertyList : public TQListView { - Q_OBJECT + TQ_OBJECT public: PropertyList( PropertyEditor *e ); @@ -727,7 +727,7 @@ private: class EventList : public HierarchyList { - Q_OBJECT + TQ_OBJECT public: EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ); @@ -754,7 +754,7 @@ private: class PropertyEditor : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: PropertyEditor( TQWidget *parent ); @@ -805,7 +805,7 @@ private: class PropertyDateItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyDateItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ); @@ -828,7 +828,7 @@ private: class PropertyTimeItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ); @@ -851,7 +851,7 @@ private: class PropertyDateTimeItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: PropertyDateTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ); diff --git a/tools/designer/designer/qcompletionedit.h b/tools/designer/designer/qcompletionedit.h index 7bae93b8e..fcc8b4aec 100644 --- a/tools/designer/designer/qcompletionedit.h +++ b/tools/designer/designer/qcompletionedit.h @@ -42,7 +42,7 @@ class TQVBox; class TQCompletionEdit : public TQLineEdit { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd ) Q_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive ) diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp index 0e4a5206a..4f6c997dc 100644 --- a/tools/designer/designer/resource.cpp +++ b/tools/designer/designer/resource.cpp @@ -2429,13 +2429,13 @@ static TQImage loadImageData( TQDomElement &n2 ) ulong len = n2.attribute( "length" ).toULong(); if ( len < data.length() * 5 ) len = data.length() * 5; - // qUncompress() expects the first 4 bytes to be the expected length of + // tqUncompress() expects the first 4 bytes to be the expected length of // the uncompressed data ba[0] = ( len & 0xff000000 ) >> 24; ba[1] = ( len & 0x00ff0000 ) >> 16; ba[2] = ( len & 0x0000ff00 ) >> 8; ba[3] = ( len & 0x000000ff ); - TQByteArray baunzip = qUncompress( ba, baSize ); + TQByteArray baunzip = tqUncompress( ba, baSize ); img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.find('.')) ); } else { img.loadFromData( (const uchar*)ba+lengthOffset, baSize-lengthOffset, format ); diff --git a/tools/designer/designer/sizehandle.h b/tools/designer/designer/sizehandle.h index d391ec9a2..adc1d7810 100644 --- a/tools/designer/designer/sizehandle.h +++ b/tools/designer/designer/sizehandle.h @@ -45,7 +45,7 @@ class TQPaintEvent; class SizeHandle : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum Direction { LeftTop, Top, RightTop, Right, RightBottom, Bottom, LeftBottom, Left }; diff --git a/tools/designer/designer/sourceeditor.h b/tools/designer/designer/sourceeditor.h index a41fd86c2..613fb549c 100644 --- a/tools/designer/designer/sourceeditor.h +++ b/tools/designer/designer/sourceeditor.h @@ -46,7 +46,7 @@ class SourceFile; class SourceEditor : public TQVBox { - Q_OBJECT + TQ_OBJECT public: SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface ); diff --git a/tools/designer/designer/sourcefile.h b/tools/designer/designer/sourcefile.h index 47663c8e4..b659efaa9 100644 --- a/tools/designer/designer/sourcefile.h +++ b/tools/designer/designer/sourcefile.h @@ -43,7 +43,7 @@ class Project; class SourceFile : public TQObject { - Q_OBJECT + TQ_OBJECT public: SourceFile( const TQString &fn, bool temp, Project *p ); diff --git a/tools/designer/designer/startdialogimpl.h b/tools/designer/designer/startdialogimpl.h index c9406dc18..21d0b1dfa 100644 --- a/tools/designer/designer/startdialogimpl.h +++ b/tools/designer/designer/startdialogimpl.h @@ -46,7 +46,7 @@ class FileDialog : public TQFileDialog { - Q_OBJECT + TQ_OBJECT public: FileDialog( const TQString &dir, TQWidget *parent ); @@ -61,7 +61,7 @@ signals: class StartDialog : public StartDialogBase { - Q_OBJECT + TQ_OBJECT public: StartDialog( TQWidget *parent, const TQString &templatePath ); diff --git a/tools/designer/designer/styledbutton.h b/tools/designer/designer/styledbutton.h index 4574bf424..e9639d03b 100644 --- a/tools/designer/designer/styledbutton.h +++ b/tools/designer/designer/styledbutton.h @@ -43,7 +43,7 @@ class FormWindow; class StyledButton : public TQButton { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( TQColor color READ color WRITE setColor ) Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap ) diff --git a/tools/designer/designer/tableeditorimpl.h b/tools/designer/designer/tableeditorimpl.h index bb688433e..f566f2643 100644 --- a/tools/designer/designer/tableeditorimpl.h +++ b/tools/designer/designer/tableeditorimpl.h @@ -43,7 +43,7 @@ class FormWindow; class TableEditor : public TableEditorBase { - Q_OBJECT + TQ_OBJECT public: TableEditor( TQWidget* parent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0, diff --git a/tools/designer/designer/timestamp.h b/tools/designer/designer/timestamp.h index b37d57f12..bdb88d801 100644 --- a/tools/designer/designer/timestamp.h +++ b/tools/designer/designer/timestamp.h @@ -40,7 +40,7 @@ class TimeStamp : public TQObject { - Q_OBJECT + TQ_OBJECT public: TimeStamp( TQObject *parent, const TQString &f ); diff --git a/tools/designer/designer/variabledialogimpl.h b/tools/designer/designer/variabledialogimpl.h index af4564b26..adc6f9643 100644 --- a/tools/designer/designer/variabledialogimpl.h +++ b/tools/designer/designer/variabledialogimpl.h @@ -41,7 +41,7 @@ class TQListView; class VariableDialog : public VariableDialogBase { - Q_OBJECT + TQ_OBJECT public: VariableDialog( FormWindow *fw, TQWidget* parent = 0 ); ~VariableDialog(); diff --git a/tools/designer/designer/widgetaction.h b/tools/designer/designer/widgetaction.h index da500176e..40017de8e 100644 --- a/tools/designer/designer/widgetaction.h +++ b/tools/designer/designer/widgetaction.h @@ -38,7 +38,7 @@ class WidgetAction : public TQAction { - Q_OBJECT + TQ_OBJECT public: WidgetAction( const TQString &grp, TQObject* parent, diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h index 59e05a992..55d229077 100644 --- a/tools/designer/designer/widgetfactory.h +++ b/tools/designer/designer/widgetfactory.h @@ -128,7 +128,7 @@ private: class TQDesignerTabWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) @@ -157,7 +157,7 @@ private: class TQDesignerWidgetStack : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: @@ -200,7 +200,7 @@ private: class TQDesignerWizard : public TQWizard { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true ) Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) @@ -242,7 +242,7 @@ private: class TQLayoutWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::sizePolicy() ) {} @@ -260,7 +260,7 @@ protected: class CustomWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw ) @@ -292,7 +292,7 @@ protected: class Line : public TQFrame { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) Q_OVERRIDE( int frameWidth DESIGNABLE false ) @@ -318,7 +318,7 @@ public: class TQDesignerLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget ) @@ -350,7 +350,7 @@ private: class TQDesignerWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TQDesignerWidget( FormWindow *fw, TQWidget *parent, const char *name ) @@ -370,7 +370,7 @@ private: class TQDesignerDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT Q_OVERRIDE( bool modal READ isModal WRITE setModal ) public: @@ -391,7 +391,7 @@ private: class TQDesignerToolButton : public TQToolButton { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: @@ -414,7 +414,7 @@ public: class TQDesignerRadioButton : public TQRadioButton { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: @@ -439,7 +439,7 @@ public: class TQDesignerPushButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: @@ -463,7 +463,7 @@ public: class TQDesignerCheckBox : public TQCheckBox { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: @@ -487,7 +487,7 @@ public: class TQDesignerToolBox : public TQToolBox { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( TQString itemLabel READ itemLabel WRITE setItemLabel STORED false DESIGNABLE true ) Q_PROPERTY( TQCString itemName READ itemName WRITE setItemName STORED false DESIGNABLE true ) Q_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true ) diff --git a/tools/designer/designer/wizardeditorimpl.h b/tools/designer/designer/wizardeditorimpl.h index 983e26a86..c83268938 100644 --- a/tools/designer/designer/wizardeditorimpl.h +++ b/tools/designer/designer/wizardeditorimpl.h @@ -44,7 +44,7 @@ class FormWindow; class WizardEditor : public WizardEditorBase { - Q_OBJECT + TQ_OBJECT public: WizardEditor( TQWidget *parent, TQWizard *wizard, FormWindow *fw ); diff --git a/tools/designer/designer/workspace.h b/tools/designer/designer/workspace.h index e99c6f401..4f5bea132 100644 --- a/tools/designer/designer/workspace.h +++ b/tools/designer/designer/workspace.h @@ -93,7 +93,7 @@ private: class Workspace : public TQListView { - Q_OBJECT + TQ_OBJECT public: Workspace( TQWidget *parent , MainWindow *mw ); diff --git a/tools/designer/editor/arghintwidget.cpp b/tools/designer/editor/arghintwidget.cpp index e16708d0d..c49066c0c 100644 --- a/tools/designer/editor/arghintwidget.cpp +++ b/tools/designer/editor/arghintwidget.cpp @@ -128,7 +128,7 @@ static const char * right_disabled_xpm[] = { class ArrowButton : public TQButton { - Q_OBJECT + TQ_OBJECT public: enum Dir { Left, Right }; diff --git a/tools/designer/editor/arghintwidget.h b/tools/designer/editor/arghintwidget.h index 09937e3d2..5de4a129f 100644 --- a/tools/designer/editor/arghintwidget.h +++ b/tools/designer/editor/arghintwidget.h @@ -41,7 +41,7 @@ class ArrowButton; class ArgHintWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: ArgHintWidget( TQWidget *parent, const char*name ); diff --git a/tools/designer/editor/browser.h b/tools/designer/editor/browser.h index a19e2bcca..ac8ada282 100644 --- a/tools/designer/editor/browser.h +++ b/tools/designer/editor/browser.h @@ -43,7 +43,7 @@ class TQTextFormat; class EditorBrowser : public TQObject { - Q_OBJECT + TQ_OBJECT public: EditorBrowser( Editor *e ); diff --git a/tools/designer/editor/completion.h b/tools/designer/editor/completion.h index 6328315c7..cb46fed8a 100644 --- a/tools/designer/editor/completion.h +++ b/tools/designer/editor/completion.h @@ -64,7 +64,7 @@ struct CompletionEntry class EditorCompletion : public TQObject { - Q_OBJECT + TQ_OBJECT public: EditorCompletion( Editor *e ); diff --git a/tools/designer/editor/editor.h b/tools/designer/editor/editor.h index 768c5f530..060394312 100644 --- a/tools/designer/editor/editor.h +++ b/tools/designer/editor/editor.h @@ -44,7 +44,7 @@ class TQAccel; class Editor : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: enum Selection { diff --git a/tools/designer/editor/markerwidget.h b/tools/designer/editor/markerwidget.h index 2ab70a420..67e4e3bc2 100644 --- a/tools/designer/editor/markerwidget.h +++ b/tools/designer/editor/markerwidget.h @@ -42,7 +42,7 @@ class TQTextParagraph; class MarkerWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MarkerWidget( ViewManager *parent, const char*name ); diff --git a/tools/designer/editor/viewmanager.h b/tools/designer/editor/viewmanager.h index 46e4839de..ea8addc53 100644 --- a/tools/designer/editor/viewmanager.h +++ b/tools/designer/editor/viewmanager.h @@ -47,7 +47,7 @@ class TQTimer; class ViewManager : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ViewManager( TQWidget *parent, const char *name ); diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp index f0014d37b..11adb7f94 100644 --- a/tools/designer/editor/yyindent.cpp +++ b/tools/designer/editor/yyindent.cpp @@ -72,7 +72,7 @@ #include <ntqregexp.h> -/* qmake ignore Q_OBJECT */ +/* qmake ignore TQ_OBJECT */ /* The indenter avoids getting stuck in almost infinite loops by @@ -629,9 +629,9 @@ static bool isUnfinishedLine() if ( TQString("{};").find(lastCh) == -1 && !yyLine->endsWith("...") ) { /* It doesn't end with ';' or similar. If it's neither - "Q_OBJECT" nor "if ( x )", it must be an unfinished line. + "TQ_OBJECT" nor "if ( x )", it must be an unfinished line. */ - unf = ( yyLine->contains("Q_OBJECT") == 0 && + unf = ( yyLine->contains("TQ_OBJECT") == 0 && !matchBracelessControlStatement() ); } else if ( lastCh == TQChar(';') ) { if ( lastParen(*yyLine) == TQChar('(') ) { diff --git a/tools/designer/examples/credit/creditform.h b/tools/designer/examples/credit/creditform.h index 5bd2778ed..f8beb3581 100644 --- a/tools/designer/examples/credit/creditform.h +++ b/tools/designer/examples/credit/creditform.h @@ -2,7 +2,7 @@ class CreditForm : public CreditFormBase { - Q_OBJECT + TQ_OBJECT public: CreditForm( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); diff --git a/tools/designer/examples/credit/creditformbase.h b/tools/designer/examples/credit/creditformbase.h index 428b3d1b8..8d8b97c69 100644 --- a/tools/designer/examples/credit/creditformbase.h +++ b/tools/designer/examples/credit/creditformbase.h @@ -21,7 +21,7 @@ class TQSpinBox; class CreditFormBase : public TQDialog { - Q_OBJECT + TQ_OBJECT public: CreditFormBase( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); diff --git a/tools/designer/examples/filechooser/widget/filechooser.h b/tools/designer/examples/filechooser/widget/filechooser.h index 4d303a94c..8a8232946 100644 --- a/tools/designer/examples/filechooser/widget/filechooser.h +++ b/tools/designer/examples/filechooser/widget/filechooser.h @@ -14,7 +14,7 @@ class TQPushButton; class QT_WIDGET_PLUGIN_EXPORT FileChooser : public TQWidget { - Q_OBJECT + TQ_OBJECT Q_ENUMS( Mode ) Q_PROPERTY( Mode mode READ mode WRITE setMode ) diff --git a/tools/designer/examples/opengl/glwidget.h b/tools/designer/examples/opengl/glwidget.h index 6cb998ee7..43d68783b 100644 --- a/tools/designer/examples/opengl/glwidget.h +++ b/tools/designer/examples/opengl/glwidget.h @@ -39,7 +39,7 @@ class GLWidget : public TQGLWidget { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( double xRot READ xRot WRITE setXRot ) Q_PROPERTY( double yRot READ yRot WRITE setYRot ) Q_PROPERTY( double zRot READ zRot WRITE setZRot ) diff --git a/tools/designer/examples/receiver2/receiver.h b/tools/designer/examples/receiver2/receiver.h index aadc6a9e9..773f47ec1 100644 --- a/tools/designer/examples/receiver2/receiver.h +++ b/tools/designer/examples/receiver2/receiver.h @@ -3,7 +3,7 @@ class Receiver : public TQObject { - Q_OBJECT + TQ_OBJECT public: void setParent( TQDialog *parent ); public slots: diff --git a/tools/designer/examples/sizeaware/sizeaware.h b/tools/designer/examples/sizeaware/sizeaware.h index d118ed3f7..8e1adaae1 100644 --- a/tools/designer/examples/sizeaware/sizeaware.h +++ b/tools/designer/examples/sizeaware/sizeaware.h @@ -4,7 +4,7 @@ class SizeAware : public TQDialog { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( TQString company READ company WRITE setCompany ) Q_PROPERTY( TQString settingsFile READ settingsFile WRITE setSettingsFile ) public: diff --git a/tools/designer/examples/vcr/vcr.h b/tools/designer/examples/vcr/vcr.h index daff3d1d0..1c407d172 100644 --- a/tools/designer/examples/vcr/vcr.h +++ b/tools/designer/examples/vcr/vcr.h @@ -4,7 +4,7 @@ class Vcr : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Vcr( TQWidget *parent = 0, const char *name = 0 ); ~Vcr() {} diff --git a/tools/designer/plugins/cppeditor/cppbrowser.h b/tools/designer/plugins/cppeditor/cppbrowser.h index 30d14cdca..c906eafcd 100644 --- a/tools/designer/plugins/cppeditor/cppbrowser.h +++ b/tools/designer/plugins/cppeditor/cppbrowser.h @@ -39,7 +39,7 @@ class CppEditorBrowser : public EditorBrowser { - Q_OBJECT + TQ_OBJECT public: CppEditorBrowser( Editor *e ); diff --git a/tools/designer/plugins/cppeditor/cppcompletion.h b/tools/designer/plugins/cppeditor/cppcompletion.h index 965fc8f38..f6d2134c9 100644 --- a/tools/designer/plugins/cppeditor/cppcompletion.h +++ b/tools/designer/plugins/cppeditor/cppcompletion.h @@ -40,7 +40,7 @@ class CppEditorCompletion : public EditorCompletion { - Q_OBJECT + TQ_OBJECT public: CppEditorCompletion( Editor *e ); diff --git a/tools/designer/plugins/cppeditor/cppeditor.h b/tools/designer/plugins/cppeditor/cppeditor.h index a8704b1b7..6df0d926c 100644 --- a/tools/designer/plugins/cppeditor/cppeditor.h +++ b/tools/designer/plugins/cppeditor/cppeditor.h @@ -44,7 +44,7 @@ class CIndent; class CppEditor : public Editor { - Q_OBJECT + TQ_OBJECT public: CppEditor( const TQString &fn, TQWidget *parent, const char *name, DesignerInterface *i ); diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h index 238611c99..2a48277b3 100644 --- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h +++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h @@ -45,7 +45,7 @@ struct DesignerInterface; class EditorInterfaceImpl : public TQObject, public EditorInterface { - Q_OBJECT + TQ_OBJECT public: EditorInterfaceImpl(); diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.h b/tools/designer/plugins/wizards/sqlformwizardimpl.h index be3602d79..1bce4780e 100644 --- a/tools/designer/plugins/wizards/sqlformwizardimpl.h +++ b/tools/designer/plugins/wizards/sqlformwizardimpl.h @@ -41,7 +41,7 @@ class SqlFormWizard : public SqlFormWizardBase { - Q_OBJECT + TQ_OBJECT public: SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, TQWidget* parent = 0, DesignerFormWindow *fw = 0, diff --git a/tools/designer/tools/conv2ui/main.cpp b/tools/designer/tools/conv2ui/main.cpp index df26872f2..67c584b94 100644 --- a/tools/designer/tools/conv2ui/main.cpp +++ b/tools/designer/tools/conv2ui/main.cpp @@ -149,7 +149,7 @@ void printHelpMessage( TQStringList & formats ) void printVersion() { - printf( "TQt user interface file converter for TQt version %s\n", QT_VERSION_STR ); + printf( "TQt user interface file converter for TQt version %s\n", TQT_VERSION_STR ); } int main( int argc, char ** argv ) diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp index aa00988ea..63cbd9bc1 100644 --- a/tools/designer/uic/embed.cpp +++ b/tools/designer/uic/embed.cpp @@ -236,7 +236,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima " if ( TQString::fromUtf8(embed_image_vec[i].name) == name ) {\n" #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION " TQByteArray baunzip;\n" - " baunzip = qUncompress( embed_image_vec[i].data, \n" + " baunzip = tqUncompress( embed_image_vec[i].data, \n" " embed_image_vec[i].compressed );\n" " TQImage img((uchar*)baunzip.data(),\n" " embed_image_vec[i].width,\n" diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp index e185af6c3..a2768de90 100644 --- a/tools/designer/uic/form.cpp +++ b/tools/designer/uic/form.cpp @@ -64,18 +64,18 @@ static TQByteArray unzipXPM( TQString data, ulong& length ) r += l - 'a' + 10; ba[ i ] = r; } - // qUncompress() expects the first 4 bytes to be the expected length of the + // tqUncompress() expects the first 4 bytes to be the expected length of the // uncompressed data ba[0] = ( length & 0xff000000 ) >> 24; ba[1] = ( length & 0x00ff0000 ) >> 16; ba[2] = ( length & 0x0000ff00 ) >> 8; ba[3] = ( length & 0x000000ff ); - TQByteArray baunzip = qUncompress( ba, baSize ); + TQByteArray baunzip = tqUncompress( ba, baSize ); delete[] ba; return baunzip; } -#if QT_VERSION >= 0x030900 +#if TQT_VERSION >= 0x030900 #error Add this functionality to TQDir (relativePathTo() maybe?) and \ remove it from here and from moc #endif @@ -373,8 +373,8 @@ void Uic::createFormDecl( const TQDomElement &e ) out << exportMacro << " "; out << bareNameOfClass << " : public " << objClass << endl << "{" << endl; - /* qmake ignore Q_OBJECT */ - out << " Q_OBJECT" << endl; + /* qmake ignore TQ_OBJECT */ + out << " TQ_OBJECT" << endl; out << endl; out << "public:" << endl; @@ -583,7 +583,7 @@ void Uic::createFormDecl( const TQDomElement &e ) registerLayouts( e ); out << endl; -#if QT_VERSION >= 0x030900 +#if TQT_VERSION >= 0x030900 #error Make languageChange() a virtual protected non-slot member of TQWidget #endif diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp index 452aad978..dbb3962a4 100644 --- a/tools/designer/uic/main.cpp +++ b/tools/designer/uic/main.cpp @@ -74,7 +74,7 @@ int main( int argc, char * argv[] ) TQApplication app(argc, argv, FALSE); TQString keybase( "/TQt Designer/" + - TQString::number( (QT_VERSION >> 16) & 0xff ) +"." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" ); + TQString::number( (TQT_VERSION >> 16) & 0xff ) +"." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" ); TQSettings config; config.insertSearchPath( TQSettings::Windows, "/Trolltech" ); TQStringList pluginPaths = config.readListEntry( keybase + "PluginPaths" ); @@ -169,7 +169,7 @@ int main( int argc, char * argv[] ) } else if ( opt == "version" ) { fprintf( stderr, "User Interface Compiler for TQt version %s\n", - QT_VERSION_STR ); + TQT_VERSION_STR ); return 1; } else if ( opt == "help" ) { break; @@ -298,7 +298,7 @@ int main( int argc, char * argv[] ) TQDomElement e = doc.firstChild().toElement(); if ( e.hasAttribute("version") && e.attribute("version").toDouble() > 3.3 ) { qWarning( TQString("uic: File generated with too recent version of TQt Designer (%s vs. %s)"), - e.attribute("version").latin1(), QT_VERSION_STR ); + e.attribute("version").latin1(), TQT_VERSION_STR ); return 1; } diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp index f89b2ffb4..194bb6154 100644 --- a/tools/designer/uic/subclassing.cpp +++ b/tools/designer/uic/subclassing.cpp @@ -63,8 +63,8 @@ void Uic::createSubDecl( const TQDomElement &e, const TQString& subClass ) out << "class " << subClass << " : public " << nameOfClass << endl; out << "{" << endl; -/* tmake ignore Q_OBJECT */ - out << " Q_OBJECT" << endl; +/* tmake ignore TQ_OBJECT */ + out << " TQ_OBJECT" << endl; out << endl; out << "public:" << endl; diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp index 269f6c355..cbf49cc47 100644 --- a/tools/designer/uilib/qwidgetfactory.cpp +++ b/tools/designer/uilib/qwidgetfactory.cpp @@ -174,7 +174,7 @@ static TQImage loadImageData( const TQString& format, ulong len, TQByteArray dat if ( format == "XPM.GZ" || format == "XBM.GZ" ) { if ( len < data.size() * 10 ) len = data.size() * 10; - // qUncompress() expects the first 4 bytes to be the expected length of + // tqUncompress() expects the first 4 bytes to be the expected length of // the uncompressed data TQByteArray dataTmp( data.size() + 4 ); memcpy( dataTmp.data()+4, data.data(), data.size() ); @@ -182,7 +182,7 @@ static TQImage loadImageData( const TQString& format, ulong len, TQByteArray dat dataTmp[1] = ( len & 0x00ff0000 ) >> 16; dataTmp[2] = ( len & 0x0000ff00 ) >> 8; dataTmp[3] = ( len & 0x000000ff ); - TQByteArray baunzip = qUncompress( dataTmp ); + TQByteArray baunzip = tqUncompress( dataTmp ); len = baunzip.size(); img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.find('.')) ); } else { @@ -491,7 +491,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec if ( !connections.isNull() ) loadConnections( connections, connector ); - if ( w && name && qstrlen( name ) > 0 ) + if ( w && name && tqstrlen( name ) > 0 ) w->setName( name ); if ( !tabOrder.isNull() ) diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf index ecf2689a5..771fff592 100644 --- a/tools/linguist/book/linguist-programmer.leaf +++ b/tools/linguist/book/linguist-programmer.leaf @@ -130,9 +130,9 @@ would become button = new QPushButton( tr("&Quit"), this); \endcode -\index Q_OBJECT +\index TQ_OBJECT -All \l QObject subclasses that use the \c Q_OBJECT macro implement +All \l QObject subclasses that use the \c TQ_OBJECT macro implement the \c tr() function. Although the \c tr() call is normally made directly since it is @@ -581,7 +581,7 @@ version}, above, the central widget with the four buttons is an \skipto class ArrowPad \printline class ArrowPad -\index Q_OBJECT +\index TQ_OBJECT \index tr() \index QObject!tr() \index Translation Contexts @@ -591,7 +591,7 @@ When \l lupdate is run it not only extracts the source texts but it also groups them into contexts. A context is the name of the class in which the source text appears. Thus, in this example, "ArrowPad" is a context: it is the context of the texts in the \c ArrowPad class. -The \c Q_OBJECT macro defines \c tr(x) in \c ArrowPad like this +The \c TQ_OBJECT macro defines \c tr(x) in \c ArrowPad like this \index QApplication!translate() \index translate()!QApplication @@ -623,17 +623,17 @@ user-visible text. \img tt2_en.png \caption Tutorial 2 Screenshot, English version -\index Q_OBJECT +\index TQ_OBJECT \index MainWindow!in Translation Tutorial \quotefile tt2/mainwindow.h \skipto QMainWindow \printline QMainWindow -\printuntil Q_OBJECT +\printuntil TQ_OBJECT In the \e {Tutorial 2 Screenshot, English version}, above, the whole window is a \c MainWindow. This is defined in the \c mainwindow.h -header file. Here too, we use \c Q_OBJECT, so that \c MainWindow will +header file. Here too, we use \c TQ_OBJECT, so that \c MainWindow will become a context in \e {Qt Linguist}. In the implementation of \c MainWindow, \c mainwindow.cpp, we create @@ -850,13 +850,13 @@ The PrintPanel is defined in \c printpanel.h. \quotefile tt3/printpanel.h \skipto QVBox \printline QVBox -\printuntil Q_OBJECT +\printuntil TQ_OBJECT -\index Q_OBJECT +\index TQ_OBJECT \index PrintPanel!in Translation Tutorial -PrintPanel is a \l QWidget. It needs the \c Q_OBJECT macro for \c +PrintPanel is a \l QWidget. It needs the \c TQ_OBJECT macro for \c tr() to work properly. The implementation file is \c printpanel.cpp. diff --git a/tools/linguist/linguist/finddialog.h b/tools/linguist/linguist/finddialog.h index 43c7b589b..c2576002e 100644 --- a/tools/linguist/linguist/finddialog.h +++ b/tools/linguist/linguist/finddialog.h @@ -41,7 +41,7 @@ class TQLineEdit; class FindDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: enum { SourceText = 0x1, Translations = 0x2, Comments = 0x4 }; diff --git a/tools/linguist/linguist/msgedit.h b/tools/linguist/linguist/msgedit.h index a85bc1dd3..b1cfd9442 100644 --- a/tools/linguist/linguist/msgedit.h +++ b/tools/linguist/linguist/msgedit.h @@ -63,7 +63,7 @@ class PhraseLV; class PageCurl : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PageCurl( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) @@ -125,7 +125,7 @@ private: class EditorPage : public TQFrame { - Q_OBJECT + TQ_OBJECT public: EditorPage( TQWidget * parent = 0, const char * name = 0 ); @@ -157,7 +157,7 @@ signals: class MessageEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MessageEditor( MetaTranslator * t, TQWidget * parent = 0, const char * name = 0 ); diff --git a/tools/linguist/linguist/phrasebookbox.h b/tools/linguist/linguist/phrasebookbox.h index a48d40c02..99edb9f81 100644 --- a/tools/linguist/linguist/phrasebookbox.h +++ b/tools/linguist/linguist/phrasebookbox.h @@ -47,7 +47,7 @@ class PhraseLV; class PhraseBookBox : public TQDialog { - Q_OBJECT + TQ_OBJECT public: PhraseBookBox( const TQString& filename, const PhraseBook& phraseBook, TQWidget *parent = 0, const char *name = 0, diff --git a/tools/linguist/linguist/phraselv.h b/tools/linguist/linguist/phraselv.h index 8135b43e3..e2e7ee19b 100644 --- a/tools/linguist/linguist/phraselv.h +++ b/tools/linguist/linguist/phraselv.h @@ -69,7 +69,7 @@ private: class PhraseLV : public TQListView { - Q_OBJECT + TQ_OBJECT public: PhraseLV( TQWidget *parent, const char *name ); ~PhraseLV(); diff --git a/tools/linguist/linguist/simtexth.cpp b/tools/linguist/linguist/simtexth.cpp index 931ba1377..8d6182210 100644 --- a/tools/linguist/linguist/simtexth.cpp +++ b/tools/linguist/linguist/simtexth.cpp @@ -191,7 +191,7 @@ CandidateList similarTextHeuristicCandidates( const MetaTranslator *tor, TQValueList<int> scores; CandidateList candidates; CoMatrix cmTarget( text ); - int targetLen = qstrlen( text ); + int targetLen = tqstrlen( text ); TML all = tor->translatedMessages(); TML::Iterator it; diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp index e174edc50..d044ca699 100644 --- a/tools/linguist/linguist/trwindow.cpp +++ b/tools/linguist/linguist/trwindow.cpp @@ -859,7 +859,7 @@ void TrWindow::manual() void TrWindow::about() { AboutDialog about( this, 0, TRUE ); - about.versionLabel->setText( tr("Version %1").arg(QT_VERSION_STR) ); + about.versionLabel->setText( tr("Version %1").arg(TQT_VERSION_STR) ); about.exec(); } @@ -1847,8 +1847,8 @@ bool TrWindow::danger( const TQString& source, const TQString& translation, void TrWindow::readConfig() { TQString keybase( "/TQt Linguist/" + - TQString::number( (QT_VERSION >> 16) & 0xff ) + - "." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" ); + TQString::number( (TQT_VERSION >> 16) & 0xff ) + + "." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" ); TQSettings config; config.insertSearchPath( TQSettings::Windows, "/Trolltech" ); @@ -1918,8 +1918,8 @@ void TrWindow::readConfig() void TrWindow::writeConfig() { TQString keybase( "/TQt Linguist/" + - TQString::number( (QT_VERSION >> 16) & 0xff ) + - "." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" ); + TQString::number( (TQT_VERSION >> 16) & 0xff ) + + "." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" ); TQSettings config; config.insertSearchPath( TQSettings::Windows, "/Trolltech" ); diff --git a/tools/linguist/linguist/trwindow.h b/tools/linguist/linguist/trwindow.h index af20b4873..82fc4ec10 100644 --- a/tools/linguist/linguist/trwindow.h +++ b/tools/linguist/linguist/trwindow.h @@ -63,7 +63,7 @@ class Statistics; class TrWindow : public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: static TQPixmap * pxOn; static TQPixmap * pxOff; diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp index 9dc6b07eb..587f62104 100644 --- a/tools/linguist/lrelease/main.cpp +++ b/tools/linguist/lrelease/main.cpp @@ -120,7 +120,7 @@ int main( int argc, char **argv ) verbose = TRUE; continue; } else if ( qstrcmp(argv[i], "-version") == 0 ) { - fprintf( stderr, "lrelease version %s\n", QT_VERSION_STR ); + fprintf( stderr, "lrelease version %s\n", TQT_VERSION_STR ); return 0; } else if ( qstrcmp(argv[i], "-qm") == 0 ) { if ( i == argc - 1 ) { diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp index a557fd518..7201f3a0e 100644 --- a/tools/linguist/lupdate/fetchtr.cpp +++ b/tools/linguist/lupdate/fetchtr.cpp @@ -45,12 +45,12 @@ #include <stdio.h> #include <string.h> -/* qmake ignore Q_OBJECT */ +/* qmake ignore TQ_OBJECT */ static const char MagicComment[] = "TRANSLATOR "; -static TQMap<TQCString, int> needs_Q_OBJECT; -static TQMap<TQCString, int> lacks_Q_OBJECT; +static TQMap<TQCString, int> needs_TQ_OBJECT; +static TQMap<TQCString, int> lacks_TQ_OBJECT; /* The first part of this source file is the C++ tokenizer. We skip @@ -75,7 +75,7 @@ static TQMap<TQCString, int> lacks_Q_OBJECT; */ enum { Tok_Eof, Tok_class, Tok_namespace, Tok_return, Tok_tr, - Tok_trUtf8, Tok_translate, Tok_Q_OBJECT, Tok_Ident, + Tok_trUtf8, Tok_translate, Tok_TQ_OBJECT, Tok_Ident, Tok_Comment, Tok_String, Tok_Arrow, Tok_Colon, Tok_Gulbrandsen, Tok_LeftBrace, Tok_RightBrace, Tok_LeftParen, Tok_RightParen, Tok_Comma, Tok_Semicolon }; @@ -167,7 +167,7 @@ static int getToken() switch ( yyIdent[0] ) { case 'Q': if ( strcmp(yyIdent + 1, "_OBJECT") == 0 ) { - return Tok_Q_OBJECT; + return Tok_TQ_OBJECT; } else if ( strcmp(yyIdent + 1, "T_TR_NOOP") == 0 ) { return Tok_tr; } else if ( strcmp(yyIdent + 1, "T_TRANSLATE_NOOP") == 0 ) { @@ -480,7 +480,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, TQCString functionContext = initialContext; TQCString prefix; bool utf8 = FALSE; - bool missing_Q_OBJECT = FALSE; + bool missing_TQ_OBJECT = FALSE; yyTok = getToken(); while ( yyTok != Tok_Eof ) { @@ -511,7 +511,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, } if ( yyTok == Tok_Colon ) { - missing_Q_OBJECT = TRUE; + missing_TQ_OBJECT = TRUE; } else { functionContext = defaultContext; } @@ -550,13 +550,13 @@ static void parse( MetaTranslator *tor, const char *initialContext, tor->insert( MetaTranslatorMessage(context, text, com, TQString::null, utf8) ); - if ( lacks_Q_OBJECT.contains(context) ) { - qWarning( "%s:%d: Class '%s' lacks Q_OBJECT macro", + if ( lacks_TQ_OBJECT.contains(context) ) { + qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", (const char *) yyFileName, yyLineNo, (const char *) context ); - lacks_Q_OBJECT.remove( context ); + lacks_TQ_OBJECT.remove( context ); } else { - needs_Q_OBJECT.insert( context, 0 ); + needs_TQ_OBJECT.insert( context, 0 ); } } } @@ -580,8 +580,8 @@ static void parse( MetaTranslator *tor, const char *initialContext, TQString::null, utf8) ); } break; - case Tok_Q_OBJECT: - missing_Q_OBJECT = FALSE; + case Tok_TQ_OBJECT: + missing_TQ_OBJECT = FALSE; yyTok = getToken(); break; case Tok_Ident: @@ -637,17 +637,17 @@ static void parse( MetaTranslator *tor, const char *initialContext, yyBraceDepth + 1 == (int) namespaces.count() ) namespaces.remove( namespaces.fromLast() ); if ( yyBraceDepth == (int) namespaces.count() ) { - if ( missing_Q_OBJECT ) { - if ( needs_Q_OBJECT.contains(functionContext) ) { - qWarning( "%s:%d: Class '%s' lacks Q_OBJECT macro", + if ( missing_TQ_OBJECT ) { + if ( needs_TQ_OBJECT.contains(functionContext) ) { + qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", (const char *) yyFileName, yyLineNo, (const char *) functionContext ); } else { - lacks_Q_OBJECT.insert( functionContext, 0 ); + lacks_TQ_OBJECT.insert( functionContext, 0 ); } } functionContext = defaultContext; - missing_Q_OBJECT = FALSE; + missing_TQ_OBJECT = FALSE; } yyTok = getToken(); break; diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index 7c933afed..1e7225081 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -126,7 +126,7 @@ int main( int argc, char **argv ) verbose = TRUE; continue; } else if ( qstrcmp(argv[i], "-version") == 0 ) { - fprintf( stderr, "lupdate version %s\n", QT_VERSION_STR ); + fprintf( stderr, "lupdate version %s\n", TQT_VERSION_STR ); return 0; } else if ( qstrcmp(argv[i], "-ts") == 0 ) { metTsFlag = TRUE; diff --git a/tools/linguist/lupdate/numberh.cpp b/tools/linguist/lupdate/numberh.cpp index 52593b59e..29d6fd2f9 100644 --- a/tools/linguist/lupdate/numberh.cpp +++ b/tools/linguist/lupdate/numberh.cpp @@ -98,7 +98,7 @@ static TQString translationAttempt( const TQString& oldTranslation, const char *newSource ) { int p = zeroKey( oldSource ).contains( '0' ); - int oldSourceLen = qstrlen( oldSource ); + int oldSourceLen = tqstrlen( oldSource ); TQString attempt; TQStringList oldNumbers; TQStringList newNumbers; diff --git a/tools/linguist/qdoc.conf b/tools/linguist/qdoc.conf index 86e6066e4..27ba5efe8 100644 --- a/tools/linguist/qdoc.conf +++ b/tools/linguist/qdoc.conf @@ -5,7 +5,7 @@ OUTPUTDIR = $QTDIR/tools/linguist/doc/html BASE = file:$QTDIR/tools/linguist/doc/html/ COMPANY = Trolltech PRODUCT = TQt Linguist -VERSIONSYM = QT_VERSION_STR +VERSIONSYM = TQT_VERSION_STR DEFINE = QT_QDOC QT_.*_SUPPORT _WS_.*_ FALSE = 0 1 INTERNAL = no diff --git a/tools/linguist/qm2ts/main.cpp b/tools/linguist/qm2ts/main.cpp index c32c5248d..7c30167ae 100644 --- a/tools/linguist/qm2ts/main.cpp +++ b/tools/linguist/qm2ts/main.cpp @@ -64,7 +64,7 @@ int main( int argc, char **argv ) verbose = TRUE; continue; } else if ( qstrcmp(argv[i], "-version") == 0 ) { - fprintf( stderr, "qm2ts version %s\n", QT_VERSION_STR ); + fprintf( stderr, "qm2ts version %s\n", TQT_VERSION_STR ); return 0; } diff --git a/tools/linguist/tutorial/tt2/arrowpad.h b/tools/linguist/tutorial/tt2/arrowpad.h index c973523bb..e0d304922 100644 --- a/tools/linguist/tutorial/tt2/arrowpad.h +++ b/tools/linguist/tutorial/tt2/arrowpad.h @@ -11,7 +11,7 @@ class ArrowPad : public TQGrid { - Q_OBJECT + TQ_OBJECT public: ArrowPad( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tools/linguist/tutorial/tt2/mainwindow.h b/tools/linguist/tutorial/tt2/mainwindow.h index 0a190af08..92ecf61c7 100644 --- a/tools/linguist/tutorial/tt2/mainwindow.h +++ b/tools/linguist/tutorial/tt2/mainwindow.h @@ -11,7 +11,7 @@ class MainWindow : public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow( TQWidget *parent = 0, const char *name = 0 ); }; diff --git a/tools/linguist/tutorial/tt3/mainwindow.h b/tools/linguist/tutorial/tt3/mainwindow.h index c0b5812fb..2007658eb 100644 --- a/tools/linguist/tutorial/tt3/mainwindow.h +++ b/tools/linguist/tutorial/tt3/mainwindow.h @@ -11,7 +11,7 @@ class MainWindow : public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tools/linguist/tutorial/tt3/printpanel.h b/tools/linguist/tutorial/tt3/printpanel.h index 565b7b629..2c7d34a6b 100644 --- a/tools/linguist/tutorial/tt3/printpanel.h +++ b/tools/linguist/tutorial/tt3/printpanel.h @@ -11,7 +11,7 @@ class PrintPanel : public TQVBox { - Q_OBJECT + TQ_OBJECT public: PrintPanel( TQWidget *parent = 0, const char *name = 0 ); }; diff --git a/tools/makeqpf/main.cpp b/tools/makeqpf/main.cpp index c3f233d12..5d9bb185f 100644 --- a/tools/makeqpf/main.cpp +++ b/tools/makeqpf/main.cpp @@ -139,7 +139,7 @@ public: class MakeTQPF : public TQMainWindow { - Q_OBJECT + TQ_OBJECT TQListView* view; public: MakeTQPF() diff --git a/tools/qconfig/main.h b/tools/qconfig/main.h index 6d68b97db..48ffacddc 100644 --- a/tools/qconfig/main.h +++ b/tools/qconfig/main.h @@ -42,7 +42,7 @@ class TQListView; class TQLabel; class Info : public TQTextBrowser { - Q_OBJECT + TQ_OBJECT public: Info( TQWidget* parent, const char* name=0 ); @@ -54,7 +54,7 @@ public slots: }; class Main : public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: Main(); void loadFeatures(const TQString& filename); diff --git a/tools/qtconfig/colorbutton.h b/tools/qtconfig/colorbutton.h index 504579df8..9b1351f65 100644 --- a/tools/qtconfig/colorbutton.h +++ b/tools/qtconfig/colorbutton.h @@ -39,7 +39,7 @@ class ColorButton : public TQButton { - Q_OBJECT + TQ_OBJECT public: ColorButton(TQWidget *, const char * = 0); diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index e3f113664..bf399bd40 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -490,7 +490,7 @@ void MainWindow::fileSave() TQStringList libpath = TQApplication::libraryPaths(); TQString libpathkey = - TQString("/qt/%1.%2/libraryPath").arg( QT_VERSION >> 16 ).arg( (QT_VERSION & 0xff00 ) >> 8 ); + TQString("/qt/%1.%2/libraryPath").arg( TQT_VERSION >> 16 ).arg( (TQT_VERSION & 0xff00 ) >> 8 ); settings.writeEntry(libpathkey, libpath, ':'); settings.writeEntry("/qt/fontPath", fontpaths, ':'); settings.writeEntry("/qt/embedFonts", fontembeddingcheckbox->isChecked() ); diff --git a/tools/qtconfig/mainwindow.h b/tools/qtconfig/mainwindow.h index a539f905c..7e4fa4f7b 100644 --- a/tools/qtconfig/mainwindow.h +++ b/tools/qtconfig/mainwindow.h @@ -39,7 +39,7 @@ class MainWindow : public MainWindowBase { - Q_OBJECT + TQ_OBJECT public: MainWindow(); diff --git a/tools/qtconfig/paletteeditoradvanced.h b/tools/qtconfig/paletteeditoradvanced.h index 457b1c676..c1724a651 100644 --- a/tools/qtconfig/paletteeditoradvanced.h +++ b/tools/qtconfig/paletteeditoradvanced.h @@ -38,7 +38,7 @@ class PaletteEditorAdvanced : public PaletteEditorAdvancedBase { - Q_OBJECT + TQ_OBJECT public: PaletteEditorAdvanced( TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); diff --git a/tools/qtconfig/previewframe.h b/tools/qtconfig/previewframe.h index d0ec6eb32..8aead5a34 100644 --- a/tools/qtconfig/previewframe.h +++ b/tools/qtconfig/previewframe.h @@ -41,7 +41,7 @@ class Workspace : public TQWorkspace { - Q_OBJECT + TQ_OBJECT public: Workspace( TQWidget* parent = 0, const char* name = 0 ) @@ -54,7 +54,7 @@ protected: class PreviewFrame : public TQVBox { - Q_OBJECT + TQ_OBJECT public: PreviewFrame( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tools/qtconfig/previewwidget.h b/tools/qtconfig/previewwidget.h index d74af3e69..738c0aa64 100644 --- a/tools/qtconfig/previewwidget.h +++ b/tools/qtconfig/previewwidget.h @@ -38,7 +38,7 @@ class PreviewWidget : public PreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: PreviewWidget( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tools/qvfb/gammaview.h b/tools/qvfb/gammaview.h index 67d4695a2..268c83928 100644 --- a/tools/qvfb/gammaview.h +++ b/tools/qvfb/gammaview.h @@ -38,7 +38,7 @@ class GammaView: public TQWidget { - Q_OBJECT + TQ_OBJECT public: GammaView( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ) : diff --git a/tools/qvfb/qvfb.h b/tools/qvfb/qvfb.h index 59a051d57..518e1d76f 100644 --- a/tools/qvfb/qvfb.h +++ b/tools/qvfb/qvfb.h @@ -42,7 +42,7 @@ class Config; class TQVFb: public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *parent = 0, const char *name = 0, uint wflags = 0 ); diff --git a/tools/qvfb/qvfbratedlg.h b/tools/qvfb/qvfbratedlg.h index 28c9c17d7..2e514c5d2 100644 --- a/tools/qvfb/qvfbratedlg.h +++ b/tools/qvfb/qvfbratedlg.h @@ -38,7 +38,7 @@ class TQSlider; class TQVFbRateDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: TQVFbRateDialog( int value, TQWidget *parent=0, const char *name=0, bool modal=FALSE ); diff --git a/tools/qvfb/qvfbview.h b/tools/qvfb/qvfbview.h index 5220cb2a9..dee52fb73 100644 --- a/tools/qvfb/qvfbview.h +++ b/tools/qvfb/qvfbview.h @@ -41,7 +41,7 @@ struct TQVFbHeader; class TQVFbView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: TQVFbView( int display_id, int w, int h, int d, TQWidget *parent = 0, const char *name = 0, uint wflags = 0 ); |