From 99a2774ca6f1cab334de5d43fe36fc44ae889a4c Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 12 Jun 2011 01:36:19 +0000 Subject: TQt4 convert kdesdk This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kapptemplate/appframework/app.spec | 4 ++-- kapptemplate/existing/app-Makefile.am | 2 +- kapptemplate/kapp/app-Makefile.am | 2 +- kapptemplate/kapp/app.cpp | 6 +++--- kapptemplate/kapp/app.h | 3 ++- kapptemplate/kapp/apppref.cpp | 16 ++++++++-------- kapptemplate/kapp/apppref.h | 11 +++++++---- kapptemplate/kapp/appview.cpp | 6 +++--- kapptemplate/kapp/appview.h | 3 ++- kapptemplate/kapptemplate.common | 2 +- kapptemplate/kapptemplate.in | 2 +- kapptemplate/kpartapp/app-Makefile.am | 2 +- kapptemplate/kpartapp/app.cpp | 2 +- kapptemplate/kpartapp/app.h | 1 + kapptemplate/kpartapp/app_part-desktop | 2 +- kapptemplate/kpartapp/app_part.cpp | 14 +++++++------- kapptemplate/kpartapp/app_part.h | 5 +++-- kapptemplate/kpartplugin/plugin_app.cpp | 10 +++++----- kapptemplate/kpartplugin/plugin_app.h | 3 ++- 19 files changed, 52 insertions(+), 44 deletions(-) (limited to 'kapptemplate') diff --git a/kapptemplate/appframework/app.spec b/kapptemplate/appframework/app.spec index b0f3fd48..8cd1be53 100644 --- a/kapptemplate/appframework/app.spec +++ b/kapptemplate/appframework/app.spec @@ -34,8 +34,8 @@ make -j$numprocs make install-strip DESTDIR=\$RPM_BUILD_ROOT cd $RPM_BUILD_ROOT -find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/%{name}-master.list -find . -type f -o -type l | sed 's|^\.||' >> \$RPM_BUILD_DIR/%{name}-master.list +tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/%{name}-master.list +tqfind . -type f -o -type l | sed 's|^\.||' >> \$RPM_BUILD_DIR/%{name}-master.list %clean rm -rf \$RPM_BUILD_DIR/%{name}-%{version} diff --git a/kapptemplate/existing/app-Makefile.am b/kapptemplate/existing/app-Makefile.am index 79236a7f..5241a4f2 100644 --- a/kapptemplate/existing/app-Makefile.am +++ b/kapptemplate/existing/app-Makefile.am @@ -23,7 +23,7 @@ ${APP_NAME_LC}_SOURCES = ${EXISTING_SOURCE} # these are the headers for your project that won't be installed noinst_HEADERS = ${EXISTING_HEADER} -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO messages: rc.cpp diff --git a/kapptemplate/kapp/app-Makefile.am b/kapptemplate/kapp/app-Makefile.am index 9ed82a08..5cf0ca86 100644 --- a/kapptemplate/kapp/app-Makefile.am +++ b/kapptemplate/kapp/app-Makefile.am @@ -31,7 +31,7 @@ ${APP_NAME_LC}_client_LDFLAGS = \$(KDE_RPATH) \$(all_libraries) ${APP_NAME_LC}_client_LDADD = \$(LIB_KDECORE) ${APP_NAME_LC}_client_SOURCES = ${APP_NAME_LC}_client.cpp -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO messages: rc.cpp diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp index 04f88108..a1333cf7 100644 --- a/kapptemplate/kapp/app.cpp +++ b/kapptemplate/kapp/app.cpp @@ -144,7 +144,7 @@ void ${APP_NAME}::dragEnterEvent(TQDragEnterEvent *event) void ${APP_NAME}::dropEvent(TQDropEvent *event) { // this is a very simplistic implementation of a drop event. we - // will only accept a dropped URL. the Qt dnd code can do *much* + // will only accept a dropped URL. the TQt dnd code can do *much* // much more, so please read the docs there KURL::List urls; @@ -174,7 +174,7 @@ void ${APP_NAME}::fileOpen() // this slot is called whenever the File->Open menu is selected, // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked - KURL url = KURLRequesterDlg::getURL(TQString::null, this, i18n("Open Location") ); + KURL url = KURLRequesterDlg::getURL(TQString(), this, i18n("Open Location") ); if (!url.isEmpty()) m_view->openURL(url); } @@ -206,7 +206,7 @@ void ${APP_NAME}::filePrint() if (!m_printer) m_printer = new KPrinter; if (m_printer->setup(this)) { - // setup the printer. with Qt, you always "print" to a + // setup the printer. with TQt, you always "print" to a // TQPainter.. whether the output medium is a pixmap, a screen, // or paper TQPainter p; diff --git a/kapptemplate/kapp/app.h b/kapptemplate/kapp/app.h index 2b1d1d55..dfcbf7cc 100644 --- a/kapptemplate/kapp/app.h +++ b/kapptemplate/kapp/app.h @@ -26,6 +26,7 @@ class KURL; class ${APP_NAME} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor @@ -44,7 +45,7 @@ public: protected: /** - * Overridden virtuals for Qt drag 'n drop (XDND) + * Overridden virtuals for TQt drag 'n drop (XDND) */ virtual void dragEnterEvent(TQDragEnterEvent *event); virtual void dropEvent(TQDropEvent *event); diff --git a/kapptemplate/kapp/apppref.cpp b/kapptemplate/kapp/apppref.cpp index 6a479b83..5ab7d8a6 100644 --- a/kapptemplate/kapp/apppref.cpp +++ b/kapptemplate/kapp/apppref.cpp @@ -22,20 +22,20 @@ ${APP_NAME}Preferences::${APP_NAME}Preferences() m_pageTwo = new ${APP_NAME}PrefPageTwo(frame); } -${APP_NAME}PrefPageOne::${APP_NAME}PrefPageOne(TQWidget *parent) - : TQFrame(parent) +${APP_NAME}PrefPageOne::${APP_NAME}PrefPageOne(TQWidget *tqparent) + : TQFrame(tqparent) { - TQHBoxLayout *layout = new TQHBoxLayout(this); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + tqlayout->setAutoAdd(true); new TQLabel("Add something here", this); } -${APP_NAME}PrefPageTwo::${APP_NAME}PrefPageTwo(TQWidget *parent) - : TQFrame(parent) +${APP_NAME}PrefPageTwo::${APP_NAME}PrefPageTwo(TQWidget *tqparent) + : TQFrame(tqparent) { - TQHBoxLayout *layout = new TQHBoxLayout(this); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + tqlayout->setAutoAdd(true); new TQLabel("Add something here", this); } diff --git a/kapptemplate/kapp/apppref.h b/kapptemplate/kapp/apppref.h index 234223f6..c20c8af3 100644 --- a/kapptemplate/kapp/apppref.h +++ b/kapptemplate/kapp/apppref.h @@ -12,6 +12,7 @@ class ${APP_NAME}PrefPageTwo; class ${APP_NAME}Preferences : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ${APP_NAME}Preferences(); @@ -20,18 +21,20 @@ private: ${APP_NAME}PrefPageTwo *m_pageTwo; }; -class ${APP_NAME}PrefPageOne : public QFrame +class ${APP_NAME}PrefPageOne : public TQFrame { Q_OBJECT + TQ_OBJECT public: - ${APP_NAME}PrefPageOne(TQWidget *parent = 0); + ${APP_NAME}PrefPageOne(TQWidget *tqparent = 0); }; -class ${APP_NAME}PrefPageTwo : public QFrame +class ${APP_NAME}PrefPageTwo : public TQFrame { Q_OBJECT + TQ_OBJECT public: - ${APP_NAME}PrefPageTwo(TQWidget *parent = 0); + ${APP_NAME}PrefPageTwo(TQWidget *tqparent = 0); }; #endif // ${APP_NAME_UC}PREF_H diff --git a/kapptemplate/kapp/appview.cpp b/kapptemplate/kapp/appview.cpp index 3527596b..48365348 100644 --- a/kapptemplate/kapp/appview.cpp +++ b/kapptemplate/kapp/appview.cpp @@ -12,11 +12,11 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}view.cpp #include #include -${APP_NAME}View::${APP_NAME}View(TQWidget *parent) - : TQWidget(parent), +${APP_NAME}View::${APP_NAME}View(TQWidget *tqparent) + : TQWidget(tqparent), DCOPObject("${APP_NAME}Iface") { - // setup our layout manager to automatically add our widgets + // setup our tqlayout manager to automatically add our widgets TQHBoxLayout *top_layout = new TQHBoxLayout(this); top_layout->setAutoAdd(true); diff --git a/kapptemplate/kapp/appview.h b/kapptemplate/kapp/appview.h index 14fc3043..25dddfd1 100644 --- a/kapptemplate/kapp/appview.h +++ b/kapptemplate/kapp/appview.h @@ -24,11 +24,12 @@ class KURL; class ${APP_NAME}View : public TQWidget, public ${APP_NAME}Iface { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - ${APP_NAME}View(TQWidget *parent); + ${APP_NAME}View(TQWidget *tqparent); /** * Destructor diff --git a/kapptemplate/kapptemplate.common b/kapptemplate/kapptemplate.common index 8cff2d60..a5a63a16 100644 --- a/kapptemplate/kapptemplate.common +++ b/kapptemplate/kapptemplate.common @@ -299,7 +299,7 @@ function GetFileList if [ -d "$DIRECTORY" ]; then # FILES=`/bin/ls -1 -I "no-exe" -I*~ $DIRECTORY`; - FILES=`cd $DIRECTORY; find . ! -name "*~" -maxdepth 1 -type f -print | sed 's,^\./,,' | sort`; + FILES=`cd $DIRECTORY; tqfind . ! -name "*~" -maxdepth 1 -type f -print | sed 's,^\./,,' | sort`; if [ ! "$FILES" ]; then diff --git a/kapptemplate/kapptemplate.in b/kapptemplate/kapptemplate.in index dde86d04..7490f94e 100644 --- a/kapptemplate/kapptemplate.in +++ b/kapptemplate/kapptemplate.in @@ -13,7 +13,7 @@ function LoadDefaults { # horrid hack to try and figure out what shell we are using - # basically, if we can find /usr/ucb/echo, then we are almost for sure + # basically, if we can tqfind /usr/ucb/echo, then we are almost for sure # NOT on a Linux system and probably 'echo "\c" works. if we don't # find it, we'll assume that the shell is really bash. if [ -f "/usr/ucb/echo" ]; diff --git a/kapptemplate/kpartapp/app-Makefile.am b/kapptemplate/kpartapp/app-Makefile.am index 3aa0495f..fc096f65 100644 --- a/kapptemplate/kpartapp/app-Makefile.am +++ b/kapptemplate/kpartapp/app-Makefile.am @@ -10,7 +10,7 @@ INCLUDES = \$(all_includes) # these are the headers for your project noinst_HEADERS = ${APP_NAME_LC}.h ${APP_NAME_LC}_part.h -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO messages: rc.cpp diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp index 626aa8bd..c5d21f06 100644 --- a/kapptemplate/kpartapp/app.cpp +++ b/kapptemplate/kpartapp/app.cpp @@ -152,7 +152,7 @@ void ${APP_NAME}::fileOpen() // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked KURL url = - KFileDialog::getOpenURL( TQString::null, TQString::null, this ); + KFileDialog::getOpenURL( TQString(), TQString(), this ); if (url.isEmpty() == false) { diff --git a/kapptemplate/kpartapp/app.h b/kapptemplate/kpartapp/app.h index 41daea60..b9862c3b 100644 --- a/kapptemplate/kpartapp/app.h +++ b/kapptemplate/kpartapp/app.h @@ -21,6 +21,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/${APP_NAME_LC}.h class ${APP_NAME} : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/kapptemplate/kpartapp/app_part-desktop b/kapptemplate/kpartapp/app_part-desktop index 6ba3bf54..b32923f6 100644 --- a/kapptemplate/kpartapp/app_part-desktop +++ b/kapptemplate/kpartapp/app_part-desktop @@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.desktop [Desktop Entry] Encoding=UTF-8 Name=${APP_NAME}Part -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart X-KDE-Library=lib${APP_NAME_LC}part Type=Service diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp index d8880577..25bf0886 100644 --- a/kapptemplate/kpartapp/app_part.cpp +++ b/kapptemplate/kpartapp/app_part.cpp @@ -17,16 +17,16 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp typedef KParts::GenericFactory<${APP_NAME}Part> ${APP_NAME}PartFactory; K_EXPORT_COMPONENT_FACTORY( lib${APP_NAME_LC}part, ${APP_NAME}PartFactory ) -${APP_NAME}Part::${APP_NAME}Part( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, +${APP_NAME}Part::${APP_NAME}Part( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) - : KParts::ReadWritePart(parent, name) + : KParts::ReadWritePart(tqparent, name) { // we need an instance setInstance( ${APP_NAME}PartFactory::instance() ); // this should be your custom internal widget - m_widget = new TQMultiLineEdit( parentWidget, widgetName ); + m_widget = new TQMultiLineEdit( tqparentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); @@ -79,7 +79,7 @@ void ${APP_NAME}Part::setModified(bool modified) else save->setEnabled(false); - // in any event, we want our parent to do it's thing + // in any event, we want our tqparent to do it's thing ReadWritePart::setModified(modified); } @@ -101,7 +101,7 @@ bool ${APP_NAME}Part::openFile() return false; // our example widget is text-based, so we use TQTextStream instead - // of a raw QDataStream + // of a raw TQDataStream TQTextStream stream(&file); TQString str; while (!stream.eof()) @@ -124,7 +124,7 @@ bool ${APP_NAME}Part::saveFile() if (isReadWrite() == false) return false; - // m_file is always local, so we use QFile + // m_file is always local, so we use TQFile TQFile file(m_file); if (file.open(IO_WriteOnly) == false) return false; diff --git a/kapptemplate/kpartapp/app_part.h b/kapptemplate/kpartapp/app_part.h index 75eedc4f..908adaa3 100644 --- a/kapptemplate/kpartapp/app_part.h +++ b/kapptemplate/kpartapp/app_part.h @@ -22,12 +22,13 @@ class KAboutData; class ${APP_NAME}Part : public KParts::ReadWritePart { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - ${APP_NAME}Part(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList &args); + ${APP_NAME}Part(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList &args); /** * Destructor diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp index 0ec7a273..c6a27fb8 100644 --- a/kapptemplate/kpartplugin/plugin_app.cpp +++ b/kapptemplate/kpartplugin/plugin_app.cpp @@ -13,9 +13,9 @@ typedef KGenericFactory ${APP_NAME}Factory; K_EXPORT_COMPONENT_FACTORY( lib${APP_NAME_LC}plugin, ${APP_NAME}Factory( "${APP_NAME_LC}" ) ); -Plugin${APP_NAME}::Plugin${APP_NAME}( TQObject* parent, const char* name, +Plugin${APP_NAME}::Plugin${APP_NAME}( TQObject* tqparent, const char* name, const TQStringList & /*args*/ ) - : Plugin( parent, name ) + : Plugin( tqparent, name ) { // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. @@ -33,7 +33,7 @@ void Plugin${APP_NAME}::slotAction() // This plugin assumes KHTMLPart. If your plugin can handle more // than this or a different Part than this, simply delete or // change the following block. - if ( !parent()->inherits("KHTMLPart") ) + if ( !tqparent()->inherits("KHTMLPart") ) { TQString title( i18n( "Cannot Translate Source" ) ); TQString text( i18n( "You cannot translate anything except web pages " @@ -43,9 +43,9 @@ void Plugin${APP_NAME}::slotAction() return; } - // Get a handle on our parent so we may get the necessary data for + // Get a handle on our tqparent so we may get the necessary data for // processing - KHTMLPart *part = dynamic_cast(parent()); + KHTMLPart *part = dynamic_cast(tqparent()); // This plugin only uses the URL. You may use whatever data you // need. diff --git a/kapptemplate/kpartplugin/plugin_app.h b/kapptemplate/kpartplugin/plugin_app.h index 8bb225b8..2d1745f5 100644 --- a/kapptemplate/kpartplugin/plugin_app.h +++ b/kapptemplate/kpartplugin/plugin_app.h @@ -8,8 +8,9 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.h class Plugin${APP_NAME} : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Plugin${APP_NAME}( TQObject* parent = 0, const char* name = 0, + Plugin${APP_NAME}( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); virtual ~Plugin${APP_NAME}(); -- cgit v1.2.1