From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../app_templates/cmakelibc/cmakelibc.kdevtemplate | 4 +-- .../cmakelibcpp/cmakelibcpp.kdevtemplate | 4 +-- .../cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp | 34 +++++++++---------- .../cpp/app_templates/cmakeqt3app/cmakeqt3app.h | 5 +-- .../cmakesimple/cmakesimple.kdevtemplate | 2 +- .../cmakesimplec/cmakesimplec.kdevtemplate | 2 +- .../cpp/app_templates/dcopservice/dcopservice.cpp | 2 +- .../generichello/generichello.kdevtemplate | 2 +- .../cpp/app_templates/gnome2mmapp/main_window.hh | 2 +- .../cpp/app_templates/gtk2mmapp/main_window.hh | 2 +- languages/cpp/app_templates/kapp/app.cpp | 8 ++--- languages/cpp/app_templates/kapp/app.h | 3 +- languages/cpp/app_templates/kapp/appview.cpp | 6 ++-- languages/cpp/app_templates/kapp/appview.h | 3 +- languages/cpp/app_templates/kapp/pref.cpp | 16 ++++----- languages/cpp/app_templates/kapp/pref.h | 11 ++++--- languages/cpp/app_templates/kapp/src-Makefile.am | 4 +-- .../cpp/app_templates/kateplugin/plugin_app.cpp | 8 ++--- .../cpp/app_templates/kateplugin/plugin_app.h | 6 ++-- .../cpp/app_templates/kateplugin/src-Makefile.am | 2 +- .../cpp/app_templates/kateplugin2/plugin_app.cpp | 12 +++---- .../cpp/app_templates/kateplugin2/plugin_app.h | 9 +++-- .../cpp/app_templates/kateplugin2/src-Makefile.am | 2 +- languages/cpp/app_templates/kcmodule/module.cpp | 4 +-- languages/cpp/app_templates/kcmodule/module.h | 3 +- .../cpp/app_templates/kcmodule/src-Makefile.am | 2 +- languages/cpp/app_templates/kconfig35/app.h | 1 + languages/cpp/app_templates/kconfig35/appview.cpp | 6 ++-- languages/cpp/app_templates/kconfig35/appview.h | 3 +- .../cpp/app_templates/kconfig35/appview_base.ui | 6 ++-- .../cpp/app_templates/kconfig35/prefs-base.ui | 18 +++++----- .../cpp/app_templates/kconfig35/src-Makefile.am | 4 +-- languages/cpp/app_templates/kde4app/kapp4.cpp | 10 +++--- languages/cpp/app_templates/kde4app/kapp4.h | 1 + languages/cpp/app_templates/kde4app/kapp4view.cpp | 2 +- languages/cpp/app_templates/kde4app/kapp4view.h | 5 +-- .../cpp/app_templates/kde4app/kapp4view_base.ui | 12 +++---- .../app_templates/kde4app/kde4app-CMakeLists.txt | 2 +- languages/cpp/app_templates/kde4app/prefs_base.ui | 22 ++++++------- languages/cpp/app_templates/kdedcop/app.h | 1 + .../cpp/app_templates/kdedcop/src-Makefile.am | 4 +-- .../cpp/app_templates/kdevlang/kdevlang_part.cpp | 6 ++-- .../cpp/app_templates/kdevlang/kdevlang_part.h | 3 +- .../cpp/app_templates/kdevpart/globalconfig.cpp | 4 +-- .../cpp/app_templates/kdevpart/globalconfig.h | 3 +- .../cpp/app_templates/kdevpart/globalconfigbase.ui | 4 +-- .../cpp/app_templates/kdevpart/kdevpart_part.cpp | 4 +-- .../cpp/app_templates/kdevpart/kdevpart_part.h | 3 +- .../cpp/app_templates/kdevpart/kdevpart_widget.h | 3 +- .../cpp/app_templates/kdevpart/projectconfig.cpp | 4 +-- .../cpp/app_templates/kdevpart/projectconfig.h | 3 +- .../app_templates/kdevpart/projectconfigbase.ui | 4 +-- .../cpp/app_templates/kdevpart2/globalconfig.cpp | 4 +-- .../cpp/app_templates/kdevpart2/globalconfig.h | 3 +- .../app_templates/kdevpart2/globalconfigbase.ui | 4 +-- .../cpp/app_templates/kdevpart2/kdevpart_part.cpp | 4 +-- .../cpp/app_templates/kdevpart2/kdevpart_part.h | 3 +- .../cpp/app_templates/kdevpart2/kdevpart_widget.h | 3 +- .../cpp/app_templates/kdevpart2/projectconfig.cpp | 4 +-- .../cpp/app_templates/kdevpart2/projectconfig.h | 3 +- .../app_templates/kdevpart2/projectconfigbase.ui | 4 +-- .../cpp/app_templates/kfileplugin/kfile_plugin.cpp | 4 +-- .../cpp/app_templates/kfileplugin/kfile_plugin.h | 3 +- .../cpp/app_templates/kfileplugin/src-Makefile.am | 4 +-- languages/cpp/app_templates/khello/app.h | 1 + languages/cpp/app_templates/khello/src-Makefile.am | 4 +-- languages/cpp/app_templates/khello2/app.h | 1 + .../cpp/app_templates/khello2/src-Makefile.am | 4 +-- languages/cpp/app_templates/khello2/widget.cpp | 4 +-- languages/cpp/app_templates/khello2/widget.h | 3 +- languages/cpp/app_templates/khello2/widgetbase.ui | 12 +++---- languages/cpp/app_templates/kicker/applet.cpp | 8 ++--- languages/cpp/app_templates/kicker/applet.h | 7 ++-- languages/cpp/app_templates/kicker/src-Makefile.am | 2 +- languages/cpp/app_templates/kioslave/slave.cpp | 2 +- .../cpp/app_templates/kioslave/src-Makefile.am | 2 +- languages/cpp/app_templates/kmake/mainview.ui | 14 ++++---- languages/cpp/app_templates/kmake/mainviewimp.cpp | 4 +-- languages/cpp/app_templates/kmake/mainviewimp.h | 3 +- .../app_templates/kofficepart/kopart_factory.cpp | 10 +++--- .../cpp/app_templates/kofficepart/kopart_factory.h | 5 +-- .../cpp/app_templates/kofficepart/kopart_part.cpp | 14 ++++---- .../cpp/app_templates/kofficepart/kopart_part.h | 7 ++-- .../cpp/app_templates/kofficepart/kopart_view.cpp | 4 +-- .../cpp/app_templates/kofficepart/kopart_view.h | 3 +- .../cpp/app_templates/kofficepart/src-Makefile.am | 2 +- .../app_templates/konqnavpanel/konqnavpanel.cpp | 4 +-- .../cpp/app_templates/konqnavpanel/konqnavpanel.h | 7 ++-- languages/cpp/app_templates/kpartapp/app.cpp | 2 +- languages/cpp/app_templates/kpartapp/app.h | 1 + languages/cpp/app_templates/kpartapp/app_part.cpp | 20 ++++++------ languages/cpp/app_templates/kpartapp/app_part.h | 10 +++--- .../cpp/app_templates/kpartapp/src-Makefile.am | 4 +-- .../cpp/app_templates/kpartplugin/plugin_app.cpp | 14 ++++---- .../cpp/app_templates/kpartplugin/plugin_app.h | 6 ++-- .../cpp/app_templates/kpartplugin/src-Makefile.am | 2 +- languages/cpp/app_templates/kscons_kmdi/QUICKSTART | 16 ++++----- .../cpp/app_templates/kscons_kmdi/SConscript-src | 2 +- languages/cpp/app_templates/kscons_kmdi/SConstruct | 16 ++++----- .../cpp/app_templates/kscons_kmdi/app_part.cpp | 14 ++++---- languages/cpp/app_templates/kscons_kmdi/app_part.h | 5 +-- .../cpp/app_templates/kscons_kmdi/appkmdi.cpp | 8 ++--- languages/cpp/app_templates/kscons_kmdi/appkmdi.h | 1 + .../cpp/app_templates/kscons_kmdi/appkmdiView.cpp | 8 ++--- .../cpp/app_templates/kscons_kmdi/appkmdiView.h | 3 +- .../cpp/app_templates/kscons_kmdi/kmdikonsole.cpp | 2 +- .../cpp/app_templates/kscons_kmdi/kmdikonsole.h | 5 +-- .../cpp/app_templates/kscons_kmdi/messages.sh | 6 ++-- languages/cpp/app_templates/kscons_kmdi/prefs.ui | 6 ++-- languages/cpp/app_templates/kscons_kxt/QUICKSTART | 16 ++++----- .../cpp/app_templates/kscons_kxt/SConscript-src | 2 +- languages/cpp/app_templates/kscons_kxt/SConstruct | 16 ++++----- languages/cpp/app_templates/kscons_kxt/app.cpp | 2 +- languages/cpp/app_templates/kscons_kxt/app.h | 1 + languages/cpp/app_templates/kscons_kxt/appview.cpp | 6 ++-- languages/cpp/app_templates/kscons_kxt/appview.h | 3 +- .../cpp/app_templates/kscons_kxt/appview_base.ui | 6 ++-- languages/cpp/app_templates/kscons_kxt/messages.sh | 6 ++-- .../cpp/app_templates/kscons_kxt/prefs-base.ui | 18 +++++----- .../app_templates/kscreensaver/kscreensaver.cpp | 4 +-- .../cpp/app_templates/kscreensaver/kscreensaver.h | 4 ++- .../app_templates/kscreensaver/kscreensaverui.ui | 16 ++++----- .../cpp/app_templates/kscreensaver/src-Makefile.am | 2 +- languages/cpp/app_templates/kxt/app.h | 1 + languages/cpp/app_templates/kxt/appview.cpp | 6 ++-- languages/cpp/app_templates/kxt/appview.h | 3 +- languages/cpp/app_templates/kxt/appview_base.ui | 6 ++-- languages/cpp/app_templates/kxt/prefs-base.ui | 18 +++++----- languages/cpp/app_templates/kxt/src-Makefile.am | 4 +-- .../cpp/app_templates/noatunui/plugin_impl.cpp | 12 +++---- languages/cpp/app_templates/noatunui/plugin_impl.h | 1 + .../cpp/app_templates/noatunui/src-Makefile.am | 2 +- .../cpp/app_templates/noatunvisual/plugin_impl.cpp | 6 ++-- .../cpp/app_templates/noatunvisual/plugin_impl.h | 2 +- .../cpp/app_templates/noatunvisual/src-Makefile.am | 2 +- languages/cpp/app_templates/opieapp/app.pro | 4 +-- languages/cpp/app_templates/opieapp/example.cpp | 8 ++--- languages/cpp/app_templates/opieapp/example.h | 5 +-- languages/cpp/app_templates/opieapp/examplebase.ui | 4 +-- languages/cpp/app_templates/opieapplet/app.pro | 4 +-- .../cpp/app_templates/opieapplet/simpleimpl.cpp | 30 ++++++++--------- .../cpp/app_templates/opieapplet/simpleimpl.h | 29 +++++++++-------- languages/cpp/app_templates/opieinput/app.pro | 4 +-- .../cpp/app_templates/opieinput/simpleimpl.cpp | 22 ++++++------- languages/cpp/app_templates/opieinput/simpleimpl.h | 11 ++++--- languages/cpp/app_templates/opiemenu/app.pro | 4 +-- .../cpp/app_templates/opiemenu/simpleimpl.cpp | 16 ++++----- languages/cpp/app_templates/opiemenu/simpleimpl.h | 9 ++--- languages/cpp/app_templates/opienet/app.pro | 4 +-- .../cpp/app_templates/opienet/simmplemodule.h | 8 ++--- .../cpp/app_templates/opienet/simpleiface.cpp | 8 ++--- languages/cpp/app_templates/opienet/simpleiface.h | 3 +- .../cpp/app_templates/opienet/simplemodule.cpp | 4 +-- languages/cpp/app_templates/opienet/simplemodule.h | 8 ++--- languages/cpp/app_templates/opietoday/app.pro | 4 +-- .../cpp/app_templates/opietoday/exampleplugin.cpp | 6 ++-- .../app_templates/opietoday/examplepluginimpl.cpp | 12 +++---- .../app_templates/opietoday/examplepluginimpl.h | 4 +-- .../opietoday/examplepluginwidget.cpp | 8 ++--- .../app_templates/opietoday/examplepluginwidget.h | 3 +- languages/cpp/app_templates/prc-tool/palmhello.c | 2 +- languages/cpp/app_templates/qmakeapp/qmakeapp.cpp | 34 +++++++++---------- languages/cpp/app_templates/qmakeapp/qmakeapp.h | 5 +-- languages/cpp/app_templates/qt4hello/main.cpp | 6 ++-- languages/cpp/app_templates/qt4makeapp/main.cpp | 2 +- .../cpp/app_templates/qt4makeapp/qt4makeapp.cpp | 38 +++++++++++----------- .../cpp/app_templates/qt4makeapp/qt4makeapp.h | 13 ++++---- languages/cpp/app_templates/qtopia4app/example.cpp | 12 +++---- languages/cpp/app_templates/qtopia4app/example.h | 5 +-- .../cpp/app_templates/qtopia4app/example.html | 4 +-- .../cpp/app_templates/qtopia4app/examplebase.ui | 10 +++--- languages/cpp/app_templates/qtopia4app/main.cpp | 6 ++-- .../cpp/app_templates/qtopiaapp/example.control | 2 +- languages/cpp/app_templates/qtopiaapp/example.cpp | 8 ++--- languages/cpp/app_templates/qtopiaapp/example.h | 3 +- languages/cpp/app_templates/qtopiaapp/example.html | 4 +-- .../cpp/app_templates/qtopiaapp/examplebase.ui | 4 +-- languages/cpp/app_templates/qtopiaapp/main.cpp | 4 +-- 178 files changed, 614 insertions(+), 552 deletions(-) (limited to 'languages/cpp/app_templates') diff --git a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate index cd3783f7..5240b2ee 100644 --- a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate +++ b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate @@ -51,11 +51,11 @@ Comment[ja]=共有ライブラリのテンプレートを作成します。同 Comment[nds]=Stellt en Vörlaag för en deelt Bibliotheek mit en Testprogramm in C op. Dat Kompileren bruukt ansteed vun de "automake/autoconf/libtool"-Kombinatschoon "CMake" in de Verschoon 2.1 (ut dat cmake-CVS) oder 2.2 (de tokamen Utgaav). Comment[ne]=C मा परीक्षण अनुप्रयोग सहितको साझेदारी टेम्प्लेट उत्पन्न गर्दछ । यसले automake/autoconf/libtool संयोजनको सट्टामा CMake निर्माण उपकरण प्रयोग गरेर कम्पाइल गर्दछ । यसका लागि cmake 2.1 (cmake cvs बाट उपलब्ध हुन्छ) वा अब आउने cmake 2.2 उत्पादन आवश्यक पर्दछ । Comment[nl]=Genereert een gedeelde-bibliotheek-sjabloon inclusief een testtoepassing in C. Het compileert met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 (beschikbaar in het cvs van cmake) of de aankomende cmake 2.2-uitgave. -Comment[pl]=Generuje szablon współdzielonej biblioteki zawierający także program testowy w języku C. Kompilacja odbywa sie za pomocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2. +Comment[pl]=Generuje szablon współdzielonej biblioteki zawierający także program testowy w języku C. Kompilacja odbywa sie za potqmocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2. Comment[pt]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2. Comment[pt_BR]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2. Comment[ru]=Создание шаблона разделяемой библиотеки, включая тестовую программу на C. Для сборки потребуется CMake вместо комбинации automake/autoconf/libtool. Потребуется cmake 2.1 (из CVS cmake) или релиз cmake 2.2. -Comment[sk]=Vygeneruje šablónu pre zdieľanú knižnicu vrátane testovacej aplikácie v C.Kompiluje sa pomocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release. +Comment[sk]=Vygeneruje šablónu pre zdieľanú knižnicu vrátane testovacej aplikácie v C.Kompiluje sa potqmocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release. Comment[sl]=Ustvari predlogo za deljeno knjižnico in testni program v C. Za prevajanje se namesto kombinacije automake/autoconf/libtool uporabi orodje za gradnjo CMake. Potreben je CMake 2.1 ali CMake 2.2. Comment[sr]=Прави шаблон дељене библиотеке, укључујући и пробни програм у C-у. Преводи се помоћу алата CMake уместо комбинације Automake/Autoconf/Libtool. Захтева CMake 2.1 (доступан у CVS-у CMake-а) или надолазеће издање CMake 2.2. Comment[sr@Latn]=Pravi šablon deljene biblioteke, uključujući i probni program u C-u. Prevodi se pomoću alata CMake umesto kombinacije Automake/Autoconf/Libtool. Zahteva CMake 2.1 (dostupan u CVS-u CMake-a) ili nadolazeće izdanje CMake 2.2. diff --git a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate index e6e6ac44..8f3d0cf9 100644 --- a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate +++ b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate @@ -51,11 +51,11 @@ Comment[ja]=共有ライブラリのテンプレートを作成します。同 Comment[nds]=Stellt en Vörlaag för en deelt Bibliotheek mit en Testprogramm in C++ op. Dat Kompileren bruukt ansteed vun de "automake/autoconf/libtool"-Kombinatschoon "CMake" in de Verschoon 2.1 (ut dat cmake-CVS) oder 2.2 (de tokamen Utgaav). Comment[ne]=C++ मा परीक्षण अनुप्रयोग सहितको साझेदारी टेम्प्लेट उत्पन्न गर्दछ । यसले automake/autoconf/libtool संयोजनको सट्टामा CMake निर्माण उपकरण प्रयोग गरेर कम्पाइल गर्दछ । यसका लागि cmake 2.1 (cmake cvs बाट उपलब्ध हुन्छ) वा अब आउने cmake 2.2 उत्पादन आवश्यक पर्दछ । Comment[nl]=Genereert een gedeelde-bibliotheek-sjabloon inclusief een testtoepassing in C++. Het compileert met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 (uit het cvs van cmake) of de aankomende cmake 2.2-uitgave. -Comment[pl]=Generuje szablon współdzielonej biblioteki zawierający także program testowy w języku C++. Kompilacja odbywa sie za pomocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2. +Comment[pl]=Generuje szablon współdzielonej biblioteki zawierający także program testowy w języku C++. Kompilacja odbywa sie za potqmocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2. Comment[pt]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C++. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2. Comment[pt_BR]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C++. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2. Comment[ru]=Создание шаблона разделяемой библиотеки, включая тестовую программу на C++. Для сборки потребуется CMake вместо комбинации automake/autoconf/libtool. Потребуется cmake 2.1 (из CVS cmake) или релиз cmake 2.2. -Comment[sk]=Vygeneruje šablónu zdieľanej knižnice vrátane testovacej aplikácie v C++.Kompiluje sa pomocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release. +Comment[sk]=Vygeneruje šablónu zdieľanej knižnice vrátane testovacej aplikácie v C++.Kompiluje sa potqmocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release. Comment[sl]=Ustvari predlogo za deljeno knjižnico in testni program v C++. Za prevajanje se namesto kombinacije automake/autoconf/libtool uporabi orodje za gradnjo CMake. Potreben je CMake 2.1 ali CMake 2.2. Comment[sr]=Прави шаблон дељене библиотеке укључујући и пробни програм у C++-у. Преводи се помоћу алата CMake уместо комбинације Automake/Autoconf/Libtool. Захтева CMake 2.1 (доступан у CVS-у CMake-а) или надолазеће издање CMake 2.2. Comment[sr@Latn]=Pravi šablon deljene biblioteke uključujući i probni program u C++-u. Prevodi se pomoću alata CMake umesto kombinacije Automake/Autoconf/Libtool. Zahteva CMake 2.1 (dostupan u CVS-u CMake-a) ili nadolazeće izdanje CMake 2.2. diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp index f3c5f7f2..4b78645a 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -36,17 +36,17 @@ openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen - = new TQToolButton( openIcon, tr("Open File"), TQString::null, + = new TQToolButton( openIcon, tr("Open File"), TQString(), this, TQT_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave - = new TQToolButton( saveIcon, tr("Save File"), TQString::null, + = new TQToolButton( saveIcon, tr("Save File"), TQString(), this, TQT_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint - = new TQToolButton( printIcon, tr("Print File"), TQString::null, + = new TQToolButton( printIcon, tr("Print File"), TQString(), this, TQT_SLOT(print()), fileTools, "print file" ); @@ -103,7 +103,7 @@ file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), qApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); @@ -111,7 +111,7 @@ menuBar()->insertItem( tr("&Help"), help ); help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); - help->insertItem( tr("About &Qt"), this, TQT_SLOT(aboutQt()) ); + help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) ); help->insertSeparator(); help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); @@ -134,13 +134,13 @@ void %{APPNAME}::newDoc() { %{APPNAME} *ed = new %{APPNAME}; - ed->setCaption(tr("Qt Example - Application")); + ed->setCaption(tr("TQt Example - Application")); ed->show(); } void %{APPNAME}::choose() { - TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, + TQString fn = TQFileDialog::getOpenFileName( TQString(), TQString(), this); if ( !fn.isEmpty() ) load( fn ); @@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName ) e->setText( ts.read() ); e->setModified( FALSE ); setCaption( fileName ); - statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 ); + statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 ); } @@ -173,7 +173,7 @@ void %{APPNAME}::save() TQString text = e->text(); TQFile f( filename ); if ( !f.open( IO_WriteOnly ) ) { - statusBar()->message( tr("Could not write to %1").arg(filename), + statusBar()->message( tr("Could not write to %1").tqarg(filename), 2000 ); return; } @@ -186,13 +186,13 @@ void %{APPNAME}::save() setCaption( filename ); - statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 ); + statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 ); } void %{APPNAME}::saveAs() { - TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null, + TQString fn = TQFileDialog::getSaveFileName( TQString(), TQString(), this ); if ( !fn.isEmpty() ) { filename = fn; @@ -249,7 +249,7 @@ void %{APPNAME}::closeEvent( TQCloseEvent* ce ) return; } - switch( TQMessageBox::information( this, tr("Qt Application Example"), + switch( TQMessageBox::information( this, tr("TQt Application Example"), tr("Do you want to save the changes" " to the document?"), tr("Yes"), tr("No"), tr("Cancel"), @@ -271,13 +271,13 @@ void %{APPNAME}::closeEvent( TQCloseEvent* ce ) void %{APPNAME}::about() { - TQMessageBox::about( this, tr("Qt Application Example"), + TQMessageBox::about( this, tr("TQt Application Example"), tr("This example demonstrates simple use of " - "TQMainWindow,\nQMenuBar and TQToolBar.")); + "TQMainWindow,\nTQMenuBar and TQToolBar.")); } -void %{APPNAME}::aboutQt() +void %{APPNAME}::aboutTQt() { - TQMessageBox::aboutQt( this, tr("Qt Application Example") ); + TQMessageBox::aboutTQt( this, tr("TQt Application Example") ); } diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h index af12e1eb..bc8a2b93 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h @@ -7,9 +7,10 @@ class TQTextEdit; -class %{APPNAME}: public QMainWindow +class %{APPNAME}: public TQMainWindow { Q_OBJECT + TQ_OBJECT public: %{APPNAME}(); @@ -27,7 +28,7 @@ private slots: void print(); void about(); - void aboutQt(); + void aboutTQt(); private: TQPrinter *printer; diff --git a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate index 2e6032e8..a80c8079 100644 --- a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate +++ b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate @@ -44,7 +44,7 @@ Comment[it]=Genera un semplice programma di "Hello world" in C++ che usa CMake i Comment[ja]=ビルドに automake/autoconf/libtool ではなく CMake を使った簡単な Hello World プログラムを C++ で作成します。CMake 2.1 または 2.2 が必要です。 Comment[nds]=Stellt en eenfach "Moin Welt"-Programm in C++ op, mit "CMake" ansteed vun de "automake/autoconf/libtool"-Reeg. Nödig is Verschoon 2.1 oder 2.2 vun CMake. Comment[nl]=Genereert een eenvoudig Hello World-programma in C++ met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 of cmake 2.2. -Comment[pl]=Generuje prosty program 'Witaj świecie' w języku C++. Kompilacja odbywa sie za pomocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake w wersji 2.1 lub 2.2. +Comment[pl]=Generuje prosty program 'Witaj świecie' w języku C++. Kompilacja odbywa sie za potqmocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake w wersji 2.1 lub 2.2. Comment[pt]=Gera um programa simples Olá Mundo em C++, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 ou do cmake 2.2. Comment[pt_BR]=Gera um programa simples Olá Mundo em C++, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 ou do cmake 2.2. Comment[ru]=Создание простого приложения Hello world на C++. Для сборки потребуется CMake вместо комбинации automake/autoconf/libtool. Потребуется cmake версии 2.1 или 2.2. diff --git a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate index 3fc09047..3068fdd3 100644 --- a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate +++ b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate @@ -49,7 +49,7 @@ Comment[ja]=ビルドに automake/autoconf/libtool ではなく CMake を使っ Comment[nds]=Stellt en eenfach "Moin Welt"-Programm in C op mit "CMake" in de Verschoon 2.1 (ut dat cmake-CVS) oder 2.2 (de tokamen Utgaav) ansteed vun de "automake/autoconf/libtool"-Kombinatschoon. Comment[ne]= automake/autoconf/libtool संयोजनको सट्टामा CMake निर्माण उपकरण प्रयोग गरेर C मा साधारण हेल्लो वोल्ड कार्यक्रम उत्पन्न गर्दछ । यसलाई cmake 2.1 (cmake cvs बाट उपलब्ध हुन्छ) वा आउदै गरेको cmake 2.2 उत्पादन आवश्यक हुन्छ । Comment[nl]=Genereert een eenvoudig Hello World-programma in C met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 (uit het cvs van cmake) of de aankomende cmake 2.2-uitgave. -Comment[pl]=Generuje prosty program 'Witaj świecie' w języku C. Kompilacja odbywa sie za pomocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2. +Comment[pl]=Generuje prosty program 'Witaj świecie' w języku C. Kompilacja odbywa sie za potqmocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2. Comment[pt]=Gera um programa simples Olá Mundo em C, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2. Comment[pt_BR]=Gera um programa simples Olá Mundo em C, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2. Comment[ru]=Создание простого приложения Hello world на C. Для сборки потребуется CMake вместо комбинации automake/autoconf/libtool. Потребуется cmake 2.1 (из CVS cmake) или релиз cmake 2.2. diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp index 32f32c65..2f569f3c 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp +++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp @@ -33,7 +33,7 @@ void %{APPNAME}::add(TQString arg) bool %{APPNAME}::remove(TQString arg) { - TQStringList::Iterator it = m_List.find(arg); + TQStringList::Iterator it = m_List.tqfind(arg); if (it != m_List.end()) { m_List.remove(it); diff --git a/languages/cpp/app_templates/generichello/generichello.kdevtemplate b/languages/cpp/app_templates/generichello/generichello.kdevtemplate index 787140ff..2c71b0ad 100644 --- a/languages/cpp/app_templates/generichello/generichello.kdevtemplate +++ b/languages/cpp/app_templates/generichello/generichello.kdevtemplate @@ -18,7 +18,7 @@ Name[ja]=C++ プログラム (シェルスクリプトベースのビルドシ Name[nds]=C++-Programm (Konsoolskript-Opstellsystem) Name[ne]=C++ कार्यक्रम (शेल स्क्रिप्ट निर्माण प्रणाली) Name[nl]=C++-programma (shellscript build system) -Name[pl]=Program w C++ (system budowania za pomocą skryptów powłoki) +Name[pl]=Program w C++ (system budowania za potqmocą skryptów powłoki) Name[pt]=Programa em C++ (sistema de compilação em 'shell script') Name[pt_BR]=Programa em C++ (sistema de compilação em 'shell script') Name[ru]=Приложение C++ (сборка на скриптах командной оболочки) diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.hh b/languages/cpp/app_templates/gnome2mmapp/main_window.hh index ae93336b..7b356a27 100644 --- a/languages/cpp/app_templates/gnome2mmapp/main_window.hh +++ b/languages/cpp/app_templates/gnome2mmapp/main_window.hh @@ -2,7 +2,7 @@ // newer (non customized) versions of this file go to main_window.hh_new -// you might replace +// you might tqreplace // class foo : public foo_glade { ... }; // by // typedef foo_glade foo; diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.hh b/languages/cpp/app_templates/gtk2mmapp/main_window.hh index 640e1461..6f9405d0 100644 --- a/languages/cpp/app_templates/gtk2mmapp/main_window.hh +++ b/languages/cpp/app_templates/gtk2mmapp/main_window.hh @@ -2,7 +2,7 @@ // newer (non customized) versions of this file go to main_window.hh_new -// you might replace +// you might tqreplace // class foo : public foo_glade { ... }; // by // typedef foo_glade foo; diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index 6388f452..10046641 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -141,7 +141,7 @@ void %{APPNAME}::dragEnterEvent(TQDragEnterEvent *event) void %{APPNAME}::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; @@ -173,10 +173,10 @@ void %{APPNAME}::fileOpen() // button is clicked /* // this brings up the generic open dialog - KURL url = KURLRequesterDlg::getURL(TQString::null, this, i18n("Open Location") ); + KURL url = KURLRequesterDlg::getURL(TQString(), this, i18n("Open Location") ); */ // standard filedialog - KURL url = KFileDialog::getOpenURL(TQString::null, TQString::null, this, i18n("Open Location")); + KURL url = KFileDialog::getOpenURL(TQString(), TQString(), this, i18n("Open Location")); if (!url.isEmpty()) m_view->openURL(url); } @@ -208,7 +208,7 @@ void %{APPNAME}::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/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h index 1c92feb8..762d8791 100644 --- a/languages/cpp/app_templates/kapp/app.h +++ b/languages/cpp/app_templates/kapp/app.h @@ -26,6 +26,7 @@ class KURL; class %{APPNAME} : 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/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index 32afca2e..5b42a36a 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -13,11 +13,11 @@ #include #include -%{APPNAME}View::%{APPNAME}View(TQWidget *parent) - : TQWidget(parent), +%{APPNAME}View::%{APPNAME}View(TQWidget *tqparent) + : TQWidget(tqparent), DCOPObject("%{APPNAME}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/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h index a4f0b2e6..2eab2322 100644 --- a/languages/cpp/app_templates/kapp/appview.h +++ b/languages/cpp/app_templates/kapp/appview.h @@ -24,11 +24,12 @@ class KURL; class %{APPNAME}View : public TQWidget, public %{APPNAME}Iface { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAME}View(TQWidget *parent); + %{APPNAME}View(TQWidget *tqparent); /** * Destructor diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp index ff83190f..3d720a65 100644 --- a/languages/cpp/app_templates/kapp/pref.cpp +++ b/languages/cpp/app_templates/kapp/pref.cpp @@ -22,20 +22,20 @@ m_pageTwo = new %{APPNAME}PrefPageTwo(frame); } -%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent) - : TQFrame(parent) +%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *tqparent) + : TQFrame(tqparent) { - TQHBoxLayout *layout = new TQHBoxLayout(this); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + tqlayout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } -%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent) - : TQFrame(parent) +%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *tqparent) + : TQFrame(tqparent) { - TQHBoxLayout *layout = new TQHBoxLayout(this); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + tqlayout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } diff --git a/languages/cpp/app_templates/kapp/pref.h b/languages/cpp/app_templates/kapp/pref.h index 93859cfd..23798000 100644 --- a/languages/cpp/app_templates/kapp/pref.h +++ b/languages/cpp/app_templates/kapp/pref.h @@ -12,6 +12,7 @@ class %{APPNAME}PrefPageTwo; class %{APPNAME}Preferences : public KDialogBase { Q_OBJECT + TQ_OBJECT public: %{APPNAME}Preferences(); @@ -20,18 +21,20 @@ private: %{APPNAME}PrefPageTwo *m_pageTwo; }; -class %{APPNAME}PrefPageOne : public QFrame +class %{APPNAME}PrefPageOne : public TQFrame { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}PrefPageOne(TQWidget *parent = 0); + %{APPNAME}PrefPageOne(TQWidget *tqparent = 0); }; -class %{APPNAME}PrefPageTwo : public QFrame +class %{APPNAME}PrefPageTwo : public TQFrame { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}PrefPageTwo(TQWidget *parent = 0); + %{APPNAME}PrefPageTwo(TQWidget *tqparent = 0); }; #endif // _%{APPNAMEUC}PREF_H_ diff --git a/languages/cpp/app_templates/kapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am index 51cb1973..f118ee10 100644 --- a/languages/cpp/app_templates/kapp/src-Makefile.am +++ b/languages/cpp/app_templates/kapp/src-Makefile.am @@ -25,11 +25,11 @@ noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h pref.h %{APPNAMELC}_client_LDADD = $(LIB_KDECORE) %{APPNAMELC}_client_SOURCES = %{APPNAMELC}_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 - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 1a40df32..8c729f72 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -33,15 +33,15 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) { - return new KatePlugin%{APPNAME}( parent, name ); + return new KatePlugin%{APPNAME}( tqparent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) - : Kate::Plugin ( (Kate::Application*)parent, name ) +KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ) { } diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h index 879ff967..2183e88e 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin/plugin_app.h @@ -17,12 +17,13 @@ class KatePluginFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -31,9 +32,10 @@ class KatePluginFactory : public KLibFactory class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); + KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); virtual ~KatePlugin%{APPNAME}(); void addView (Kate::MainWindow *win); diff --git a/languages/cpp/app_templates/kateplugin/src-Makefile.am b/languages/cpp/app_templates/kateplugin/src-Makefile.am index 88ba33a8..42a3cec8 100644 --- a/languages/cpp/app_templates/kateplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kateplugin/src-Makefile.am @@ -16,5 +16,5 @@ plugins_DATA = plugin_%{APPNAMELC}.rc kde_services_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 18595d10..9ee7b8b5 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -37,15 +37,15 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) { - return new KatePlugin%{APPNAME}( parent, name ); + return new KatePlugin%{APPNAME}( tqparent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) - : Kate::Plugin ( (Kate::Application*)parent, name ) +KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ) { } @@ -114,8 +114,8 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p ) /** * %{APPNAME}ConfigPage */ -%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* parent /*= 0L*/, TQWidget *parentWidget /*= 0L*/) - : Kate::PluginConfigPage( parentWidget ) +%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/) + : Kate::PluginConfigPage( tqparentWidget ) { TQVBoxLayout* lo = new TQVBoxLayout( this, 0, 0, "config_page_layout" ); lo->setSpacing(KDialogBase::spacingHint()); diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h index 6ad068d4..3082884e 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h @@ -21,12 +21,13 @@ class %{APPNAME}ConfigPage; class KatePluginFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -35,9 +36,10 @@ private: class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension { Q_OBJECT + TQ_OBJECT public: - KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); + KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); virtual ~KatePlugin%{APPNAME}(); void addView (Kate::MainWindow *win); @@ -65,10 +67,11 @@ private: class %{APPNAME}ConfigPage : public Kate::PluginConfigPage { Q_OBJECT + TQ_OBJECT friend class KatePlugin%{APPNAME}; public: - %{APPNAME}ConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); + %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L); ~%{APPNAME}ConfigPage (); /** Reimplemented from Kate::PluginConfigPage; just emits configPageApplyRequest( this ). */ diff --git a/languages/cpp/app_templates/kateplugin2/src-Makefile.am b/languages/cpp/app_templates/kateplugin2/src-Makefile.am index 2dbd9367..14a5dd2a 100644 --- a/languages/cpp/app_templates/kateplugin2/src-Makefile.am +++ b/languages/cpp/app_templates/kateplugin2/src-Makefile.am @@ -16,6 +16,6 @@ plugins_DATA = plugin_%{APPNAMELC}.rc kde_services_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp index bb15b923..4e9d3ca5 100644 --- a/languages/cpp/app_templates/kcmodule/module.cpp +++ b/languages/cpp/app_templates/kcmodule/module.cpp @@ -11,8 +11,8 @@ typedef KGenericFactory<%{APPNAME}, TQWidget> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY( kcm_%{APPNAME}, %{APPNAME}Factory("kcm%{APPNAMELC}")) -%{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name, const TQStringList&) - : KCModule(parent, name), myAboutData(0) +%{APPNAME}::%{APPNAME}(TQWidget *tqparent, const char *name, const TQStringList&) + : KCModule(tqparent, name), myAboutData(0) { // place widgets here load(); diff --git a/languages/cpp/app_templates/kcmodule/module.h b/languages/cpp/app_templates/kcmodule/module.h index 7f539c60..57542aae 100644 --- a/languages/cpp/app_templates/kcmodule/module.h +++ b/languages/cpp/app_templates/kcmodule/module.h @@ -9,9 +9,10 @@ class %{APPNAME}: public KCModule { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); + %{APPNAME}( TQWidget *tqparent=0, const char *name=0, const TQStringList& = TQStringList() ); ~%{APPNAME}(); virtual void load(); diff --git a/languages/cpp/app_templates/kcmodule/src-Makefile.am b/languages/cpp/app_templates/kcmodule/src-Makefile.am index e5d30776..6efe685a 100644 --- a/languages/cpp/app_templates/kcmodule/src-Makefile.am +++ b/languages/cpp/app_templates/kcmodule/src-Makefile.am @@ -13,5 +13,5 @@ xdg_apps_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `find -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcm%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kconfig35/app.h b/languages/cpp/app_templates/kconfig35/app.h index 0174aa1b..b8ec3f1e 100644 --- a/languages/cpp/app_templates/kconfig35/app.h +++ b/languages/cpp/app_templates/kconfig35/app.h @@ -26,6 +26,7 @@ class KURL; class %{APPNAMELC} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/kconfig35/appview.cpp index 30d627fe..0c82dd25 100644 --- a/languages/cpp/app_templates/kconfig35/appview.cpp +++ b/languages/cpp/app_templates/kconfig35/appview.cpp @@ -6,8 +6,8 @@ #include #include -%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) - : %{APPNAMELC}view_base(parent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent) + : %{APPNAMELC}view_base(tqparent) { settingsChanged(); } @@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kconfig35/appview.h b/languages/cpp/app_templates/kconfig35/appview.h index e0738ebe..897072a6 100644 --- a/languages/cpp/app_templates/kconfig35/appview.h +++ b/languages/cpp/app_templates/kconfig35/appview.h @@ -22,11 +22,12 @@ class KURL; class %{APPNAMELC}View : public %{APPNAMELC}view_base { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAMELC}View(TQWidget *parent); + %{APPNAMELC}View(TQWidget *tqparent); /** * Destructor diff --git a/languages/cpp/app_templates/kconfig35/appview_base.ui b/languages/cpp/app_templates/kconfig35/appview_base.ui index 626d95df..5852f806 100644 --- a/languages/cpp/app_templates/kconfig35/appview_base.ui +++ b/languages/cpp/app_templates/kconfig35/appview_base.ui @@ -1,6 +1,6 @@ %{APPNAMELC}view_base - + %{APPNAMELC}view_base @@ -19,7 +19,7 @@ unnamed - + sillyLabel @@ -29,5 +29,5 @@ - + diff --git a/languages/cpp/app_templates/kconfig35/prefs-base.ui b/languages/cpp/app_templates/kconfig35/prefs-base.ui index 5c0fc860..8c8b9012 100644 --- a/languages/cpp/app_templates/kconfig35/prefs-base.ui +++ b/languages/cpp/app_templates/kconfig35/prefs-base.ui @@ -1,6 +1,6 @@ Prefs_base - + Prefs_base @@ -16,7 +16,7 @@ unnamed - + textLabel2_2 @@ -32,7 +32,7 @@ - + textLabel1 @@ -40,7 +40,7 @@ Project age: - + textLabel2 @@ -66,7 +66,7 @@ Expanding - + 41 20 @@ -83,14 +83,14 @@ Expanding - + 41 20 - + kcfg_val_time @@ -111,7 +111,7 @@ Expanding - + 41 20 @@ -120,7 +120,7 @@ - + kcolorbutton.h diff --git a/languages/cpp/app_templates/kconfig35/src-Makefile.am b/languages/cpp/app_templates/kconfig35/src-Makefile.am index 5f7936da..2a04da7e 100644 --- a/languages/cpp/app_templates/kconfig35/src-Makefile.am +++ b/languages/cpp/app_templates/kconfig35/src-Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = %{APPNAMELC} # set the include path for X, qt and KDE INCLUDES = $(all_includes) -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO # the library search path. @@ -27,7 +27,7 @@ kde_kcfg_DATA = %{APPNAMELC}.kcfg noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h prefs.h messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp index b73c02cb..bb91d42e 100644 --- a/languages/cpp/app_templates/kde4app/kapp4.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4.cpp @@ -4,8 +4,8 @@ #include "%{APPNAMELC}view.h" #include "settings.h" -#include -#include +#include +#include #include #include @@ -48,13 +48,13 @@ void %{APPNAME}::setupActions() { KStandardAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStandardAction::quit(qApp, TQT_SLOT(quit()), actionCollection()); + KStandardAction::quit(tqApp, TQT_SLOT(quit()), actionCollection()); KStandardAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View KAction *custom = new KAction(KIcon("colorize"), i18n("Swi&tch Colors"), this); - actionCollection()->addAction( QLatin1String("switch_action"), custom ); + actionCollection()->addAction( TQLatin1String("switch_action"), custom ); connect(custom, TQT_SIGNAL(triggered(bool)), m_view, TQT_SLOT(switchColors())); } @@ -83,7 +83,7 @@ void %{APPNAME}::optionsPreferences() ui_prefs_base.setupUi(generalSettingsDlg); dialog->addPage(generalSettingsDlg, i18n("General"), "package_setting"); connect(dialog, TQT_SIGNAL(settingsChanged(TQString)), m_view, TQT_SLOT(settingsChanged())); - dialog->setAttribute( Qt::WA_DeleteOnClose ); + dialog->setAttribute( TQt::WA_DeleteOnClose ); dialog->show(); } diff --git a/languages/cpp/app_templates/kde4app/kapp4.h b/languages/cpp/app_templates/kde4app/kapp4.h index fb059fde..1a15a7c7 100644 --- a/languages/cpp/app_templates/kde4app/kapp4.h +++ b/languages/cpp/app_templates/kde4app/kapp4.h @@ -23,6 +23,7 @@ class KUrl; class %{APPNAME} : public KXmlGuiWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kde4app/kapp4view.cpp b/languages/cpp/app_templates/kde4app/kapp4view.cpp index 785a6858..9d9e482a 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4view.cpp @@ -3,7 +3,7 @@ #include "settings.h" #include -#include +#include %{APPNAME}View::%{APPNAME}View(TQWidget *) { diff --git a/languages/cpp/app_templates/kde4app/kapp4view.h b/languages/cpp/app_templates/kde4app/kapp4view.h index 40749696..c4ce6517 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view.h +++ b/languages/cpp/app_templates/kde4app/kapp4view.h @@ -2,7 +2,7 @@ #ifndef %{APPNAMELC}VIEW_H #define %{APPNAMELC}VIEW_H -#include +#include #include "ui_%{APPNAMELC}view_base.h" @@ -22,11 +22,12 @@ class KUrl; class %{APPNAME}View : public TQWidget, public Ui::%{APPNAMELC}view_base { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAME}View(TQWidget *parent); + %{APPNAME}View(TQWidget *tqparent); /** * Destructor diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui index eb6a254a..92a83f43 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui +++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui @@ -1,6 +1,6 @@ %{APPNAMELC}view_base - + 0 @@ -15,7 +15,7 @@ true - + 11 @@ -35,7 +35,7 @@ 6 - + @@ -196,7 +196,7 @@ true - + Qt::AlignCenter @@ -204,9 +204,9 @@ - + - + qPixmapFromMimeSource diff --git a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt index 2544a271..c29d33da 100644 --- a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt +++ b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt @@ -9,7 +9,7 @@ set(%{APPNAMELC}_SRCS %{APPNAMELC}view.cpp ) -#kde4_automoc(${%{APPNAMELC}_SRCS}) +#kde4_autotqmoc(${%{APPNAMELC}_SRCS}) kde4_add_ui_files(%{APPNAMELC}_SRCS %{APPNAMELC}view_base.ui prefs_base.ui) diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui index ea400f02..98bf5f19 100644 --- a/languages/cpp/app_templates/kde4app/prefs_base.ui +++ b/languages/cpp/app_templates/kde4app/prefs_base.ui @@ -1,6 +1,6 @@ prefs_base - + 0 @@ -9,9 +9,9 @@ 156 - + - + Background color: @@ -37,7 +37,7 @@ p, li { white-space: pre-wrap; } - + Project age: @@ -47,7 +47,7 @@ p, li { white-space: pre-wrap; } - + Foreground color: @@ -80,7 +80,7 @@ p, li { white-space: pre-wrap; } QSizePolicy::Expanding - + 41 20 @@ -96,7 +96,7 @@ p, li { white-space: pre-wrap; } QSizePolicy::Expanding - + 41 20 @@ -105,7 +105,7 @@ p, li { white-space: pre-wrap; } - + Set the project age (in days) @@ -128,7 +128,7 @@ p, li { white-space: pre-wrap; } QSizePolicy::Expanding - + 41 20 @@ -136,9 +136,9 @@ p, li { white-space: pre-wrap; } - + - + qPixmapFromMimeSource diff --git a/languages/cpp/app_templates/kdedcop/app.h b/languages/cpp/app_templates/kdedcop/app.h index b908b62c..77914d1c 100644 --- a/languages/cpp/app_templates/kdedcop/app.h +++ b/languages/cpp/app_templates/kdedcop/app.h @@ -19,6 +19,7 @@ class %{APPNAME} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kdedcop/src-Makefile.am b/languages/cpp/app_templates/kdedcop/src-Makefile.am index dc26ec93..9b32fb8f 100644 --- a/languages/cpp/app_templates/kdedcop/src-Makefile.am +++ b/languages/cpp/app_templates/kdedcop/src-Makefile.am @@ -6,11 +6,11 @@ INCLUDES = $(all_includes) # these are the headers for your project noinst_HEADERS = %{APPNAMELC}.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 - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot # this is the program that gets installed. it's name is used for all diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 364ec0d7..e6b82e21 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -21,8 +21,8 @@ typedef KGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( "kdev%{APPNAMELC}" ) ); static const KDevPluginInfo data("kdev%{APPNAMELC}"); -%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList& ) -: KDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" ) +%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList& ) +: KDevLanguageSupport(&data, tqparent, name ? name : "%{APPNAME}Part" ) { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdevlang_%{APPNAMELC}.rc"); @@ -91,7 +91,7 @@ void %{APPNAME}Part::savedFile(const KURL &fileName) { - if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) + if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { kdDebug(9014) << "parse file " << fileName.path() << endl; emit addedSourceInfo( fileName.path() ); diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h index d6d92ff6..234107bb 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h @@ -18,8 +18,9 @@ class KAction; class %{APPNAME}Part : public KDevLanguageSupport { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &); + %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &); ~%{APPNAME}Part(); protected: virtual Features features(); diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.cpp b/languages/cpp/app_templates/kdevpart/globalconfig.cpp index cddf3e7e..54e56426 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/globalconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) - : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) + : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.h b/languages/cpp/app_templates/kdevpart/globalconfig.h index aea1cbea..f08bd1bd 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart/globalconfig.h @@ -9,8 +9,9 @@ class %{APPNAME}Part; class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui index c16bd90d..7cba9a36 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui @@ -1,6 +1,6 @@ %{APPNAME}GlobalConfigBase - + %{APPNAME}GlobalConfigBase @@ -16,5 +16,5 @@ %{APPNAME} - + diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index 082549c4..96ddb6ca 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") +%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdev%{APPNAMELC}.rc"); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h index b73e61da..ddedde17 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h @@ -19,8 +19,9 @@ Please read the README.dox file for more info about this part class %{APPNAME}Part: public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); + %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h index 308c3e7e..f7c0290f 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h @@ -8,9 +8,10 @@ class KDevProject; class %{APPNAME}Part; -class %{APPNAME}Widget: public QWidget +class %{APPNAME}Widget: public TQWidget { Q_OBJECT + TQ_OBJECT public: %{APPNAME}Widget(%{APPNAME}Part *part); ~%{APPNAME}Widget(); diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.cpp b/languages/cpp/app_templates/kdevpart/projectconfig.cpp index 42a9f3e7..a3bc8b8c 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/projectconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) - : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) + : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.h b/languages/cpp/app_templates/kdevpart/projectconfig.h index 0ab0cb35..2d13ce14 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart/projectconfig.h @@ -9,8 +9,9 @@ class %{APPNAME}Part; class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui index c733a774..140e8df4 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui @@ -1,6 +1,6 @@ %{APPNAME}ProjectConfigBase - + %{APPNAME}ProjectConfigBase @@ -16,5 +16,5 @@ %{APPNAME} - + diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp index cddf3e7e..54e56426 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) - : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) + : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h index aea1cbea..f08bd1bd 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.h @@ -9,8 +9,9 @@ class %{APPNAME}Part; class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui index c16bd90d..7cba9a36 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui @@ -1,6 +1,6 @@ %{APPNAME}GlobalConfigBase - + %{APPNAME}GlobalConfigBase @@ -16,5 +16,5 @@ %{APPNAME} - + diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index 082549c4..96ddb6ca 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") +%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdev%{APPNAMELC}.rc"); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h index b73e61da..ddedde17 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -19,8 +19,9 @@ Please read the README.dox file for more info about this part class %{APPNAME}Part: public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); + %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h index 308c3e7e..f7c0290f 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h @@ -8,9 +8,10 @@ class KDevProject; class %{APPNAME}Part; -class %{APPNAME}Widget: public QWidget +class %{APPNAME}Widget: public TQWidget { Q_OBJECT + TQ_OBJECT public: %{APPNAME}Widget(%{APPNAME}Part *part); ~%{APPNAME}Widget(); diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp index 42a9f3e7..a3bc8b8c 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) - : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) + : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h index 0ab0cb35..2d13ce14 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.h @@ -9,8 +9,9 @@ class %{APPNAME}Part; class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui index c733a774..140e8df4 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui @@ -1,6 +1,6 @@ %{APPNAME}ProjectConfigBase - + %{APPNAME}ProjectConfigBase @@ -16,5 +16,5 @@ %{APPNAME} - + diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp index db259cb3..5ccbec50 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp @@ -13,9 +13,9 @@ typedef KGenericFactory<%{APPNAME}Plugin> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY(kfile_%{APPNAME}, %{APPNAME}Factory( "kfile_%{APPNAMELC}" )) -%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *parent, const char *name, +%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { //add the mimetype here - example: //KFileMimeTypeInfo* info = addMimeTypeInfo( "text/html" ); diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h index 94776938..93303359 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h @@ -13,9 +13,10 @@ class TQStringList; class %{APPNAME}Plugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Plugin( TQObject *parent, const char *name, const TQStringList& args ); + %{APPNAME}Plugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/languages/cpp/app_templates/kfileplugin/src-Makefile.am b/languages/cpp/app_templates/kfileplugin/src-Makefile.am index 48ac1c66..4bfee32a 100644 --- a/languages/cpp/app_templates/kfileplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kfileplugin/src-Makefile.am @@ -11,12 +11,12 @@ kfile_%{APPNAMELC}_la_SOURCES = kfile_%{APPNAMELC}.cpp kfile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kfile_%{APPNAMELC}_la_LIBADD = $(LIB_KIO) -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO services_DATA = kfile_%{APPNAMELC}.desktop servicesdir = $(kde_servicesdir) messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kfile_%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/khello/app.h b/languages/cpp/app_templates/khello/app.h index 678df7a3..fd0ca00b 100644 --- a/languages/cpp/app_templates/khello/app.h +++ b/languages/cpp/app_templates/khello/app.h @@ -17,6 +17,7 @@ class %{APPNAME} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/khello/src-Makefile.am b/languages/cpp/app_templates/khello/src-Makefile.am index d9ac7c7a..820f292a 100644 --- a/languages/cpp/app_templates/khello/src-Makefile.am +++ b/languages/cpp/app_templates/khello/src-Makefile.am @@ -4,11 +4,11 @@ INCLUDES = $(all_includes) # these are the headers for your project noinst_HEADERS = %{APPNAMELC}.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 - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/khello2/app.h b/languages/cpp/app_templates/khello2/app.h index 678df7a3..fd0ca00b 100644 --- a/languages/cpp/app_templates/khello2/app.h +++ b/languages/cpp/app_templates/khello2/app.h @@ -17,6 +17,7 @@ class %{APPNAME} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/khello2/src-Makefile.am b/languages/cpp/app_templates/khello2/src-Makefile.am index 4664fe84..7f9d7125 100644 --- a/languages/cpp/app_templates/khello2/src-Makefile.am +++ b/languages/cpp/app_templates/khello2/src-Makefile.am @@ -4,11 +4,11 @@ INCLUDES = $(all_includes) # these are the headers for your project noinst_HEADERS = %{APPNAMELC}.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 - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/khello2/widget.cpp b/languages/cpp/app_templates/khello2/widget.cpp index 266e894f..40e2d2bb 100644 --- a/languages/cpp/app_templates/khello2/widget.cpp +++ b/languages/cpp/app_templates/khello2/widget.cpp @@ -4,8 +4,8 @@ #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* parent, const char* name, WFlags fl) - : %{APPNAME}WidgetBase(parent,name,fl) +%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* tqparent, const char* name, WFlags fl) + : %{APPNAME}WidgetBase(tqparent,name,fl) {} %{APPNAME}Widget::~%{APPNAME}Widget() diff --git a/languages/cpp/app_templates/khello2/widget.h b/languages/cpp/app_templates/khello2/widget.h index 50d7a721..3773456b 100644 --- a/languages/cpp/app_templates/khello2/widget.h +++ b/languages/cpp/app_templates/khello2/widget.h @@ -8,9 +8,10 @@ class %{APPNAME}Widget : public %{APPNAME}WidgetBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Widget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}Widget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}Widget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/app_templates/khello2/widgetbase.ui b/languages/cpp/app_templates/khello2/widgetbase.ui index e6f5be3d..4540c922 100644 --- a/languages/cpp/app_templates/khello2/widgetbase.ui +++ b/languages/cpp/app_templates/khello2/widgetbase.ui @@ -1,6 +1,6 @@ %{APPNAME}WidgetBase - + %{APPNAMELC}widgetbase @@ -19,7 +19,7 @@ unnamed - + button @@ -27,7 +27,7 @@ Click Me! - + label @@ -45,8 +45,8 @@ button_clicked() - + button_clicked() - - + + diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp index 29ec3d1d..d609fa26 100644 --- a/languages/cpp/app_templates/kicker/applet.cpp +++ b/languages/cpp/app_templates/kicker/applet.cpp @@ -10,8 +10,8 @@ #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) - : KPanelApplet(configFile, type, actions, parent, name) +%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) + : KPanelApplet(configFile, type, actions, tqparent, name) { // Get the current application configuration handle ksConfig = config(); @@ -62,11 +62,11 @@ void %{APPNAME}::resizeEvent(TQResizeEvent *e) extern "C" { - KPanelApplet* init( TQWidget *parent, const TQString& configFile) + KPanelApplet* init( TQWidget *tqparent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, - parent, "%{APPNAMELC}"); + tqparent, "%{APPNAMELC}"); } } diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h index ba4d6cd4..b11b1aa9 100644 --- a/languages/cpp/app_templates/kicker/applet.h +++ b/languages/cpp/app_templates/kicker/applet.h @@ -15,6 +15,7 @@ class %{APPNAME} : public KPanelApplet { Q_OBJECT + TQ_OBJECT public: /** @@ -23,11 +24,11 @@ public: * @param configFile The configFile handed over in the factory function. * @param Type The applet @ref type(). * @param actions Standard RMB menu actions supported by the applet (see @ref action() ). - * @param parent The pointer to the parent widget handed over in the factory function. - * @param name A Qt object name for your applet. + * @param tqparent The pointer to the tqparent widget handed over in the factory function. + * @param name A TQt object name for your applet. **/ %{APPNAME}(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); /** destructor */ ~%{APPNAME}(); diff --git a/languages/cpp/app_templates/kicker/src-Makefile.am b/languages/cpp/app_templates/kicker/src-Makefile.am index 424062d1..8a46f24d 100644 --- a/languages/cpp/app_templates/kicker/src-Makefile.am +++ b/languages/cpp/app_templates/kicker/src-Makefile.am @@ -11,5 +11,5 @@ kde_module_LTLIBRARIES = %{APPNAMELC}_panelapplet.la %{APPNAMELC}dir = $(kde_datadir)/kicker/applets messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/kioslave/slave.cpp index c8dc5d81..ad5d7991 100644 --- a/languages/cpp/app_templates/kioslave/slave.cpp +++ b/languages/cpp/app_templates/kioslave/slave.cpp @@ -48,7 +48,7 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url ) int remotePort = url.port(); kdDebug() << "myURL: " << url.prettyURL() << endl; - infoMessage(i18n("Looking for %1...").arg( remoteServer ) ); + infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) ); // Send the mimeType as soon as it is known mimeType("text/plain"); // Send the data diff --git a/languages/cpp/app_templates/kioslave/src-Makefile.am b/languages/cpp/app_templates/kioslave/src-Makefile.am index 957ec330..b73354f1 100644 --- a/languages/cpp/app_templates/kioslave/src-Makefile.am +++ b/languages/cpp/app_templates/kioslave/src-Makefile.am @@ -10,5 +10,5 @@ protocol_DATA = %{APPNAMELC}.protocol protocoldir = $(kde_servicesdir) messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kio_%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui index fea02def..2aefef82 100644 --- a/languages/cpp/app_templates/kmake/mainview.ui +++ b/languages/cpp/app_templates/kmake/mainview.ui @@ -1,6 +1,6 @@ MainView - + Form1 @@ -16,7 +16,7 @@ unnamed - + groupBox1 @@ -35,7 +35,7 @@ unnamed - + helloLabel @@ -45,7 +45,7 @@ true - + AlignCenter @@ -69,8 +69,8 @@ slotHelloButtonClicked() - + slotHelloButtonClicked() - - + + diff --git a/languages/cpp/app_templates/kmake/mainviewimp.cpp b/languages/cpp/app_templates/kmake/mainviewimp.cpp index 8a0de706..5e953b0d 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.cpp +++ b/languages/cpp/app_templates/kmake/mainviewimp.cpp @@ -3,8 +3,8 @@ #include #include -MainViewImp::MainViewImp(TQWidget* parent, const char* name, WFlags fl) -: MainView(parent,name,fl) +MainViewImp::MainViewImp(TQWidget* tqparent, const char* name, WFlags fl) +: MainView(tqparent,name,fl) { } diff --git a/languages/cpp/app_templates/kmake/mainviewimp.h b/languages/cpp/app_templates/kmake/mainviewimp.h index 190a26e3..1a8af0b8 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.h +++ b/languages/cpp/app_templates/kmake/mainviewimp.h @@ -6,9 +6,10 @@ class MainViewImp : public MainView { Q_OBJECT + TQ_OBJECT public: - MainViewImp(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + MainViewImp(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~MainViewImp(); public slots: diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp index 86287a3f..034e2fb3 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -23,8 +23,8 @@ extern "C" KInstance* %{APPNAME}Factory::s_global = 0L; KAboutData* %{APPNAME}Factory::s_aboutData = 0L; -%{APPNAME}Factory::%{APPNAME}Factory( TQObject* parent, const char* name ) - : KoFactory( parent, name ) +%{APPNAME}Factory::%{APPNAME}Factory( TQObject* tqparent, const char* name ) + : KoFactory( tqparent, name ) { global(); } @@ -37,14 +37,14 @@ KAboutData* %{APPNAME}Factory::s_aboutData = 0L; s_global = 0L; } -KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & ) +KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) { // If classname is "KoDocument", our host is a koffice application // otherwise, the host wants us as a simple part, so switch to readonly and single view. bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); - // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case. - %{APPNAME}Part *part = new %{APPNAME}Part( parentWidget, widgetName, parent, name, !bWantKoDocument ); + // tqparentWidget and widgetName are used by KoDocument for the "readonly+singleView" case. + %{APPNAME}Part *part = new %{APPNAME}Part( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument ); if ( !bWantKoDocument ) part->setReadWrite( false ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h index 58061af3..149b4b50 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.h +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h @@ -14,11 +14,12 @@ class KAboutData; class %{APPNAME}Factory : public KoFactory { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Factory( TQObject* parent = 0, const char* name = 0 ); + %{APPNAME}Factory( TQObject* tqparent = 0, const char* name = 0 ); ~%{APPNAME}Factory(); - virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); + virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp index c12b5fd7..389fb431 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp @@ -8,20 +8,20 @@ #include -%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode ) - : KoDocument( parentWidget, widgetName, parent, name, singleViewMode ) +%{APPNAME}Part::%{APPNAME}Part( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) + : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode ) { } -bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget ) +bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* tqparentWidget ) { // If nothing is loaded, do initialize here return TRUE; } -KoView* %{APPNAME}Part::createViewInstance( TQWidget* parent, const char* name ) +KoView* %{APPNAME}Part::createViewInstance( TQWidget* tqparent, const char* name ) { - return new %{APPNAME}View( this, parent, name ); + return new %{APPNAME}View( this, tqparent, name ); } bool %{APPNAME}Part::loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store ) @@ -32,13 +32,13 @@ bool %{APPNAME}Part::loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisS bool %{APPNAME}Part::loadXML( TQIODevice *, const TQDomDocument & ) { - /// @todo load the document from the QDomDocument + /// @todo load the document from the TQDomDocument return true; } TQDomDocument %{APPNAME}Part::saveXML() { - /// @todo save the document into a QDomDocument + /// @todo save the document into a TQDomDocument return TQDomDocument(); } diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h index 95ebb3f6..0ec011ae 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.h +++ b/languages/cpp/app_templates/kofficepart/kopart_part.h @@ -11,12 +11,13 @@ class %{APPNAME}Part : public KoDocument { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); + %{APPNAME}Part( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false ); virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); - virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 ); + virtual bool initDoc( InitDocFlags flags, TQWidget* tqparentWidget = 0 ); virtual bool loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store ); virtual bool loadXML( TQIODevice *, const TQDomDocument & ); @@ -24,7 +25,7 @@ public: virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter ); protected: - virtual KoView* createViewInstance( TQWidget* parent, const char* name ); + virtual KoView* createViewInstance( TQWidget* tqparent, const char* name ); }; #endif diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index f32707a8..240251f9 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -13,8 +13,8 @@ #include #include -%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent, const char* name ) - : KoView( part, parent, name ) +%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* tqparent, const char* name ) + : KoView( part, tqparent, name ) { setInstance( %{APPNAME}Factory::global() ); setXMLFile( "%{APPNAMELC}.rc" ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h index 63f5127b..bcaac2e1 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.h +++ b/languages/cpp/app_templates/kofficepart/kopart_view.h @@ -16,8 +16,9 @@ class %{APPNAME}Part; class %{APPNAME}View : public KoView { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent = 0, const char* name = 0 ); + %{APPNAME}View( %{APPNAME}Part* part, TQWidget* tqparent = 0, const char* name = 0 ); protected slots: void cut(); diff --git a/languages/cpp/app_templates/kofficepart/src-Makefile.am b/languages/cpp/app_templates/kofficepart/src-Makefile.am index 19d38267..a0f702f6 100644 --- a/languages/cpp/app_templates/kofficepart/src-Makefile.am +++ b/languages/cpp/app_templates/kofficepart/src-Makefile.am @@ -37,5 +37,5 @@ rc_DATA = %{APPNAMELC}.rc rcdir = $(kde_datadir)/%{APPNAMELC} messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp %{APPNAMELC}_aboutdata.h -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp index ae9a85a6..4f0d7557 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp @@ -7,8 +7,8 @@ #include "%{APPNAMELC}.h" #include "%{APPNAMELC}.moc" -%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): - KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) +%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name): + KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name) { widget=new TQLabel("Init Value",widgetParent); } diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index 9599b530..b219619b 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -14,18 +14,19 @@ class %{APPNAME} : public KonqSidebarPlugin { Q_OBJECT + TQ_OBJECT public: /** * Construct a @ref KonqSidebarPlugin. * * @param inst The sidebar's kinstance class. - * @param parent The sidebar internal button info class responsible for this plugin. + * @param tqparent The sidebar internal button info class responsible for this plugin. * @param widgetParent The container which will contain the plugins widget. * @param desktopName The filename of the configuration file. - * @param name A Qt object name for your plugin. + * @param name A TQt object name for your plugin. **/ - %{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + %{APPNAME}(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); /** destructor */ ~%{APPNAME}(); diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 3a8a2274..39bb7108 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -183,7 +183,7 @@ void %{APPNAME}::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/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h index 25cd63bf..9bc577cb 100644 --- a/languages/cpp/app_templates/kpartapp/app.h +++ b/languages/cpp/app_templates/kpartapp/app.h @@ -22,6 +22,7 @@ class KToggleAction; class %{APPNAME} : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 809d642a..45a8116a 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -12,15 +12,15 @@ #include #include -%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name ) - : KParts::ReadWritePart(parent, name) +%{APPNAME}Part::%{APPNAME}Part( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name ) + : KParts::ReadWritePart(tqparent, name) { // we need an instance setInstance( %{APPNAME}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); @@ -74,7 +74,7 @@ void %{APPNAME}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); } @@ -86,7 +86,7 @@ bool %{APPNAME}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()) @@ -109,7 +109,7 @@ bool %{APPNAME}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; @@ -164,12 +164,12 @@ KAboutData* %{APPNAME}PartFactory::s_about = 0L; s_instance = 0L; } -KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, +KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ) { // Create an instance of our Part - %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, parent, name ); + %{APPNAME}Part* obj = new %{APPNAME}Part( tqparentWidget, widgetName, tqparent, name ); // See if we are to be read-write or not if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h index 1ebc7825..8d5417ad 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.h +++ b/languages/cpp/app_templates/kpartapp/app_part.h @@ -21,12 +21,13 @@ class TQMultiLineEdit; class %{APPNAME}Part : public KParts::ReadWritePart { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAME}Part(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name); + %{APPNAME}Part(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name); /** * Destructor @@ -70,11 +71,12 @@ class KAboutData; class %{APPNAME}PartFactory : public KParts::Factory { Q_OBJECT + TQ_OBJECT public: %{APPNAME}PartFactory(); virtual ~%{APPNAME}PartFactory(); - virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, + virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/languages/cpp/app_templates/kpartapp/src-Makefile.am b/languages/cpp/app_templates/kpartapp/src-Makefile.am index 357e2d0b..9b1a14b4 100644 --- a/languages/cpp/app_templates/kpartapp/src-Makefile.am +++ b/languages/cpp/app_templates/kpartapp/src-Makefile.am @@ -4,11 +4,11 @@ INCLUDES = $(all_includes) # these are the headers for your project noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}_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 - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index 61e3ca0e..dac6dc20 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -8,8 +8,8 @@ #include #include -Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) - : Plugin( parent, name ) +Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* tqparent, const char* name ) + : Plugin( tqparent, name ) { // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. @@ -27,7 +27,7 @@ void Plugin%{APPNAME}::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 " @@ -37,9 +37,9 @@ void Plugin%{APPNAME}::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. @@ -83,9 +83,9 @@ void Plugin%{APPNAME}::slotAction() s_instance = 0; } -TQObject* %{APPNAME}Factory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) +TQObject* %{APPNAME}Factory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) { - return new Plugin%{APPNAME}( parent, name ); + return new Plugin%{APPNAME}( tqparent, name ); } KInstance *%{APPNAME}Factory::instance() diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h index 7c7bfc0c..3d637d1b 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.h +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h @@ -8,8 +8,9 @@ class Plugin%{APPNAME} : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Plugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); + Plugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); virtual ~Plugin%{APPNAME}(); public slots: @@ -19,11 +20,12 @@ public slots: class %{APPNAME}Factory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: %{APPNAME}Factory(); virtual ~%{APPNAME}Factory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); static KInstance* instance(); diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am index 52e29c09..81242777 100644 --- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am @@ -18,5 +18,5 @@ pluginsdir = $(kde_datadir)/khtml/kpartplugins plugins_DATA = plugin_%{APPNAMELC}.rc messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART index ceaf1bda..0ba306bb 100644 --- a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART +++ b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART @@ -12,7 +12,7 @@ http://freehackers.org/~tnagy/bksys_manual.html CONFIGURING AND COMPILING THE PROJECT(S) SCONS TIPS -MOC PROCESSING +TQMOC PROCESSING SCONS MINIMUM DISTRIBUTION MORE TIPS @@ -61,20 +61,20 @@ checkinstall --fstrans=no --nodoc scons install To make scons run (much) faster, consult ./addons/README in bksys ------------------------------------------ -MOC PROCESSING +TQMOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has -signals and slots, then 'foo.h' must contain the macro Q_OBJECT -in order to compile. foo_moc.cpp is usually generated, and is -used to produce foo_moc.o which is linked with the +Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT +in order to compile. foo_tqmoc.cpp is usually generated, and is +used to produce foo_tqmoc.o which is linked with the program or the library. -In kde programs, 'foo.moc' is generated instead of foo_moc.cpp, +In kde programs, 'foo.tqmoc' is generated instead of foo_tqmoc.cpp, and it must be included at the very end of foo.cpp (add #include "foo.moc" : this increases the speed of compilation a *lot* and makes less object files. -Both modes are provided though, see test6-mocfiesta/ +Both modes are provided though, see test6-tqmocfiesta/ ------------------------------------------ MINIMUM SCONS DISTRIBUTION @@ -127,7 +127,7 @@ remember that libtool is broken on many systems (invalid flags among others), so when you can work without libtool (small projects especially), just do it. -** moc processing ** +** tqmoc processing ** As stated above, you should always add #include "foo.moc" for your qt classes (Q_OBJECT) to save precious compilation time. diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-src b/languages/cpp/app_templates/kscons_kmdi/SConscript-src index 746cdf98..9850e2ae 100644 --- a/languages/cpp/app_templates/kscons_kmdi/SConscript-src +++ b/languages/cpp/app_templates/kscons_kmdi/SConscript-src @@ -1,6 +1,6 @@ #! /usr/bin/env python ## This script is a quick test to demonstrate (and test) -## the bksys moc handling '#include "file.moc"' can be added .. or not +## the bksys tqmoc handling '#include "file.moc"' can be added .. or not ## ## Thomas Nagy, 2005 ## This file can be reused freely for any project (see COPYING) diff --git a/languages/cpp/app_templates/kscons_kmdi/SConstruct b/languages/cpp/app_templates/kscons_kmdi/SConstruct index b82de4e1..238a05b8 100644 --- a/languages/cpp/app_templates/kscons_kmdi/SConstruct +++ b/languages/cpp/app_templates/kscons_kmdi/SConstruct @@ -73,20 +73,20 @@ if 'dist' in COMMAND_LINE_TARGETS: shutil.copytree(startdir, FOLDER) ## remove our object files first - os.popen("find "+FOLDER+" -name \"*cache*\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \"*.pyc\" | xargs rm -f") + os.popen("tqfind "+FOLDER+" -name \"*cache*\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \"*.pyc\" | xargs rm -f") #os.popen("pushd %s && scons -c " % FOLDER) # TODO ## CVS cleanup - os.popen("find "+FOLDER+" -name \"CVS\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \"CVS\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") ## Subversion cleanup - os.popen("find %s -name .svn -type d | xargs rm -rf" % FOLDER) + os.popen("tqfind %s -name .svn -type d | xargs rm -rf" % FOLDER) ## GNU Arch cleanup - os.popen("find "+FOLDER+" -name \"{arch}\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \"{arch}\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") ## Create the tarball (coloured output) print "\033[92m"+"Writing archive "+ARCHIVE+"\033[0m" @@ -105,7 +105,7 @@ if 'distclean' in COMMAND_LINE_TARGETS: import os, shutil if os.path.isdir(env['CACHEDIR']): shutil.rmtree(env['CACHEDIR']) - os.popen("find . -name \"*.pyc\" | xargs rm -rf") + os.popen("tqfind . -name \"*.pyc\" | xargs rm -rf") env.Default(None) env.Exit(0) diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp index a851f02a..1f27cee4 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp @@ -17,15 +17,15 @@ typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory; K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); -%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList & /*args*/) - : KParts::ReadWritePart(parent) +%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList & /*args*/) + : KParts::ReadWritePart(tqparent) { // we need an instance setInstance( %{APPNAMELC}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); @@ -88,7 +88,7 @@ void %{APPNAMELC}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); } @@ -100,7 +100,7 @@ bool %{APPNAMELC}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()) @@ -123,7 +123,7 @@ bool %{APPNAMELC}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/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h index 3fa9beb5..39509adf 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.h +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h @@ -23,12 +23,13 @@ class KAboutData; class %{APPNAMELC}Part : public KParts::ReadWritePart { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList & /*args*/); + %{APPNAMELC}Part(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList & /*args*/); /** * Destructor diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp index 4286053a..efb41c1d 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include @@ -146,7 +146,7 @@ void %{APPNAMELC}kmdi::setupActions() void %{APPNAMELC}kmdi::showTip() { - KTipDialog::showTip(this,TQString::null,true); + KTipDialog::showTip(this,TQString(),true); } void %{APPNAMELC}kmdi::showTipOnStart() @@ -204,7 +204,7 @@ void %{APPNAMELC}kmdi::currentChanged( KMdiChildView *current ) } // switch to the corresponding document - if ( m_views.contains( (%{APPNAMELC}kmdiView*) current ) ) + if ( m_views.tqcontains( (%{APPNAMELC}kmdiView*) current ) ) { %{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) current; //view->updateCaption(); @@ -243,7 +243,7 @@ bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v) } %{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) v; - if ( m_views.contains( view ) ) + if ( m_views.tqcontains( view ) ) { m_views.remove( view ); if ( view->part()->queryClose() ) diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h b/languages/cpp/app_templates/kscons_kmdi/appkmdi.h index 8e80ab29..ca78c895 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.h @@ -28,6 +28,7 @@ class MiscProperties; class %{APPNAMELC}kmdi : public KMdiMainFrm { Q_OBJECT + TQ_OBJECT public: %{APPNAMELC}kmdi( KMdi::MdiMode mode ); virtual ~%{APPNAMELC}kmdi(); diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp index d7c00001..232d6b44 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp @@ -13,8 +13,8 @@ #include "%{APPNAMELC}kmdiView.h" - %{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *parentWidget, const char *name ) -: KMdiChildView( parentWidget, name ) + %{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *tqparentWidget, const char *name ) +: KMdiChildView( tqparentWidget, name ) { m_part = NULL; @@ -35,9 +35,9 @@ part()->widget()->setFocus(); setFocusProxy(part()->widget()); - TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" ); + TQBoxLayout* tqlayout = new TQHBoxLayout(this, 0, -1, "kdissertviewtqlayout" ); part()->widget()->reparent( this, TQPoint(0, 0) ); - layout->addWidget( part()->widget() ); + tqlayout->addWidget( part()->widget() ); // connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) ); } diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h index af05df48..31167035 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h @@ -15,8 +15,9 @@ class %{APPNAMELC}kmdiView : public KMdiChildView { Q_OBJECT + TQ_OBJECT public: - %{APPNAMELC}kmdiView( TQWidget *parentWidget=0L, const char *name=0L ); + %{APPNAMELC}kmdiView( TQWidget *tqparentWidget=0L, const char *name=0L ); virtual ~%{APPNAMELC}kmdiView(); KParts::ReadWritePart *part() { return m_part; } diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp index 5bd6b949..d0c856ec 100644 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp @@ -12,7 +12,7 @@ #include "kmdikonsole.h" -kmdikonsole::kmdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name) +kmdikonsole::kmdikonsole(TQWidget *tqparent, const char *name) : TQVBox(tqparent, name) { m_haskonsole = false; respawn(); diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h index ef5a2c1e..e97175c1 100644 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h +++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h @@ -5,12 +5,13 @@ #include -class kmdikonsole : public QVBox +class kmdikonsole : public TQVBox { Q_OBJECT + TQ_OBJECT public: - kmdikonsole( TQWidget* parent, const char* name=0); + kmdikonsole( TQWidget* tqparent, const char* name=0); ~kmdikonsole(); public slots: diff --git a/languages/cpp/app_templates/kscons_kmdi/messages.sh b/languages/cpp/app_templates/kscons_kmdi/messages.sh index a36f5c93..7df00263 100755 --- a/languages/cpp/app_templates/kscons_kmdi/messages.sh +++ b/languages/cpp/app_templates/kscons_kmdi/messages.sh @@ -34,14 +34,14 @@ fi echo "extracting the strings" # process the .ui and .rc files -$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp -$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp +$EXTRACTRC `tqfind $SRCDIR -iname *.rc` >> rc.cpp +$EXTRACTRC `tqfind $SRCDIR -iname *.ui` >> rc.cpp echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp # process the tips - $SRCDIR is supposed to be where the tips are living pushd $TIPSDIR; preparetips >tips.cpp; popd -$XGETTEXT `find $SRCDIR -name "*.cpp"` -o kdissert.pot +$XGETTEXT `tqfind $SRCDIR -name "*.cpp"` -o kdissert.pot # remove the intermediate files rm -f $TIPSDIR/tips.cpp diff --git a/languages/cpp/app_templates/kscons_kmdi/prefs.ui b/languages/cpp/app_templates/kscons_kmdi/prefs.ui index 5de638ef..8b3346de 100644 --- a/languages/cpp/app_templates/kscons_kmdi/prefs.ui +++ b/languages/cpp/app_templates/kscons_kmdi/prefs.ui @@ -1,6 +1,6 @@ prefs - + prefs @@ -16,7 +16,7 @@ unnamed - + kcfg_showCloseTabsButton @@ -26,5 +26,5 @@ - + diff --git a/languages/cpp/app_templates/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART index ceaf1bda..0ba306bb 100644 --- a/languages/cpp/app_templates/kscons_kxt/QUICKSTART +++ b/languages/cpp/app_templates/kscons_kxt/QUICKSTART @@ -12,7 +12,7 @@ http://freehackers.org/~tnagy/bksys_manual.html CONFIGURING AND COMPILING THE PROJECT(S) SCONS TIPS -MOC PROCESSING +TQMOC PROCESSING SCONS MINIMUM DISTRIBUTION MORE TIPS @@ -61,20 +61,20 @@ checkinstall --fstrans=no --nodoc scons install To make scons run (much) faster, consult ./addons/README in bksys ------------------------------------------ -MOC PROCESSING +TQMOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has -signals and slots, then 'foo.h' must contain the macro Q_OBJECT -in order to compile. foo_moc.cpp is usually generated, and is -used to produce foo_moc.o which is linked with the +Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT +in order to compile. foo_tqmoc.cpp is usually generated, and is +used to produce foo_tqmoc.o which is linked with the program or the library. -In kde programs, 'foo.moc' is generated instead of foo_moc.cpp, +In kde programs, 'foo.tqmoc' is generated instead of foo_tqmoc.cpp, and it must be included at the very end of foo.cpp (add #include "foo.moc" : this increases the speed of compilation a *lot* and makes less object files. -Both modes are provided though, see test6-mocfiesta/ +Both modes are provided though, see test6-tqmocfiesta/ ------------------------------------------ MINIMUM SCONS DISTRIBUTION @@ -127,7 +127,7 @@ remember that libtool is broken on many systems (invalid flags among others), so when you can work without libtool (small projects especially), just do it. -** moc processing ** +** tqmoc processing ** As stated above, you should always add #include "foo.moc" for your qt classes (Q_OBJECT) to save precious compilation time. diff --git a/languages/cpp/app_templates/kscons_kxt/SConscript-src b/languages/cpp/app_templates/kscons_kxt/SConscript-src index 02432be5..bc91cc0b 100644 --- a/languages/cpp/app_templates/kscons_kxt/SConscript-src +++ b/languages/cpp/app_templates/kscons_kxt/SConscript-src @@ -33,7 +33,7 @@ myenv.KDEprogram( "%{APPNAMELC}", %{APPNAMELC}_sources ) ## Customization ## Additional include paths for compiling the source files -## Always add '../' (top-level directory) because moc makes code that needs it +## Always add '../' (top-level directory) because tqmoc makes code that needs it myenv.KDEaddpaths_includes( "./ ../" ) ## Necessary libraries to link against diff --git a/languages/cpp/app_templates/kscons_kxt/SConstruct b/languages/cpp/app_templates/kscons_kxt/SConstruct index b82de4e1..238a05b8 100644 --- a/languages/cpp/app_templates/kscons_kxt/SConstruct +++ b/languages/cpp/app_templates/kscons_kxt/SConstruct @@ -73,20 +73,20 @@ if 'dist' in COMMAND_LINE_TARGETS: shutil.copytree(startdir, FOLDER) ## remove our object files first - os.popen("find "+FOLDER+" -name \"*cache*\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \"*.pyc\" | xargs rm -f") + os.popen("tqfind "+FOLDER+" -name \"*cache*\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \"*.pyc\" | xargs rm -f") #os.popen("pushd %s && scons -c " % FOLDER) # TODO ## CVS cleanup - os.popen("find "+FOLDER+" -name \"CVS\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \"CVS\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") ## Subversion cleanup - os.popen("find %s -name .svn -type d | xargs rm -rf" % FOLDER) + os.popen("tqfind %s -name .svn -type d | xargs rm -rf" % FOLDER) ## GNU Arch cleanup - os.popen("find "+FOLDER+" -name \"{arch}\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \"{arch}\" | xargs rm -rf") + os.popen("tqfind "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") ## Create the tarball (coloured output) print "\033[92m"+"Writing archive "+ARCHIVE+"\033[0m" @@ -105,7 +105,7 @@ if 'distclean' in COMMAND_LINE_TARGETS: import os, shutil if os.path.isdir(env['CACHEDIR']): shutil.rmtree(env['CACHEDIR']) - os.popen("find . -name \"*.pyc\" | xargs rm -rf") + os.popen("tqfind . -name \"*.pyc\" | xargs rm -rf") env.Default(None) env.Exit(0) diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index 2a696ea0..ec892c11 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -158,7 +158,7 @@ void %{APPNAME}::changeCaption(const TQString& text) void %{APPNAME}::showTip() { - KTipDialog::showTip(this,TQString::null,true); + KTipDialog::showTip(this,TQString(),true); } void %{APPNAME}::showTipOnStart() diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h index e812716d..afc6d642 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.h +++ b/languages/cpp/app_templates/kscons_kxt/app.h @@ -29,6 +29,7 @@ class %{APPNAME} : public KMainWindow, public DCOPObject { K_DCOP Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp index 2bcc9c6a..a474e605 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.cpp +++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp @@ -6,8 +6,8 @@ #include #include -%{APPNAME}View::%{APPNAME}View(TQWidget *parent) - : %{APPNAME}view_base(parent) +%{APPNAME}View::%{APPNAME}View(TQWidget *tqparent) + : %{APPNAME}view_base(tqparent) { settingsChanged(); } @@ -33,7 +33,7 @@ void %{APPNAME}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kscons_kxt/appview.h b/languages/cpp/app_templates/kscons_kxt/appview.h index 8cd02bef..8d4517bd 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.h +++ b/languages/cpp/app_templates/kscons_kxt/appview.h @@ -22,11 +22,12 @@ class KURL; class %{APPNAME}View : public %{APPNAME}view_base { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAME}View(TQWidget *parent); + %{APPNAME}View(TQWidget *tqparent); /** * Destructor diff --git a/languages/cpp/app_templates/kscons_kxt/appview_base.ui b/languages/cpp/app_templates/kscons_kxt/appview_base.ui index 6cd36d2c..4604ca4b 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview_base.ui +++ b/languages/cpp/app_templates/kscons_kxt/appview_base.ui @@ -2,7 +2,7 @@ %{APPNAME}view_base %{CPP_TEMPLATE} %{AUTHOR} <%{EMAIL}> - + %{APPNAME}view_base @@ -21,7 +21,7 @@ unnamed - + sillyLabel @@ -31,5 +31,5 @@ - + diff --git a/languages/cpp/app_templates/kscons_kxt/messages.sh b/languages/cpp/app_templates/kscons_kxt/messages.sh index a36f5c93..7df00263 100755 --- a/languages/cpp/app_templates/kscons_kxt/messages.sh +++ b/languages/cpp/app_templates/kscons_kxt/messages.sh @@ -34,14 +34,14 @@ fi echo "extracting the strings" # process the .ui and .rc files -$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp -$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp +$EXTRACTRC `tqfind $SRCDIR -iname *.rc` >> rc.cpp +$EXTRACTRC `tqfind $SRCDIR -iname *.ui` >> rc.cpp echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp # process the tips - $SRCDIR is supposed to be where the tips are living pushd $TIPSDIR; preparetips >tips.cpp; popd -$XGETTEXT `find $SRCDIR -name "*.cpp"` -o kdissert.pot +$XGETTEXT `tqfind $SRCDIR -name "*.cpp"` -o kdissert.pot # remove the intermediate files rm -f $TIPSDIR/tips.cpp diff --git a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui index 43ef8a5f..59403c40 100644 --- a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui @@ -2,7 +2,7 @@ Prefs_base %{CPP_TEMPLATE} %{AUTHOR} <%{EMAIL}> - + Prefs_base @@ -18,7 +18,7 @@ unnamed - + textLabel2_2 @@ -34,7 +34,7 @@ - + textLabel1 @@ -42,7 +42,7 @@ Project age: - + textLabel2 @@ -68,7 +68,7 @@ Expanding - + 41 20 @@ -85,14 +85,14 @@ Expanding - + 41 20 - + kcfg_val_time @@ -113,7 +113,7 @@ Expanding - + 41 20 @@ -122,7 +122,7 @@ - + kcolorbutton.h diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp index efdbf40b..855fb657 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp @@ -33,8 +33,8 @@ extern "C" //----------------------------------------------------------------------------- //! dialog to setup screen saver parameters -%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name ) - : %{APPNAME}UI( parent, name, TRUE ) +%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *tqparent, const char *name ) + : %{APPNAME}UI( tqparent, name, TRUE ) { /// @todo //Connect your signals and slots here to configure the screen saver. diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.h b/languages/cpp/app_templates/kscreensaver/kscreensaver.h index a5d252a5..c8511d34 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.h +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.h @@ -9,6 +9,7 @@ class %{APPNAME} : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: %{APPNAME}( WId drawable ); virtual ~%{APPNAME}(); @@ -20,8 +21,9 @@ private: class %{APPNAME}Setup : public %{APPNAME}UI { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Setup( TQWidget *parent = NULL, const char *name = NULL ); + %{APPNAME}Setup( TQWidget *tqparent = NULL, const char *name = NULL ); private slots: void slotOkPressed(); diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui index c4a843d0..da84ab28 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui +++ b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui @@ -2,7 +2,7 @@ %{APPNAME}UI This is the main UI for setting up your screen saver. Ian Reinhart Geiser - + %{APPNAMELC}cfg @@ -17,7 +17,7 @@ Screen Saver Config - + Layout2 @@ -33,7 +33,7 @@ unnamed - + CheckBox1 @@ -41,7 +41,7 @@ Set some setting - + Layout1 @@ -50,7 +50,7 @@ unnamed - + OkayPushButton @@ -58,7 +58,7 @@ &OK - + CancelPushButton @@ -74,6 +74,6 @@ kdialog.h - - + + diff --git a/languages/cpp/app_templates/kscreensaver/src-Makefile.am b/languages/cpp/app_templates/kscreensaver/src-Makefile.am index e19ffb77..e11ec0dc 100644 --- a/languages/cpp/app_templates/kscreensaver/src-Makefile.am +++ b/languages/cpp/app_templates/kscreensaver/src-Makefile.am @@ -20,5 +20,5 @@ desktopdir = $(kde_appsdir)/System/ScreenSavers EXTRA_DIST = $(desktop_DATA) messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h index 09f031c4..6ed2ab3d 100644 --- a/languages/cpp/app_templates/kxt/app.h +++ b/languages/cpp/app_templates/kxt/app.h @@ -27,6 +27,7 @@ class KURL; class %{APPNAMELC} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp index 30d627fe..0c82dd25 100644 --- a/languages/cpp/app_templates/kxt/appview.cpp +++ b/languages/cpp/app_templates/kxt/appview.cpp @@ -6,8 +6,8 @@ #include #include -%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) - : %{APPNAMELC}view_base(parent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent) + : %{APPNAMELC}view_base(tqparent) { settingsChanged(); } @@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kxt/appview.h b/languages/cpp/app_templates/kxt/appview.h index e0738ebe..897072a6 100644 --- a/languages/cpp/app_templates/kxt/appview.h +++ b/languages/cpp/app_templates/kxt/appview.h @@ -22,11 +22,12 @@ class KURL; class %{APPNAMELC}View : public %{APPNAMELC}view_base { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAMELC}View(TQWidget *parent); + %{APPNAMELC}View(TQWidget *tqparent); /** * Destructor diff --git a/languages/cpp/app_templates/kxt/appview_base.ui b/languages/cpp/app_templates/kxt/appview_base.ui index 626d95df..5852f806 100644 --- a/languages/cpp/app_templates/kxt/appview_base.ui +++ b/languages/cpp/app_templates/kxt/appview_base.ui @@ -1,6 +1,6 @@ %{APPNAMELC}view_base - + %{APPNAMELC}view_base @@ -19,7 +19,7 @@ unnamed - + sillyLabel @@ -29,5 +29,5 @@ - + diff --git a/languages/cpp/app_templates/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui index 5c0fc860..8c8b9012 100644 --- a/languages/cpp/app_templates/kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kxt/prefs-base.ui @@ -1,6 +1,6 @@ Prefs_base - + Prefs_base @@ -16,7 +16,7 @@ unnamed - + textLabel2_2 @@ -32,7 +32,7 @@ - + textLabel1 @@ -40,7 +40,7 @@ Project age: - + textLabel2 @@ -66,7 +66,7 @@ Expanding - + 41 20 @@ -83,14 +83,14 @@ Expanding - + 41 20 - + kcfg_val_time @@ -111,7 +111,7 @@ Expanding - + 41 20 @@ -120,7 +120,7 @@ - + kcolorbutton.h diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am index 5f7936da..2a04da7e 100644 --- a/languages/cpp/app_templates/kxt/src-Makefile.am +++ b/languages/cpp/app_templates/kxt/src-Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = %{APPNAMELC} # set the include path for X, qt and KDE INCLUDES = $(all_includes) -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO # the library search path. @@ -27,7 +27,7 @@ kde_kcfg_DATA = %{APPNAMELC}.kcfg noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h prefs.h messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp index 7f4cda15..508f7cc9 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp @@ -74,9 +74,9 @@ connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup())); - mVolume=new L33tSlider(0,100,10,0, Horizontal, this); + mVolume=new L33tSlider(0,100,10,0,Qt::Horizontal, this); mVolume->setValue(napp->player()->volume()); - mSeeker=new L33tSlider(0,1000,10,0, Horizontal, this); + mSeeker=new L33tSlider(0,1000,10,0,Qt::Horizontal, this); mStatusBar=new KStatusBar(this); @@ -86,7 +86,7 @@ l->addWidget(mStop,0,1); l->addWidget(mPlay,0,2); l->addWidget(mForward,0,3); - l->addWidget(mPlaylist,0,4, Qt::AlignLeft); + l->addWidget(mPlaylist,0,4, TQt::AlignLeft); l->addWidget(mLoop,0,5); l->addWidget(mPopup,0,6); l->addColSpacing(4, buttonSize+8); @@ -124,7 +124,7 @@ connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); // Event Filter for the RMB - for (TQPtrListIterator i(*children()); i.current(); ++i) + for (TQPtrListIterator i(*tqchildren()); i.current(); ++i) (*i)->installEventFilter(this); setCaption("Noatun"); @@ -132,7 +132,7 @@ show(); // What it is now, stay. - setFixedSize(minimumSize()); + setFixedSize(tqminimumSize()); } %{APPNAME}UI::~%{APPNAME}UI() @@ -189,7 +189,7 @@ void %{APPNAME}UI::changeCaption(const TQString& text) void %{APPNAME}UI::popup() { NoatunStdAction::ContextMenu::showContextMenu( - mapToGlobal(mPopup->geometry().bottomLeft()) ); + mapToGlobal(mPopup->tqgeometry().bottomLeft()) ); } void %{APPNAME}UI::slotPlaying() diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.h b/languages/cpp/app_templates/noatunui/plugin_impl.h index 476530f2..498864c6 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.h +++ b/languages/cpp/app_templates/noatunui/plugin_impl.h @@ -26,6 +26,7 @@ class KStatusBar; class %{APPNAME}UI : public TQWidget, public UserInterface { Q_OBJECT + TQ_OBJECT public: %{APPNAME}UI(); virtual ~%{APPNAME}UI(); diff --git a/languages/cpp/app_templates/noatunui/src-Makefile.am b/languages/cpp/app_templates/noatunui/src-Makefile.am index 95506569..f7c7b349 100644 --- a/languages/cpp/app_templates/noatunui/src-Makefile.am +++ b/languages/cpp/app_templates/noatunui/src-Makefile.am @@ -20,5 +20,5 @@ plugins_DATA = %{APPNAMELC}.plugin # kde_services_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp index a25f1fd2..f84a4fd3 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp @@ -117,7 +117,7 @@ void Bitmap::fadeStar() d++; x++; } - repaint(); + tqrepaint(); } } @@ -211,7 +211,7 @@ void %{APPNAME}View::checkInput() } break; - case SDL_QUIT: + case SDL_TQUIT: exit(0); break; } @@ -220,7 +220,7 @@ void %{APPNAME}View::checkInput() #define output2 ((unsigned char*)outputBmp.data) -void %{APPNAME}View::repaint() +void %{APPNAME}View::tqrepaint() { SDL_LockSurface(surface); TEST(); diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.h b/languages/cpp/app_templates/noatunvisual/plugin_impl.h index 2a7de7b1..a95845c9 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin_impl.h +++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.h @@ -58,7 +58,7 @@ protected: void setupPalette(double dummy=0.0); /** Draw everything. */ - void repaint(); + void tqrepaint(); private: /** used for pipelining */ diff --git a/languages/cpp/app_templates/noatunvisual/src-Makefile.am b/languages/cpp/app_templates/noatunvisual/src-Makefile.am index 207fd8a8..8f649499 100644 --- a/languages/cpp/app_templates/noatunvisual/src-Makefile.am +++ b/languages/cpp/app_templates/noatunvisual/src-Makefile.am @@ -15,5 +15,5 @@ plugins_DATA = %{APPNAMELC}.plugin # kde_services_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/opieapp/app.pro b/languages/cpp/app_templates/opieapp/app.pro index f4111696..74323c7c 100644 --- a/languages/cpp/app_templates/opieapp/app.pro +++ b/languages/cpp/app_templates/opieapp/app.pro @@ -9,8 +9,8 @@ QMAKE_LIBDIR = $(OPIEDIR)/lib OPIE-SPEC=6 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp index ebb4233c..6636116e 100644 --- a/languages/cpp/app_templates/opieapp/example.cpp +++ b/languages/cpp/app_templates/opieapp/example.cpp @@ -6,11 +6,11 @@ typedef OApplicationFactory<%{APPNAME}> %{APPNAME}Factory; OPIE_EXPORT_APP( %{APPNAME}Factory ) /* - * Constructs a %{APPNAME} which is a child of 'parent', with the + * Constructs a %{APPNAME} which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) - : %{APPNAME}Base( parent, name, fl ) +%{APPNAME}::%{APPNAME}( TQWidget* tqparent, const char* name, WFlags fl ) + : %{APPNAME}Base( tqparent, name, fl ) { connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } @@ -20,7 +20,7 @@ OPIE_EXPORT_APP( %{APPNAME}Factory ) */ %{APPNAME}::~%{APPNAME}() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h index 2a9c9efa..0a8320c9 100644 --- a/languages/cpp/app_templates/opieapp/example.h +++ b/languages/cpp/app_templates/opieapp/example.h @@ -5,12 +5,13 @@ class %{APPNAME} : public %{APPNAME}Base { Q_OBJECT + TQ_OBJECT public: static TQString appName() { - return TQString::fromLatin1("%{APPNAMELC}" ); + return TQString::tqfromLatin1("%{APPNAMELC}" ); } - %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/opieapp/examplebase.ui b/languages/cpp/app_templates/opieapp/examplebase.ui index b6b81b11..1243c341 100644 --- a/languages/cpp/app_templates/opieapp/examplebase.ui +++ b/languages/cpp/app_templates/opieapp/examplebase.ui @@ -7,7 +7,7 @@ %{APPNAME}Base - geometry + tqgeometry 0 0 @@ -45,5 +45,5 @@ - + diff --git a/languages/cpp/app_templates/opieapplet/app.pro b/languages/cpp/app_templates/opieapplet/app.pro index e1cc1e3b..696082d0 100644 --- a/languages/cpp/app_templates/opieapplet/app.pro +++ b/languages/cpp/app_templates/opieapplet/app.pro @@ -6,8 +6,8 @@ TARGET = %{APPNAMELC} QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp index 3264314c..cc2a6a17 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp @@ -2,14 +2,14 @@ #include #include -#include // for AppLnk -#include // for Resource loading +#include // for AppLnk +#include // for Resource loading #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(TQWidget *parent) - : TQWidget( parent, "%{APPNAME} Applet" ) { +%{APPNAME}::%{APPNAME}(TQWidget *tqparent) + : TQWidget( tqparent, "%{APPNAME} Applet" ) { /* * we will load an Image, scale it for the right usage * remember your applet might be used by different @@ -79,7 +79,7 @@ void %{APPNAME}::paintEvent( TQPaintEvent* ) { %{APPNAME}Impl::~%{APPNAME}Impl() { /* * we will delete our applets as well - * setAUtoDelete makes the QList free + * setAUtoDelete makes the TQList free * the objects behind the pointers */ m_applets.setAutoDelete( true ); @@ -89,12 +89,12 @@ void %{APPNAME}::paintEvent( TQPaintEvent* ) { /* * For the taskbar interface return a Widget */ -TQWidget* %{APPNAME}Impl::applet( TQWidget* parent ) { +TQWidget* %{APPNAME}Impl::applet( TQWidget* tqparent ) { /* * There are problems with ownership. So we add * our ownlist and clear this; */ - %{APPNAME}* ap = new %{APPNAME}( parent ); + %{APPNAME}* ap = new %{APPNAME}( tqparent ); m_applets.append( ap ); return ap; @@ -109,12 +109,12 @@ int %{APPNAME}Impl::position()const { /* - * Now the important QUnkownInterface method without + * Now the important TQUnkownInterface method without * this one your applet won't load * @param uuid The uuid of the interface * @param iface The pointer to the interface ptr */ -QRESULT %{APPNAME}Impl::queryInterface( const QUuid& uuid, QUnknownInterface** iface) { +TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid& uuid, TQUnknownInterface** iface) { /* set the pointer to the interface to 0 */ *iface = 0; @@ -128,24 +128,24 @@ QRESULT %{APPNAME}Impl::queryInterface( const QUuid& uuid, QUnknownInterface** i * Now the caller knows that the Interface Pointer * is valid and the interface supported */ - if ( uuid == IID_QUnknown ) + if ( uuid == IID_TQUnknown ) *iface = this; else if ( uuid == IID_TaskbarApplet ) *iface = this; else - return QS_FALSE; + return TQS_FALSE; if ( *iface ) (*iface)->addRef(); - return QS_OK; + return TQS_OK; } /* * Finally we need to export the Interface. * CREATE_INSTANCE creates a interface and calls - * queryInterface for the QUnknownInterface once + * queryInterface for the TQUnknownInterface once * With out this function the applet can't be loaded. * * NOTE: If your applet does not load it's likely you've an @@ -156,7 +156,7 @@ QRESULT %{APPNAME}Impl::queryInterface( const QUuid& uuid, QUnknownInterface** i * The main(int argc, char* argv[] ) does not need to be * included in a library so it's ok that the linker complains */ -Q_EXPORT_INTERFACE() { - Q_CREATE_INSTANCE( %{APPNAME}Impl ) +TQ_EXPORT_INTERFACE() { + TQ_CREATE_INSTANCE( %{APPNAME}Impl ) } diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.h b/languages/cpp/app_templates/opieapplet/simpleimpl.h index 7cca8ee7..855aed57 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.h +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.h @@ -3,18 +3,18 @@ /** - * Opie and Qtopia uses a component system called QCOM - * which was first part of the Qt 3.0 API but was made - * prviate during the betas. Opie and Qtopia still use it + * Opie and TQtopia uses a component system called TQCOM + * which was first part of the TQt 3.0 API but was made + * prviate during the betas. Opie and TQtopia still use it * and we're happy with it. - * Every starts with the QUnknownInterface. It supports functions + * Every starts with the TQUnknownInterface. It supports functions * for reference counting and the most important one - * is for a query. Every QCOM interface got a global unique id ( GUID,UUID ) + * is for a query. Every TQCOM interface got a global unique id ( GUID,UUID ) * query is used to see if a interface is supported by * a dynamic shared object ( dso / plugin ) * For tasks like loading Applications, InputMethods, Today, MenuButton, * Taskbar, Style, Email Client there are specefic Interfaces you - * need to implement. The interfaces inherits from QUnknownInterface and + * need to implement. The interfaces inherits from TQUnknownInterface and * you'll need inherit from the interface. * As example we will use the Taskbar interface */ @@ -22,26 +22,27 @@ /* * The taskbar applet interfaces wants us to implement position() and applet() - * additionally we need to implement add(), release() and queryInterface for QUnknownInterface + * additionally we need to implement add(), release() and queryInterface for TQUnknownInterface * luckiy there is a macro for the reference counting * We provide an Implementation of the interface. */ #include #include -#include +#include /* * Because we only draw an Icon in a fixed width and height - * we declare and define %{APPNAME} here and you could use QLabel + * we declare and define %{APPNAME} here and you could use TQLabel * setPixmap or use TQWidget and draw yourself. * You might also want to reimplement mouse*Event to use some simple actions */ class %{APPNAME} : public TQWidget { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}(TQWidget *parent); + %{APPNAME}(TQWidget *tqparent); ~%{APPNAME}(); private: void mousePressEvent( TQMouseEvent* ); @@ -55,9 +56,9 @@ public: %{APPNAME}Impl(); virtual ~%{APPNAME}Impl(); - QRESULT queryInterface( const QUuid&, QUnknownInterface** ); + TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); - TQWidget *applet( TQWidget* parent ); + TQWidget *applet( TQWidget* tqparent ); int position()const; /* @@ -65,10 +66,10 @@ public: * if reference drops to zero * delete this is called */ - Q_REFCOUNT + TQ_REFCOUNT private: - QList<%{APPNAME}> m_applets; + TQList<%{APPNAME}> m_applets; }; diff --git a/languages/cpp/app_templates/opieinput/app.pro b/languages/cpp/app_templates/opieinput/app.pro index 1711c78f..5a3a7a40 100644 --- a/languages/cpp/app_templates/opieinput/app.pro +++ b/languages/cpp/app_templates/opieinput/app.pro @@ -6,8 +6,8 @@ TARGET = %{APPNAMELC} QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index db2e4285..ea178e59 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include "%{APPNAMELC}.h" @@ -58,7 +58,7 @@ void %{APPNAME}::slotKey(int _ke){ /* * Send the key - * ke is the unicode + * ke is the tqunicode * _ke + 0x41 is the keycode * m_state Normally the state * down/up @@ -102,10 +102,10 @@ void %{APPNAME}::slotCtrl(bool b){ delete m_icn; } -TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *parent, Qt::WFlags f ) +TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *tqparent, TQt::WFlags f ) { if ( !m_pickboard ) - m_pickboard = new %{APPNAME}( parent, f ); + m_pickboard = new %{APPNAME}( tqparent, f ); return m_pickboard; } @@ -133,25 +133,25 @@ void %{APPNAME}Impl::onKeyPress( TQObject *receiver, const char *slot ) TQObject::connect( m_pickboard, TQT_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); } -#ifndef QT_NO_COMPONENT -QRESULT %{APPNAME}Impl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) +#ifndef TQT_NO_COMPONENT +TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface ) { *iface = 0; - if ( uuid == IID_QUnknown ) + if ( uuid == IID_TQUnknown ) *iface = this; else if ( uuid == IID_InputMethod ) *iface = this; else - return QS_FALSE; + return TQS_FALSE; if ( *iface ) (*iface)->addRef(); - return QS_OK; + return TQS_OK; } -Q_EXPORT_INTERFACE() +TQ_EXPORT_INTERFACE() { - Q_CREATE_INSTANCE( %{APPNAME}Impl ) + TQ_CREATE_INSTANCE( %{APPNAME}Impl ) } #endif diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.h b/languages/cpp/app_templates/opieinput/simpleimpl.h index 6d7033f0..76af8138 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.h +++ b/languages/cpp/app_templates/opieinput/simpleimpl.h @@ -3,12 +3,13 @@ #include -#include +#include class TQPixmap; class TQCheckBox; class %{APPNAME} : public TQHBox { Q_OBJECT + TQ_OBJECT public: %{APPNAME}( TQWidget *par, WFlags f ); ~%{APPNAME}(); @@ -31,12 +32,12 @@ public: %{APPNAME}Impl(); virtual ~%{APPNAME}Impl(); -#ifndef QT_NO_COMPONENT - QRESULT queryInterface( const QUuid&, QUnknownInterface** ); - Q_REFCOUNT +#ifndef TQT_NO_COMPONENT + TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); + TQ_REFCOUNT #endif - virtual TQWidget *inputMethod( TQWidget *parent, Qt::WFlags f ); + virtual TQWidget *inputMethod( TQWidget *tqparent, TQt::WFlags f ); virtual void resetState(); virtual TQPixmap *icon(); virtual TQString name(); diff --git a/languages/cpp/app_templates/opiemenu/app.pro b/languages/cpp/app_templates/opiemenu/app.pro index 71bc208c..f9600bf4 100644 --- a/languages/cpp/app_templates/opiemenu/app.pro +++ b/languages/cpp/app_templates/opiemenu/app.pro @@ -6,8 +6,8 @@ TARGET = %{APPNAMELC} QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp index 17b59a3e..9d953663 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp @@ -1,7 +1,7 @@ #include "%{APPNAMELC}.h" -#include -#include +#include +#include /* QT */ #include @@ -57,22 +57,22 @@ void %{APPNAME}::activated() } -QRESULT %{APPNAME}::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) +TQRESULT %{APPNAME}::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface ) { *iface = 0; - if ( uuid == IID_QUnknown ) + if ( uuid == IID_TQUnknown ) *iface = this; else if ( uuid == IID_MenuApplet ) *iface = this; else - return QS_FALSE; + return TQS_FALSE; if ( *iface ) (*iface)->addRef(); - return QS_OK; + return TQS_OK; } -Q_EXPORT_INTERFACE() +TQ_EXPORT_INTERFACE() { - Q_CREATE_INSTANCE( %{APPNAME} ) + TQ_CREATE_INSTANCE( %{APPNAME} ) } diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.h b/languages/cpp/app_templates/opiemenu/simpleimpl.h index b384ee2d..61c3cc5b 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.h +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.h @@ -1,7 +1,7 @@ #ifndef %{APPNAME}_MENU_APPLET_H #define %{APPNAME}_MENU_APPLET_H -#include +#include #include @@ -9,13 +9,14 @@ class %{APPNAME} : public TQObject, public MenuAppletInterface { Q_OBJECT + TQ_OBJECT public: %{APPNAME} ( ); virtual ~%{APPNAME} ( ); - QRESULT queryInterface( const QUuid&, QUnknownInterface** ); - Q_REFCOUNT + TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); + TQ_REFCOUNT virtual int position() const; @@ -25,7 +26,7 @@ public: /* virtual TQString tr( const char* ) const; virtual TQString tr( const char*, const char* ) const; */ - virtual TQPopupMenu *popup ( TQWidget *parent ) const; + virtual TQPopupMenu *popup ( TQWidget *tqparent ) const; virtual void activated ( ); }; diff --git a/languages/cpp/app_templates/opienet/app.pro b/languages/cpp/app_templates/opienet/app.pro index 53fb6eea..df87650c 100644 --- a/languages/cpp/app_templates/opienet/app.pro +++ b/languages/cpp/app_templates/opienet/app.pro @@ -7,8 +7,8 @@ LIBS += -linterfaces QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opienet/simmplemodule.h b/languages/cpp/app_templates/opienet/simmplemodule.h index 7a8882b4..5c928ec9 100644 --- a/languages/cpp/app_templates/opienet/simmplemodule.h +++ b/languages/cpp/app_templates/opienet/simmplemodule.h @@ -12,19 +12,19 @@ public: VirtualModule(); ~VirtualModule(); - const TQString type() {return TQString::fromLatin1("vpn" );} + const TQString type() {return TQString::tqfromLatin1("vpn" );} void setProfile( const TQString& ) {} bool isOwner( Interface* ); TQWidget *configure( Interface* ); TQWidget *information( Interface* ); - QList getInterfaces(); + TQList getInterfaces(); void possibleNewInterfaces( TQMap& ); Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } + TQString getPixmapName( Interface* ) {return TQString::tqfromLatin1("Tux"); } void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: - QList m_interfaces; + TQList m_interfaces; }; extern "C" { diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp index bbabcbda..9b38bc77 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.cpp +++ b/languages/cpp/app_templates/opienet/simpleiface.cpp @@ -1,9 +1,9 @@ #include "%{APPNAMELC}iface.h" -%{APPNAME}Interface::%{APPNAME}Interface( TQObject* parent, +%{APPNAME}Interface::%{APPNAME}Interface( TQObject* tqparent, const char* name, bool status ) - : Interface(parent, name, status ) + : Interface(tqparent, name, status ) { } @@ -31,13 +31,13 @@ bool %{APPNAME}Interface::refresh() { void %{APPNAME}Interface::start() { // call pptp - setStatus(true); + settqStatus(true); refresh(); emit updateMessage("VPN started"); } void %{APPNAME}Interface::stop() { - setStatus(false ); + settqStatus(false ); refresh(); emit updateMessage("VPN halted"); } diff --git a/languages/cpp/app_templates/opienet/simpleiface.h b/languages/cpp/app_templates/opienet/simpleiface.h index ef514697..c38d884f 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.h +++ b/languages/cpp/app_templates/opienet/simpleiface.h @@ -5,9 +5,10 @@ class %{APPNAME}Interface : public Interface { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Interface(TQObject* parent, const char* name = "vpn", bool up = false ); + %{APPNAME}Interface(TQObject* tqparent, const char* name = "vpn", bool up = false ); ~%{APPNAME}Interface(); public slots: diff --git a/languages/cpp/app_templates/opienet/simplemodule.cpp b/languages/cpp/app_templates/opienet/simplemodule.cpp index 0a96c844..f8e963bd 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.cpp +++ b/languages/cpp/app_templates/opienet/simplemodule.cpp @@ -29,7 +29,7 @@ */ bool %{APPNAME}Module::isOwner( Interface* iface ) { /* check if it is our device */ - return m_interfaces.find( iface ) != -1; + return m_interfaces.tqfind( iface ) != -1; } TQWidget* %{APPNAME}Module::configure( Interface* ) { @@ -41,7 +41,7 @@ TQWidget* %{APPNAME}Module::information( Interface* iface ) { return new InterfaceInformationImp(0, "Interface info", iface ); } -QList %{APPNAME}Module::getInterfaces() { +TQList %{APPNAME}Module::getInterfaces() { return m_interfaces; } diff --git a/languages/cpp/app_templates/opienet/simplemodule.h b/languages/cpp/app_templates/opienet/simplemodule.h index 4120d811..327c1d43 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.h +++ b/languages/cpp/app_templates/opienet/simplemodule.h @@ -12,19 +12,19 @@ public: %{APPNAME}Module(); ~%{APPNAME}Module(); - const TQString type() {return TQString::fromLatin1("vpn" );} + const TQString type() {return TQString::tqfromLatin1("vpn" );} void setProfile( const TQString& ) {} bool isOwner( Interface* ); TQWidget *configure( Interface* ); TQWidget *information( Interface* ); - QList getInterfaces(); + TQList getInterfaces(); void possibleNewInterfaces( TQMap& ); Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } + TQString getPixmapName( Interface* ) {return TQString::tqfromLatin1("Tux"); } void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: - QList m_interfaces; + TQList m_interfaces; }; extern "C" { diff --git a/languages/cpp/app_templates/opietoday/app.pro b/languages/cpp/app_templates/opietoday/app.pro index 152dc6f6..73e03efb 100644 --- a/languages/cpp/app_templates/opietoday/app.pro +++ b/languages/cpp/app_templates/opietoday/app.pro @@ -6,8 +6,8 @@ TARGET = %{APPNAMELC} QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp index c7df8069..d3dc37ab 100644 --- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp +++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp @@ -19,7 +19,7 @@ double %{APPNAME}::versionNumber() const { // this sets the image that will be shown on the left side of the plugin TQString %{APPNAME}::pixmapNameWidget() const { - return TQString::fromLatin1("%{APPNAMELC}/%{APPNAMELC}"); + return TQString::tqfromLatin1("%{APPNAMELC}/%{APPNAMELC}"); } TQWidget* %{APPNAME}::widget( TQWidget * wid ) { @@ -36,13 +36,13 @@ TQString %{APPNAME}::pixmapNameConfig() const { } // No config widget yet, look at the datebook plugin for an example of that -TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*parent*/ ) { +TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*tqparent*/ ) { return 0l; } // add the binary name of the app to launch here TQString %{APPNAME}::appName() const { - return TQString::null; + return TQString(); } // if the plugin should be excluded form the refresh cycles that can be set in the today app diff --git a/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp b/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp index 3a9481f1..a4896308 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp @@ -14,17 +14,17 @@ TodayPluginObject* %{APPNAME}Impl::guiPart() { return examplePlugin; } -QRESULT %{APPNAME}Impl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { +TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid & uuid, TQUnknownInterface **iface ) { *iface = 0; - if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { + if ( ( uuid == IID_TQUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { *iface = this, (*iface)->addRef(); }else - return QS_FALSE; + return TQS_FALSE; - return QS_OK; + return TQS_OK; } -Q_EXPORT_INTERFACE() { - Q_CREATE_INSTANCE( %{APPNAME}Impl ); +TQ_EXPORT_INTERFACE() { + TQ_CREATE_INSTANCE( %{APPNAME}Impl ); } diff --git a/languages/cpp/app_templates/opietoday/examplepluginimpl.h b/languages/cpp/app_templates/opietoday/examplepluginimpl.h index ccb7c3b3..ddc63bc2 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginimpl.h +++ b/languages/cpp/app_templates/opietoday/examplepluginimpl.h @@ -11,8 +11,8 @@ public: %{APPNAME}Impl(); virtual ~%{APPNAME}Impl(); - QRESULT queryInterface( const QUuid &, QUnknownInterface** ); - Q_REFCOUNT + TQRESULT queryInterface( const TQUuid &, TQUnknownInterface** ); + TQ_REFCOUNT virtual TodayPluginObject *guiPart(); diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp index a80dad81..98b19f9a 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp @@ -1,10 +1,10 @@ -#include -#include +#include +#include #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *parent, const char* name) - : TQWidget(parent, name ) { +%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *tqparent, const char* name) + : TQWidget(tqparent, name ) { m_exampleLabel = 0l; m_layout = 0l; diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h index 53a67b18..f5e35d4e 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h @@ -8,9 +8,10 @@ class %{APPNAME}Widget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Widget( TQWidget *parent, const char *name ); + %{APPNAME}Widget( TQWidget *tqparent, const char *name ); ~%{APPNAME}Widget(); void refresh(); diff --git a/languages/cpp/app_templates/prc-tool/palmhello.c b/languages/cpp/app_templates/prc-tool/palmhello.c index 0a34b6c4..e0317932 100644 --- a/languages/cpp/app_templates/prc-tool/palmhello.c +++ b/languages/cpp/app_templates/prc-tool/palmhello.c @@ -22,7 +22,7 @@ static Boolean MainFormHandleEvent (EventPtr e) break; case menuEvent: - MenuEraseStatus(NULL); + MenuErasetqStatus(NULL); switch(e->data.menu.itemID) { } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp index f3c5f7f2..4b78645a 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -36,17 +36,17 @@ openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen - = new TQToolButton( openIcon, tr("Open File"), TQString::null, + = new TQToolButton( openIcon, tr("Open File"), TQString(), this, TQT_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave - = new TQToolButton( saveIcon, tr("Save File"), TQString::null, + = new TQToolButton( saveIcon, tr("Save File"), TQString(), this, TQT_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint - = new TQToolButton( printIcon, tr("Print File"), TQString::null, + = new TQToolButton( printIcon, tr("Print File"), TQString(), this, TQT_SLOT(print()), fileTools, "print file" ); @@ -103,7 +103,7 @@ file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), qApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); @@ -111,7 +111,7 @@ menuBar()->insertItem( tr("&Help"), help ); help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); - help->insertItem( tr("About &Qt"), this, TQT_SLOT(aboutQt()) ); + help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) ); help->insertSeparator(); help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); @@ -134,13 +134,13 @@ void %{APPNAME}::newDoc() { %{APPNAME} *ed = new %{APPNAME}; - ed->setCaption(tr("Qt Example - Application")); + ed->setCaption(tr("TQt Example - Application")); ed->show(); } void %{APPNAME}::choose() { - TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, + TQString fn = TQFileDialog::getOpenFileName( TQString(), TQString(), this); if ( !fn.isEmpty() ) load( fn ); @@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName ) e->setText( ts.read() ); e->setModified( FALSE ); setCaption( fileName ); - statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 ); + statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 ); } @@ -173,7 +173,7 @@ void %{APPNAME}::save() TQString text = e->text(); TQFile f( filename ); if ( !f.open( IO_WriteOnly ) ) { - statusBar()->message( tr("Could not write to %1").arg(filename), + statusBar()->message( tr("Could not write to %1").tqarg(filename), 2000 ); return; } @@ -186,13 +186,13 @@ void %{APPNAME}::save() setCaption( filename ); - statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 ); + statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 ); } void %{APPNAME}::saveAs() { - TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null, + TQString fn = TQFileDialog::getSaveFileName( TQString(), TQString(), this ); if ( !fn.isEmpty() ) { filename = fn; @@ -249,7 +249,7 @@ void %{APPNAME}::closeEvent( TQCloseEvent* ce ) return; } - switch( TQMessageBox::information( this, tr("Qt Application Example"), + switch( TQMessageBox::information( this, tr("TQt Application Example"), tr("Do you want to save the changes" " to the document?"), tr("Yes"), tr("No"), tr("Cancel"), @@ -271,13 +271,13 @@ void %{APPNAME}::closeEvent( TQCloseEvent* ce ) void %{APPNAME}::about() { - TQMessageBox::about( this, tr("Qt Application Example"), + TQMessageBox::about( this, tr("TQt Application Example"), tr("This example demonstrates simple use of " - "TQMainWindow,\nQMenuBar and TQToolBar.")); + "TQMainWindow,\nTQMenuBar and TQToolBar.")); } -void %{APPNAME}::aboutQt() +void %{APPNAME}::aboutTQt() { - TQMessageBox::aboutQt( this, tr("Qt Application Example") ); + TQMessageBox::aboutTQt( this, tr("TQt Application Example") ); } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.h b/languages/cpp/app_templates/qmakeapp/qmakeapp.h index af12e1eb..bc8a2b93 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.h +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.h @@ -7,9 +7,10 @@ class TQTextEdit; -class %{APPNAME}: public QMainWindow +class %{APPNAME}: public TQMainWindow { Q_OBJECT + TQ_OBJECT public: %{APPNAME}(); @@ -27,7 +28,7 @@ private slots: void print(); void about(); - void aboutQt(); + void aboutTQt(); private: TQPrinter *printer; diff --git a/languages/cpp/app_templates/qt4hello/main.cpp b/languages/cpp/app_templates/qt4hello/main.cpp index cbff1d3c..59ee17d7 100644 --- a/languages/cpp/app_templates/qt4hello/main.cpp +++ b/languages/cpp/app_templates/qt4hello/main.cpp @@ -1,11 +1,11 @@ %{CPP_TEMPLATE} -#include +#include int main(int argc, char *argv[]) { - QCoreApplication app(argc, argv); - qDebug("Hello from Qt 4!"); + TQCoreApplication app(argc, argv); + qDebug("Hello from TQt 4!"); return 0; } diff --git a/languages/cpp/app_templates/qt4makeapp/main.cpp b/languages/cpp/app_templates/qt4makeapp/main.cpp index 4f6295a2..55f24795 100644 --- a/languages/cpp/app_templates/qt4makeapp/main.cpp +++ b/languages/cpp/app_templates/qt4makeapp/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(application); + TQ_INIT_RESOURCE(application); TQApplication app(argc, argv); %{APPNAME} * mw = new %{APPNAME}(); mw->show(); diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp index cdf18174..f2178d9d 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp @@ -1,6 +1,6 @@ %{CPP_TEMPLATE} -#include +#include #include "%{APPNAMELC}.h" #include @@ -75,7 +75,7 @@ void %{APPNAME}::about() { TQMessageBox::about(this, tr("About Application"), tr("The Application example demonstrates how to " - "write modern GUI applications using Qt, with a menu bar, " + "write modern GUI applications using TQt, with a menu bar, " "toolbars, and a status bar.")); } @@ -86,17 +86,17 @@ void %{APPNAME}::documentWasModified() void %{APPNAME}::createActions() { - newAct = new TQAction(QIcon(":/filenew.xpm"), tr("&New"), this); + newAct = new TQAction(TQIcon(":/filenew.xpm"), tr("&New"), this); newAct->setShortcut(tr("Ctrl+N")); newAct->setStatusTip(tr("Create a new file")); connect(newAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(newFile())); - openAct = new TQAction(QIcon(":/fileopen.xpm"), tr("&Open..."), this); + openAct = new TQAction(TQIcon(":/fileopen.xpm"), tr("&Open..."), this); openAct->setShortcut(tr("Ctrl+O")); openAct->setStatusTip(tr("Open an existing file")); connect(openAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(open())); - saveAct = new TQAction(QIcon(":/filesave.xpm"), tr("&Save"), this); + saveAct = new TQAction(TQIcon(":/filesave.xpm"), tr("&Save"), this); saveAct->setShortcut(tr("Ctrl+S")); saveAct->setStatusTip(tr("Save the document to disk")); connect(saveAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(save())); @@ -110,19 +110,19 @@ void %{APPNAME}::createActions() exitAct->setStatusTip(tr("Exit the application")); connect(exitAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(close())); - cutAct = new TQAction(QIcon(":/editcut.xpm"), tr("Cu&t"), this); + cutAct = new TQAction(TQIcon(":/editcut.xpm"), tr("Cu&t"), this); cutAct->setShortcut(tr("Ctrl+X")); cutAct->setStatusTip(tr("Cut the current selection's contents to the " "clipboard")); connect(cutAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(cut())); - copyAct = new TQAction(QIcon(":/editcopy.xpm"), tr("&Copy"), this); + copyAct = new TQAction(TQIcon(":/editcopy.xpm"), tr("&Copy"), this); copyAct->setShortcut(tr("Ctrl+C")); copyAct->setStatusTip(tr("Copy the current selection's contents to the " "clipboard")); connect(copyAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(copy())); - pasteAct = new TQAction(QIcon(":/editpaste.xpm"), tr("&Paste"), this); + pasteAct = new TQAction(TQIcon(":/editpaste.xpm"), tr("&Paste"), this); pasteAct->setShortcut(tr("Ctrl+V")); pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " "selection")); @@ -132,9 +132,9 @@ void %{APPNAME}::createActions() aboutAct->setStatusTip(tr("Show the application's About box")); connect(aboutAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(about())); - aboutQtAct = new TQAction(tr("About &Qt"), this); - aboutQtAct->setStatusTip(tr("Show the Qt library's About box")); - connect(aboutQtAct, TQT_SIGNAL(triggered()), qApp, TQT_SLOT(aboutQt())); + aboutTQtAct = new TQAction(tr("About &TQt"), this); + aboutTQtAct->setStatusTip(tr("Show the TQt library's About box")); + connect(aboutTQtAct, TQT_SIGNAL(triggered()), tqApp, TQT_SLOT(aboutTQt())); cutAct->setEnabled(false); copyAct->setEnabled(false); @@ -163,7 +163,7 @@ void %{APPNAME}::createMenus() helpMenu = menuBar()->addMenu(tr("&Help")); helpMenu->addAction(aboutAct); - helpMenu->addAction(aboutQtAct); + helpMenu->addAction(aboutTQtAct); } void %{APPNAME}::createToolBars() @@ -223,13 +223,13 @@ void %{APPNAME}::loadFile(const TQString &fileName) if (!file.open(TQFile::ReadOnly | TQFile::Text)) { TQMessageBox::warning(this, tr("Application"), tr("Cannot read file %1:\n%2.") - .arg(fileName) - .arg(file.errorString())); + .tqarg(fileName) + .tqarg(file.errorString())); return; } TQTextStream in(&file); - TQApplication::setOverrideCursor(Qt::WaitCursor); + TQApplication::setOverrideCursor(TQt::WaitCursor); textEdit->setPlainText(in.readAll()); TQApplication::restoreOverrideCursor(); @@ -243,13 +243,13 @@ bool %{APPNAME}::saveFile(const TQString &fileName) if (!file.open(TQFile::WriteOnly | TQFile::Text)) { TQMessageBox::warning(this, tr("Application"), tr("Cannot write file %1:\n%2.") - .arg(fileName) - .arg(file.errorString())); + .tqarg(fileName) + .tqarg(file.errorString())); return false; } TQTextStream out(&file); - TQApplication::setOverrideCursor(Qt::WaitCursor); + TQApplication::setOverrideCursor(TQt::WaitCursor); out << textEdit->toPlainText(); TQApplication::restoreOverrideCursor(); @@ -270,7 +270,7 @@ void %{APPNAME}::setCurrentFile(const TQString &fileName) else shownName = strippedName(curFile); - setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application"))); + setWindowTitle(tr("%1[*] - %2").tqarg(shownName).tqarg(tr("Application"))); } TQString %{APPNAME}::strippedName(const TQString &fullFileName) diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h index 14a40d99..65402c85 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h @@ -7,12 +7,13 @@ #include class TQAction; -class QMenu; +class TQMenu; class TQTextEdit; -class %{APPNAME}:public QMainWindow +class %{APPNAME}:public TQMainWindow { Q_OBJECT + TQ_OBJECT public: %{APPNAME}(); @@ -45,9 +46,9 @@ private: TQTextEdit *textEdit; TQString curFile; - QMenu *fileMenu; - QMenu *editMenu; - QMenu *helpMenu; + TQMenu *fileMenu; + TQMenu *editMenu; + TQMenu *helpMenu; TQToolBar *fileToolBar; TQToolBar *editToolBar; TQAction *newAct; @@ -59,7 +60,7 @@ private: TQAction *copyAct; TQAction *pasteAct; TQAction *aboutAct; - TQAction *aboutQtAct; + TQAction *aboutTQtAct; }; #endif diff --git a/languages/cpp/app_templates/qtopia4app/example.cpp b/languages/cpp/app_templates/qtopia4app/example.cpp index 45331649..12c3f634 100644 --- a/languages/cpp/app_templates/qtopia4app/example.cpp +++ b/languages/cpp/app_templates/qtopia4app/example.cpp @@ -2,8 +2,8 @@ #include "%{APPNAMELC}.h" #include -%{APPNAME}Base::%{APPNAME}Base( TQWidget *parent, Qt::WFlags f ) - : TQWidget( parent, f ) +%{APPNAME}Base::%{APPNAME}Base( TQWidget *tqparent, TQt::WFlags f ) + : TQWidget( tqparent, f ) { setupUi( this ); } @@ -13,11 +13,11 @@ } /* - * Constructs a %{APPNAME} which is a child of 'parent', with the + * Constructs a %{APPNAME} which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( TQWidget *parent, Qt::WFlags f ) - : %{APPNAME}Base( parent, f ) +%{APPNAME}::%{APPNAME}( TQWidget *tqparent, TQt::WFlags f ) + : %{APPNAME}Base( tqparent, f ) { connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } @@ -27,7 +27,7 @@ */ %{APPNAME}::~%{APPNAME}() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/languages/cpp/app_templates/qtopia4app/example.h b/languages/cpp/app_templates/qtopia4app/example.h index 5bfc69ba..e4c44a8f 100644 --- a/languages/cpp/app_templates/qtopia4app/example.h +++ b/languages/cpp/app_templates/qtopia4app/example.h @@ -6,15 +6,16 @@ class %{APPNAME}Base : public TQWidget, public Ui_%{APPNAME}Base { public: - %{APPNAME}Base( TQWidget *parent = 0, Qt::WFlags f = 0 ); + %{APPNAME}Base( TQWidget *tqparent = 0, TQt::WFlags f = 0 ); virtual ~%{APPNAME}Base(); }; class %{APPNAME} : public %{APPNAME}Base { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}( TQWidget *parent = 0, Qt::WFlags f = 0 ); + %{APPNAME}( TQWidget *tqparent = 0, TQt::WFlags f = 0 ); virtual ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/qtopia4app/example.html b/languages/cpp/app_templates/qtopia4app/example.html index 279a6106..9bcae99d 100644 --- a/languages/cpp/app_templates/qtopia4app/example.html +++ b/languages/cpp/app_templates/qtopia4app/example.html @@ -6,10 +6,10 @@

To user this application:

    -
  1. Press the icon in the Qtopia launcher. +
  2. Press the icon in the TQtopia launcher.
  3. Read the label.
  4. Press the button.
  5. Read the source code provided.
-Now you know how to make a Qtopia application! +Now you know how to make a TQtopia application! diff --git a/languages/cpp/app_templates/qtopia4app/examplebase.ui b/languages/cpp/app_templates/qtopia4app/examplebase.ui index 17d6bc20..76e7d49f 100644 --- a/languages/cpp/app_templates/qtopia4app/examplebase.ui +++ b/languages/cpp/app_templates/qtopia4app/examplebase.ui @@ -3,7 +3,7 @@ %{APPNAME}Base - + 0 @@ -15,7 +15,7 @@ %{APPNAME} - + 11 @@ -23,7 +23,7 @@ 6 - + This is just an %{APPNAME}. It doesn't do anything interesting at all. @@ -33,12 +33,12 @@ - + Quit - + diff --git a/languages/cpp/app_templates/qtopia4app/main.cpp b/languages/cpp/app_templates/qtopia4app/main.cpp index 43dbb4ac..b4ccc5ca 100644 --- a/languages/cpp/app_templates/qtopia4app/main.cpp +++ b/languages/cpp/app_templates/qtopia4app/main.cpp @@ -1,7 +1,7 @@ #include "%{APPNAMELC}.h" -#include +#include -QTOPIA_ADD_APPLICATION("%{APPNAMELC}", %{APPNAME}) -QTOPIA_MAIN +TQTOPIA_ADD_APPLICATION("%{APPNAMELC}", %{APPNAME}) +TQTOPIA_MAIN diff --git a/languages/cpp/app_templates/qtopiaapp/example.control b/languages/cpp/app_templates/qtopiaapp/example.control index d04f87ec..666968a3 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.control +++ b/languages/cpp/app_templates/qtopiaapp/example.control @@ -7,5 +7,5 @@ Arch: $DEVICE_ARCH Version: 1.0.0 License: Public Domain Description: %{APPNAME} program - An %{APPNAMELC} program for the Qtopia environment. + An %{APPNAMELC} program for the TQtopia environment. Does nothing interesting. diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp index a849977d..85082508 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.cpp +++ b/languages/cpp/app_templates/qtopiaapp/example.cpp @@ -3,11 +3,11 @@ #include /* - * Constructs a %{APPNAME} which is a child of 'parent', with the + * Constructs a %{APPNAME} which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) - : %{APPNAME}Base( parent, name, fl ) +%{APPNAME}::%{APPNAME}( TQWidget* tqparent, const char* name, WFlags fl ) + : %{APPNAME}Base( tqparent, name, fl ) { connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } @@ -17,7 +17,7 @@ */ %{APPNAME}::~%{APPNAME}() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/languages/cpp/app_templates/qtopiaapp/example.h b/languages/cpp/app_templates/qtopiaapp/example.h index 42dfc2dd..64abf97c 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.h +++ b/languages/cpp/app_templates/qtopiaapp/example.h @@ -6,9 +6,10 @@ class %{APPNAME} : public %{APPNAME}Base { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/qtopiaapp/example.html b/languages/cpp/app_templates/qtopiaapp/example.html index 279a6106..9bcae99d 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.html +++ b/languages/cpp/app_templates/qtopiaapp/example.html @@ -6,10 +6,10 @@

To user this application:

    -
  1. Press the icon in the Qtopia launcher. +
  2. Press the icon in the TQtopia launcher.
  3. Read the label.
  4. Press the button.
  5. Read the source code provided.
-Now you know how to make a Qtopia application! +Now you know how to make a TQtopia application! diff --git a/languages/cpp/app_templates/qtopiaapp/examplebase.ui b/languages/cpp/app_templates/qtopiaapp/examplebase.ui index b6b81b11..1243c341 100644 --- a/languages/cpp/app_templates/qtopiaapp/examplebase.ui +++ b/languages/cpp/app_templates/qtopiaapp/examplebase.ui @@ -7,7 +7,7 @@ %{APPNAME}Base - geometry + tqgeometry 0 0 @@ -45,5 +45,5 @@ - + diff --git a/languages/cpp/app_templates/qtopiaapp/main.cpp b/languages/cpp/app_templates/qtopiaapp/main.cpp index 0311a32e..ce7161b1 100644 --- a/languages/cpp/app_templates/qtopiaapp/main.cpp +++ b/languages/cpp/app_templates/qtopiaapp/main.cpp @@ -1,10 +1,10 @@ #include "%{APPNAMELC}.h" -#include +#include int main( int argc, char ** argv ) { - QPEApplication a( argc, argv ); + TQPEApplication a( argc, argv ); %{APPNAME} mw; a.showMainWidget( &mw ); -- cgit v1.2.1