diff options
Diffstat (limited to 'languages/cpp')
259 files changed, 904 insertions, 5695 deletions
diff --git a/languages/cpp/KDevCppSupportIface.h b/languages/cpp/KDevCppSupportIface.h index 3d9363ba..614e1bd6 100644 --- a/languages/cpp/KDevCppSupportIface.h +++ b/languages/cpp/KDevCppSupportIface.h @@ -9,7 +9,7 @@ class CppSupportPart; class KDevCppSupportIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index d6dd5290..0808d7af 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -100,7 +100,7 @@ void AddAttributeDialog::accept() int varEndLine, varEndColumn; ( *it ) ->getEndPosition( &varEndLine, &varEndColumn ); TQString access = accessID( *it ); - TQPair<int, int> varEndPoint = tqMakePair( varEndLine, varEndColumn ); + TQPair<int, int> varEndPoint = qMakePair( varEndLine, varEndColumn ); if ( !points.contains( access ) || points[ access ] < varEndPoint ) { @@ -139,7 +139,7 @@ void AddAttributeDialog::accept() else { str.prepend( access + ":\n" ); - points[ *it ] = tqMakePair( line - 1, 0 ); + points[ *it ] = qMakePair( line - 1, 0 ); pt = points[ *it ]; // end of class declaration } diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h index da75c98c..1d1e61fd 100644 --- a/languages/cpp/addattributedialog.h +++ b/languages/cpp/addattributedialog.h @@ -28,7 +28,7 @@ class CppSupportPart; class AddAttributeDialog : public AddAttributeDialogBase { - Q_OBJECT + TQ_OBJECT public: AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui index 18b98e9c..86ee3f25 100644 --- a/languages/cpp/addattributedialogbase.ui +++ b/languages/cpp/addattributedialogbase.ui @@ -258,9 +258,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -275,9 +272,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -359,14 +353,14 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot>addAttribute()</slot> <slot>deleteCurrentAttribute()</slot> <slot>currentChanged(TQListViewItem*)</slot> <slot>updateGUI()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index e4b19c18..79ec1e65 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -166,7 +166,7 @@ void AddMethodDialog::accept() int funEndLine, funEndColumn; ( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); TQString access = accessID( *it ); - TQPair<int, int> funEndPoint = tqMakePair( funEndLine, funEndColumn ); + TQPair<int, int> funEndPoint = qMakePair( funEndLine, funEndColumn ); if ( !points.contains( access ) || points[ access ] < funEndPoint ) { @@ -206,7 +206,7 @@ void AddMethodDialog::accept() else { str.prepend( access + ":\n" ); - points[ *it ] = tqMakePair( line - 1, 0 ); + points[ *it ] = qMakePair( line - 1, 0 ); pt = points[ *it ]; // end of class declaration } diff --git a/languages/cpp/addmethoddialog.h b/languages/cpp/addmethoddialog.h index f1cfaf28..0362eae1 100644 --- a/languages/cpp/addmethoddialog.h +++ b/languages/cpp/addmethoddialog.h @@ -28,7 +28,7 @@ class CppSupportPart; class AddMethodDialog : public AddMethodDialogBase { - Q_OBJECT + TQ_OBJECT public: AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui index 3926f966..83af7489 100644 --- a/languages/cpp/addmethoddialogbase.ui +++ b/languages/cpp/addmethoddialogbase.ui @@ -314,9 +314,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -331,9 +328,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -442,7 +436,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot>addMethod()</slot> @@ -450,7 +444,7 @@ <slot>currentChanged(TQListViewItem*)</slot> <slot>updateGUI()</slot> <slot>browseImplementationFile()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt index 14e63fa7..66656732 100644 --- a/languages/cpp/app_templates/CMakeLists.txt +++ b/languages/cpp/app_templates/CMakeLists.txt @@ -28,7 +28,6 @@ add_subdirectory( gtk2mmapp ) add_subdirectory( kapp ) add_subdirectory( kateplugin ) add_subdirectory( kateplugin2 ) -add_subdirectory( kde4app ) add_subdirectory( kdedcop ) add_subdirectory( kdevlang ) add_subdirectory( kdevpart ) @@ -58,9 +57,6 @@ add_subdirectory( opietoday ) add_subdirectory( qmakeapp ) add_subdirectory( qmakeempty ) add_subdirectory( qmakesimple ) -add_subdirectory( qt4hello ) -add_subdirectory( qt4makeapp ) -add_subdirectory( qtopia4app ) add_subdirectory( qtopiaapp ) add_subdirectory( tdecmodule ) add_subdirectory( tdeconfig35 ) diff --git a/languages/cpp/app_templates/Makefile.am b/languages/cpp/app_templates/Makefile.am index 8350118d..bbd1618a 100644 --- a/languages/cpp/app_templates/Makefile.am +++ b/languages/cpp/app_templates/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker tdeioslave kdevpart kdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello tdeconfig35 kdevlang noatunvisual noatunui kmod tdefileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app +SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker tdeioslave kdevpart kdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello tdeconfig35 kdevlang noatunvisual noatunui kmod tdefileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qmakeempty automakeempty makefileempty profilescdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE profilesc_DATA = c.appwizard diff --git a/languages/cpp/app_templates/chello/chello.kdevtemplate b/languages/cpp/app_templates/chello/chello.kdevtemplate index b3848aa4..5d867549 100644 --- a/languages/cpp/app_templates/chello/chello.kdevtemplate +++ b/languages/cpp/app_templates/chello/chello.kdevtemplate @@ -13,21 +13,21 @@ Archive=chello.tar.gz [LIBS] Type = value -ValueType=QString +ValueType=TQString Value= OPT_LIBS Comment= Optional libraries to link to. Default= -lm [INCLUDES] Type = value -ValueType=QString +ValueType=TQString Value= OPT_INCS Comment= Optional include path. Default= -I/usr/include [CFLAGS] Type = value -ValueType=QString +ValueType=TQString Value= CFLAGS Comment= Optional CFLAGS to define in the makefile. Default= diff --git a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src index d2fabc7a..9e3b5385 100644 --- a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src +++ b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src @@ -1,16 +1,16 @@ #this is just a basic CMakeLists.txt, for more information see the cmake manpage #add definitions, compiler switches, etc. -ADD_DEFINITIONS(-Wall -O2) +add_definitions(-Wall -O2) #build a shared library -ADD_LIBRARY(%{APPNAMELC} SHARED %{APPNAMELC}.c) +add_library(%{APPNAMELC} SHARED %{APPNAMELC}.c) #for testing the shared library you probably need some test app too -ADD_EXECUTABLE(%{APPNAMELC}test %{APPNAMELC}test.c) +add_executable(%{APPNAMELC}test %{APPNAMELC}test.c) #need to link to some other libraries ? just add them here -TARGET_LINK_LIBRARIES(%{APPNAMELC}test %{APPNAMELC}) +target_link_libraries(%{APPNAMELC}test %{APPNAMELC}) #add an install target here #INSTALL_FILES(...) diff --git a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src index ee2bb832..6450c4b9 100644 --- a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src +++ b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src @@ -1,16 +1,16 @@ #this is just a basic CMakeLists.txt, for more information see the cmake manpage #add definitions, compiler switches, etc. -ADD_DEFINITIONS(-Wall -O2) +add_definitions(-Wall -O2) #build a shared library -ADD_LIBRARY(%{APPNAMELC} SHARED %{APPNAMELC}.cpp) +add_library(%{APPNAMELC} SHARED %{APPNAMELC}.cpp) #for testing the shared library you probably need some test app too -ADD_EXECUTABLE(%{APPNAMELC}test %{APPNAMELC}test.cpp) +add_executable(%{APPNAMELC}test %{APPNAMELC}test.cpp) #need to link to some other libraries ? just add them here -TARGET_LINK_LIBRARIES(%{APPNAMELC}test %{APPNAMELC}) +target_link_libraries(%{APPNAMELC}test %{APPNAMELC}) #add an install target here #INSTALL_FILES(...) diff --git a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src index 6122c34f..f78028c9 100644 --- a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src +++ b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src @@ -2,26 +2,26 @@ # for more information see the cmake man page # add definitions, compiler switches, etc. -ADD_DEFINITIONS(${QT_DEFINITIONS} -Wall -O2 -g) +add_definitions(${QT_DEFINITIONS} -Wall -O2 -g) # add the Qt include dir to the include path -INCLUDE_DIRECTORIES(${TQT_INCLUDE_DIR}) +include_directories(${TQT_INCLUDE_DIR}) # list all source files in a variable -SET(%{APPNAMELC}_SRCS main.cpp %{APPNAMELC}.cpp) +set(%{APPNAMELC}_SRCS main.cpp %{APPNAMELC}.cpp) # specify the headers which have to be processed by moc # and collect the results in the variable given above -QT_WRAP_CPP (%{APPNAMELC} %{APPNAMELC}_SRCS %{APPNAMELC}.h) +qt_wrap_cpp (%{APPNAMELC} %{APPNAMELC}_SRCS %{APPNAMELC}.h) # create tan executable from the list of source files -ADD_EXECUTABLE(%{APPNAMELC} ${%{APPNAMELC}_SRCS}) +add_executable(%{APPNAMELC} ${%{APPNAMELC}_SRCS}) # link the application to the Qt libs -TARGET_LINK_LIBRARIES(%{APPNAMELC} ${TQT_LIBRARIES} ) +target_link_libraries(%{APPNAMELC} ${TQT_LIBRARIES} ) # create an install rule for the executable -INSTALL(TARGETS %{APPNAMELC} DESTINATION bin ) +install(TARGETS %{APPNAMELC} DESTINATION bin ) # if you need to install more things, take a look at the install() command # in the cmake man page diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp index 39b6e5af..8ce81310 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp @@ -37,17 +37,17 @@ openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen = new TQToolButton( openIcon, tr("Open File"), TQString(), - this, TQT_SLOT(choose()), fileTools, "open file" ); + this, TQ_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave = new TQToolButton( saveIcon, tr("Save File"), TQString(), - this, TQT_SLOT(save()), fileTools, "save file" ); + this, TQ_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint = new TQToolButton( printIcon, tr("Print File"), TQString(), - this, TQT_SLOT(print()), fileTools, "print file" ); + this, TQ_SLOT(print()), fileTools, "print file" ); (void)TQWhatsThis::whatsThisButton( fileTools ); @@ -79,41 +79,41 @@ menuBar()->insertItem( tr("&File"), file ); - file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( tr("&New"), this, TQ_SLOT(newDoc()), CTRL+Key_N ); int id; id = file->insertItem( openIcon, tr("&Open..."), - this, TQT_SLOT(choose()), CTRL+Key_O ); + this, TQ_SLOT(choose()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, tr("&Save"), - this, TQT_SLOT(save()), CTRL+Key_S ); + this, TQ_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) ); + id = file->insertItem( tr("Save &As..."), this, TQ_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); file->insertSeparator(); id = file->insertItem( printIcon, tr("&Print..."), - this, TQT_SLOT(print()), CTRL+Key_P ); + this, TQ_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); file->insertSeparator(); - file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); + file->insertItem( tr("&Close"), this, TQ_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( tr("&Help"), help ); - help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); - help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) ); + help->insertItem( tr("&About"), this, TQ_SLOT(about()), Key_F1 ); + help->insertItem( tr("About &TQt"), this, TQ_SLOT(aboutTQt()) ); help->insertSeparator(); - help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); + help->insertItem( tr("What's &This"), this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 ); e = new TQTextEdit( this, "editor" ); e->setFocus(); diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h index ef58ff46..ba2d50ed 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h @@ -9,7 +9,7 @@ class TQTextEdit; class %{APPNAME}: public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/cmakeqt3app/main.cpp b/languages/cpp/app_templates/cmakeqt3app/main.cpp index 8938adc5..ba45c728 100644 --- a/languages/cpp/app_templates/cmakeqt3app/main.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/main.cpp @@ -8,6 +8,6 @@ int main( int argc, char ** argv ) { %{APPNAME} * mw = new %{APPNAME}(); mw->setCaption( "%{APPNAME}" ); mw->show(); - a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) ); + a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/languages/cpp/app_templates/cpp.appwizard b/languages/cpp/app_templates/cpp.appwizard index dc233269..cbb5a6af 100644 --- a/languages/cpp/app_templates/cpp.appwizard +++ b/languages/cpp/app_templates/cpp.appwizard @@ -1,2 +1,2 @@ [General] -List=opiemenu,win32hello,cppcurseshello,gtk2mmapp,opienet,wxhello,cpphello,opietoday,clanlib,cppsdlhello,qmakeapp,qt4hello,qt4makeapp,cmakelibcpp,opieapp,qmakesimple,cmakesimple,generichello,opieapplet,qtopiaapp,gnome2mmapp,opieinput,win32gui,cmakeqt3app,qmakeempty,automakeempty,makefileempty,qtopia4app +List=opiemenu,win32hello,cppcurseshello,gtk2mmapp,opienet,wxhello,cpphello,opietoday,clanlib,cppsdlhello,qmakeapp,cmakelibcpp,opieapp,qmakesimple,cmakesimple,generichello,opieapplet,qtopiaapp,gnome2mmapp,opieinput,win32gui,cmakeqt3app,qmakeempty,automakeempty,makefileempty diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index 774efe8e..d801904f 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -49,10 +49,10 @@ setupGUI(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -88,19 +88,19 @@ void %{APPNAME}::load(const KURL& url) void %{APPNAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0, - this, TQT_SLOT(optionsPreferences()), + this, TQ_SLOT(optionsPreferences()), actionCollection(), "custom_action"); } diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h index 5f39dd11..fe2a96d3 100644 --- a/languages/cpp/app_templates/kapp/app.h +++ b/languages/cpp/app_templates/kapp/app.h @@ -25,7 +25,7 @@ class KURL; */ class %{APPNAME} : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index 16c05a3f..244f4a75 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -63,10 +63,10 @@ return; } - connect(m_html, TQT_SIGNAL(setWindowCaption(const TQString&)), - this, TQT_SLOT(slotSetTitle(const TQString&))); - connect(m_html, TQT_SIGNAL(setStatusBarText(const TQString&)), - this, TQT_SLOT(slotOnURL(const TQString&))); + connect(m_html, TQ_SIGNAL(setWindowCaption(const TQString&)), + this, TQ_SLOT(slotSetTitle(const TQString&))); + connect(m_html, TQ_SIGNAL(setStatusBarText(const TQString&)), + this, TQ_SLOT(slotOnURL(const TQString&))); } diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h index 79513a9d..f79e7322 100644 --- a/languages/cpp/app_templates/kapp/appview.h +++ b/languages/cpp/app_templates/kapp/appview.h @@ -23,7 +23,7 @@ class KURL; */ class %{APPNAME}View : public TQWidget, public %{APPNAME}Iface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kapp/pref.h b/languages/cpp/app_templates/kapp/pref.h index b2aae436..ec7116fd 100644 --- a/languages/cpp/app_templates/kapp/pref.h +++ b/languages/cpp/app_templates/kapp/pref.h @@ -11,7 +11,7 @@ class %{APPNAME}PrefPageTwo; class %{APPNAME}Preferences : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Preferences(); @@ -23,7 +23,7 @@ private: class %{APPNAME}PrefPageOne : public TQFrame { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}PrefPageOne(TQWidget *parent = 0); @@ -31,7 +31,7 @@ public: class %{APPNAME}PrefPageTwo : public TQFrame { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}PrefPageTwo(TQWidget *parent = 0); diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 4d80a74c..351fca4e 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -55,7 +55,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("Insert Hello World"), 0, this, - TQT_SLOT( slotInsertHello() ), view->actionCollection(), + TQ_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); view->setInstance (new TDEInstance("kate")); diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h index 847e6175..fba66bcc 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin/plugin_app.h @@ -16,14 +16,14 @@ 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_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static TDEInstance* s_instance; @@ -31,7 +31,7 @@ class KatePluginFactory : public KLibFactory class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 8845fae3..19b31c71 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -59,7 +59,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("Insert Hello World"), 0, this, - TQT_SLOT( slotInsertHello() ), view->actionCollection(), + TQ_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); view->setInstance (new TDEInstance("kate")); @@ -94,7 +94,7 @@ Kate::PluginConfigPage* KatePlugin%{APPNAME}::configPage (uint, TQWidget *w, con { %{APPNAME}ConfigPage* p = new %{APPNAME}ConfigPage(this, w); initConfigPage( p ); - connect( p, TQT_SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, TQT_SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) ); + connect( p, TQ_SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, TQ_SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) ); return (Kate::PluginConfigPage*)p; } @@ -124,7 +124,7 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p ) lo->addWidget(lab); - // TODO: add connection to emit TQT_SLOT( changed() ) + // TODO: add connection to emit TQ_SLOT( changed() ) } %{APPNAME}ConfigPage::~%{APPNAME}ConfigPage() diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h index 80fb0103..4096a9de 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h @@ -20,14 +20,14 @@ 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_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static TDEInstance* s_instance; @@ -35,7 +35,7 @@ private: class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension { - Q_OBJECT + TQ_OBJECT public: @@ -66,7 +66,7 @@ private: class %{APPNAME}ConfigPage : public Kate::PluginConfigPage { - Q_OBJECT + TQ_OBJECT friend class KatePlugin%{APPNAME}; diff --git a/languages/cpp/app_templates/kde4app/CMakeLists.txt b/languages/cpp/app_templates/kde4app/CMakeLists.txt deleted file mode 100644 index 215f653d..00000000 --- a/languages/cpp/app_templates/kde4app/CMakeLists.txt +++ /dev/null @@ -1,51 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -set( _tarball_desktops kapp4.desktop ) -set( _tarball_files - kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp - kapp4view.h kapp4view_base.ui main.cpp kde4appui.rc - kde4app-CMakeLists.txt kapp4.kcfg - settings.kcfgc kde4app.png README kde4app.kdevelop - kde4app.kdevelop.filelist -) -set( _tarball_content ${_tarball_desktops} ${_tarball_files} ) -list( SORT _tarball_content ) - -tde_create_translated_desktop( - SOURCE ${_tarball_desktops} - DESTINATION - - PO_DIR tdevelop-desktops -) - -file( - COPY ${_tarball_files} - DESTINATION ${CMAKE_CURRENT_BINARY_DIR} -) - -tde_create_tarball( - TARGET kde4app.tar.gz - SOURCEDIR ${CMAKE_CURRENT_BINARY_DIR} - FILES ${_tarball_content} -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/kde4app.tar.gz kde4app.png - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) - - -tde_create_translated_desktop( - SOURCE kde4app.kdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates - KEYWORDS Category - PO_DIR tdevelop-desktops -) diff --git a/languages/cpp/app_templates/kde4app/Makefile.am b/languages/cpp/app_templates/kde4app/Makefile.am deleted file mode 100644 index 2b39fcb4..00000000 --- a/languages/cpp/app_templates/kde4app/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \ - main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \ - kde4app.png README kde4app.kdevelop kde4app.kdevelop.filelist - -templateName = kde4app - -### no need to change below: -template_DATA = $(templateName).kdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/kdevappwizard -$(templateName).tar.gz: ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - $(GZIP_COMMAND) -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz ${templateName}.png - -CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/kde4app/README b/languages/cpp/app_templates/kde4app/README deleted file mode 100644 index 8180d28c..00000000 --- a/languages/cpp/app_templates/kde4app/README +++ /dev/null @@ -1,15 +0,0 @@ -!!!!!ATTENTION!!!!! - -Before starting the build you may need to setup the KDE4 environment variables. -To do this open Project->Project Options and then look at the "Run" and the "Make" -pages. Each of these two has an environment variables widget in which you have -to fill in the right values for the variables already listed. - -After setting up the variables you'll also need to run cmake inside the build -directory. This can not be done by tdevelop as a KDE4 environment is needed -when running cmake to find KDE4. Open the integrated konsole and change to the build -subdirectory. Then setup a KDE4 environment and run "cmake ../". - -More information how to setup a KDE4 development environment can be found on -http://techbase.kde.org/Getting_Started/Increased_Productivity_in_KDE4_with_Scripts - diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp deleted file mode 100644 index d224123c..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4.cpp +++ /dev/null @@ -1,90 +0,0 @@ -%{CPP_TEMPLATE} - -#include "%{APPNAMELC}.h" -#include "%{APPNAMELC}view.h" -#include "settings.h" - -#include <TQtGui/TQDropEvent> -#include <TQtGui/TQPainter> - -#include <tdeconfigdialog.h> -#include <kstatusbar.h> - -#include <tdeaction.h> -#include <tdeactioncollection.h> -#include <kstandardaction.h> - -#include <KDE/TDELocale> - -%{APPNAME}::%{APPNAME}() - : KXmlGuiWindow(), - m_view(new %{APPNAME}View(this)), - m_printer(0) -{ - // accept dnd - setAcceptDrops(true); - - // tell the KXmlGuiWindow that this is indeed the main widget - setCentralWidget(m_view); - - // then, setup our actions - setupActions(); - - // add a status bar - statusBar()->show(); - - // a call to KXmlGuiWindow::setupGUI() populates the GUI - // with actions, using KXMLGUI. - // It also applies the saved mainwindow settings, if any, and ask the - // mainwindow to automatically save settings if changed: window size, - // toolbar position, icon size, etc. - setupGUI(); -} - -%{APPNAME}::~%{APPNAME}() -{ -} - -void %{APPNAME}::setupActions() -{ - TDEStandardAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - TDEStandardAction::quit(tqApp, TQT_SLOT(quit()), actionCollection()); - - TDEStandardAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); - - // custom menu and menu item - the slot is in the class %{APPNAME}View - TDEAction *custom = new TDEAction(TDEIcon("colorize"), i18n("Swi&tch Colors"), this); - actionCollection()->addAction( TQLatin1String("switch_action"), custom ); - connect(custom, TQT_SIGNAL(triggered(bool)), m_view, TQT_SLOT(switchColors())); -} - -void %{APPNAME}::fileNew() -{ - // this slot is called whenever the File->New menu is selected, - // the New shortcut is pressed (usually CTRL+N) or the New toolbar - // button is clicked - - // create a new window - (new %{APPNAME})->show(); -} - -void %{APPNAME}::optionsPreferences() -{ - // The preference dialog is derived from prefs_base.ui - // - // compare the names of the widgets in the .ui file - // to the names of the variables in the .kcfg file - //avoid to have 2 dialogs shown - if ( TDEConfigDialog::showDialog( "settings" ) ) { - return; - } - TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self()); - TQWidget *generalSettingsDlg = new TQWidget; - 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( TQt::WA_DeleteOnClose ); - dialog->show(); -} - -#include "%{APPNAMELC}.moc" diff --git a/languages/cpp/app_templates/kde4app/kapp4.desktop b/languages/cpp/app_templates/kde4app/kapp4.desktop deleted file mode 100644 index 37d66d29..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=KApp4 - -GenericName=A KDE4 Application - -Exec=kapp4 %i -caption "%c" -Icon=kapp4 -Type=Application -Terminal=false -X-DocPath=kapp4/kapp4.html diff --git a/languages/cpp/app_templates/kde4app/kapp4.h b/languages/cpp/app_templates/kde4app/kapp4.h deleted file mode 100644 index 3c209de2..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4.h +++ /dev/null @@ -1,54 +0,0 @@ -%{H_TEMPLATE} -#ifndef %{APPNAMEUC}_H -#define %{APPNAMEUC}_H - - -#include <kxmlguiwindow.h> - -#include "ui_prefs_base.h" - -class %{APPNAME}View; -class KPrinter; -class TDEToggleAction; -class KUrl; - -/** - * This class serves as the main window for %{APPNAME}. It handles the - * menus, toolbars, and status bars. - * - * @short Main window class - * @author Andreas Pakulat <apaku@gmx.de> - * @version 0.1 - */ -class %{APPNAME} : public KXmlGuiWindow -{ - Q_OBJECT - -public: - /** - * Default Constructor - */ - %{APPNAME}(); - - /** - * Default Destructor - */ - virtual ~%{APPNAME}(); - -private slots: - void fileNew(); - void optionsPreferences(); - -private: - void setupActions(); - -private: - Ui::prefs_base ui_prefs_base ; - %{APPNAME}View *m_view; - - KPrinter *m_printer; - TDEToggleAction *m_toolbarAction; - TDEToggleAction *m_statusbarAction; -}; - -#endif // _%{APPNAMELC}_H_ diff --git a/languages/cpp/app_templates/kde4app/kapp4.kcfg b/languages/cpp/app_templates/kde4app/kapp4.kcfg deleted file mode 100644 index 6040f769..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4.kcfg +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="%{APPNAMELC}rc"/> - <group name="Preferences"> - <entry name="col_background" type="Color"> - <label>color of the background</label> - <default>black</default> - </entry> - <entry name="col_foreground" type="Color"> - <label>color of the foreground</label> - <default>yellow</default> - </entry> - <entry name="val_time" type="Int"> - <label>size of a ball</label> - <default>2</default> - </entry> - </group> -</kcfg> diff --git a/languages/cpp/app_templates/kde4app/kapp4view.cpp b/languages/cpp/app_templates/kde4app/kapp4view.cpp deleted file mode 100644 index af95aa15..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4view.cpp +++ /dev/null @@ -1,42 +0,0 @@ -%{CPP_TEMPLATE} -#include "%{APPNAMELC}view.h" -#include "settings.h" - -#include <tdelocale.h> -#include <TQtGui/TQLabel> - -%{APPNAME}View::%{APPNAME}View(TQWidget *) -{ - ui_%{APPNAMELC}view_base.setupUi(this); - settingsChanged(); - setAutoFillBackground(true); -} - -%{APPNAME}View::~%{APPNAME}View() -{ - -} - -void %{APPNAME}View::switchColors() -{ - // switch the foreground/background colors of the label - TQColor color = Settings::col_background(); - Settings::setCol_background( Settings::col_foreground() ); - Settings::setCol_foreground( color ); - - settingsChanged(); -} - -void %{APPNAME}View::settingsChanged() -{ - TQPalette pal; - pal.setColor( TQPalette::Window, Settings::col_background()); - pal.setColor( TQPalette::WindowText, Settings::col_foreground()); - ui_%{APPNAMELC}view_base.kcfg_sillyLabel->setPalette( pal ); - - // i18n : internationalization - ui_%{APPNAMELC}view_base.kcfg_sillyLabel->setText( i18n("This project is %1 days old",Settings::val_time()) ); - emit signalChangeStatusbar( i18n("Settings changed") ); -} - -#include "%{APPNAMELC}view.moc" diff --git a/languages/cpp/app_templates/kde4app/kapp4view.h b/languages/cpp/app_templates/kde4app/kapp4view.h deleted file mode 100644 index 855a2144..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4view.h +++ /dev/null @@ -1,56 +0,0 @@ -%{H_TEMPLATE} -#ifndef %{APPNAMELC}VIEW_H -#define %{APPNAMELC}VIEW_H - -#include <TQtGui/TQWidget> - -#include "ui_%{APPNAMELC}view_base.h" - -class TQPainter; -class KUrl; - -/** - * This is the main view class for %{APPNAME}. Most of the non-menu, - * non-toolbar, and non-statusbar (e.g., non frame) GUI code should go - * here. - * - * @short Main view - * @author %{AUTHOR} <%{EMAIL}> - * @version %{VERSION} - */ - -class %{APPNAME}View : public TQWidget, public Ui::%{APPNAMELC}view_base -{ - Q_OBJECT - -public: - /** - * Default constructor - */ - %{APPNAME}View(TQWidget *parent); - - /** - * Destructor - */ - virtual ~%{APPNAME}View(); - -private: - Ui::%{APPNAMELC}view_base ui_%{APPNAMELC}view_base; - -signals: - /** - * Use this signal to change the content of the statusbar - */ - void signalChangeStatusbar(const TQString& text); - - /** - * Use this signal to change the content of the caption - */ - void signalChangeCaption(const TQString& text); - -private slots: - void switchColors(); - void settingsChanged(); -}; - -#endif // %{APPNAME}VIEW_H diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui deleted file mode 100644 index 6738a789..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui +++ /dev/null @@ -1,213 +0,0 @@ -<ui version="4.0" > -<class>%{APPNAMELC}view_base</class> -<widget class="TQWidget" name="%{APPNAMELC}view_base" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>315</width> - <height>233</height> - </rect> - </property> - <property name="windowTitle" > - <string>%{APPNAMELC}_base</string> - </property> - <property name="autoFillBackground" > - <bool>true</bool> - </property> - <layout class="TQGridLayout" > - <property name="leftMargin" > - <number>11</number> - </property> - <property name="topMargin" > - <number>11</number> - </property> - <property name="rightMargin" > - <number>11</number> - </property> - <property name="bottomMargin" > - <number>11</number> - </property> - <property name="horizontalSpacing" > - <number>6</number> - </property> - <property name="verticalSpacing" > - <number>6</number> - </property> - <item row="0" column="0" > - <widget class="TQLabel" name="kcfg_sillyLabel" > - <property name="palette" > - <palette> - <active> - <colorrole role="WindowText" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>255</red> - <green>255</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Button" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Base" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Window" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="AlternateBase" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - </active> - <inactive> - <colorrole role="WindowText" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>255</red> - <green>255</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Button" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Base" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Window" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="AlternateBase" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - </inactive> - <disabled> - <colorrole role="WindowText" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>119</red> - <green>119</green> - <blue>119</blue> - </color> - </brush> - </colorrole> - <colorrole role="Button" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Base" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Window" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="AlternateBase" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - </disabled> - </palette> - </property> - <property name="font" > - <font> - <family>Sans Serif</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="autoFillBackground" > - <bool>true</bool> - </property> - <property name="text" > - <string>hello, world</string> - </property> - <property name="scaledContents" > - <bool>true</bool> - </property> - <property name="alignment" > - <set>Qt::AlignCenter</set> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - <layoutdefault spacing="6" margin="11" /> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> - <resources/> - <connections/> -</ui> diff --git a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt deleted file mode 100644 index ef8ff86a..00000000 --- a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -project(%{APPNAME}) -find_package(KDE4 REQUIRED) -include (KDE4Defaults) -include_directories( ${KDE4_INCLUDES} ${TQT_INCLUDES} ) - -set(%{APPNAMELC}_SRCS - %{APPNAMELC}.cpp - main.cpp - %{APPNAMELC}view.cpp - ) - -#kde4_automoc(${%{APPNAMELC}_SRCS}) - -kde4_add_ui_files(%{APPNAMELC}_SRCS %{APPNAMELC}view_base.ui prefs_base.ui) - -kde4_add_kcfg_files(%{APPNAMELC}_SRCS settings.kcfgc ) - -kde4_add_executable(%{APPNAMELC} ${%{APPNAMELC}_SRCS}) - -target_link_libraries(%{APPNAMELC} ${KDE4_TDEUI_LIBS} ) - -install(TARGETS %{APPNAMELC} DESTINATION ${BIN_INSTALL_DIR} ) - - -########### install files ############### - -install( FILES %{APPNAMELC}.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES %{APPNAMELC}.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -install( FILES %{APPNAMELC}ui.rc DESTINATION ${DATA_INSTALL_DIR}/%{APPNAMELC} ) - - diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevelop b/languages/cpp/app_templates/kde4app/kde4app.kdevelop deleted file mode 100644 index 5168efbe..00000000 --- a/languages/cpp/app_templates/kde4app/kde4app.kdevelop +++ /dev/null @@ -1,205 +0,0 @@ -<?xml version = '1.0'?> -<kdevelop> - <general> - <author>%{AUTHOR}</author> - <email>%{EMAIL}</email> - <version>%{VERSION}</version> - <projectmanagement>KDevCustomProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectname>%{APPNAMELC}</projectname> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - <runappinappdirectory>true</runappinappdirectory> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - </display> - </kdevdebugger> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevcvs> - <cvsoptions>-f</cvsoptions> - <commitoptions/> - <updateoptions>-dP</updateoptions> - <addoptions/> - <removeoptions>-f</removeoptions> - <diffoptions>-u3 -p</diffoptions> - <logoptions/> - <rshoptions/> - </kdevcvs> - <cppsupportpart> - <codecompletion/> - <filetemplates> - <choosefiles>false</choosefiles> - <interfaceURL/> - <implementationURL/> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - <lowercasefilenames>true</lowercasefilenames> - </filetemplates> - </cppsupportpart> - <kdevcustomproject> - <run> - <mainprogram>%{dest}/build/%{APPNAMELC}</mainprogram> - <programargs/> - <terminal>false</terminal> - <autocompile>false</autocompile> - <envvars> - <envvar value="" name="TDEDIRS" /> - <envvar value="" name="TDEHOME" /> - <envvar value="" name="LD_LIBRARY_PATH" /> - <envvar value="" name="PATH" /> - <envvar value="" name="PKG_CONFIG_PATH" /> - <envvar value="" name="QT_PLUGIN_PATH" /> - </envvars> - <autoinstall>false</autoinstall> - <autotdesu>false</autotdesu> - <globaldebugarguments/> - <useglobalprogram>true</useglobalprogram> - <globalcwd>%{dest}</globalcwd> - <directoryradio>executable</directoryradio> - </run> - <build> - <buildtool>make</buildtool> - <builddir>%{dest}/build</builddir> - </build> - <make> - <abortonerror>false</abortonerror> - <numberofjobs>1</numberofjobs> - <prio>0</prio> - <dontact>false</dontact> - <makebin>make</makebin> - <defaulttarget/> - <makeoptions/> - <selectedenvironment>default</selectedenvironment> - <environments> - <default> - <envvar value="" name="TDEDIRS" /> - <envvar value="" name="TDEHOME" /> - <envvar value="" name="LD_LIBRARY_PATH" /> - <envvar value="" name="PATH" /> - <envvar value="" name="PKG_CONFIG_PATH" /> - <envvar value="" name="QT_PLUGIN_PATH" /> - </default> - </environments> - </make> - <filetypes> - <filetype>*.h</filetype> - <filetype>*.cpp</filetype> - <filetype>CMakeLists.txt</filetype> - <filetype>*.desktop</filetype> - <filetype>*.kcfg*</filetype> - <filetype>*.ui</filetype> - <filetype>Doxyfile</filetype> - <filetype>*.dox</filetype> - <filetype>*.rc</filetype> - <filetype>*.cmake</filetype> - </filetypes> - <other> - <prio>0</prio> - <otherbin/> - <defaulttarget/> - <otheroptions/> - <selectedenvironment>default</selectedenvironment> - <environments> - <default/> - </environments> - </other> - <blacklist> - <path>build</path> - </blacklist> - </kdevcustomproject> - <kdevcppsupport> - <qt> - <used>true</used> - <version>4</version> - <includestyle>4</includestyle> - <designerintegration>ExternalDesigner</designerintegration> - <designer>/usr/bin/designer-qt4</designer> - <root>/usr/lib/qt4</root> - </qt> - </kdevcppsupport> - <kdevclassview> - <folderhierarchy>true</folderhierarchy> - <depthoffolders>2</depthoffolders> - </kdevclassview> - <kdevdocumentation> - <projectdoc> - <docsystem>Doxygen Documentation Collection</docsystem> - <docurl>%{APPNAMELC}.tag</docurl> - </projectdoc> - </kdevdocumentation> -</kdevelop> diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevelop.filelist b/languages/cpp/app_templates/kde4app/kde4app.kdevelop.filelist deleted file mode 100644 index 5235563f..00000000 --- a/languages/cpp/app_templates/kde4app/kde4app.kdevelop.filelist +++ /dev/null @@ -1,13 +0,0 @@ -# KDevelop Custom Project File List -CMakeLists.txt -main.cpp -prefs_base.ui -settings.kcfgc -%{APPNAMELC}.cpp -%{APPNAMELC}.desktop -%{APPNAMELC}.h -%{APPNAMELC}.kcfg -%{APPNAMELC}ui.rc -%{APPNAMELC}view.cpp -%{APPNAMELC}view.h -%{APPNAMELC}view_base.ui diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate b/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate deleted file mode 100644 index e61148ed..00000000 --- a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate +++ /dev/null @@ -1,95 +0,0 @@ -# TDE Config File -[General] -Name=KDE4 Application framework - -Comment=Generates a simple KDE4 application with one toplevel window, menus and toolbars. - -Category=C++/KDE4 - -Icon=kde4app.png -FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=%{dest}/README -Archive=kde4app.tar.gz - -[FILE1] -Type=install -Source=%{src}/CMakeLists.txt -Dest=%{dest}/CMakeLists.txt - -[FILE2] -Type=install -Source=%{src}/main.cpp -Dest=%{dest}/main.cpp - -[FILE3] -Type=install -Source=%{src}/kapp4.cpp -Dest=%{dest}/%{APPNAMELC}.cpp - -[FILE4] -Type=install -Source=%{src}/kapp4.h -Dest=%{dest}/%{APPNAMELC}.h - -[FILE5] -Type=install -Source=%{src}/kapp4view.cpp -Dest=%{dest}/%{APPNAMELC}view.cpp - -[FILE6] -Type=install -Source=%{src}/kapp4view.h -Dest=%{dest}/%{APPNAMELC}view.h - -[FILE7] -Type=install -Source=%{src}/kde4appui.rc -Dest=%{dest}/%{APPNAMELC}ui.rc - -[FILE8] -Type=install -Source=%{src}/kapp4view_base.ui -Dest=%{dest}/%{APPNAMELC}view_base.ui - -[FILE9] -Type=install -Source=%{src}/kapp4.desktop -Dest=%{dest}/%{APPNAMELC}.desktop - -[FILE10] -Type=install -Source=%{src}/kapp4.kcfg -Dest=%{dest}/%{APPNAMELC}.kcfg - -[FILE11] -Type=install -Source=%{src}/prefs_base.ui -Dest=%{dest}/prefs_base.ui - -[FILE12] -Type=install -Source=%{src}/settings.kcfgc -Dest=%{dest}/settings.kcfgc - -[FILE13] -Type=install -Source=%{src}/README -Dest=%{dest}/README - -[FILE14] -Type=install -Source=%{src}/kde4app.kdevelop -Dest=%{dest}/%{APPNAMELC}.kdevelop - -[FILE15] -Type=install -Source=%{src}/kde4app.kdevelop.filelist -Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist - -[MKDIR1] -Type=mkdir -Dir=%{dest}/build - -[MSG] -Type=message -Comment=A KDE4 Application was created at %{dest} diff --git a/languages/cpp/app_templates/kde4app/kde4app.png b/languages/cpp/app_templates/kde4app/kde4app.png Binary files differdeleted file mode 100644 index 42dfe38d..00000000 --- a/languages/cpp/app_templates/kde4app/kde4app.png +++ /dev/null diff --git a/languages/cpp/app_templates/kde4app/kde4appui.rc b/languages/cpp/app_templates/kde4app/kde4appui.rc deleted file mode 100644 index 406bccc6..00000000 --- a/languages/cpp/app_templates/kde4app/kde4appui.rc +++ /dev/null @@ -1,8 +0,0 @@ -<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="KApp4" version="1"> -<MenuBar> - <Menu name="move"><text>&Move</text> - <Action name="switch_action" /> - </Menu> -</MenuBar> -</kpartgui> diff --git a/languages/cpp/app_templates/kde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp deleted file mode 100644 index 5c83921b..00000000 --- a/languages/cpp/app_templates/kde4app/main.cpp +++ /dev/null @@ -1,55 +0,0 @@ -%{CPP_TEMPLATE} - -#include "%{APPNAMELC}.h" -#include <tdeapplication.h> -#include <tdeaboutdata.h> -#include <tdecmdlineargs.h> -#include <KDE/TDELocale> - -static const char description[] = - I18N_NOOP("A KDE 4 Application"); - -static const char version[] = "%{VERSION}"; - -int main(int argc, char **argv) -{ - TDEAboutData about("%{APPNAMELC}", 0, ki18n("%{APPNAME}"), version, ki18n(description), - TDEAboutData::License_%{LICENSE}, ki18n("(C) %{YEAR} %{AUTHOR}"), KLocalizedString(), 0, "%{EMAIL}"); - about.addAuthor( ki18n("%{AUTHOR}"), KLocalizedString(), "%{EMAIL}" ); - TDECmdLineArgs::init(argc, argv, &about); - - TDECmdLineOptions options; - options.add("+[URL]", ki18n( "Document to open" )); - TDECmdLineArgs::addCmdLineOptions(options); - TDEApplication app; - - %{APPNAME} *widget = new %{APPNAME}; - - // see if we are starting with session management - if (app.isSessionRestored()) - { - RESTORE(%{APPNAME}); - } - else - { - // no session.. just start up normally - TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - if (args->count() == 0) - { - //%{APPNAMELC} *widget = new %{APPNAMELC}; - widget->show(); - } - else - { - int i = 0; - for (; i < args->count(); i++) - { - //%{APPNAMELC} *widget = new %{APPNAMELC}; - widget->show(); - } - } - args->clear(); - } - - return app.exec(); -} diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui deleted file mode 100644 index 87a191f1..00000000 --- a/languages/cpp/app_templates/kde4app/prefs_base.ui +++ /dev/null @@ -1,155 +0,0 @@ -<ui version="4.0" > - <class>prefs_base</class> - <widget class="TQWidget" name="prefs_base" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>282</width> - <height>156</height> - </rect> - </property> - <layout class="TQGridLayout" > - <item row="0" column="0" > - <widget class="TQLabel" name="textLabel2_2" > - <property name="text" > - <string>Background color:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="KColorButton" name="kcfg_col_background" > - <property name="toolTip" > - <string>Choose a new background color</string> - </property> - <property name="whatsThis" > - <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Change the <span style=" font-weight:600;">background</span> color by clicking here and choose the new <span style=" color:#ff0000;">color</span> in the <span style=" font-style:italic;">color dialog</span>.</p></body></html></string> - </property> - <property name="text" > - <string/> - </property> - </widget> - </item> - <item row="2" column="0" > - <widget class="TQLabel" name="textLabel1" > - <property name="text" > - <string>Project age:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="TQLabel" name="textLabel2" > - <property name="text" > - <string>Foreground color:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="1" column="1" > - <widget class="KColorButton" name="kcfg_col_foreground" > - <property name="toolTip" > - <string>Choose a new foreground color</string> - </property> - <property name="whatsThis" > - <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Change the <span style=" font-weight:600;">foreground</span> color by clicking here and choose the new <span style=" color:#ff0000;">color</span> in the <span style=" font-style:italic;">color dialog</span>.</p></body></html></string> - </property> - <property name="text" > - <string/> - </property> - </widget> - </item> - <item row="0" column="2" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" > - <size> - <width>41</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" > - <size> - <width>41</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="1" > - <widget class="TQSpinBox" name="kcfg_val_time" > - <property name="toolTip" > - <string>Set the project age (in days)</string> - </property> - <property name="whatsThis" > - <string>Change the project age (in days) by choosing a new number of days.</string> - </property> - <property name="minimum" > - <number>1</number> - </property> - <property name="value" > - <number>2</number> - </property> - </widget> - </item> - <item row="2" column="2" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" > - <size> - <width>41</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <layoutdefault spacing="6" margin="11" /> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> - <customwidgets> - <customwidget> - <class>KColorButton</class> - <extends>QPushButton</extends> - <header>kcolorbutton.h</header> - </customwidget> - </customwidgets> - <includes> - <include location="local" >kcolorbutton.h</include> - </includes> - <resources/> - <connections/> -</ui> diff --git a/languages/cpp/app_templates/kde4app/settings.kcfgc b/languages/cpp/app_templates/kde4app/settings.kcfgc deleted file mode 100644 index 402fad09..00000000 --- a/languages/cpp/app_templates/kde4app/settings.kcfgc +++ /dev/null @@ -1,6 +0,0 @@ -# Code generation options for tdeconfig_compiler -File=%{APPNAMELC}.kcfg -ClassName=Settings -Singleton=true -Mutators=col_background,col_foreground -# will create the necessary code for setting those variables diff --git a/languages/cpp/app_templates/kdedcop/app.h b/languages/cpp/app_templates/kdedcop/app.h index 814fccad..ecb916d6 100644 --- a/languages/cpp/app_templates/kdedcop/app.h +++ b/languages/cpp/app_templates/kdedcop/app.h @@ -18,7 +18,7 @@ */ class %{APPNAME} : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 69dcd7d8..c96ffbf1 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -28,17 +28,17 @@ static const KDevPluginInfo data("kdev%{APPNAMELC}"); setXMLFile("kdevlang_%{APPNAMELC}.rc"); - m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQ_SLOT(slotRun()),actionCollection(), "build_execute" ); kdDebug() << "Creating %{APPNAMELC} Part" << endl; - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) ); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), this, TQ_SLOT(savedFile(const KURL&)) ); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part *))); } @@ -74,14 +74,14 @@ void %{APPNAME}Part::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(parse())); + TQTimer::singleShot(0, this, TQ_SLOT(parse())); } void %{APPNAME}Part::projectClosed() { diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h index 1cce0fa6..80a5354d 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h @@ -17,7 +17,7 @@ class TDEAction; */ class %{APPNAME}Part : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &); diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.h b/languages/cpp/app_templates/kdevpart/globalconfig.h index 723dbae2..c5625705 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart/globalconfig.h @@ -8,7 +8,7 @@ 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); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate index a7d04396..7bb82bf9 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate +++ b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate @@ -12,14 +12,14 @@ Archive=kdevpart.tar.gz [SCOPE] Type = value -ValueType=QString +ValueType=TQString Value= SCOPE Comment= The scope of a plugin (Global, Project, Core) Default= Global [PROPS] Type = value -ValueType=QString +ValueType=TQString Value= PROPS Comment= The list of supported TDevelop properties Default= diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index 6a2559ba..4c940738 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -60,16 +60,16 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("%{APPNAME}"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("%{APPNAME}"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } %{APPNAME}Part::~%{APPNAME}Part() @@ -92,7 +92,7 @@ void %{APPNAME}Part::setupActions() { // create XMLGUI actions here action = new TDEAction(i18n("&Do Something..."), 0, - this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); + this, TQ_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do.")); } @@ -105,13 +105,13 @@ void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, case GLOBALDOC_OPTIONS: { %{APPNAME}GlobalConfig *w = new %{APPNAME}GlobalConfig(this, page, "global config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { %{APPNAME}ProjectConfig *w = new %{APPNAME}ProjectConfig(this, page, "project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -131,7 +131,7 @@ void %{APPNAME}Part::contextMenu(TQPopupMenu *popup, const Context *context) // or create menu items on the fly // int id = -1; // id = popup->insertItem(i18n("Do Something Here"), - // this, TQT_SLOT(doSomething()) ); + // this, TQ_SLOT(doSomething()) ); // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do." } else if (context->hasType(Context::FileContext)) diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h index 9414d448..cae84cf2 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h @@ -18,7 +18,7 @@ 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); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h index e54abd4d..53b86bc9 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h @@ -10,7 +10,7 @@ class %{APPNAME}Part; class %{APPNAME}Widget: public TQWidget { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Widget(%{APPNAME}Part *part); diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.h b/languages/cpp/app_templates/kdevpart/projectconfig.h index 49d4f089..54ffcccf 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart/projectconfig.h @@ -8,7 +8,7 @@ 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); diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h index 723dbae2..c5625705 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.h @@ -8,7 +8,7 @@ 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); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate index 3eebf31a..d2b2e39f 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate +++ b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate @@ -12,14 +12,14 @@ Archive=kdevpart2.tar.gz [SCOPE] Type = value -ValueType=QString +ValueType=TQString Value= SCOPE Comment= The scope of a plugin (Global, Project, Core) Default= Global [PROPS] Type = value -ValueType=QString +ValueType=TQString Value= PROPS Comment= The list of supported TDevelop properties Default= diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index 6a2559ba..4c940738 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -60,16 +60,16 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("%{APPNAME}"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("%{APPNAME}"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } %{APPNAME}Part::~%{APPNAME}Part() @@ -92,7 +92,7 @@ void %{APPNAME}Part::setupActions() { // create XMLGUI actions here action = new TDEAction(i18n("&Do Something..."), 0, - this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); + this, TQ_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do.")); } @@ -105,13 +105,13 @@ void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, case GLOBALDOC_OPTIONS: { %{APPNAME}GlobalConfig *w = new %{APPNAME}GlobalConfig(this, page, "global config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { %{APPNAME}ProjectConfig *w = new %{APPNAME}ProjectConfig(this, page, "project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -131,7 +131,7 @@ void %{APPNAME}Part::contextMenu(TQPopupMenu *popup, const Context *context) // or create menu items on the fly // int id = -1; // id = popup->insertItem(i18n("Do Something Here"), - // this, TQT_SLOT(doSomething()) ); + // this, TQ_SLOT(doSomething()) ); // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do." } else if (context->hasType(Context::FileContext)) diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h index 9414d448..cae84cf2 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -18,7 +18,7 @@ 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); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h index e54abd4d..53b86bc9 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h @@ -10,7 +10,7 @@ class %{APPNAME}Part; class %{APPNAME}Widget: public TQWidget { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Widget(%{APPNAME}Part *part); diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h index 49d4f089..54ffcccf 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.h @@ -8,7 +8,7 @@ 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); diff --git a/languages/cpp/app_templates/khello/app.h b/languages/cpp/app_templates/khello/app.h index 11a9241f..bc0b1520 100644 --- a/languages/cpp/app_templates/khello/app.h +++ b/languages/cpp/app_templates/khello/app.h @@ -16,7 +16,7 @@ */ class %{APPNAME} : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/khello2/app.h b/languages/cpp/app_templates/khello2/app.h index 11a9241f..bc0b1520 100644 --- a/languages/cpp/app_templates/khello2/app.h +++ b/languages/cpp/app_templates/khello2/app.h @@ -16,7 +16,7 @@ */ class %{APPNAME} : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/khello2/widget.h b/languages/cpp/app_templates/khello2/widget.h index 127019ee..aac7c40d 100644 --- a/languages/cpp/app_templates/khello2/widget.h +++ b/languages/cpp/app_templates/khello2/widget.h @@ -7,7 +7,7 @@ class %{APPNAME}Widget : public %{APPNAME}WidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/khello2/widgetbase.ui b/languages/cpp/app_templates/khello2/widgetbase.ui index 365f4cf2..90cac0c6 100644 --- a/languages/cpp/app_templates/khello2/widgetbase.ui +++ b/languages/cpp/app_templates/khello2/widgetbase.ui @@ -45,8 +45,8 @@ <slot>button_clicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>button_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h index 7d272743..e078b568 100644 --- a/languages/cpp/app_templates/kicker/applet.h +++ b/languages/cpp/app_templates/kicker/applet.h @@ -14,7 +14,7 @@ class %{APPNAME} : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui index 194d8ffe..a5481dd2 100644 --- a/languages/cpp/app_templates/kmake/mainview.ui +++ b/languages/cpp/app_templates/kmake/mainview.ui @@ -69,8 +69,8 @@ <slot>slotHelloButtonClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotHelloButtonClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kmake/mainviewimp.h b/languages/cpp/app_templates/kmake/mainviewimp.h index a5ca62df..3e1a7287 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.h +++ b/languages/cpp/app_templates/kmake/mainviewimp.h @@ -5,7 +5,7 @@ class MainViewImp : public MainView { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h index 2d5a56e2..7957037a 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.h +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h @@ -13,7 +13,7 @@ class TDEAboutData; class %{APPNAME}Factory : public KoFactory { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Factory( TQObject* parent = 0, const char* name = 0 ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h index 9dced411..57b57cb6 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.h +++ b/languages/cpp/app_templates/kofficepart/kopart_part.h @@ -10,7 +10,7 @@ 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 ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index 601413ef..2cf5ff06 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -18,9 +18,9 @@ { setInstance( %{APPNAME}Factory::global() ); setXMLFile( "%{APPNAMELC}.rc" ); - KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" ); + KStdAction::cut(this, TQ_SLOT( cut() ), actionCollection(), "cut" ); // Note: Prefer KStdAction::* to any custom action if possible. - //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQT_SLOT( cut() ), + //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQ_SLOT( cut() ), // actionCollection(), "cut"); } diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h index a7e0fd50..6233ff6d 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.h +++ b/languages/cpp/app_templates/kofficepart/kopart_view.h @@ -15,7 +15,7 @@ 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 ); diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index 527be77e..aedddf27 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -13,7 +13,7 @@ class %{APPNAME} : public KonqSidebarPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 759cbf5a..f963714e 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -76,16 +76,16 @@ void %{APPNAME}::load(const KURL& url) void %{APPNAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void %{APPNAME}::saveProperties(TDEConfig* /*config*/) @@ -159,8 +159,8 @@ void %{APPNAME}::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h index b9101033..480680b7 100644 --- a/languages/cpp/app_templates/kpartapp/app.h +++ b/languages/cpp/app_templates/kpartapp/app.h @@ -21,7 +21,7 @@ class TDEToggleAction; */ class %{APPNAME} : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index adf210b3..f4f866b1 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -26,9 +26,9 @@ setWidget(m_widget); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("%{APPNAMELC}_part.rc"); @@ -49,12 +49,12 @@ void %{APPNAME}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + connect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); else { - disconnect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + disconnect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h index 6ea44663..39e3827b 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.h +++ b/languages/cpp/app_templates/kpartapp/app_part.h @@ -20,7 +20,7 @@ class TQMultiLineEdit; */ class %{APPNAME}Part : public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: /** @@ -70,7 +70,7 @@ class TDEAboutData; class %{APPNAME}PartFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}PartFactory(); diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index c395d983..ecda7fb0 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -14,7 +14,7 @@ Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. (void) new TDEAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0, - this, TQT_SLOT(slotAction()), + this, TQ_SLOT(slotAction()), actionCollection(), "plugin_action" ); } diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h index 16142b33..30352231 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.h +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h @@ -7,7 +7,7 @@ class Plugin%{APPNAME} : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: Plugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); @@ -19,13 +19,13 @@ 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_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); static TDEInstance* instance(); diff --git a/languages/cpp/app_templates/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART index 0028fa2c..7036e4cb 100644 --- a/languages/cpp/app_templates/kscons_kxt/QUICKSTART +++ b/languages/cpp/app_templates/kscons_kxt/QUICKSTART @@ -64,7 +64,7 @@ To make scons run (much) faster, consult ./addons/README in bksys MOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has -Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT +signals and slots, then 'foo.h' must contain the macro TQ_OBJECT in order to compile. foo_moc.cpp is usually generated, and is used to produce foo_moc.o which is linked with the program or the library. @@ -129,7 +129,7 @@ among others), so when you can work without libtool ** moc processing ** As stated above, you should always add #include "foo.moc" -for your qt classes (Q_OBJECT) to save precious compilation time. +for your qt classes (TQ_OBJECT) to save precious compilation time. ** using a cache ** It is a good idea to enable the cache feature in SConstruct, diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index 00e1adea..44a90d53 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -48,10 +48,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); showTipOnStart(); } @@ -62,22 +62,22 @@ void %{APPNAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() + KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, - m_view, TQT_SLOT(switchColors()), + m_view, TQ_SLOT(switchColors()), actionCollection(), "switch_action"); createGUI(); @@ -140,7 +140,7 @@ void %{APPNAME}::optionsPreferences() // to the names of the variables in the .kcfg file TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h index 8fb9d688..9493eb35 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.h +++ b/languages/cpp/app_templates/kscons_kxt/app.h @@ -28,7 +28,7 @@ class KURL; class %{APPNAME} : public TDEMainWindow, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kscons_kxt/appview.h b/languages/cpp/app_templates/kscons_kxt/appview.h index 38f0e58a..7b115860 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.h +++ b/languages/cpp/app_templates/kscons_kxt/appview.h @@ -21,7 +21,7 @@ class KURL; */ class %{APPNAME}View : public %{APPNAME}view_base { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART index 0028fa2c..7036e4cb 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART +++ b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART @@ -64,7 +64,7 @@ To make scons run (much) faster, consult ./addons/README in bksys MOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has -Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT +signals and slots, then 'foo.h' must contain the macro TQ_OBJECT in order to compile. foo_moc.cpp is usually generated, and is used to produce foo_moc.o which is linked with the program or the library. @@ -129,7 +129,7 @@ among others), so when you can work without libtool ** moc processing ** As stated above, you should always add #include "foo.moc" -for your qt classes (Q_OBJECT) to save precious compilation time. +for your qt classes (TQ_OBJECT) to save precious compilation time. ** using a cache ** It is a good idea to enable the cache feature in SConstruct, diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp index cde31592..daa8b078 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp @@ -31,9 +31,9 @@ K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); setWidget(m_widget); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("%{APPNAMELC}_part.rc"); @@ -63,12 +63,12 @@ void %{APPNAMELC}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + connect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); else { - disconnect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + disconnect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.h b/languages/cpp/app_templates/kscons_tdemdi/app_part.h index 13f773a1..e23f8cbf 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app_part.h +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.h @@ -22,7 +22,7 @@ class TDEAboutData; */ class %{APPNAMELC}Part : public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp index c63cb223..51639f36 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp @@ -53,8 +53,8 @@ setStandardMDIMenuEnabled(false); m_manager = new KParts::PartManager(this); - connect(m_manager, TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(createGUI(KParts::Part*)) ); + connect(m_manager, TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(createGUI(KParts::Part*)) ); #if KDE_IS_VERSION(3, 3, 0) setToolviewStyle( KMdi::TextAndIcon ); @@ -77,7 +77,7 @@ // and a status bar statusBar()->show(); - connect( this, TQT_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQT_SLOT( currentChanged( KMdiChildView * ) ) ); + connect( this, TQ_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQ_SLOT( currentChanged( KMdiChildView * ) ) ); m_console = new tdemdikonsole(this, "konsole"); m_console->setIcon( SmallIcon("konsole") ); @@ -92,7 +92,7 @@ but->setIconSet(SmallIcon("tab_remove")); but->adjustSize(); but->hide(); - connect(but, TQT_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQT_SIGNAL(activated())); + connect(but, TQ_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQ_SIGNAL(activated())); tabWidget()->setCornerWidget(but, TopRight); } #endif @@ -124,22 +124,22 @@ void %{APPNAMELC}tdemdi::setupActions() { setXMLFile("%{APPNAMELC}_shell.rc"); - KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); - KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() + KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); - KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); TDEAction* action = KStdAction::configureToolbars(this, - TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + TQ_SLOT(optionsConfigureToolbars()), actionCollection()); createGUI( NULL ); } @@ -320,7 +320,7 @@ void %{APPNAMELC}tdemdi::optionsPreferences() TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h index 288395db..a2af9030 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h @@ -27,7 +27,7 @@ class MiscProperties; */ class %{APPNAMELC}tdemdi : public KMdiMainFrm { - Q_OBJECT + TQ_OBJECT public: %{APPNAMELC}tdemdi( KMdi::MdiMode mode ); diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp index 1feb1b8b..24b1a974 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp @@ -39,7 +39,7 @@ part()->widget()->reparent( this, TQPoint(0, 0) ); layout->addWidget( part()->widget() ); - // connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) ); + // connect( m_part, TQ_SIGNAL(stateChanged()), this, TQ_SLOT(updateCaption()) ); } else { diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h index 00109fdb..1f40ea9a 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h @@ -14,7 +14,7 @@ */ class %{APPNAMELC}tdemdiView : public KMdiChildView { - Q_OBJECT + TQ_OBJECT public: %{APPNAMELC}tdemdiView( TQWidget *parentWidget=0L, const char *name=0L ); diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp index 229c28a8..22c399ef 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp @@ -31,11 +31,11 @@ void tdemdikonsole::respawn() if (!m_part) return; - if (m_part->widget()->inherits(TQFRAME_OBJECT_NAME_STRING)) + if (m_part->widget()->inherits("TQFrame")) ((TQFrame*)m_part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); m_haskonsole=true; - connect( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + connect( m_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); m_part->widget()->show(); show(); diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h index d84cd961..0aded5c1 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h +++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h @@ -7,7 +7,7 @@ class tdemdikonsole : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp index ecdd5127..e9edb6d5 100644 --- a/languages/cpp/app_templates/kxt/app.cpp +++ b/languages/cpp/app_templates/kxt/app.cpp @@ -47,10 +47,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -60,19 +60,19 @@ void %{APPNAMELC}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAMELC}View TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, - m_view, TQT_SLOT(switchColors()), + m_view, TQ_SLOT(switchColors()), actionCollection(), "switch_action"); createGUI(); @@ -135,7 +135,7 @@ void %{APPNAMELC}::optionsPreferences() // to the names of the variables in the .kcfg file TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h index 7b6305ea..83bcca7d 100644 --- a/languages/cpp/app_templates/kxt/app.h +++ b/languages/cpp/app_templates/kxt/app.h @@ -26,7 +26,7 @@ class KURL; */ class %{APPNAMELC} : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kxt/appview.h b/languages/cpp/app_templates/kxt/appview.h index a486ec43..20e010d0 100644 --- a/languages/cpp/app_templates/kxt/appview.h +++ b/languages/cpp/app_templates/kxt/appview.h @@ -21,7 +21,7 @@ class KURL; */ class %{APPNAMELC}View : public %{APPNAMELC}view_base { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp index 150e829d..a0c0d0ee 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp @@ -33,50 +33,50 @@ mBack=new TQPushButton(this); mBack->setFixedSize(buttonSize,buttonSize); mBack->setPixmap(BarIcon("noatunback")); - connect(mBack, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back())); + connect(mBack, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back())); TQToolTip::add(mBack,i18n("Back")); mStop=new TQPushButton(this); mStop->setFixedSize(buttonSize,buttonSize); mStop->setPixmap(BarIcon("noatunstop")); - connect(mStop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop())); + connect(mStop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop())); TQToolTip::add(mStop, i18n("Stop")); mPlay=new TQPushButton(this); mPlay->setToggleButton(true); mPlay->setFixedSize(buttonSize,buttonSize); mPlay->setPixmap(BarIcon("noatunplay")); - connect(mPlay, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause())); + connect(mPlay, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause())); TQToolTip::add(mPlay, i18n("Play")); mForward=new TQPushButton(this); mForward->setFixedSize(buttonSize,buttonSize); mForward->setPixmap(BarIcon("noatunforward")); - connect(mForward, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward())); + connect(mForward, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward())); TQToolTip::add(mForward, i18n("Forward")); mPlaylist=new TQPushButton(this); mPlaylist->setToggleButton(true); mPlaylist->setFixedSize(buttonSize,buttonSize); mPlaylist->setPixmap(BarIcon("noatunplaylist")); - connect(mPlaylist, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView())); + connect(mPlaylist, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView())); TQToolTip::add(mPlaylist, i18n("Playlist")); mLoop=new TQPushButton(this); mLoop->setFixedSize(buttonSize,buttonSize); mLoop->setPixmap(BarIcon("noatunloopnone")); - connect(mLoop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(loop())); + connect(mLoop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(loop())); TQToolTip::add(mLoop, i18n("Change loop style")); mPopup=new TQPushButton(this); mPopup->setFixedSize(buttonSize,buttonSize); mPopup->setPixmap(BarIcon("noatun")); - connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup())); + connect(mPopup, TQ_SIGNAL(clicked()), TQ_SLOT(popup())); - mVolume=new L33tSlider(0,100,10,0,Qt::Horizontal, this); + mVolume=new L33tSlider(0,100,10,0,TQt::Horizontal, this); mVolume->setValue(napp->player()->volume()); - mSeeker=new L33tSlider(0,1000,10,0,Qt::Horizontal, this); + mSeeker=new L33tSlider(0,1000,10,0,TQt::Horizontal, this); mStatusBar=new KStatusBar(this); @@ -98,30 +98,30 @@ statusBar()->message(i18n("No File Loaded")); statusBar()->insertItem("--:--/--:--", 1, 0, true); - connect(napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); - connect(napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); + connect(napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) ); + connect(napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) ); - connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); - connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); - connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); + connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused())); napp->player()->handleButtons(); - connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(changeLoopType(int))); + connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(changeLoopType(int))); /* This skipToWrapper is needed to pass milliseconds to Player() as everybody * below the GUI is based on milliseconds instead of some unprecise thingy * like seconds or mille */ - connect(seeker(), TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); - connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int))); - connect(seeker(), TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int))); + connect(seeker(), TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int))); + connect(this, TQ_SIGNAL(skipTo(int)), napp->player(), TQ_SLOT(skipTo(int))); + connect(seeker(), TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(sliderMoved(int))); - connect(mVolume, TQT_SIGNAL(sliderMoved(int)), napp->player(), TQT_SLOT(setVolume(int))); - connect(mVolume, TQT_SIGNAL(userChanged(int)), napp->player(), TQT_SLOT(setVolume(int))); + connect(mVolume, TQ_SIGNAL(sliderMoved(int)), napp->player(), TQ_SLOT(setVolume(int))); + connect(mVolume, TQ_SIGNAL(userChanged(int)), napp->player(), TQ_SLOT(setVolume(int))); - connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(playlistShown())); - connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); + connect(napp->player(), TQ_SIGNAL(playlistShown()), TQ_SLOT(playlistShown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(playlistHidden())); // Event Filter for the RMB for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i) diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.h b/languages/cpp/app_templates/noatunui/plugin_impl.h index 44f77f75..253c94dc 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.h +++ b/languages/cpp/app_templates/noatunui/plugin_impl.h @@ -25,7 +25,7 @@ class KStatusBar; */ class %{APPNAME}UI : public TQWidget, public UserInterface { -Q_OBJECT +TQ_OBJECT public: %{APPNAME}UI(); diff --git a/languages/cpp/app_templates/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp index 6a0d616e..f0be7179 100644 --- a/languages/cpp/app_templates/opieapp/example.cpp +++ b/languages/cpp/app_templates/opieapp/example.cpp @@ -12,7 +12,7 @@ OPIE_EXPORT_APP( %{APPNAME}Factory ) %{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) : %{APPNAME}Base( parent, name, fl ) { - connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); + connect(quit, TQ_SIGNAL(clicked()), this, TQ_SLOT(goodBye())); } /* diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h index 0dabb6c9..9f2cd967 100644 --- a/languages/cpp/app_templates/opieapp/example.h +++ b/languages/cpp/app_templates/opieapp/example.h @@ -4,7 +4,7 @@ class %{APPNAME} : public %{APPNAME}Base { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/opieapp/examplebase.ui b/languages/cpp/app_templates/opieapp/examplebase.ui index b6b81b11..e6f7eba6 100644 --- a/languages/cpp/app_templates/opieapp/examplebase.ui +++ b/languages/cpp/app_templates/opieapp/examplebase.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI> <class>%{APPNAME}Base</class> <widget> - <class>QWidget</class> + <class>TQWidget</class> <property stdset="1"> <name>name</name> <cstring>%{APPNAME}Base</cstring> diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp index fbb29ae2..db3e71c4 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp @@ -128,7 +128,7 @@ TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid& uuid, TQUnknownInterface* * Now the caller knows that the Interface Pointer * is valid and the interface supported */ - if ( uuid == IID_TQUnknown ) + if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_TaskbarApplet ) *iface = this; diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.h b/languages/cpp/app_templates/opieapplet/simpleimpl.h index dc227bb1..a1e8400f 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.h +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.h @@ -39,7 +39,7 @@ * 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); diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index a4c2e177..dd3475e1 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp @@ -11,33 +11,33 @@ : TQHBox(par, "name", fl ) { TQCheckBox *box1 = new TQCheckBox(tr("Alt"),this); - connect(box1,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(slotAlt(bool))); + connect(box1,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(slotAlt(bool))); m_alt = box1; box1 = new TQCheckBox(tr("Shift"),this ); - connect(box1,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(slotShift(bool))); + connect(box1,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(slotShift(bool))); m_shi = box1; box1 = new TQCheckBox(tr("Ctrl","Control Shortcut on keyboard"),this ); - connect(box1,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(slotCtrl(bool))); + connect(box1,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(slotCtrl(bool))); m_ctrl = box1; TQSignalMapper *map = new TQSignalMapper(this); TQPushButton *btn = new TQPushButton("a",this); map->setMapping(btn,0); - connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); + connect(btn,TQ_SIGNAL(clicked()),map,TQ_SLOT(map())); btn = new TQPushButton("b",this); map->setMapping(btn,1); - connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); + connect(btn,TQ_SIGNAL(clicked()),map,TQ_SLOT(map())); btn = new TQPushButton("c",this); map->setMapping(btn,2); - connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); + connect(btn,TQ_SIGNAL(clicked()),map,TQ_SLOT(map())); - connect(map,TQT_SIGNAL(mapped(int)), - this,TQT_SLOT(slotKey(int))); + connect(map,TQ_SIGNAL(mapped(int)), + this,TQ_SLOT(slotKey(int))); resetState(); } @@ -130,14 +130,14 @@ TQString %{APPNAME}Impl::name() void %{APPNAME}Impl::onKeyPress( TQObject *receiver, const char *slot ) { if ( m_pickboard ) - TQObject::connect( m_pickboard, TQT_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); + TQObject::connect( m_pickboard, TQ_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); } #ifndef TQT_NO_COMPONENT TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface ) { *iface = 0; - if ( uuid == IID_TQUnknown ) + if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_InputMethod ) *iface = this; diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.h b/languages/cpp/app_templates/opieinput/simpleimpl.h index 6466810d..8ac6ce99 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.h +++ b/languages/cpp/app_templates/opieinput/simpleimpl.h @@ -8,7 +8,7 @@ class TQPixmap; class TQCheckBox; class %{APPNAME} : public TQHBox { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}( TQWidget *par, WFlags f ); diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp index 9d953663..7b32c534 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp @@ -60,7 +60,7 @@ void %{APPNAME}::activated() TQRESULT %{APPNAME}::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface ) { *iface = 0; - if ( uuid == IID_TQUnknown ) + if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_MenuApplet ) *iface = this; diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.h b/languages/cpp/app_templates/opiemenu/simpleimpl.h index bf111a5a..688cf0b8 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.h +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.h @@ -8,7 +8,7 @@ class %{APPNAME} : public TQObject, public MenuAppletInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/opienet/simpleiface.h b/languages/cpp/app_templates/opienet/simpleiface.h index 4ad088f8..8dac2450 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.h +++ b/languages/cpp/app_templates/opienet/simpleiface.h @@ -4,7 +4,7 @@ #include <interfaces/interface.h> class %{APPNAME}Interface : public Interface { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp b/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp index a4896308..5b6367d2 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp @@ -16,7 +16,7 @@ TodayPluginObject* %{APPNAME}Impl::guiPart() { TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid & uuid, TQUnknownInterface **iface ) { *iface = 0; - if ( ( uuid == IID_TQUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { + if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { *iface = this, (*iface)->addRef(); }else return TQS_FALSE; diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp index 2f491481..fdbbf4dd 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp @@ -17,7 +17,7 @@ // that should be triggered when clicked are defined in slotClicked() // of course also normal widgets can be used. m_exampleLabel = new OClickableLabel( this ); - connect( m_exampleLabel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ) ); + connect( m_exampleLabel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClicked() ) ); if ( m_layout ) { delete m_layout; diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h index 252efc85..a802f2ba 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h @@ -7,7 +7,7 @@ class %{APPNAME}Widget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/qmakeapp/main.cpp b/languages/cpp/app_templates/qmakeapp/main.cpp index 8938adc5..ba45c728 100644 --- a/languages/cpp/app_templates/qmakeapp/main.cpp +++ b/languages/cpp/app_templates/qmakeapp/main.cpp @@ -8,6 +8,6 @@ int main( int argc, char ** argv ) { %{APPNAME} * mw = new %{APPNAME}(); mw->setCaption( "%{APPNAME}" ); mw->show(); - a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) ); + a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp index 39b6e5af..8ce81310 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp @@ -37,17 +37,17 @@ openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen = new TQToolButton( openIcon, tr("Open File"), TQString(), - this, TQT_SLOT(choose()), fileTools, "open file" ); + this, TQ_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave = new TQToolButton( saveIcon, tr("Save File"), TQString(), - this, TQT_SLOT(save()), fileTools, "save file" ); + this, TQ_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint = new TQToolButton( printIcon, tr("Print File"), TQString(), - this, TQT_SLOT(print()), fileTools, "print file" ); + this, TQ_SLOT(print()), fileTools, "print file" ); (void)TQWhatsThis::whatsThisButton( fileTools ); @@ -79,41 +79,41 @@ menuBar()->insertItem( tr("&File"), file ); - file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( tr("&New"), this, TQ_SLOT(newDoc()), CTRL+Key_N ); int id; id = file->insertItem( openIcon, tr("&Open..."), - this, TQT_SLOT(choose()), CTRL+Key_O ); + this, TQ_SLOT(choose()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, tr("&Save"), - this, TQT_SLOT(save()), CTRL+Key_S ); + this, TQ_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) ); + id = file->insertItem( tr("Save &As..."), this, TQ_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); file->insertSeparator(); id = file->insertItem( printIcon, tr("&Print..."), - this, TQT_SLOT(print()), CTRL+Key_P ); + this, TQ_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); file->insertSeparator(); - file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); + file->insertItem( tr("&Close"), this, TQ_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( tr("&Help"), help ); - help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); - help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) ); + help->insertItem( tr("&About"), this, TQ_SLOT(about()), Key_F1 ); + help->insertItem( tr("About &TQt"), this, TQ_SLOT(aboutTQt()) ); help->insertSeparator(); - help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); + help->insertItem( tr("What's &This"), this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 ); e = new TQTextEdit( this, "editor" ); e->setFocus(); diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.h b/languages/cpp/app_templates/qmakeapp/qmakeapp.h index ef58ff46..ba2d50ed 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.h +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.h @@ -9,7 +9,7 @@ class TQTextEdit; class %{APPNAME}: public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate index 9572fea6..091cc093 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate @@ -66,14 +66,14 @@ Comment=A Qt3/Qmake based application was created in %{dest} [TQTDIR] Type=value -ValueType=QString +ValueType=TQString Value=TQTDIR Comment=Directory where Qt3 is installed. Default= [QMAKE] Type=value -ValueType=QString +ValueType=TQString Value=QMAKE Comment=Absolute Path for QMake (Qt3). Default= diff --git a/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate index 2ff310ba..69339244 100644 --- a/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate +++ b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate @@ -26,14 +26,14 @@ Comment=A Qmake based application was created in %{dest} [QMAKE] Type=value -ValueType=QString +ValueType=TQString Value=QMAKE Comment=Absolute Path for QMake. Default= [DESIGNER] Type=value -ValueType=QString +ValueType=TQString Value=DESIGNER Comment=Absolute Path for Designer. Default= diff --git a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate index 4d9b41b1..c8718e94 100644 --- a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate +++ b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate @@ -42,14 +42,14 @@ Comment=A Qmake/Qt3 based hello world program was created in %{dest} [TQTDIR] Type=value -ValueType=QString +ValueType=TQString Value=TQTDIR Comment=Directory where Qt3 is installed. Default= [QMAKE] Type=value -ValueType=QString +ValueType=TQString Value=QMAKE Comment=Absolute Path for QMake (Qt3). Default= diff --git a/languages/cpp/app_templates/qt4hello/CMakeLists.txt b/languages/cpp/app_templates/qt4hello/CMakeLists.txt deleted file mode 100644 index 47a77b8b..00000000 --- a/languages/cpp/app_templates/qt4hello/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -set( _tarball_content - main.cpp qt4hello.png qt4hello.kdevelop qt4hello.pro - src.pro ReadMe -) -list( SORT _tarball_content ) - -tde_create_tarball( - TARGET qt4hello.tar.gz - FILES ${_tarball_content} -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/qt4hello.tar.gz qt4hello.png - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) - - -tde_create_translated_desktop( - SOURCE qt4hello.kdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates - KEYWORDS Category - PO_DIR tdevelop-desktops -) diff --git a/languages/cpp/app_templates/qt4hello/Makefile.am b/languages/cpp/app_templates/qt4hello/Makefile.am deleted file mode 100644 index b285f781..00000000 --- a/languages/cpp/app_templates/qt4hello/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -dataFiles = main.cpp qt4hello.png qt4hello.kdevelop \ - qt4hello.pro src.pro ReadMe - -templateName = qt4hello - -### no need to change below: -template_DATA = $(templateName).kdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/kdevappwizard -$(templateName).tar.gz: ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - $(GZIP_COMMAND) -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz ${templateName}.png - -CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/qt4hello/ReadMe b/languages/cpp/app_templates/qt4hello/ReadMe deleted file mode 100644 index 87d23f71..00000000 --- a/languages/cpp/app_templates/qt4hello/ReadMe +++ /dev/null @@ -1,11 +0,0 @@ -READ THIS IN ORDER TO COMPILE THE Qt4 TEMPLATE ----------------------------------------------- - -Before compiling, check the Qt Options, go to -Project->Project Options->C++ Support and open the Qt Options tab. - -Check that the Qt installation directory is correct for the Qt version you've chosen. - ------------------- -Andreas Pakulat -July 2006 diff --git a/languages/cpp/app_templates/qt4hello/main.cpp b/languages/cpp/app_templates/qt4hello/main.cpp deleted file mode 100644 index 905f35fb..00000000 --- a/languages/cpp/app_templates/qt4hello/main.cpp +++ /dev/null @@ -1,11 +0,0 @@ -%{CPP_TEMPLATE} - -#include <TQCoreApplication> - -int main(int argc, char *argv[]) -{ - TQCoreApplication app(argc, argv); - tqDebug("Hello from TQt 4!"); - return 0; -} - diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.kdevelop b/languages/cpp/app_templates/qt4hello/qt4hello.kdevelop deleted file mode 100644 index 74dee1ae..00000000 --- a/languages/cpp/app_templates/qt4hello/qt4hello.kdevelop +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0"?> -<kdevelop> - <general> - <author>%{AUTHOR}</author> - <email>%{EMAIL}</email> - <version>%{VERSION}</version> - <projectmanagement>KDevTrollProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - </keywords> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*" name="Others" /> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - </tree> - </kdevfileview> - <kdevcppsupport> - <qt> - <used>true</used> - <version>4</version> - <includestyle>4</includestyle> - <designerintegration>ExternalDesigner</designerintegration> - <qmake>%{QMAKE}</qmake> - <designer>%{DESIGNER}</designer> - </qt> - </kdevcppsupport> - <kdevdoctreeview> - <ignoretocs> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>qt-kdev3</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoredoxygen> - <toc>TDE Libraries (Doxygen)</toc> - </ignoredoxygen> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell/> - <breakpoints/> - <programargs></programargs> - <gdbpath>/usr/bin/gdb</gdbpath> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - </display> - <breakpoints/> - </kdevdebugger> - <kdevtrollproject> - <run> - <mainprogram>./bin/%{APPNAMELC}</mainprogram> - <programargs/> - </run> - </kdevtrollproject> - <workspace> - <openfiles/> - </workspace> - <kdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - <type ext="ts" /> - <type ext="qrc" /> - </useglobaltypes> - </kdevfilecreate> - <kdevdocumentation> - <projectdoc> - <docsystem>Doxygen Documentation Collection</docsystem> - <docurl>%{APPNAMELC}.tag</docurl> - </projectdoc> - </kdevdocumentation> -</kdevelop> diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate b/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate deleted file mode 100644 index eb76b3fd..00000000 --- a/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate +++ /dev/null @@ -1,59 +0,0 @@ -# TDE Config File -[General] -Name=Basic Qt4 Application - -Comment=Generate a very simple QMake/Qt4 based application (crossplatform compatible) - Needs Qt4 - -Category=C++/QMake project - -Icon=qt4hello.png -FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=%{dest}/src/main.cpp,%{dest}/src/ReadMe -Archive=qt4hello.tar.gz - -[FILE1] -Type=install -Source=%{src}/qt4hello.kdevelop -Dest=%{dest}/%{APPNAMELC}.kdevelop - -[FILE2] -Type=install -Source=%{src}/qt4hello.pro -Dest=%{dest}/%{APPNAMELC}.pro - -[MkDir1] -Type=mkdir -Dir=%{dest}/src - -[FILE3] -Type=install -Source=%{src}/src.pro -Dest=%{dest}/src/src.pro - -[FILE4] -Type=install -Source=%{src}/main.cpp -Dest=%{dest}/src/main.cpp - -[FILE5] -Type=install -Source=%{src}/ReadMe -Dest=%{dest}/src/ReadMe - -[MSG] -Type=message -Comment=A Qt4/Qmake based application was created in %{dest} - -[QMAKE] -Type=value -ValueType=QString -Value=QMAKE -Comment=Absolute Path for QMake (Qt4). -Default= - -[DESIGNER] -Type=value -ValueType=QString -Value=DESIGNER -Comment=Absolute Path for Designer (Qt4). -Default= diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.png b/languages/cpp/app_templates/qt4hello/qt4hello.png Binary files differdeleted file mode 100644 index b7c952b4..00000000 --- a/languages/cpp/app_templates/qt4hello/qt4hello.png +++ /dev/null diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.pro b/languages/cpp/app_templates/qt4hello/qt4hello.pro deleted file mode 100644 index 7177d225..00000000 --- a/languages/cpp/app_templates/qt4hello/qt4hello.pro +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS += src -TEMPLATE = subdirs -CONFIG += warn_on \ - qt \ - thread
\ No newline at end of file diff --git a/languages/cpp/app_templates/qt4hello/src.pro b/languages/cpp/app_templates/qt4hello/src.pro deleted file mode 100644 index ae5bac37..00000000 --- a/languages/cpp/app_templates/qt4hello/src.pro +++ /dev/null @@ -1,8 +0,0 @@ -SOURCES += main.cpp -TEMPLATE = app -CONFIG += warn_on \ - thread \ - qt -TARGET = %{APPNAMELC} -DESTDIR = ../bin -QT -= gui diff --git a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt b/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt deleted file mode 100644 index ac7a350d..00000000 --- a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -set( _tarball_content - main.cpp qt4makeapp.cpp qt4makeapp.h qt4makeapp.png - qt4makeapp.kdevelop qt4makeapp.pro src.pro application.qrc - ReadMe filesave.xpm fileopen.xpm filenew.xpm editcopy.xpm - editpaste.xpm editcut.xpm -) -list( SORT _tarball_content ) - -tde_create_tarball( - TARGET qt4makeapp.tar.gz - FILES ${_tarball_content} -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/qt4makeapp.tar.gz qt4makeapp.png - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) - - -tde_create_translated_desktop( - SOURCE qt4makeapp.kdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates - KEYWORDS Category - PO_DIR tdevelop-desktops -) diff --git a/languages/cpp/app_templates/qt4makeapp/Makefile.am b/languages/cpp/app_templates/qt4makeapp/Makefile.am deleted file mode 100644 index 62c4c120..00000000 --- a/languages/cpp/app_templates/qt4makeapp/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -dataFiles = main.cpp qt4makeapp.cpp qt4makeapp.h qt4makeapp.png qt4makeapp.kdevelop \ - qt4makeapp.pro src.pro application.qrc ReadMe filesave.xpm fileopen.xpm filenew.xpm \ - editcopy.xpm editpaste.xpm editcut.xpm - -templateName = qt4makeapp - -### no need to change below: -template_DATA = $(templateName).kdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/kdevappwizard -$(templateName).tar.gz: ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - $(GZIP_COMMAND) -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz ${templateName}.png - -CLEANFILES = *.tar.gz
\ No newline at end of file diff --git a/languages/cpp/app_templates/qt4makeapp/ReadMe b/languages/cpp/app_templates/qt4makeapp/ReadMe deleted file mode 100644 index 87d23f71..00000000 --- a/languages/cpp/app_templates/qt4makeapp/ReadMe +++ /dev/null @@ -1,11 +0,0 @@ -READ THIS IN ORDER TO COMPILE THE Qt4 TEMPLATE ----------------------------------------------- - -Before compiling, check the Qt Options, go to -Project->Project Options->C++ Support and open the Qt Options tab. - -Check that the Qt installation directory is correct for the Qt version you've chosen. - ------------------- -Andreas Pakulat -July 2006 diff --git a/languages/cpp/app_templates/qt4makeapp/application.qrc b/languages/cpp/app_templates/qt4makeapp/application.qrc deleted file mode 100644 index c35b0695..00000000 --- a/languages/cpp/app_templates/qt4makeapp/application.qrc +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file>editcopy.xpm</file> - <file>editcut.xpm</file> - <file>filenew.xpm</file> - <file>fileopen.xpm</file> - <file>editpaste.xpm</file> - <file>filesave.xpm</file> -</qresource> -</RCC>
\ No newline at end of file diff --git a/languages/cpp/app_templates/qt4makeapp/editcopy.xpm b/languages/cpp/app_templates/qt4makeapp/editcopy.xpm deleted file mode 100644 index 8350ed0e..00000000 --- a/languages/cpp/app_templates/qt4makeapp/editcopy.xpm +++ /dev/null @@ -1,193 +0,0 @@ -/* XPM */ -static char *editcopy[] = { -/* columns rows colors chars-per-pixel */ -"32 32 155 2", -" c black", -". c #191000", -"X c #221700", -"o c #2E2300", -"O c #452E00", -"+ c #433200", -"@ c #493000", -"# c #553800", -"$ c #5D4600", -"% c #6B5000", -"& c #724B00", -"* c #7D5E00", -"= c #6E694F", -"- c #7E795F", -"; c #865900", -": c #8A5C00", -"> c #8B6800", -", c #936200", -"< c #926D00", -"1 c #926B1A", -"2 c #967000", -"3 c #9B721D", -"4 c #9B7625", -"5 c #9E792A", -"6 c #A47C00", -"7 c #AA7D00", -"8 c #A1761A", -"9 c #A57816", -"0 c #A4791D", -"q c #AD8200", -"w c #B28500", -"e c #AE8530", -"r c #B99626", -"t c #97906D", -"y c #B18D48", -"u c #B49049", -"i c #B89542", -"p c #BA9C4D", -"a c #BD9E52", -"s c #BFA053", -"d c #B8AE78", -"f c #BEB47E", -"g c #C49300", -"h c #C89600", -"j c #C19D2C", -"k c #C1A43F", -"l c #C09E4E", -"z c #CFB457", -"x c #C9B159", -"c c #CAB573", -"v c #D4BF7C", -"b c #FFDF62", -"n c #FFE064", -"m c #FFE16D", -"M c #FFE372", -"N c #FFE479", -"B c #A19D8E", -"V c #ABA89A", -"C c #BEB580", -"Z c #BDB488", -"A c #B8B496", -"S c #AEADAA", -"D c #B3AFA1", -"F c #BCBBB6", -"G c #BFBFB9", -"H c #C0B680", -"J c #C4BA85", -"K c #C6BD8B", -"L c #CBB589", -"P c #C8BE88", -"I c #C3BC90", -"U c #CBC18C", -"Y c #CCC493", -"T c #D7CB8C", -"R c #DAC786", -"E c #D8C789", -"W c #DAC98B", -"Q c #D0C690", -"! c #D4CA94", -"~ c #D4CC9B", -"^ c #D8CE98", -"/ c #DCD29C", -"( c #C6C3B7", -") c #C8C6BE", -"_ c #D5C5A5", -"` c #DBC8A1", -"' c #DBD4A2", -"] c #DED9AE", -"[ c #D9D5B1", -"{ c #E0CC82", -"} c #E8D98B", -"| c #E8D991", -" . c #E1D7A1", -".. c #E5DBA5", -"X. c #E4DCAB", -"o. c #E8DDAA", -"O. c #E1DCB2", -"+. c #E1DCB8", -"@. c #FFE683", -"#. c #FFE78A", -"$. c #FFE885", -"%. c #FFE88D", -"&. c #FFE992", -"*. c #FFEC9D", -"=. c #FFF09F", -"-. c #ECE2AC", -";. c #E5E0B6", -":. c #E5E1B8", -">. c #EBE4B6", -",. c #EAE5BC", -"<. c #F0E5A8", -"1. c #FFEDA3", -"2. c #FFEDA9", -"3. c #F1E8B8", -"4. c #FFEFB1", -"5. c #FFF1A5", -"6. c #FFF2AD", -"7. c #FFF2B4", -"8. c #FFF2BC", -"9. c #CAC8C2", -"0. c #D6D4CB", -"q. c #DFDAC5", -"w. c #D4D2D0", -"e. c #E0D7C5", -"r. c #E4DAC3", -"t. c #E8DEC7", -"y. c #E0DFD3", -"u. c #E6E2C2", -"i. c #E8E1C5", -"p. c #EBE3CB", -"a. c #EEE9C2", -"s. c #E8E6DC", -"d. c #F3EDC3", -"f. c #F2EDCB", -"g. c #F7F2CD", -"h. c #FFF3C3", -"j. c #FFF4CA", -"k. c #FFF8C5", -"l. c #FFF8CD", -"z. c #FDF5D2", -"x. c #FFF7D8", -"c. c #FFF9D4", -"v. c #FFF9DC", -"b. c #E9E8E7", -"n. c #F3EFE3", -"m. c #F2F0E3", -"M. c #F4F2EA", -"N. c #FBF7E6", -"B. c #FEF9E3", -"V. c #FFFBEC", -"C. c #F4F4F3", -"Z. c #F8F7F6", -"A. c #FEFCF4", -"S. c #FEFEFC", -"D. c None", -/* pixels */ -"D.D.D.D.D.D.D.D.D.D.D.D.h g g g g g g g g g g w * D.D.D.D.D.", -"D.D.D.D.D.D.D.D.D.D.D.D.g z.z.g.g.g.g.g.g.z.g.R 2 D.D.D.D.D.", -"D.D.D.D.D.D.D.D.D.D.D.D.g z.d.3.3.3.3.3.3.>.f.g.z < D.D.D.D.", -"D.D.D.D.D., : ; , : : : 7 a i a R -.-.-.-.' m.u.g.j > D.D.D.", -"D.D.D.D., u y y L L L L ` t.t.e.e v -.-.-.Y b.S.+.d.q D.D.D.", -"D.D.D.D., S.S.S.S.S.S.S.S.Z.b.S.e.i W o.o.K w.S.A.u.q D.D.D.", -"D.D.D.D., S.S.S.A.S.S.S.S.M.w.S.S._ a E ..K 0.S.S.q.7 D.D.D.", -"D.D.D.D., S.A.V.A.A.A.V.A.n.9.S.S.C._ a ..Y t = - A 6 D.D.D.", -"D.D.D.D., A.A.V.A.V.V.V.A.n.9.S.S.S.Z.3 ' ' K Z A ] 7 D.D.D.", -"D.D.D.D., A.V.B.V.V.B.V.V.n.( F S S G 5 ' | / / X.f.q D.D.D.", -"D.D.D.D., A.V.x.B.x.V.B.N.B.e.D B V ) 3 / / ^ ^ ' a.q D.D.D.", -"D.D.D.D., V.N.N.B.B.B.v.v.N.z.p.i.p.n.8 ^ / ! Q ' a.q D.D.D.", -"D.D.D.D., B.B.x.v.x.z.j.j.x.z.z.c.B.B.0 ! ! ! ^ ' ,.q D.D.D.", -"D.D.D.D., B.h.h.z.z.x.x.z.z.z.h.j.x.v.0 ! Q Y ! ~ ,.q D.D.D.", -"D.D.D.D., v.c.k.x.h.j.j.j.z.8.h.k.j.v.0 U T U U ~ ,.q D.D.D.", -"D.D.D.D., v.k.z.h.h.h.j.8.j.h.h.j.k.v.0 U U U U Y ;.q D.D.D.", -"D.D.D.D., x.h.8.8.h.j.8.8.4.h.4.8.h.x.8 P H P P ~ ;.q D.D.D.", -"D.D.D.D., v.h.4.4.8.8.4.1.z.h.8.4.h.c.8 H J H J Y ;.q D.D.D.", -"D.D.D.D., c.2.z.j.4.*.1.1.8.2.2.*.2.l.8 J J H J U ] q D.D.D.", -"D.D.D.D., l.h.2.4.4.1.%.1.&.2.4.8.7.k.8 f d f H U ] q D.D.D.", -"D.D.D.D., z.8.#.1.4.1.*.1.1.1.*.N 4.l.8 f f C K ~ :.q D.D.D.", -"D.D.D.D., 8.&.4.#.%.4.&.@.#.%.%.&.2.l.8 K K Y ~ ] ,.6 D.D.D.", -"D.D.D.D., h.&.#.*.1.1.%.N N #.&.*.1.l.0 ' ] T x r 6 % D.D.D.", -"D.D.D.D., 4.4.%.*.#.b &.N M b M 2.1.k.9 k 7 > $ o D.D.D.", -"D.D.D.D., 7.&.N 5.&.N @.*.b N M N =.k., + D.D.D.", -"D.D.D.D., 6.N N M M &.#.N 2.$.%.8.6.<.& D.D.D.D.D.", -"D.D.D.D., 5.&.7.n $.m M 1.7.7.o.c 5 & @ D.D.D.D.D.D.D.D.D.", -"D.D.D.D., 7.*.m %.=.&.7.} p 1 % # X D.D.D.D.D.D.D.D.D.D.", -"D.D.D.D., 6.5.5.5.| a 1 & + . D.D.D.D.D.D.D.D.D.D.", -"D.D.D.D., 6.-.a 1 & O . D.D.D.D.D.D.D.D.D.D.D.D.", -"D.D.D.D.; : % O . D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.", -"D.D.D.D. D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D." -}; diff --git a/languages/cpp/app_templates/qt4makeapp/editcut.xpm b/languages/cpp/app_templates/qt4makeapp/editcut.xpm deleted file mode 100644 index 9a118931..00000000 --- a/languages/cpp/app_templates/qt4makeapp/editcut.xpm +++ /dev/null @@ -1,252 +0,0 @@ -/* XPM */ -static char *editcut[] = { -/* columns rows colors chars-per-pixel */ -"32 32 214 2", -" c #000000", -". c #0B0B0B", -"X c #181300", -"o c #1D190B", -"O c #131313", -"+ c #1B1B1B", -"@ c #211E11", -"# c #26231A", -"$ c #2A2513", -"% c #2E2912", -"& c #2E2A19", -"* c #372E0B", -"= c #302A12", -"- c #312C1B", -"; c #3A320F", -": c #3C3415", -"> c #3C351B", -", c #232323", -"< c #2B2922", -"1 c #2C2C2C", -"2 c #302E26", -"3 c #353120", -"4 c #3F3B2D", -"5 c #313131", -"6 c #3A3A3A", -"7 c #423814", -"8 c #493E17", -"9 c #413D2F", -"0 c #423F32", -"q c #4F4319", -"w c #5C4A00", -"e c #5F4F0D", -"r c #514410", -"t c #554813", -"y c #4E472C", -"u c #444136", -"i c #4A483F", -"p c #534B2B", -"a c #504B37", -"s c #514C3A", -"d c #654F04", -"f c #604F0B", -"g c #665200", -"h c #675509", -"j c #6B5405", -"k c #6C5807", -"l c #6C590B", -"z c #745B04", -"x c #715D0A", -"c c #7B5B02", -"v c #625B3B", -"b c #7E6815", -"n c #6C643E", -"m c #4D4B42", -"M c #494949", -"N c #504D43", -"B c #54534C", -"V c #515151", -"C c #5D5B54", -"Z c #656048", -"A c #736A44", -"S c #726C54", -"D c #77725B", -"F c #696968", -"G c gray50", -"H c #826203", -"J c #806609", -"K c #836907", -"L c #8D6A03", -"P c #9A6F00", -"I c #9B7005", -"U c #9E730E", -"Y c #9C7511", -"T c #85732C", -"R c #88783B", -"E c #AE7C00", -"W c #A87B13", -"Q c #847B53", -"! c #827D64", -"~ c #9C862E", -"^ c #A98A1F", -"/ c #B28D0A", -"( c #B88D00", -") c #B2821A", -"_ c #B18E1B", -"` c #B3941C", -"' c #A88E2C", -"] c #A28C36", -"[ c #AE9224", -"{ c #89815E", -"} c #87826D", -"| c #858174", -" . c #888370", -".. c #8E8A7D", -"X. c #928C71", -"o. c #A28E44", -"O. c #AA9F74", -"+. c #B9A456", -"@. c #BDA85B", -"#. c #B2A068", -"$. c #C28700", -"%. c #CC8E00", -"&. c #C29A00", -"*. c #C4962F", -"=. c #CCA100", -"-. c #D6A800", -";. c #D1AC1B", -":. c #DDB31A", -">. c #D2A922", -",. c #D4AE2B", -"<. c #DBA12E", -"1. c #DBA433", -"2. c #DDB428", -"3. c #D2B23B", -"4. c #E6A200", -"5. c #E8A509", -"6. c #EAAF00", -"7. c #EFAC1E", -"8. c #F5A100", -"9. c #FFAD02", -"0. c #FCAF0D", -"q. c #FCB005", -"w. c #FFB60C", -"e. c #FFBD00", -"r. c #FFBD16", -"t. c #E3B432", -"y. c #E8BF3C", -"u. c #F6BE2F", -"i. c #C6A949", -"p. c #D9A948", -"a. c #D8AB52", -"s. c #DBBA45", -"d. c #C5B162", -"f. c #ECB74D", -"g. c #EFB841", -"h. c #EFBE4A", -"j. c #EABA55", -"k. c #FDC006", -"l. c #FFC10B", -"z. c #FFC800", -"x. c #FFC90D", -"c. c #FAC113", -"v. c #FBC11C", -"b. c #FDC910", -"n. c #EDC233", -"m. c #F5C32D", -"M. c #FFC728", -"N. c #F4C537", -"B. c #F6C63A", -"V. c #F5CB36", -"C. c #FFD73D", -"Z. c #E9C659", -"A. c #EAC85A", -"S. c #FFDA4B", -"D. c #FFDD5D", -"F. c #E9CD6B", -"G. c #FFD560", -"H. c #FFE06C", -"J. c gray56", -"K. c #959595", -"L. c gray62", -"P. c #A6A18A", -"I. c #A8A69E", -"U. c #AEA895", -"Y. c #B3AC8F", -"T. c #B8AF8B", -"R. c #B4AD96", -"E. c #B8B199", -"W. c #A4A4A4", -"Q. c #AAAAAA", -"!. c #B0ADA3", -"~. c #BBB6A3", -"^. c #B1B1B1", -"/. c #B9B9B6", -"(. c #BBBBBA", -"). c #C5BC9D", -"_. c #C2BCA2", -"`. c #C1BEB5", -"'. c #D2C38E", -"]. c #DCC78C", -"[. c #C7C0A7", -"{. c #C7C2AE", -"}. c #C7C3B2", -"|. c #C5C2B8", -" X c #CAC6B6", -".X c #CBC9BE", -"XX c #D9D3BB", -"oX c #E6D08A", -"OX c #E7DEBD", -"+X c #ECDEB3", -"@X c #FFF0B9", -"#X c #C5C5C5", -"$X c #CECCC7", -"%X c #D0CEC5", -"&X c #D0CFC8", -"*X c #D2D1CB", -"=X c #DBD6C5", -"-X c #DBD7C9", -";X c #D3D3D1", -":X c #DBDBDB", -">X c #E5E1D6", -",X c #E5E3DA", -"<X c #E8E5D9", -"1X c #EDEADC", -"2X c #FEF6DE", -"3X c #E6E6E6", -"4X c #E9E7E2", -"5X c #E9E8E4", -"6X c #EDECEA", -"7X c #F2F1EB", -"8X c #F1F1F1", -"9X c #F8F7F4", -"0X c #F9F8F8", -"qX c None", -/* pixels */ -"qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqXqX5 5 5 1 , qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqX5 V /.&XQ.F 1 , qXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqX5 _.D.S.H.@X&X6 . qXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqX5 S.=.w g &.C...+ qXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqX5 -.' + o t z.d., qXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqX5 C V.@.+ 3 :.3., qXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqX5 '.b.F.6 , 1 s.,., qXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqX1 b ( n.OXE.E.F.^ + qXqXqXqXqXqXqXqX5 5 1 , ", -"qXqXqXqXqXqXqX l x K A.oXoXZ.i., qXqXqXqXqXqX5 V &X0X6X, ", -"qXqXqXqXqXqXqX 8 ( c.v.k.N.1 qXqXqXqX5 V $X0X0X9XXX, ", -"qXqXqXqXqXqXqXqX O t 6.e.e.k.S O 5 5 V $X8X8X8X1XD : O ", -"qXqXqXqXqXqXqXqXqXqX 3 J e.G.7X#.+ . 5 C |.3X3X5X4X_.4 % ", -"qXqXqXqXqXqXqXqXqXqX q ].0X0X+X, B }.:X:X:X:X=XS & o ", -"qXqXqXqXqXqXqXqXqXqXqX + M 8X8X7XU.Q.#X*X*X*XR.< % qX", -"qXqXqXqXqXqXqXqXqXqXqXqX, 1 X6XW.G Q.L.^.{.Z @ . qXqX", -"qXqXqXqXqXqXqXqXqXqX5 5 m P.W.:X6 . 3X/.X., @ qXqXqXqX", -"qXqXqXqXqXqXqX5 5 5 n +.R.W.J.K.W.^.:X:X1Xm + qXqXqXqXqX", -"qXqXqXqXqX5 5 i o.y.v.q./ P.I.} | R.&X*X;X8X ., qXqXqXqXqXqX", -"qXqX5 5 5 R 3.M.5.E L 7.4._ 0 + O + i ).#X#X5X~., O qXqXqXqX", -"qX5 u ] m.r.%.H r : , t.0.P 7 $ , { `.(.;X-X, + qXqXqX", -"5 u 2.w.$.k t o , ~ h.P l , u T.^.#X<XN , qXqX", -"5 >.9.U r . . , T B.*.x qX + , Q !.Q.<XC , qX", -"p q.1.> . + 1 [ m.p.k . qXqXqXqX , u O.W.;X! + ", -"4 8.j.` p 5 y ;.u.a.d % qXqXqXqXqXqX O , A P._., ", -"1 x <.f.m.x.b.y.a.g ; qXqXqXqXqXqXqXqX + 0 v O ", -" - h c W W W W z : qXqXqXqXqXqXqXqXqXqX . . ", -" * e l l f X qXqXqXqXqXqXqXqXqXqXqXqXqX ", -"qX qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX qX", -"qXqXqX qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX" -}; diff --git a/languages/cpp/app_templates/qt4makeapp/editpaste.xpm b/languages/cpp/app_templates/qt4makeapp/editpaste.xpm deleted file mode 100644 index c29ad36b..00000000 --- a/languages/cpp/app_templates/qt4makeapp/editpaste.xpm +++ /dev/null @@ -1,295 +0,0 @@ -/* XPM */ -static char *editpaste[] = { -/* columns rows colors chars-per-pixel */ -"32 32 257 2", -" c black", -". c #0D0900", -"X c #191000", -"o c #221700", -"O c #2A1B00", -"+ c #332200", -"@ c #3E2900", -"# c #3A2804", -"$ c #4D3300", -"% c #4B3E15", -"& c #44391B", -"* c #543800", -"= c #5A3B00", -"- c #4D4015", -"; c #524E25", -": c #5A4F2C", -"> c #524E3D", -", c #58562F", -"< c #53503E", -"1 c #5E623B", -"2 c #634100", -"3 c #684500", -"4 c #6E4900", -"5 c #614F11", -"6 c #685416", -"7 c #734C00", -"8 c #784F00", -"9 c #755B00", -"0 c #7C5200", -"q c #7C5A00", -"w c #7B570F", -"e c #69562F", -"r c #786600", -"t c #7F6A00", -"y c #766300", -"u c #60613F", -"i c #7C6422", -"p c #545143", -"a c #54524B", -"s c gray32", -"d c #5D5D57", -"f c #616641", -"g c #67695D", -"h c #6B734D", -"j c #6C7553", -"k c #616261", -"l c #686A64", -"z c #6B7162", -"x c #727272", -"c c #003DFF", -"v c #0043FF", -"b c #004BFF", -"n c #0053FF", -"m c #015AFF", -"M c #0063FF", -"N c #046DFF", -"B c #0865FF", -"V c #0378FF", -"C c #1663FF", -"Z c #1576FF", -"A c #2678FF", -"S c #6F7B84", -"D c #77856D", -"F c #7B8B75", -"G c #0083FF", -"H c #0197FF", -"J c #0B92FF", -"K c #1385FF", -"L c #01A5FF", -"P c #0DB5FF", -"I c #3096FF", -"U c #2DADFF", -"Y c #2FBCFF", -"T c #22C6FF", -"R c #2AC5FF", -"E c #30D0FF", -"W c #38D5FF", -"Q c #4493F1", -"! c #5F83FF", -"~ c #5F8AFF", -"^ c #5290E4", -"/ c #5F92FF", -"( c #4CAAFE", -") c #40B8FF", -"_ c #779DCB", -"` c #6693E2", -"' c #6290FF", -"] c #649DFF", -"[ c #71A6E5", -"{ c #79A4FF", -"} c #7FB3FF", -"| c #68B8F3", -" . c #42DCFF", -".. c #47E0FF", -"X. c #58E9FF", -"o. c #64C0EB", -"O. c #6ADFEF", -"+. c #825600", -"@. c #845A00", -"#. c #8B5C00", -"$. c #905F00", -"%. c #8C6103", -"&. c #876807", -"*. c #8A6111", -"=. c #886E1B", -"-. c #887600", -";. c #8C7A00", -":. c #936200", -">. c #986800", -",. c #926C22", -"<. c #987A3F", -"1. c #A07200", -"2. c #A27511", -"3. c #A97D15", -"4. c #A77B14", -"5. c #998712", -"6. c #A68000", -"7. c #A78F00", -"8. c #AD8016", -"9. c #AC9600", -"0. c #BB8F00", -"q. c #A99B2A", -"w. c #B9A000", -"e. c #B3A63C", -"r. c #958D43", -"t. c #988F44", -"y. c #9A9346", -"u. c #9F9948", -"i. c #8B897C", -"p. c #958F6F", -"a. c #98937B", -"s. c #A68443", -"d. c #B08C41", -"f. c #AF9462", -"g. c #B39864", -"h. c #B2A850", -"j. c #BDB355", -"k. c #C3972F", -"l. c #C5A400", -"z. c #CCAC00", -"x. c #D7BB00", -"c. c #CCA030", -"v. c #CBB43E", -"b. c #E4AD0C", -"n. c #ECB600", -"m. c #EDB900", -"M. c #F2BB00", -"N. c #C1B84C", -"B. c #C1B757", -"V. c #C5BB58", -"C. c #C9BE5A", -"Z. c #C2A978", -"A. c #DFC000", -"S. c #FDCB00", -"D. c #F6C300", -"F. c #FFD100", -"G. c #FEDB00", -"H. c #FFDF0E", -"J. c #F5D500", -"K. c #FBCD39", -"L. c #FFE832", -"P. c #FFE432", -"I. c #CEC25C", -"U. c #D7C648", -"Y. c #DDC74B", -"T. c #D0C55E", -"R. c #D3C85F", -"E. c #D5C960", -"W. c #DDD264", -"Q. c #E0CA4C", -"!. c #E7D14E", -"~. c #EFDA51", -"^. c #F4D050", -"/. c #F9D452", -"(. c #FEDD53", -"). c #E2D765", -"_. c #E9DD69", -"`. c #E6DD68", -"'. c #FDDB6E", -"]. c #FFEE4F", -"[. c #FEE354", -"{. c #FEEA55", -"}. c #F7E153", -"|. c #FFF056", -" X c #ECE16A", -".X c #F1E56D", -"XX c #F7EA6F", -"oX c #F7EB70", -"OX c #F9EC70", -"+X c #FEF372", -"@X c #979486", -"#X c gray60", -"$X c #969596", -"%X c #8AA193", -"&X c #82A89B", -"*X c #8CAEA3", -"=X c #86A7A9", -"-X c #8BA2B1", -";X c #ACA580", -":X c #A5A291", -">X c #B3AF98", -",X c #B8B7AF", -"<X c #B3B2AB", -"1X c #B1B1B1", -"2X c #A6B8FF", -"3X c #88DEE0", -"4X c #8BF0FE", -"5X c #A4CFC6", -"6X c #BFD5FF", -"7X c #BFDCFF", -"8X c #C2AD82", -"9X c #CBB489", -"0X c #D2BF9B", -"qX c #D1C19F", -"wX c #C8C4AA", -"eX c #CFCBB7", -"rX c #D8C7A6", -"tX c #D2C2A3", -"yX c #D5CCB3", -"uX c #DAD1A1", -"iX c #DDD5BB", -"pX c #D7D1B3", -"aX c #ECE5BB", -"sX c #F5EBB5", -"dX c #F5ECBC", -"fX c #F8EEB8", -"gX c #FCF2BC", -"hX c #CBCBCB", -"jX c #D8D6C7", -"kX c #DDDDDD", -"lX c #E4DAC2", -"zX c #ECE6C7", -"xX c #EBE6D9", -"cX c #E9E3D0", -"vX c #F5EDC4", -"bX c #F6EFC9", -"nX c #F0EBD5", -"mX c #F3EFDB", -"MX c #FCF3C5", -"NX c #FCF4CA", -"BX c #F7F0CA", -"VX c #F6F0D2", -"CX c #F9F3D3", -"ZX c #F9F4DC", -"AX c #FFF8D4", -"SX c #FFF9DB", -"DX c #E7E7E4", -"FX c #EBEBE9", -"GX c #F1EDE1", -"HX c #F9F6E5", -"JX c #FDF9E4", -"KX c #FEFBEB", -"LX c #F6F2E6", -"PX c #FEFCF3", -"IX c #FEFDFD", -"UX c #F4F4F3", -"YX c None", -/* pixels */ -"YXYXYXYXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYX", -"YXYXYXYX:.:.+ IXIXIXIXIXIXIXIXFX# +.7 YXYXYXYXYXYXYXYXYXYXYX", -"YXYXYX>.k.c.6 FXkXkXkXDXkXkXkXx i b.>.+ YXYXYXYXYXYXYXYXYXYX", -"YXYXYX:.'.K.=.hX1X1X1X1X1X1X1Xd &.0.%.* 7 #.#.:.$.#.2 YXYXYX", -"YXYXYX:./.M.%.$Xk k d s s s e w >.2.d.s.Z.9XrXlXxX0X7 YXYXYX", -"YXYXYX:.^.M.1.: % % - % 5 6 &.GXIXIXPXPXPXPXPXLXIXIXg.3 YXYX", -"YXYX#X:.^.m.v.y.r.r.r.r.h.h.2.IXPXPXKXKXPXKXHXxXUXIXIXf.4 YX", -"YXYX#X:.^.m.Y.I.B.j.j.j.V.I.4.PXKXJXKXJXKXKXmXjXFXIXIXUX+. YX", -"YXYX#X:.^.m.Y.E.I.j.j.j.I.R.8.PXKXSXJXJXJXSXnXeXDXIXIXUX<. YX", -"YXYXYX:./.M.!.W.R.I.T.R.E.W.8.UXJXJXSXSXSXSXnXeX:X@Xi.<X7 ", -"YXYXYX:./.D.~._.`.W.W.W.W. X8.PXJXSXAXSXSXSXVXjX>X@X@X,X4 ", -"YXYXYX:.(.S.}..X X X X X X X8.PXSXAXAXAXAXAXNXzXpXwXwXjX7 ", -"YXYXYX:.(.S.[.OXOXOXoXoXt.; O s a p p p p a.AXMXvXaXzXGX+. ", -"YXYXYX:.(.S.[.+X+X+XOX+X; 7X2X] / / ~ ! 2Xp MXNXNXNXSXKX+. YX", -"YXYXYX:.(.F.|.+X+X+X+X+Xy., _ A m b v c ! p MXMXgXMXAXKX+. YX", -"YXYXYX:.(.F.|.+X+X+X+X+X+Xj.& ^ B n b v ' < gXMXgXgXNXKX+. YX", -"YXYXYX:.(.F.U.W.+X+X+X+X).y.g Q N m n b ~ < gXgXgXgXAXJXq YX", -"YXYXYX:.[.l.j j y.I.j.r.1 =X( K N M m b ~ < gXgXgXgXNXKX+. YX", -"YXYXYX:.[.t 5X4X&XD F =X| U J G V Z A C / < fXgXgXgXMXHX+. YX", -"YXYXYX:.[.l.h 3XX...W T P L H K I [ S ` { < fXfXfXfXMXKX+. YX", -"YXYXYX:.[.G.e.1 *XO...E R Y Y | -Xd Z.k 6X> fXfXfXfXBXJX+. YX", -"YXYXYX:.[.G.{.`.u.1 F &X*X%Xz l a.uXfXp.> p.sXsXsXfXBXJX+. YX", -"YXYXYX:.{.G.|.+X+X XN.q.5.7.q cXvXsXsXsXsXsXsXsXsXsXBXKX+. YX", -"YXYXYX:.|.G.].|.L.H.G.G.G.A.1.JXvXsXsXsXsXsXsXsXfXdXCXPX+. YX", -"YXYXYX:.{.G.G.G.G.G.x.w.;.t :.HXdXsXsXsXsXsXdXvXBXZXLXtX= YX", -"YXYXYX:.{.G.J.x.9.;.r 9 q 0 #.KXvXsXaXsXvXBXCXHXiXg.*.= O YX", -"YXYXYX:.L.9.-.y 9 q 0 = + #.HXbXdXbXVXZXcX8X,.3 $ . YX", -"YXYXYX%.z.9 q 7 * o $.PXZXmXmX0Xs.0 $ X YX", -"YXYXYX8 0 = o :.IXpXg.*.= O YXYXYXYX", -"YXYXYX YXYX@.#.2 @ . YXYXYXYXYXYX", -"YXYXYX YXYXYXYXYX YXYXYXYXYXYXYXYXYX", -"YXYXYXYXYXYXYXYXYXYXYXYXYXYX YXYXYXYXYXYXYXYXYXYXYXYX" -}; diff --git a/languages/cpp/app_templates/qt4makeapp/filenew.xpm b/languages/cpp/app_templates/qt4makeapp/filenew.xpm deleted file mode 100644 index 85efceb2..00000000 --- a/languages/cpp/app_templates/qt4makeapp/filenew.xpm +++ /dev/null @@ -1,216 +0,0 @@ -/* XPM */ -static char *filenew[] = { -/* columns rows colors chars-per-pixel */ -"32 32 178 2", -" c black", -". c #191000", -"X c #221700", -"o c #452E00", -"O c #4A3100", -"+ c #4E3400", -"@ c #553800", -"# c #604000", -"$ c #6A4600", -"% c #6D4800", -"& c #704A00", -"* c #724C00", -"= c #744C00", -"- c #764E00", -"; c #785000", -": c #805500", -"> c #815500", -", c #835700", -"< c #865900", -"1 c #875A00", -"2 c #8A5B00", -"3 c #8A5C00", -"4 c #8B5C00", -"5 c #8C5D00", -"6 c #8D5D00", -"7 c #8F5E00", -"8 c #805911", -"9 c #905F00", -"0 c #906000", -"q c #926000", -"w c #946200", -"e c #956300", -"r c #966400", -"t c #976400", -"y c #956913", -"u c #926C22", -"i c #9B7732", -"p c #B18D48", -"a c #B28E49", -"s c #B4904A", -"d c #BAA373", -"f c #A1A195", -"g c #ABAB9F", -"h c #ADADAB", -"j c #AFAFAB", -"k c #B3B3A6", -"l c #BCBCB8", -"z c #BFBFBC", -"x c #CBB489", -"c c #CBB58A", -"v c #CDB78B", -"b c #CAB891", -"n c #C9BB9E", -"m c #CEBEA2", -"M c #C6C6BC", -"N c #D9C8A8", -"B c #E8E1BA", -"V c #E8E1BB", -"C c #FEFFA1", -"Z c #FFFFA0", -"A c #FEFFA3", -"S c #FEFFA4", -"D c #FEFFA6", -"F c #FEFFA8", -"G c #FEFFA9", -"H c #FFFFA8", -"J c #FEFFAA", -"K c #FEFFAB", -"L c #FFFFAB", -"P c #FEFFAC", -"I c #FFFFAC", -"U c #FEFFAE", -"Y c #FEFFAF", -"T c #FEFFB0", -"R c #FEFFB1", -"E c #FFFFB0", -"W c #FEFFB4", -"Q c #FEFFB5", -"! c #FFFFB4", -"~ c #FEFFB8", -"^ c #FEFFB9", -"/ c #FFFFB8", -"( c #FFFFB9", -") c #FEFFBB", -"_ c #FFFFBA", -"` c #FEFFBD", -"' c #FFFFBD", -"] c #FEFFBE", -"[ c #FFFFBE", -"{ c #C8C8C1", -"} c #CACAC4", -"| c #CBCBC6", -" . c #DBD2C1", -".. c #DEDFCF", -"X. c #D4D4D1", -"o. c #E1D5C1", -"O. c #E3D9C3", -"+. c #E5DCCC", -"@. c #E8E8D3", -"#. c #ECECD7", -"$. c #F0EBDA", -"%. c #FEFFC2", -"&. c #FEFFC3", -"*. c #FFFFC2", -"=. c #FEFFC7", -"-. c #FFFFC7", -";. c #FEFFCB", -":. c #FEFFCC", -">. c #FFFFCC", -",. c #FEFFCE", -"<. c #FEFFD0", -"1. c #FEFFD1", -"2. c #FFFFD0", -"3. c #FFFFD1", -"4. c #FFFFD3", -"5. c #FEFFD5", -"6. c #FFFFD5", -"7. c #FEFFD6", -"8. c #FEFFD7", -"9. c #FFFFD6", -"0. c #FFFFD8", -"q. c #FEFFDA", -"w. c #FFFFDA", -"e. c #FFFFDB", -"r. c #FFFFDC", -"t. c #FEFFDE", -"y. c #FEFFDF", -"u. c #FFFFDE", -"i. c #FFFFDF", -"p. c #E9E9E7", -"a. c #F3F3E9", -"s. c #F3F3EB", -"d. c #F5F5E8", -"f. c #F8F8E3", -"g. c #FEFFE0", -"h. c LightYellow", -"j. c #FFFFE1", -"k. c #FEFFE3", -"l. c #FFFFE3", -"z. c #FDFEE7", -"x. c #FEFFE4", -"c. c #FEFFE5", -"v. c #FFFFE4", -"b. c #FBFBE9", -"n. c #FEFFE8", -"m. c #FFFFE8", -"M. c #FFFFE9", -"N. c #FFFFEA", -"B. c #FEFFEC", -"V. c #FEFFED", -"C. c #FFFFEC", -"Z. c #FFFFED", -"A. c #FEFFEF", -"S. c #F4F4F0", -"D. c #F4F4F3", -"F. c #F5F5F4", -"G. c #F8F8F6", -"H. c ivory", -"J. c #FFFFF1", -"K. c #FEFFF3", -"L. c #FFFFF3", -"P. c #FEFFF4", -"I. c #FFFFF4", -"U. c #FEFFF7", -"Y. c #FFFFF6", -"T. c #FFFFF7", -"R. c #FBFBFB", -"E. c #FFFFF8", -"W. c #FFFFF9", -"Q. c #FFFFFA", -"!. c #FFFFFB", -"~. c gray99", -"^. c #FEFFFD", -"/. c #FFFFFC", -"(. c #FFFFFD", -"). c #FFFFFE", -"_. c gray100", -"`. c None", -/* pixels */ -"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.`.w 2 1 w 4 4 4 6 w 9 6 - `.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.r s p p c c c c N O.+.o.y # `.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.r ).).).).).).).).F.p.). .& o `.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w ).E.).E.).E.E.E.S.X.).R.n $ + `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w E.Y.Y.E.Y.E.E.E.a.| ).).D.m % `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w E.Y.Y.J.Y.J.Y.Y.a.| ).).).D.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w Y.J.J.J.J.J.J.J.a.M l h h { ; `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w Y.B.B.B.N.N.B.B.b...k f h } ; `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w J.N.N.N.N.N.N.N.l.f.#.@.#.a.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w J.l.l.l.l.l.l.l.l.l.l.l.l.J.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w J.r.l.l.r.l.r.l.r.l.r.l.r.J.1 `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w B.r.r.q.q.q.q.q.q.r.q.q.r.B.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w N.5.5.5.5.q.5.5.5.5.5.5.5.B., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w N.<.<.<.<.<.<.<.5.<.<.<.<.N., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w l.,.;.;.;.,.;.,.;.,.;.;.;.l., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w l.-.-.-.-.-.-.;.-.-.-.-.;.l.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w l.-.%.%.%.%.%.%.%.%.%.%.%.l., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w r.' ' ' ' ' ) ' ' ' ' ' ' r., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w r.) ) W ) ) ) ) ) ) W ) ) q., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w q.W W W W W W W W W W W W q., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w 5.Y Y W Y Y Y Y Y Y Y Y Y 5., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w 5.J J J Y J Y Y J Y J J Y q., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w 5.J J D J J D J D J W ) ,.$.- `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w <.Z D D Z D J Y ' ,.B b i - O `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w <.Z Z Z Y ) <.B d u & @ X `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w ,.J ) ,.B d y & o . `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w Y.V d u & o . `.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.1 4 & o . `.`.`.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`. `.`.`.`.`.`.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`. `.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`." -}; diff --git a/languages/cpp/app_templates/qt4makeapp/fileopen.xpm b/languages/cpp/app_templates/qt4makeapp/fileopen.xpm deleted file mode 100644 index a6c33b62..00000000 --- a/languages/cpp/app_templates/qt4makeapp/fileopen.xpm +++ /dev/null @@ -1,295 +0,0 @@ -/* XPM */ -static char *fileopen[] = { -/* columns rows colors chars-per-pixel */ -"32 32 257 2", -" c black", -". c #0B0900", -"X c #130E00", -"o c #161100", -"O c #231A00", -"+ c #352600", -"@ c #3B311C", -"# c #433100", -"$ c #4F3B00", -"% c #4A3E16", -"& c #4A3D22", -"* c #4D421A", -"= c #54420D", -"- c #4E4529", -"; c #484338", -": c #484233", -"> c #5B4B24", -", c #624500", -"< c #674D00", -"1 c #6D4D00", -"2 c #6E4F17", -"3 c #6D5200", -"4 c #775500", -"5 c #745B0F", -"6 c #795200", -"7 c #7A5A00", -"8 c #715C18", -"9 c #764B0A", -"0 c #6C5423", -"q c #6D592E", -"w c #785E27", -"e c #735626", -"r c #665736", -"t c #7A631D", -"y c #7A672E", -"u c #776535", -"i c #5C5956", -"p c #78704F", -"a c #75726E", -"s c #8D4F00", -"d c #815700", -"f c #835A00", -"g c #8A5C00", -"h c #866400", -"j c #966100", -"k c #956F00", -"l c #9C6100", -"z c #9D7500", -"x c #856B2A", -"c c #8C752A", -"v c #8C723B", -"b c #977939", -"n c #A45D00", -"m c #A26100", -"M c #AA680D", -"N c #AB6700", -"B c #A07700", -"V c #A57B00", -"C c #AB7A00", -"Z c #AA7300", -"A c #AF721A", -"S c #B87E00", -"D c #B57B00", -"F c #B0731A", -"G c #B47C26", -"H c #B77E28", -"J c #897F59", -"K c #977C40", -"L c #927F58", -"P c #807A6C", -"I c #9C821D", -"U c #9F8A35", -"Y c #AC8000", -"T c #B28500", -"R c #B68800", -"E c #BB8B00", -"W c #A78337", -"Q c #A28B31", -"! c #AF9535", -"~ c #B58E3A", -"^ c #B88633", -"/ c #B49936", -"( c #BCA039", -") c #998445", -"_ c #978657", -"` c #8B8264", -"' c #8E8572", -"] c #978864", -"[ c #978C75", -"{ c #9F9072", -"} c #A38845", -"| c #A48952", -" . c #AA965C", -".. c #A89156", -"X. c #B5934D", -"o. c #B39D45", -"O. c #B49755", -"+. c #AB984A", -"@. c #AD9A65", -"#. c #A79778", -"$. c #A59874", -"%. c #A29B7A", -"&. c #A79775", -"*. c #BDA959", -"=. c #B3A46C", -"-. c #B1A07F", -";. c #B5A97A", -":. c #BEB37B", -">. c #C49200", -",. c #C89500", -"<. c #CC9800", -"1. c #C69812", -"2. c #D2A31C", -"3. c #C2A63E", -"4. c #D7AE37", -"5. c #C29840", -"6. c #C29B4E", -"7. c #C2A641", -"8. c #C6AA43", -"9. c #C8AC45", -"0. c #CBAF49", -"q. c #CAA746", -"w. c #C4A158", -"e. c #CAA65D", -"r. c #CEA857", -"t. c #CFA95A", -"y. c #C5AC50", -"u. c #CDB14B", -"i. c #CBB358", -"p. c #CAB152", -"a. c #D2AB59", -"s. c #D1B54D", -"d. c #D4B951", -"f. c #D6BC5B", -"g. c #DDB45E", -"h. c #D9BD56", -"j. c #D2B753", -"k. c #DAAB48", -"l. c #CEAE69", -"z. c #CCAD67", -"x. c #CCB662", -"c. c #CAB26B", -"v. c #C8B66B", -"b. c #CEB775", -"n. c #CEBE7F", -"m. c #D3AD66", -"M. c #D5BE64", -"N. c #D4BF6D", -"B. c #E4B34B", -"V. c #E0B75F", -"C. c #E1B85F", -"Z. c #E4BA61", -"A. c #E9BE63", -"S. c #DDC159", -"D. c #DAC269", -"F. c #D4C176", -"G. c #D8C67F", -"H. c #E1C55D", -"J. c #EFC05D", -"K. c #F1C15E", -"L. c #E0C264", -"P. c #E5C961", -"I. c #EDC164", -"U. c #E9CD65", -"Y. c #EFD36B", -"T. c #F2C564", -"R. c #F6C868", -"E. c #F8C760", -"W. c #FBCC6A", -"Q. c #FDCB63", -"!. c #F1D56D", -"~. c #FFD06C", -"^. c #F5D972", -"/. c #FED175", -"(. c #FADE77", -"). c #E4C87A", -"_. c #FEE27C", -"`. c #8F9192", -"'. c #9A9A96", -"]. c #A79F83", -"[. c #ADA583", -"{. c #A7A399", -"}. c #BBAC86", -"|. c #BDB088", -" X c #BBB298", -".X c #A7A8A6", -"XX c #ADAEB0", -"oX c #B5B6B4", -"OX c #BABCBC", -"+X c #C6B38E", -"@X c #D3BE80", -"#X c #D0BC95", -"$X c #C6BFA6", -"%X c #C5C29D", -"&X c #D2C283", -"*X c #DAC789", -"=X c #DBCA8B", -"-X c #D5C489", -";X c #DBCD94", -":X c #D6C699", -">X c #CFC8B1", -",X c #C8C6B7", -"<X c #D1C9A6", -"1X c #DBD3BA", -"2X c #E1C981", -"3X c #E0CD91", -"4X c #ECD686", -"5X c #EBD69E", -"6X c #FED682", -"7X c #FED88B", -"8X c #FEDC95", -"9X c #E3CEA3", -"0X c #EED9A9", -"qX c #E7DCB9", -"wX c #F4DDAF", -"eX c #FFE68A", -"rX c #FFE893", -"tX c #FFEA9F", -"yX c #FFE2A5", -"uX c #FFE3AC", -"iX c #FFECA7", -"pX c #FFEDAE", -"aX c #F1E0B6", -"sX c #FDE5B4", -"dX c #FFEEB4", -"fX c #F8E5BB", -"gX c #FFF0BC", -"hX c #C5C7C8", -"jX c #C7C8CA", -"kX c #CCCECF", -"lX c #CCCAC0", -"zX c #CDCED0", -"xX c #D1D1CF", -"cX c #D1D3D4", -"vX c #D6D8DA", -"bX c #DADCDE", -"nX c #DCDEE0", -"mX c #DEE0E2", -"MX c #E7DEC2", -"NX c #EBE1C5", -"BX c #F4E9C3", -"VX c #F7EACE", -"CX c #FEEAC3", -"ZX c #FAEBCA", -"AX c #FFF1C1", -"SX c #FFF3CC", -"DX c #FFF6DA", -"FX c #E1E3E5", -"GX c #E4E6E8", -"HX c #E7E9EA", -"JX c #E8E6E0", -"KX c #E9EAEC", -"LX c #ECEEF0", -"PX c #EEF0F2", -"IX c #F8F4E8", -"UX c #F1F3F5", -"YX c None", -/* pixels */ -"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX V E <.,.T YXYXYXYXYXYX", -"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX< E 2.aXCXVXE 3 E <.E YXYX", -"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX R ,.5XCX8XQ.wX<.1.$.OX<. YXYX", -"YXYXYXYXYXYXYXYXYXYXYXYXYXYX R >.L.ZXyXT.K.E.wX ..XKXKXR YXYX", -"YXYXYXYXYXYXYXYXYXYXYXYX V E 4.ZXsXW.K.I.Z.O.{.KXUXUXMXk YXYX", -"YXYXYXYXYXYX R E 7 YX< E 2.aXsX6XC.T.Z.w.[ xXUXUXUXUX2X3 YXYX", -"YXYXYXYX R >.).5X,.T ,.5XCX8XK.T.A.a.] OXUXUXUXUXUXUX2.O YXYX", -"YXYX Y E Z.ZXsX7XsX0XCXyXR.K.I.V._ .XUXUXUXUXUXLXKXJXV D N S 7 ", -" z E 4.fXsX/.K.~./.6X~.I.I.C...'.KXUXPXPXPXLXKXGXbXl.N m.SXm.D ", -" E 0XgX7XE.W.W.~.~.R.I.Z.w.' bXUXUXUXPXPXLXmXbX$X) ~ aXSXpXBXn ", -" <.CXT.Q.~.W.W.R.I.A.t._ hXUXUXUXUXPXLXGXnX,X .t XAXSXeX4Xl.Z ", -" <.sXB.W.W.W.T.A.g._ oXUXUXUXUXUXLXLXmXcX=.5 $.BXgXeX!.D.3Xm + ", -" <.sXB.R.R.A.V.| {.KXUXUXUXUXLXKXGXvX|.c u qXdXgX^.U.f.3XH f ", -" <.sXB.T.Z.m.[ nXUXUXUXUXPXKXHXbX,X) e <XdXiX_.S.u.P.F.t.h ", -" <.sXk.Z.r.K jXUXUXUXPXLXKXmXcX@.5 %.DXiX_.Y.S.d.h.D.*Xl X ", -" <.wXq.r.X.r UXUXPXPXKXmXvX|.y _ NXdXrX!.S.d.h.d.f.=XF 4 YX", -" ,.0X5.X.) a PXPXKXGXnX>X) y >XAXAX_.S.h.h.u.s.d.F.6.g YX", -" >.9X~ } u '.LXKXmXxX .5 [.IXAX_.!.S.h.h.d.8.s.D.n.j YXYX", -" >.:XW v & kXmXvX;.t ] BXAXrX!.U.u.S.9.u.3.7.i.;XM 1 YXYXYX", -" E #Xb u : nXcX_ u 1XSXgX^.U.H.S.d.8.s.d.u.b.-XG g YXYXYXYX", -" R +Xc r a zX[.= -XdX_.U.d.P.h.d.u.3.8.N.=Xw.l 1 YXYXYXYX", -" T }.x > `.oX> %.*.S.S.h.S.7.d.h.0.p.n.c.M d . YXYXYXYXYX", -" C ].w @ XXu p *.( h.S.s.u.u.u.p.N.*X^ g + YXYXYXYXYXYX", -" Z &.e ; ` * :.o.S.S.S.u.( 9.x.&XX.j , YXYXYXYXYXYX", -" B { 0 i % [.o.u.S.d.h.9.M.&Xz.M 6 YXYXYXYXYXYXYXYX", -" z { 0 - J *./ S.9.d.i.G.&XF g O YXYXYXYXYXYXYXYXYXYX", -" z $.2 w =.! s.d.p.N.;X^ l , YXYXYXYXYXYXYXYXYXYXYX", -" B &.9 ;.Q / j.x.@Xl.m 6 YXYXYXYXYXYXYXYXYXYXYXYXYX", -" h W @.+.I y.&Xb.F 7 O YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", -" $ s %XU F.=X^ j # YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", -" g O.<Xe.l 1 YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", -" o f n d . YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" -}; diff --git a/languages/cpp/app_templates/qt4makeapp/filesave.xpm b/languages/cpp/app_templates/qt4makeapp/filesave.xpm deleted file mode 100644 index 86ea7d63..00000000 --- a/languages/cpp/app_templates/qt4makeapp/filesave.xpm +++ /dev/null @@ -1,295 +0,0 @@ -/* XPM */ -static char *filesave[] = { -/* columns rows colors chars-per-pixel */ -"32 32 257 2", -" c #000000", -". c #06060A", -"X c #09090D", -"o c #0B0B16", -"O c #101022", -"+ c #1E1E28", -"@ c #181829", -"# c #151F3A", -"$ c #1A263F", -"% c #1D2A3F", -"& c #272730", -"* c #2E2E3F", -"= c #212140", -"- c #212E41", -"; c #2F2F41", -": c #292A4A", -"> c #23224B", -", c #262353", -"< c #292655", -"1 c #2B2C54", -"2 c #2C2C5B", -"3 c #293746", -"4 c #2D304F", -"5 c #243243", -"6 c #2E315D", -"7 c #363647", -"8 c #303E4A", -"9 c #30325E", -"0 c #3C3C53", -"q c #2E2E60", -"w c #2F3160", -"e c #302E63", -"r c #313164", -"t c #363861", -"y c #353868", -"u c #384650", -"i c #284F6B", -"p c #2D547B", -"a c #3B486A", -"s c #36597D", -"d c #3D5D7C", -"f c #4C4C4C", -"g c #40405A", -"h c #414E56", -"j c #4B585E", -"k c #49545E", -"l c #555555", -"z c #4D4D6B", -"x c #434675", -"c c #4B5660", -"v c #4F5962", -"b c #41517E", -"n c #4B507D", -"m c #515C67", -"M c #505D6E", -"N c #5C5D7D", -"B c #546066", -"V c #54626D", -"C c #5B646D", -"Z c #55677A", -"A c #556B78", -"S c #5D6772", -"D c #6B6B6B", -"F c #646464", -"G c #616C73", -"H c #63707D", -"J c #6B7679", -"K c gray45", -"L c #00418E", -"P c #004494", -"I c #004894", -"U c #044F98", -"Y c #03509B", -"T c #0A5198", -"R c #13579C", -"E c #185DA1", -"W c #285888", -"Q c #2B6094", -"! c #396D9A", -"~ c #336A96", -"^ c #3D719B", -"/ c #226EB8", -"( c #326EA8", -") c #326BA3", -"_ c #3673AE", -"` c #3A76B4", -"' c #0B6FD1", -"] c #0F75D8", -"[ c #1479DA", -"{ c #1B7CDC", -"} c #466481", -"| c #42749C", -" . c #4A799E", -".. c #506A84", -"X. c #5F678D", -"o. c #576391", -"O. c #5A6592", -"+. c #5F6893", -"@. c #5B738B", -"#. c #507DA1", -"$. c #626283", -"%. c #636A94", -"&. c #656F98", -"*. c #657A8F", -"=. c #6B7299", -"-. c #717191", -";. c #797998", -":. c #687BA6", -">. c #2281DC", -",. c #3F81C0", -"<. c #3988D7", -"1. c #2785E1", -"2. c #2E8AE3", -"3. c #368FE5", -"4. c #3690E6", -"5. c #3D93E7", -"6. c #3D94E9", -"7. c #57839E", -"8. c #4787BC", -"9. c #5480A1", -"0. c #5B84A3", -"q. c #6E8496", -"w. c #6E8B9A", -"e. c #7D848E", -"r. c #728597", -"t. c #738598", -"y. c #768899", -"u. c #7B8B9B", -"i. c #6489A5", -"p. c #698EA7", -"a. c #6D8FA9", -"s. c #6E81AB", -"d. c #7683A6", -"f. c #768CB7", -"g. c #7395AD", -"h. c #7C96B0", -"j. c #4086CA", -"k. c #4986C3", -"l. c #4284C3", -"z. c #498ED2", -"x. c #4D95DB", -"c. c #548DC5", -"v. c #5D92C8", -"b. c #5593C9", -"n. c #5097DE", -"m. c #5198DE", -"M. c #4296E7", -"N. c #4895E2", -"B. c #4B99E5", -"V. c #4A9CEB", -"C. c #4599EB", -"Z. c #529DE6", -"A. c #589EE2", -"S. c #54A1EB", -"D. c #5AA1E6", -"F. c #5AA5EB", -"G. c #5EA8EF", -"H. c #53A3F1", -"J. c #5EAAF2", -"K. c #6699CB", -"L. c #799BC8", -"P. c #7EA6C9", -"I. c #60A2E5", -"U. c #65A7E8", -"Y. c #6BABE9", -"T. c #68ADF2", -"R. c #67B0F5", -"E. c #6DB3F6", -"W. c #70ADEA", -"Q. c #75B0E9", -"!. c #7CB5EB", -"~. c #73B9F8", -"^. c #7BBDFB", -"/. c #7CBAF6", -"(. c gray55", -"). c #828899", -"_. c #84949E", -"`. c #918E8A", -"'. c #949494", -"]. c #8F8FA9", -"[. c #8997A5", -"{. c #8A9AA9", -"}. c #9A9BAF", -"|. c #9399A9", -" X c #9FAAB5", -".X c #A29E9B", -"XX c #A7A7A7", -"oX c #ABABAB", -"OX c #A3A3B4", -"+X c #A8A8B7", -"@X c #A3ABB3", -"#X c #B4B5B5", -"$X c #B0B0BC", -"%X c #B7B9BC", -"&X c #BBB7B3", -"*X c #BBBBBB", -"=X c #82B1DB", -"-X c #81B7EC", -";X c #88BBED", -":X c #86BAED", -">X c #AEBBC8", -",X c #A6BDCD", -"<X c #BBBCC3", -"1X c #81C1F6", -"2X c #83C2FA", -"3X c #89C4FA", -"4X c #8CC8FC", -"5X c #95C2EF", -"6X c #93CBFD", -"7X c #9BCFFF", -"8X c #97D0FC", -"9X c #9CD3FE", -"0X c #BEC0C1", -"qX c #A3C7E7", -"wX c #A2CAF1", -"eX c #A1D4FF", -"rX c #A3D8FF", -"tX c #AADBFF", -"yX c #B0D1F2", -"uX c #BDD9F4", -"iX c #AAE0FF", -"pX c #B3E1FF", -"aX c #B9E6FF", -"sX c #BEE9FF", -"dX c #C4C4C4", -"fX c #C6C5CD", -"gX c #C6C8CB", -"hX c #CAC7C4", -"jX c #CAC8C6", -"kX c #CBCCCB", -"lX c #D1D0CE", -"zX c #D3D3D3", -"xX c #D4D7D9", -"cX c #D8D8D7", -"vX c #DBDBDB", -"bX c #C4ECFF", -"nX c #C9E0F6", -"mX c #C4F5FF", -"MX c #CCF2FF", -"NX c #D5E6F7", -"BX c #DDEBF9", -"VX c #DCFDFF", -"CX c #D3F1F5", -"ZX c #E1E0DE", -"AX c #E4E3E3", -"SX c #E4E7EA", -"DX c #E7E8E9", -"FX c #E8E6E4", -"GX c #EDE9E5", -"HX c #EBEBEB", -"JX c #E7EEF5", -"KX c #EAF2FA", -"LX c #F1EEEA", -"PX c #F3F3F3", -"IX c #F4F8FC", -"UX c #FDFDFC", -"YX c None", -/* pixels */ -"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXy y e 6 6 2 < < , , 1 YXYX", -"YXYXYX2 < , , q w 2 e r r r w e w r e 2 6 1 6 s :.f.L.y YXYX", -"YXYXYXx d.s.:.a # $ $ % - 5 3 8 u h k B S J ).,XF.b.7.r YXYX", -"YXYXYX&.mX~.8.V #X#X%XdXfXzXxXvXZXZXDXFXFXDXLXDX>.U i 9 YXYX", -"YXYXYXo.2X] L C UXDXcXzXkXkXkXjXjXdXdX%X%X&X%X*XN.' ~ 6 YXYX", -"YXYXYXo.1X] P k hXoXXXXXoXoX#X#X*X%X&X%X%XdXkXxXx.[ ~ 6 YXYX", -"YXYXYXO.3X[ I m FXkXjXjXkXkXkXkXkXkXzXzXzXcXZXSXx.{ ! 6 YXYX", -"YXYXYXo.3X{ I S UXvXxXzXkXkXkXkXkXjXdX*X%X#X&X%XZ.1.^ 9 YXYX", -"YXYXYXO.4X>.U j jX#X#X#X%XdXdXkXzXkXzXzXcXvXDXJXA.1.| 6 YXYX", -"YXYXYXO.6X>.T V PXZXZXZXAXSXDXDXFXHXDXHXHXHXHXSXI.2.| 9 YXYX", -"YXYXYXO.6X2.T G UXLXDXDXAXZXZXAXZXvXcXzXkXkXkXgXY.3. .6 YXYX", -"YXYXYXO.9X4.R m zXdXdXkXzXvXAXDXHXLXPXPXIXUXUXUXQ.6. .9 YXYX", -"YXYXYXO.9X5.R H UXIXUXUXUXUXUXUXUXUXUXUXIXKXJXBX-XC.#.9 YXYX", -"YXYXYXO.eXM./ h.UXUXIXKXBXNXnXuXyXwX5X:X!.Y.Y.Y.D.H.9.6 YXYX", -"YXYXYX+.rXB.<.x.Q.;X-XQ.Y.U.U.D.Z.Z.B.B.C.V.V.B.B.T.0.9 YXYX", -"YXYXYX+.tXB.N.B.B.B.B.C.V.V.H.H.H.D.N.z.8._ ( <.D.R.0.9 YXYX", -"YXYXYX+.tXS.Z.F.D.m.z.l.` ) Q W p s } @.r.[. X>XG.E.0.9 YXYX", -"YXYXYX+.pXU.m.) p d ..*.u.|.+X<XzXZXGXLXGXZXzXjX/.~.p.r YXYX", -"YXYXYX%.aXT.k.*.GXlX&X.X`..XhXlXzXvXvXvXvXxXkXgX2X^.a.w YXYX", -"YXYXYX%.aXE.k.r.LXoXl f l F *XlXzXvXvXvXvXcXzXgX4X:Xa.w YXYX", -"YXYXYX%.bX~.c.y.LX'.f D K D 0XkXzXvXvXvXvXvXzXfX6X4Xg.9 YXYX", -"YXYXYX%.bX^.c.y.LX'.l D K D 0XlXzXcXvXvXvXxXkXkX9X6Xw.r YXYX", -"YXYXYX%.bX2Xv.u.LX'.l K K K 0XlXzXcXvXvXvXvXkXfX9XP.M = YXYX", -"YXYXYX%.bX2XK.u.LX'.l K K D 0XlXxXcXvXZXvXxXzXkXqXZ : . YXYX", -"YXYXYX%.MX6XK.u.LX'.f F D D 0XkXzXcXvXvXvXvXcXkX_.: o YXYX", -"YXYXYX%.MX6XK.u.LXXX(.XX&XdXkXzXvXZXDXAXzX<X+X}.N O YXYX", -"YXYXYX%.VXiX=X{.FXzXkXkXjXdX<X$XOX].;.$.z 0 7 & X YXYXYX", -"YXYXYX=.CXq.A ).fX+X|.).-.N z 0 * + o YXYXYXYX", -"YXYXYXn $.t 6 , 4 0 * + . YXYXYXYXYXYX", -"YXYXYX> @ o YXYXYXYXYXYXYXYXYXYXYXYX", -"YXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", -"YXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" -}; diff --git a/languages/cpp/app_templates/qt4makeapp/main.cpp b/languages/cpp/app_templates/qt4makeapp/main.cpp deleted file mode 100644 index 55f24795..00000000 --- a/languages/cpp/app_templates/qt4makeapp/main.cpp +++ /dev/null @@ -1,14 +0,0 @@ -%{CPP_TEMPLATE} - -#include <TQApplication> -#include "%{APPNAMELC}.h" - -int main(int argc, char *argv[]) -{ - TQ_INIT_RESOURCE(application); - TQApplication app(argc, argv); - %{APPNAME} * mw = new %{APPNAME}(); - mw->show(); - return app.exec(); -} - diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp b/languages/cpp/app_templates/qt4makeapp/qt4makeapp deleted file mode 100644 index 2d69a161..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp +++ /dev/null @@ -1,11 +0,0 @@ -# QMake application -[General] -Name=Qt4/QMake Application - -Comment=Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4 - -Category=C++/QMake project - -Icon=qt4makeapp.png -FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=src/APPNAMELC.cpp diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp deleted file mode 100644 index c3a8964f..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp +++ /dev/null @@ -1,285 +0,0 @@ -%{CPP_TEMPLATE} - -#include <TQtGui> -#include "%{APPNAMELC}.h" - -#include <TQTextEdit> -#include <TQTextStream> -#include <TQCloseEvent> -#include <TQFileDialog> - -%{APPNAME}::%{APPNAME}() -{ - textEdit = new TQTextEdit; - setCentralWidget(textEdit); - - createActions(); - createMenus(); - createToolBars(); - createStatusBar(); - - readSettings(); - - connect(textEdit->document(), TQT_SIGNAL(contentsChanged()), - this, TQT_SLOT(documentWasModified())); - - setCurrentFile(""); -} - -void %{APPNAME}::closeEvent(TQCloseEvent *event) -{ - if (maybeSave()) { - writeSettings(); - event->accept(); - } else { - event->ignore(); - } -} - -void %{APPNAME}::newFile() -{ - if (maybeSave()) { - textEdit->clear(); - setCurrentFile(""); - } -} - -void %{APPNAME}::open() -{ - if (maybeSave()) { - TQString fileName = TQFileDialog::getOpenFileName(this); - if (!fileName.isEmpty()) - loadFile(fileName); - } -} - -bool %{APPNAME}::save() -{ - if (curFile.isEmpty()) { - return saveAs(); - } else { - return saveFile(curFile); - } -} - -bool %{APPNAME}::saveAs() -{ - TQString fileName = TQFileDialog::getSaveFileName(this); - if (fileName.isEmpty()) - return false; - - return saveFile(fileName); -} - -void %{APPNAME}::about() -{ - TQMessageBox::about(this, tr("About Application"), - tr("The <b>Application</b> example demonstrates how to " - "write modern GUI applications using TQt, with a menu bar, " - "toolbars, and a status bar.")); -} - -void %{APPNAME}::documentWasModified() -{ - setWindowModified(true); -} - -void %{APPNAME}::createActions() -{ - 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(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(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())); - - saveAsAct = new TQAction(tr("Save &As..."), this); - saveAsAct->setStatusTip(tr("Save the document under a new name")); - connect(saveAsAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(saveAs())); - - exitAct = new TQAction(tr("E&xit"), this); - exitAct->setShortcut(tr("Ctrl+Q")); - exitAct->setStatusTip(tr("Exit the application")); - connect(exitAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(close())); - - 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(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(TQIcon(":/editpaste.xpm"), tr("&Paste"), this); - pasteAct->setShortcut(tr("Ctrl+V")); - pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " - "selection")); - connect(pasteAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(paste())); - - aboutAct = new TQAction(tr("&About"), this); - aboutAct->setStatusTip(tr("Show the application's About box")); - connect(aboutAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(about())); - - 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); - connect(textEdit, TQT_SIGNAL(copyAvailable(bool)), - cutAct, TQT_SLOT(setEnabled(bool))); - connect(textEdit, TQT_SIGNAL(copyAvailable(bool)), - copyAct, TQT_SLOT(setEnabled(bool))); -} - -void %{APPNAME}::createMenus() -{ - fileMenu = menuBar()->addMenu(tr("&File")); - fileMenu->addAction(newAct); - fileMenu->addAction(openAct); - fileMenu->addAction(saveAct); - fileMenu->addAction(saveAsAct); - fileMenu->addSeparator(); - fileMenu->addAction(exitAct); - - editMenu = menuBar()->addMenu(tr("&Edit")); - editMenu->addAction(cutAct); - editMenu->addAction(copyAct); - editMenu->addAction(pasteAct); - - menuBar()->addSeparator(); - - helpMenu = menuBar()->addMenu(tr("&Help")); - helpMenu->addAction(aboutAct); - helpMenu->addAction(aboutTQtAct); -} - -void %{APPNAME}::createToolBars() -{ - fileToolBar = addToolBar(tr("File")); - fileToolBar->addAction(newAct); - fileToolBar->addAction(openAct); - fileToolBar->addAction(saveAct); - - editToolBar = addToolBar(tr("Edit")); - editToolBar->addAction(cutAct); - editToolBar->addAction(copyAct); - editToolBar->addAction(pasteAct); -} - -void %{APPNAME}::createStatusBar() -{ - statusBar()->showMessage(tr("Ready")); -} - -void %{APPNAME}::readSettings() -{ - TQSettings settings("Trolltech", "Application Example"); - TQPoint pos = settings.value("pos", TQPoint(200, 200)).toPoint(); - TQSize size = settings.value("size", TQSize(400, 400)).toSize(); - resize(size); - move(pos); -} - -void %{APPNAME}::writeSettings() -{ - TQSettings settings("Trolltech", "Application Example"); - settings.setValue("pos", pos()); - settings.setValue("size", size()); -} - -bool %{APPNAME}::maybeSave() -{ - if (textEdit->document()->isModified()) { - int ret = TQMessageBox::warning(this, tr("Application"), - tr("The document has been modified.\n" - "Do you want to save your changes?"), - TQMessageBox::Yes | TQMessageBox::Default, - TQMessageBox::No, - TQMessageBox::Cancel | TQMessageBox::Escape); - if (ret == TQMessageBox::Yes) - return save(); - else if (ret == TQMessageBox::Cancel) - return false; - } - return true; -} - -void %{APPNAME}::loadFile(const TQString &fileName) -{ - TQFile file(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())); - return; - } - - TQTextStream in(&file); - TQApplication::setOverrideCursor(TQt::WaitCursor); - textEdit->setPlainText(in.readAll()); - TQApplication::restoreOverrideCursor(); - - setCurrentFile(fileName); - statusBar()->showMessage(tr("File loaded"), 2000); -} - -bool %{APPNAME}::saveFile(const TQString &fileName) -{ - TQFile file(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())); - return false; - } - - TQTextStream out(&file); - TQApplication::setOverrideCursor(TQt::WaitCursor); - out << textEdit->toPlainText(); - TQApplication::restoreOverrideCursor(); - - setCurrentFile(fileName); - statusBar()->showMessage(tr("File saved"), 2000); - return true; -} - -void %{APPNAME}::setCurrentFile(const TQString &fileName) -{ - curFile = fileName; - textEdit->document()->setModified(false); - setWindowModified(false); - - TQString shownName; - if (curFile.isEmpty()) - shownName = "untitled.txt"; - else - shownName = strippedName(curFile); - - setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application"))); -} - -TQString %{APPNAME}::strippedName(const TQString &fullFileName) -{ - return TQFileInfo(fullFileName).fileName(); -} - -%{APPNAME}::~%{APPNAME}() -{ - -} - diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h deleted file mode 100644 index 99a979cf..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h +++ /dev/null @@ -1,66 +0,0 @@ -%{H_TEMPLATE} - -#ifndef %{APPNAMEUC}_H -#define %{APPNAMEUC}_H - -#include <TQMainWindow> -#include <TQCloseEvent> - -class TQAction; -class TQMenu; -class TQTextEdit; - -class %{APPNAME}:public TQMainWindow -{ - Q_OBJECT - - -public: - %{APPNAME}(); - ~%{APPNAME}(); - -protected: - void closeEvent(TQCloseEvent *event); - -private slots: - void newFile(); - void open(); - bool save(); - bool saveAs(); - void about(); - void documentWasModified(); - -private: - void createActions(); - void createMenus(); - void createToolBars(); - void createStatusBar(); - void readSettings(); - void writeSettings(); - bool maybeSave(); - void loadFile(const TQString &fileName); - bool saveFile(const TQString &fileName); - void setCurrentFile(const TQString &fileName); - TQString strippedName(const TQString &fullFileName); - - TQTextEdit *textEdit; - TQString curFile; - - TQMenu *fileMenu; - TQMenu *editMenu; - TQMenu *helpMenu; - TQToolBar *fileToolBar; - TQToolBar *editToolBar; - TQAction *newAct; - TQAction *openAct; - TQAction *saveAct; - TQAction *saveAsAct; - TQAction *exitAct; - TQAction *cutAct; - TQAction *copyAct; - TQAction *pasteAct; - TQAction *aboutAct; - TQAction *aboutTQtAct; -}; - -#endif diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop deleted file mode 100644 index 74dee1ae..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0"?> -<kdevelop> - <general> - <author>%{AUTHOR}</author> - <email>%{EMAIL}</email> - <version>%{VERSION}</version> - <projectmanagement>KDevTrollProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - </keywords> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*" name="Others" /> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - </tree> - </kdevfileview> - <kdevcppsupport> - <qt> - <used>true</used> - <version>4</version> - <includestyle>4</includestyle> - <designerintegration>ExternalDesigner</designerintegration> - <qmake>%{QMAKE}</qmake> - <designer>%{DESIGNER}</designer> - </qt> - </kdevcppsupport> - <kdevdoctreeview> - <ignoretocs> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>qt-kdev3</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoredoxygen> - <toc>TDE Libraries (Doxygen)</toc> - </ignoredoxygen> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell/> - <breakpoints/> - <programargs></programargs> - <gdbpath>/usr/bin/gdb</gdbpath> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - </display> - <breakpoints/> - </kdevdebugger> - <kdevtrollproject> - <run> - <mainprogram>./bin/%{APPNAMELC}</mainprogram> - <programargs/> - </run> - </kdevtrollproject> - <workspace> - <openfiles/> - </workspace> - <kdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - <type ext="ts" /> - <type ext="qrc" /> - </useglobaltypes> - </kdevfilecreate> - <kdevdocumentation> - <projectdoc> - <docsystem>Doxygen Documentation Collection</docsystem> - <docurl>%{APPNAMELC}.tag</docurl> - </projectdoc> - </kdevdocumentation> -</kdevelop> diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate deleted file mode 100644 index c1c0fb90..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate +++ /dev/null @@ -1,104 +0,0 @@ -# TDE Config File -[General] -Name=Qt4 Application - -Comment=Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4 - -Category=C++/QMake project - -Icon=qt4makeapp.png -FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp,%{dest}/src/ReadMe -Archive=qt4makeapp.tar.gz - -[FILE1] -Type=install -Source=%{src}/qt4makeapp.kdevelop -Dest=%{dest}/%{APPNAMELC}.kdevelop - -[FILE2] -Type=install -Source=%{src}/qt4makeapp.pro -Dest=%{dest}/%{APPNAMELC}.pro - -[MkDir1] -Type=mkdir -Dir=%{dest}/src - -[FILE3] -Type=install -Source=%{src}/src.pro -Dest=%{dest}/src/src.pro - -[FILE4] -Type=install -Source=%{src}/main.cpp -Dest=%{dest}/src/main.cpp - -[FILE5] -Type=install -Source=%{src}/qt4makeapp.cpp -Dest=%{dest}/src/%{APPNAMELC}.cpp - -[FILE6] -Type=install -Source=%{src}/qt4makeapp.h -Dest=%{dest}/src/%{APPNAMELC}.h - -[FILE7] -Type=install -Source=%{src}/fileopen.xpm -Dest=%{dest}/src/fileopen.xpm - -[FILE8] -Type=install -Source=%{src}/filesave.xpm -Dest=%{dest}/src/filesave.xpm - -[FILE9] -Type=install -Source=%{src}/filenew.xpm -Dest=%{dest}/src/filenew.xpm - -[FILE10] -Type=install -Source=%{src}/editcopy.xpm -Dest=%{dest}/src/editcopy.xpm - -[FILE11] -Type=install -Source=%{src}/editpaste.xpm -Dest=%{dest}/src/editpaste.xpm - -[FILE12] -Type=install -Source=%{src}/editcut.xpm -Dest=%{dest}/src/editcut.xpm - -[FILE13] -Type=install -Source=%{src}/application.qrc -Dest=%{dest}/src/application.qrc - -[FILE14] -Type=install -Source=%{src}/ReadMe -Dest=%{dest}/src/ReadMe - -[MSG] -Type=message -Comment=A Qt4/Qmake based application was created in %{dest} - -[QMAKE] -Type=value -ValueType=QString -Value=QMAKE -Comment=Absolute Path for QMake (Qt4). -Default= - -[DESIGNER] -Type=value -ValueType=QString -Value=DESIGNER -Comment=Absolute Path for Designer (Qt4). -Default= diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.png b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.png Binary files differdeleted file mode 100644 index d874d54e..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.png +++ /dev/null diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.pro b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.pro deleted file mode 100644 index 7177d225..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.pro +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS += src -TEMPLATE = subdirs -CONFIG += warn_on \ - qt \ - thread
\ No newline at end of file diff --git a/languages/cpp/app_templates/qt4makeapp/src.pro b/languages/cpp/app_templates/qt4makeapp/src.pro deleted file mode 100644 index fa8baae6..00000000 --- a/languages/cpp/app_templates/qt4makeapp/src.pro +++ /dev/null @@ -1,10 +0,0 @@ -SOURCES += %{APPNAMELC}.cpp \ - main.cpp -HEADERS += %{APPNAMELC}.h -TEMPLATE = app -CONFIG += warn_on \ - thread \ - qt -TARGET = %{APPNAMELC} -DESTDIR = ../bin -RESOURCES = application.qrc diff --git a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt deleted file mode 100644 index 2d708608..00000000 --- a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -set( _tarball_desktops example.desktop ) -set( _tarball_files - Example.png app.kdevelop example.html - main.cpp Makefile.am app.pro example.cpp example.h - examplebase.ui -) -set( _tarball_content ${_tarball_desktops} ${_tarball_files} ) -list( SORT _tarball_content ) - -tde_create_translated_desktop( - SOURCE ${_tarball_desktops} - DESTINATION - - PO_DIR tdevelop-desktops -) - -file( - COPY ${_tarball_files} - DESTINATION ${CMAKE_CURRENT_BINARY_DIR} -) - -tde_create_tarball( - TARGET qtopia4app.tar.gz - SOURCEDIR ${CMAKE_CURRENT_BINARY_DIR} - FILES ${_tarball_content} -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/qtopia4app.tar.gz qtopia4app.png - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) - - -tde_create_translated_desktop( - SOURCE qtopia4app.kdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates - KEYWORDS Category - PO_DIR tdevelop-desktops -) diff --git a/languages/cpp/app_templates/qtopia4app/Example.png b/languages/cpp/app_templates/qtopia4app/Example.png Binary files differdeleted file mode 100644 index 9d1a807d..00000000 --- a/languages/cpp/app_templates/qtopia4app/Example.png +++ /dev/null diff --git a/languages/cpp/app_templates/qtopia4app/Makefile.am b/languages/cpp/app_templates/qtopia4app/Makefile.am deleted file mode 100644 index 57785690..00000000 --- a/languages/cpp/app_templates/qtopia4app/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -dataFiles = Example.png app.kdevelop example.desktop \ - example.html main.cpp Makefile.am app.pro example.cpp \ - example.h examplebase.ui - -templateName = qtopia4app - -### no need to change below: -template_DATA = $(templateName).kdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/kdevappwizard -$(templateName).tar.gz: ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - gzip -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz ${templateName}.png - -CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/qtopia4app/app.kdevelop b/languages/cpp/app_templates/qtopia4app/app.kdevelop deleted file mode 100644 index f7e4a952..00000000 --- a/languages/cpp/app_templates/qtopia4app/app.kdevelop +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0"?> -<kdevelop> - <general> - <author>%{AUTHOR}</author> - <email>%{EMAIL}</email> - <version>%{VERSION}</version> - <projectmanagement>KDevTrollProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - </keywords> - <ignoreparts/> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*" name="Others" /> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoredoxygen> - <toc>TDE Libraries (Doxygen)</toc> - </ignoredoxygen> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs></programargs> - <gdbpath></gdbpath> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - </display> - </kdevdebugger> - <kdevtrollproject> - <general> - <activedir></activedir> - </general> - <run> - <mainprogram>./%{APPNAMELC}</mainprogram> - <programargs>-qws</programargs> - <envvars> - <envvar value="/opt/Qtopia/SDK/4.2.4/x86" name="QPEDIR" /> - <envvar value="$QPEDIR/qtopiacore/target" name="TQTDIR" /> - <envvar value="/opt/Qtopia/SDK/4.2.4/x86/lib:/opt/Qtopia/SDK/4.2.4/x86/qtopiacore/target/lib:$LD_LIBRARY_PATH" name="LD_LIBRARY_PATH" /> - <envvar value="$PATH:/opt/Qtopia/SDK/scripts:/opt/Qtopia/SDK/4.2.4/x86/bin:/opt/Qtopia/SDK/4.2.4/x86/scripts" name="PATH" /> - - </envvars> - </run> - <envvars/> - <make> - <abortonerror>true</abortonerror> - <runmultiplejobs>false</runmultiplejobs> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin></makebin> - <prio>0</prio> - <envvars> - <envvar value="/opt/Qtopia/SDK/4.2.4/x86" name="QPEDIR" /> - <envvar value="/opt/Qtopia/SDK/4.2.4/x86/qtopiacore/target" name="TQTDIR" /> - <envvar value="$PATH:/opt/Qtopia/SDK/scripts:/opt/Qtopia/SDK/4.2.4/x86/bin:/opt/Qtopia/SDK/4.2.4/x86/scripts" name="PATH" /> - </envvars> - </make> - </kdevtrollproject> - <kdevfilecreate> - <filetypes/> - <useglobaltypes/> - </kdevfilecreate> - <cppsupportpart> - <codecompletion> - <codehinting outputview="1" enablech="0" selectview="0" /> - </codecompletion> - <classstore> - <enablepcs>false</enablepcs> - <enablepp>false</enablepp> - <preparsing/> - </classstore> - <filetemplates> - <choosefiles>false</choosefiles> - <interfaceURL></interfaceURL> - <implementationURL></implementationURL> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - <lowercasefilenames>true</lowercasefilenames> - </filetemplates> - </cppsupportpart> - <kdevclassview> - <folderhierarchy>true</folderhierarchy> - <depthoffolders>2</depthoffolders> - </kdevclassview> - <kdevcvs> - <cvsoptions>-f</cvsoptions> - <commitoptions></commitoptions> - <updateoptions>-dP</updateoptions> - <addoptions></addoptions> - <removeoptions>-f</removeoptions> - <diffoptions>-u3 -p</diffoptions> - <logoptions></logoptions> - <rshoptions></rshoptions> - </kdevcvs> - <kdevdocumentation> - <projectdoc> - <docsystem>Doxygen Documentation Collection</docsystem> - <docurl>%{APPNAMELC}.tag</docurl> - </projectdoc> - </kdevdocumentation> - <kdevcppsupport> - <qt> - <used>true</used> - <version>4</version> - <includestyle>4</includestyle> - <root>/usr/lib/qt3</root> - <designerintegration>ExternalDesigner</designerintegration> - <qmake>/opt/Qtopia/SDK/4.2.4/x86/bin/qtopiamake</qmake> - <designer>/opt/Qtopia/SDK/4.2.4/x86/bin/designer</designer> - <designerpluginpaths/> - </qt> - </kdevcppsupport> -</kdevelop> diff --git a/languages/cpp/app_templates/qtopia4app/app.pro b/languages/cpp/app_templates/qtopia4app/app.pro deleted file mode 100644 index 05a0bb9c..00000000 --- a/languages/cpp/app_templates/qtopia4app/app.pro +++ /dev/null @@ -1,31 +0,0 @@ -qtopia_project(qtopia app) # see buildsystem.html for more project keywords -TARGET=%{APPNAMELC} -CONFIG+=qtopia_main -CONFIG+=no_singleexec -CONFIG+=no_quicklaunch -CONFIG+=no_tr - -FORMS=%{APPNAMELC}base.ui -HEADERS=%{APPNAMELC}.h -SOURCES=main.cpp %{APPNAMELC}.cpp - -desktop.files=%{APPNAMELC}.desktop -desktop.path=/apps/Applications -desktop.hint=desktop - -pics.files=pics/* -pics.path=/pics/%{APPNAMELC} -pics.hint=pics - -help.source=help -help.files=%{APPNAME}.html -help.hint=help - -INSTALLS+=desktop pics help - -pkg.name=%{APPNAME} -pkg.desc=%{APPNAME} Application -pkg.version=1.0.0-1 -pkg.maintainer=%{AUTHOR} %{EMAIL} -pkg.license=GPL -pkg.domain=window diff --git a/languages/cpp/app_templates/qtopia4app/example.cpp b/languages/cpp/app_templates/qtopia4app/example.cpp deleted file mode 100644 index 735f7e03..00000000 --- a/languages/cpp/app_templates/qtopia4app/example.cpp +++ /dev/null @@ -1,40 +0,0 @@ - -#include "%{APPNAMELC}.h" -#include <tqpushbutton.h> - -%{APPNAME}Base::%{APPNAME}Base( TQWidget *parent, TQt::WFlags f ) - : TQWidget( parent, f ) -{ - setupUi( this ); -} - -%{APPNAME}Base::~%{APPNAME}Base() -{ -} - -/* - * Constructs a %{APPNAME} which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' - */ -%{APPNAME}::%{APPNAME}( TQWidget *parent, TQt::WFlags f ) - : %{APPNAME}Base( parent, f ) -{ - connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); -} - -/* - * Destroys the object and frees any allocated resources - */ -%{APPNAME}::~%{APPNAME}() -{ - // no need to delete child widgets, TQt does it all for us -} - -/* - * A simple slot... not very interesting. - */ -void %{APPNAME}::goodBye() -{ - close(); -} - diff --git a/languages/cpp/app_templates/qtopia4app/example.desktop b/languages/cpp/app_templates/qtopia4app/example.desktop deleted file mode 100644 index 813ef2ec..00000000 --- a/languages/cpp/app_templates/qtopia4app/example.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=%{APPNAME} - -Comment=An %{APPNAME} Program - -Exec=%{APPNAMELC} -Icon=%{APPNAME} -Type=Application diff --git a/languages/cpp/app_templates/qtopia4app/example.h b/languages/cpp/app_templates/qtopia4app/example.h deleted file mode 100644 index f6e3c548..00000000 --- a/languages/cpp/app_templates/qtopia4app/example.h +++ /dev/null @@ -1,25 +0,0 @@ - -#ifndef %{APPNAMEUC}_H -#define %{APPNAMEUC}_H -#include "ui_%{APPNAMELC}base.h" - -class %{APPNAME}Base : public TQWidget, public Ui_%{APPNAME}Base -{ -public: - %{APPNAME}Base( TQWidget *parent = 0, TQt::WFlags f = 0 ); - virtual ~%{APPNAME}Base(); -}; - -class %{APPNAME} : public %{APPNAME}Base -{ - Q_OBJECT - -public: - %{APPNAME}( TQWidget *parent = 0, TQt::WFlags f = 0 ); - virtual ~%{APPNAME}(); - -private slots: - void goodBye(); -}; - -#endif // %{APPNAMEUC}_H diff --git a/languages/cpp/app_templates/qtopia4app/example.html b/languages/cpp/app_templates/qtopia4app/example.html deleted file mode 100644 index 9bcae99d..00000000 --- a/languages/cpp/app_templates/qtopia4app/example.html +++ /dev/null @@ -1,15 +0,0 @@ -<html> -<h1>%{APPNAME}</h1> - -<p>This is the help for the %{APPNAME} program. - -<p>To user this application: - -<ol> - <li>Press the <img width=12 height=12 src=%{APPNAME}.png> icon in the TQtopia launcher. - <li>Read the label. - <li>Press the button. - <li>Read the source code provided. -</ol> - -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 deleted file mode 100644 index 107d4e96..00000000 --- a/languages/cpp/app_templates/qtopia4app/examplebase.ui +++ /dev/null @@ -1,44 +0,0 @@ -<ui version="4.0" stdsetdef="1" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>%{APPNAME}Base</class> - <widget class="TQWidget" name="%{APPNAME}Base" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>196</width> - <height>245</height> - </rect> - </property> - <property name="windowTitle" > - <string>%{APPNAME}</string> - </property> - <layout class="TQVBoxLayout" > - <property name="margin" > - <number>11</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="TQLabel" name="TextLabel1" > - <property name="text" > - <string>This is just an %{APPNAME}. It doesn't do anything interesting at all.</string> - </property> - <property name="wordWrap" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="TQPushButton" name="quit" > - <property name="text" > - <string>Quit</string> - </property> - </widget> - </item> - </layout> - </widget> -</ui> diff --git a/languages/cpp/app_templates/qtopia4app/main.cpp b/languages/cpp/app_templates/qtopia4app/main.cpp deleted file mode 100644 index b4ccc5ca..00000000 --- a/languages/cpp/app_templates/qtopia4app/main.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -#include "%{APPNAMELC}.h" -#include <tqtopia/tqtopiaapplication.h> - -TQTOPIA_ADD_APPLICATION("%{APPNAMELC}", %{APPNAME}) -TQTOPIA_MAIN - diff --git a/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate b/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate deleted file mode 100644 index 6f4fbf08..00000000 --- a/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate +++ /dev/null @@ -1,87 +0,0 @@ -# TDE Config File -[General] -Name=Qtopia 4 Application - -Comment=Generate a Qmake/Qt based application for Qtopia 4.x - -Category=C++/Embedded - -Icon=qmakeapp4.png -FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}.cpp -Archive=qtopia4app.tar.gz - -[MkDir0] -Type=mkdir -Dir=%{dest}/help - -[MkDir1] -Type=mkdir -Dir=%{dest}/help/html - -[FILE1] -Type=install -EscapeXML=true -Source=%{src}/app.kdevelop -Dest=%{dest}/%{APPNAMELC}.kdevelop - -[FILE2] -Type=install -Source=%{src}/Example.png -Dest=%{dest}/%{APPNAME}.png -Process=false - -[FILE3] -Type=install -Source=%{src}/app.pro -Dest=%{dest}/%{APPNAMELC}.pro - -[FILE4] -Type=install -Source=%{src}/example.cpp -Dest=%{dest}/%{APPNAMELC}.cpp - -[FILE5] -Type=install -Source=%{src}/example.h -Dest=%{dest}/%{APPNAMELC}.h - -[FILE6] -Type=install -EscapeXML=true -Source=%{src}/examplebase.ui -Dest=%{dest}/%{APPNAMELC}base.ui - -[FILE7] -Type=install -Source=%{src}/example.desktop -Dest=%{dest}/%{APPNAMELC}.desktop - -[FILE8] -Type=install -EscapeXML=true -Source=%{src}/example.html -Dest=%{dest}/%{APPNAMELC}.html - -[FILE9] -Type=install -Source=%{src}/main.cpp -Dest=%{dest}/main.cpp - -[MSG] -Type=message -Comment=A Qtopia application was created in %{dest} - -[QMAKE] -Type=value -ValueType=QString -Value=QMAKE -Comment=Absolute Path for QMake (Qt4). -Default=/opt/Qtopia/SDK/4.2.4/x86/bin/qtopiamake - -[DESIGNER] -Type=value -ValueType=QString -Value=DESIGNER -Comment=Absolute Path for Designer (Qt4). -Default=/opt/Qtopia/SDK/4.2.4/x86/bin/designer diff --git a/languages/cpp/app_templates/qtopia4app/qtopia4app.png b/languages/cpp/app_templates/qtopia4app/qtopia4app.png Binary files differdeleted file mode 100644 index 1107719a..00000000 --- a/languages/cpp/app_templates/qtopia4app/qtopia4app.png +++ /dev/null diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp index d68f6c6d..f03ea5c3 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.cpp +++ b/languages/cpp/app_templates/qtopiaapp/example.cpp @@ -9,7 +9,7 @@ %{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) : %{APPNAME}Base( parent, name, fl ) { - connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); + connect(quit, TQ_SIGNAL(clicked()), this, TQ_SLOT(goodBye())); } /* diff --git a/languages/cpp/app_templates/qtopiaapp/example.h b/languages/cpp/app_templates/qtopiaapp/example.h index eca9c039..af32c7e7 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.h +++ b/languages/cpp/app_templates/qtopiaapp/example.h @@ -5,7 +5,7 @@ class %{APPNAME} : public %{APPNAME}Base { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/tdecmodule/module.h b/languages/cpp/app_templates/tdecmodule/module.h index 44ed3540..58622984 100644 --- a/languages/cpp/app_templates/tdecmodule/module.h +++ b/languages/cpp/app_templates/tdecmodule/module.h @@ -8,7 +8,7 @@ class %{APPNAME}: public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp index 1aab14b5..ce638d20 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.cpp +++ b/languages/cpp/app_templates/tdeconfig35/app.cpp @@ -34,10 +34,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -47,14 +47,14 @@ void %{APPNAMELC}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, - m_view, TQT_SLOT(switchColors()), + m_view, TQ_SLOT(switchColors()), actionCollection(), "switch_action"); setupGUI(); @@ -75,7 +75,7 @@ void %{APPNAMELC}::optionsPreferences() // to the names of the variables in the .kcfg file TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/tdeconfig35/app.h b/languages/cpp/app_templates/tdeconfig35/app.h index b090428f..7e9825ab 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.h +++ b/languages/cpp/app_templates/tdeconfig35/app.h @@ -25,7 +25,7 @@ class KURL; */ class %{APPNAMELC} : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/tdeconfig35/appview.h b/languages/cpp/app_templates/tdeconfig35/appview.h index a486ec43..20e010d0 100644 --- a/languages/cpp/app_templates/tdeconfig35/appview.h +++ b/languages/cpp/app_templates/tdeconfig35/appview.h @@ -21,7 +21,7 @@ class KURL; */ class %{APPNAMELC}View : public %{APPNAMELC}view_base { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h index 7397dafc..bdc6b945 100644 --- a/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h +++ b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h @@ -12,7 +12,7 @@ class TQStringList; class %{APPNAME}Plugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp index 0d2bf1ff..168cd8c4 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp @@ -38,10 +38,10 @@ extern "C" { /// @todo //Connect your signals and slots here to configure the screen saver. - connect( OkayPushButton, TQT_SIGNAL( released() ), - TQT_SLOT( slotOkPressed() ) ); - connect( CancelPushButton, TQT_SIGNAL( released() ), - TQT_SLOT( slotCancelPressed() ) ); + connect( OkayPushButton, TQ_SIGNAL( released() ), + TQ_SLOT( slotOkPressed() ) ); + connect( CancelPushButton, TQ_SIGNAL( released() ), + TQ_SLOT( slotCancelPressed() ) ); } diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h index e066852a..9557e4c1 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h @@ -8,7 +8,7 @@ class %{APPNAME} : public KScreenSaver { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}( WId drawable ); @@ -20,7 +20,7 @@ private: class %{APPNAME}Setup : public %{APPNAME}UI { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Setup( TQWidget *parent = NULL, const char *name = NULL ); diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index a4ad9fed..a111acde 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -182,14 +182,14 @@ public: { SafeString s( fileName.ascii() ); TQMutexLocker locker( &m_mutex ); - m_fileList.push_front( tqMakePair( s, readFromDisk ) ); + m_fileList.push_front( qMakePair( s, readFromDisk ) ); } void push_back( const TQString& fileName, bool readFromDisk = false ) { SafeString s( fileName.ascii() ); TQMutexLocker locker( &m_mutex ); - m_fileList.push_back( tqMakePair( s, readFromDisk ) ); + m_fileList.push_back( qMakePair( s, readFromDisk ) ); } void pop_front() diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 569db783..abd282f4 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -64,15 +64,15 @@ CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const ch : CCConfigWidgetBase( parent, name ) { m_pPart = part; - connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogRegistered( Catalog* ) ), - this, TQT_SLOT( catalogRegistered( Catalog* ) ) ); - connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogUnregistered( Catalog* ) ), - this, TQT_SLOT( catalogUnregistered( Catalog* ) ) ); + connect( m_pPart->codeRepository(), TQ_SIGNAL( catalogRegistered( Catalog* ) ), + this, TQ_SLOT( catalogRegistered( Catalog* ) ) ); + connect( m_pPart->codeRepository(), TQ_SIGNAL( catalogUnregistered( Catalog* ) ), + this, TQ_SLOT( catalogUnregistered( Catalog* ) ) ); - connect( m_qtDir, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SLOT(isValidTQtDir(const TQString &))); - connect( m_qtDir, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(isValidTQtDir(const TQString &))); + connect( m_qtDir, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SLOT(isValidTQtDir(const TQString &))); + connect( m_qtDir, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(isValidTQtDir(const TQString &))); initGeneralTab( ); initTQtTab(); @@ -401,39 +401,15 @@ void CCConfigWidget::initTQtTab() c->init(); m_qtUsed->setChecked( c->isUsed() ); - if( c->version() == 4 ) - { - m_versionQt4->setChecked( true ); - m_kdevembedded->setEnabled( false ); - m_kdevexternal->setEnabled( false ); - m_qtStyleVersion4->setEnabled( true ); - m_designerPath->setEnabled( true ); - m_qmakePath->setEnabled( true ); - m_qtDir->setEnabled( false ); - m_txtQtDir->setEnabled( false ); - m_txtDesigner->setEnabled( true ); - pluginPaths->setEnabled( true ); - } - else - { - m_versionQt3->setChecked( true ); - m_kdevembedded->setEnabled( true ); - m_kdevexternal->setEnabled( true ); - m_qtStyleVersion4->setEnabled( false ); - m_designerPath->setEnabled( true ); - m_qmakePath->setEnabled( true ); - m_qtDir->setEnabled( true ); - m_txtQtDir->setEnabled( true ); - m_txtDesigner->setEnabled( true ); - pluginPaths->setEnabled( false ); - } - if( c->includeStyle() == 4 ) - { - m_qtStyleVersion4->setChecked( true ); - }else - { - m_qtStyleVersion3->setChecked( true ); - } + m_versionQt3->setChecked( true ); + m_kdevembedded->setEnabled( true ); + m_kdevexternal->setEnabled( true ); + m_designerPath->setEnabled( true ); + m_qmakePath->setEnabled( true ); + m_qtDir->setEnabled( true ); + m_txtQtDir->setEnabled( true ); + m_txtDesigner->setEnabled( true ); + m_qtStyleVersion3->setChecked( true ); m_qtDir->setURL( c->root() ); isValidTQtDir(m_qtDir->url()); m_qmakePath->setURL( c->qmakePath() ); @@ -487,21 +463,8 @@ void CCConfigWidget::saveTQtTab() QtBuildConfig* c = m_pPart->qtBuildConfig(); c->setUsed( m_qtUsed->isChecked() ); - if( m_versionQt4->isChecked() ) - { - c->setVersion( 4 ); - } - else - { - c->setVersion( 3 ); - } - if( m_qtStyleVersion4->isChecked() ) - { - c->setIncludeStyle( 4 ); - }else - { - c->setIncludeStyle( 3 ); - } + c->setVersion( 3 ); + c->setIncludeStyle( 3 ); c->setRoot( m_qtDir->url() ); c->setTQMakePath( m_qmakePath->url() ); c->setDesignerPath( m_designerPath->url() ); @@ -524,32 +487,16 @@ void CCConfigWidget::isValidTQtDir( const TQString &dir ) TQFileInfo inc( dir + TQString( TQChar( TQDir::separator() ) )+ "include"+TQString( TQChar( TQDir::separator() ) )+ "tqt.h" ); - if ( !m_versionQt4->isChecked() && !inc.exists() ) - { - m_qtDir->lineEdit()->setPaletteForegroundColor(TQColor("#ff0000")); - }else - { - m_qtDir->lineEdit()->unsetPalette(); - } + m_qtDir->lineEdit()->unsetPalette(); } void CCConfigWidget::toggleTQtVersion( bool ) { if ( m_versionQt3->isChecked() ) { - m_qtStyleVersion4->setEnabled( false ); m_qtStyleVersion3->setChecked( true ); m_kdevembedded->setEnabled( true ); m_kdevexternal->setEnabled( true ); - pluginPaths->setEnabled( false ); - } - if ( m_versionQt4->isChecked() ) - { - m_qtStyleVersion4->setEnabled( true ); - m_tqtdesigner->setChecked( true ); - m_kdevembedded->setEnabled( false ); - m_kdevexternal->setEnabled( false ); - pluginPaths->setEnabled( true ); } isValidTQtDir( m_qtDir->url() ); isTQMakeExecutable( m_qmakePath->url() ); @@ -563,15 +510,15 @@ void CCConfigWidget::openPluginPaths() KDialog d( this ); TQVBoxLayout* mainlayout = new TQVBoxLayout( &d ); KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d ); - connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept())); + connect( ok, TQ_SIGNAL(clicked()), &d, TQ_SLOT(accept())); KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d ); - connect( cancel, TQT_SIGNAL(clicked()), &d, TQT_SLOT(reject())); + connect( cancel, TQ_SIGNAL(clicked()), &d, TQ_SLOT(reject())); TQHBoxLayout* btns = new TQHBoxLayout( &d ); btns->addItem( new TQSpacerItem(10,10,TQSizePolicy::Expanding) ); btns->addWidget(ok); btns->addWidget(cancel); - d.setCaption( i18n( "Edit TQt4 Designer Plugin Paths" ) ); + d.setCaption( i18n( "Edit TQt Designer Plugin Paths" ) ); KURLRequester * req = new KURLRequester( &d ); req->setMode( KFile::Directory ); KEditListBox* p = new KEditListBox( i18n( "Plugin Paths" ), req->customEditor(), &d ); diff --git a/languages/cpp/ccconfigwidget.h b/languages/cpp/ccconfigwidget.h index 403ce550..962b45a4 100644 --- a/languages/cpp/ccconfigwidget.h +++ b/languages/cpp/ccconfigwidget.h @@ -22,7 +22,7 @@ class KEditListBox; class CCConfigWidget : public CCConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui index e24ce54f..294deadc 100644 --- a/languages/cpp/ccconfigwidgetbase.ui +++ b/languages/cpp/ccconfigwidgetbase.ui @@ -289,9 +289,6 @@ completion-box.</string> <string>Show comment with argument hint</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </vbox> </widget> @@ -640,7 +637,7 @@ navigate the header and vice versa</string> <bool>false</bool> </property> <property name="title"> - <string>Qt::Orientation</string> + <string>Orientation</string> </property> <property name="exclusive"> <bool>true</bool> @@ -928,20 +925,6 @@ This option only applies to QMake projects.</string> <string>Select this if your project is using Qt version 3.x.<br>When this is changed the project needs to be closed and re-opened.</string> </property> </widget> - <widget class="TQRadioButton"> - <property name="name"> - <cstring>m_versionQt4</cstring> - </property> - <property name="text"> - <string>Qt 4</string> - </property> - <property name="toolTip" stdset="0"> - <string>Use Qt version 4 (When this is changed the project needs to be closed and re-opened.)</string> - </property> - <property name="whatsThis" stdset="0"> - <string>Select this if your project is using Qt version 4.x.<br>When this is changed the project needs to be closed and re-opened.</string> - </property> - </widget> <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5</cstring> @@ -988,7 +971,7 @@ This option only applies to QMake projects.</string> <string>Qt3 Directory:</string> </property> <property name="toolTip" stdset="0"> - <string>This setting is only needed for Qt3 programs, for Qt4 just make sure the QMake Binary is set properly</string> + <string>This setting is only needed for Qt3 programs</string> </property> </widget> <widget class="KURLRequester"> @@ -1059,9 +1042,6 @@ This option only applies to QMake projects.</string> <property name="text"> <string>Qt &3 style (#include <qwidget.h>)</string> </property> - <property name="accel"> - <string>Alt+3</string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -1069,20 +1049,6 @@ This option only applies to QMake projects.</string> <string>Select this if your project is using include style as known from Qt version 3.x.</string> </property> </widget> - <widget class="TQRadioButton"> - <property name="name"> - <cstring>m_qtStyleVersion4</cstring> - </property> - <property name="text"> - <string>Qt &4 style (#include <QWidget>)</string> - </property> - <property name="accel"> - <string>Alt+4</string> - </property> - <property name="whatsThis" stdset="0"> - <string>Select this if your project is using include style as known from Qt version 4.x.</string> - </property> - </widget> </vbox> </widget> <widget class="TQButtonGroup"> @@ -1176,35 +1142,6 @@ This option only applies to QMake projects.</string> </widget> </hbox> </widget> - <widget class="TQLayoutWidget"> - <property name="name"> - <cstring>layout10</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQLabel"> - <property name="name"> - <cstring>textLabel1_4</cstring> - </property> - <property name="text"> - <string>Extra Plugin Paths for Qt4 Designer:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>m_designerPrefix</cstring> - </property> - </widget> - <widget class="KPushButton"> - <property name="name"> - <cstring>pluginPaths</cstring> - </property> - <property name="text"> - <string>Change Plugin Paths</string> - </property> - </widget> - </hbox> - </widget> </vbox> </widget> <spacer> @@ -1625,12 +1562,6 @@ you right click on a variable in a header file.</string> <slot>toggleQtVersion(bool)</slot> </connection> <connection> - <sender>m_versionQt4</sender> - <signal>toggled(bool)</signal> - <receiver>CCConfigWidgetBase</receiver> - <slot>toggleQtVersion(bool)</slot> - </connection> - <connection> <sender>m_tqtdesigner</sender> <signal>toggled(bool)</signal> <receiver>m_txtDesigner</receiver> @@ -1667,18 +1598,6 @@ you right click on a variable in a header file.</string> <slot>setDisabled(bool)</slot> </connection> <connection> - <sender>m_versionQt4</sender> - <signal>toggled(bool)</signal> - <receiver>m_qtDir</receiver> - <slot>setDisabled(bool)</slot> - </connection> - <connection> - <sender>m_versionQt4</sender> - <signal>toggled(bool)</signal> - <receiver>m_txtQtDir</receiver> - <slot>setDisabled(bool)</slot> - </connection> - <connection> <sender>m_versionQt3</sender> <signal>toggled(bool)</signal> <receiver>m_txtQtDir</receiver> @@ -1726,24 +1645,6 @@ you right click on a variable in a header file.</string> <receiver>CCConfigWidgetBase</receiver> <slot>isDesignerExecutable(const TQString&)</slot> </connection> - <connection> - <sender>m_versionQt4</sender> - <signal>toggled(bool)</signal> - <receiver>textLabel1_4</receiver> - <slot>setEnabled(bool)</slot> - </connection> - <connection> - <sender>pluginPaths</sender> - <signal>clicked()</signal> - <receiver>CCConfigWidgetBase</receiver> - <slot>openPluginPaths()</slot> - </connection> - <connection> - <sender>m_versionQt4</sender> - <signal>toggled(bool)</signal> - <receiver>pluginPaths</receiver> - <slot>setEnabled(bool)</slot> - </connection> </connections> <tabstops> <tabstop>cpp_options</tabstop> @@ -1754,7 +1655,7 @@ you right click on a variable in a header file.</string> <tabstop>newPCSButton</tabstop> <tabstop>advancedOptions</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">implementationFile()</slot> <slot access="protected">interfaceFile()</slot> <slot access="protected">slotAddPPPath()</slot> @@ -1775,7 +1676,7 @@ you right click on a variable in a header file.</string> <slot>isQMakeExecutable(const TQString&)</slot> <slot>isValidQtDir(const TQString&)</slot> <slot>openPluginPaths()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/classgeneratorconfig.h b/languages/cpp/classgeneratorconfig.h index 9c9cf86f..c64ba257 100644 --- a/languages/cpp/classgeneratorconfig.h +++ b/languages/cpp/classgeneratorconfig.h @@ -16,7 +16,7 @@ class ClassGeneratorConfig : public ClassGeneratorConfigBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/classgeneratorconfigbase.ui b/languages/cpp/classgeneratorconfigbase.ui index a047fca3..a0c7f964 100644 --- a/languages/cpp/classgeneratorconfigbase.ui +++ b/languages/cpp/classgeneratorconfigbase.ui @@ -253,9 +253,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">templateTypeChanged(int type)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h index 656bd289..561cf151 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h @@ -26,7 +26,7 @@ class Warnings2Tab; class GccOptionsPlugin : public KDevCompilerOptions { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui index d752d715..9085a377 100644 --- a/languages/cpp/configproblemreporter.ui +++ b/languages/cpp/configproblemreporter.ui @@ -176,14 +176,14 @@ If disabled, the parser will typically only run when the file is saved.</string> <variables> <variable>CppSupportPart* m_part;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>setPart( CppSupportPart * part )</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> <slot access="protected">setDelayLabel( int delay )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index b032ac72..d09602c0 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -358,7 +358,7 @@ struct PopupFillerHelpStruct { memType = "enum"; TQString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQ_SLOT( popupAction( int ) ) ); receiver->m_popupActions.insert( id, d.decl ); } @@ -448,12 +448,12 @@ struct PopupFillerHelpStruct { } } - int id = parent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt1, receiver, TQ_SLOT( popupAction( int ) ) ); if ( d.resolved() ) receiver->m_popupActions.insert( id, d.resolved() ->getDeclarationInfo() ); if ( !txt2.isEmpty() ) { - int id2 = parent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) ); + int id2 = parent->insertItem( txt2, receiver, TQ_SLOT( popupDefinitionAction( int ) ) ); if ( d.resolved() ) receiver->m_popupDefinitionActions.insert( id2, d.resolved() ->getDeclarationInfo() ); } @@ -538,7 +538,7 @@ struct PopupClassViewFillerHelpStruct { memType = "enum"; TQString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQ_SLOT( popupClassViewAction( int ) ) ); receiver->m_popupClassViewActions.insert( id, dom ); } @@ -597,7 +597,7 @@ struct PopupClassViewFillerHelpStruct { } } - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQ_SLOT( popupClassViewAction( int ) ) ); if ( dom ) receiver->m_popupClassViewActions.insert( id, dom ); @@ -645,7 +645,7 @@ class PopupFiller { //kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl; } - int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQ_SLOT( popupAction( int ) ) ); DeclarationInfo fakeDec; fakeDec.name = decl.name; fakeDec.file = includeFile; @@ -671,7 +671,7 @@ class PopupFiller { f.type = d.desc(); f.memberType = SimpleTypeImpl::MemberInfo::Variable; - /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); + /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQ_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable );*/ struk.insertItem( parent, f, prefix ); @@ -683,7 +683,7 @@ class PopupFiller { parent->insertItem( i18n( "Comment on %1" ).arg( sourceVariable.name ), m ); TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } parent->insertSeparator(); } @@ -764,7 +764,7 @@ class PopupFiller { mo->insertItem( i18n( "Comment" ), m ); TQStringList ls = prepareTextForMenu( ( *it ).first.decl.comment, 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } } @@ -796,7 +796,7 @@ class PopupFiller { parent->insertItem( i18n( "Comment on %1" ).arg( cleanForMenu( d->name() ) ), m ); TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } } } @@ -856,14 +856,14 @@ struct CppCodeCompletionData { if ( recoveryPoints.count() == 0 ) return 0; - TQPair<int, int> pt = tqMakePair( line, column ); + TQPair<int, int> pt = qMakePair( line, column ); TQPtrListIterator<RecoveryPoint> it( recoveryPoints ); RecoveryPoint* recPt = 0; while ( it.current() ) { - TQPair<int, int> startPt = tqMakePair( it.current() ->startLine, it.current() ->startColumn ); - TQPair<int, int> endPt = tqMakePair( it.current() ->endLine, it.current() ->endColumn ); + TQPair<int, int> startPt = qMakePair( it.current() ->startLine, it.current() ->startColumn ); + TQPair<int, int> endPt = qMakePair( it.current() ->endLine, it.current() ->endColumn ); if ( pt < startPt ) { break; @@ -896,7 +896,7 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_pSupport = part; - connect( m_pSupport->codeCompletionConfig(), TQT_SIGNAL( stored() ), this, TQT_SLOT( emptyCache() ) ); + connect( m_pSupport->codeCompletionConfig(), TQ_SIGNAL( stored() ), this, TQ_SLOT( emptyCache() ) ); m_activeCursor = 0; m_activeEditor = 0; @@ -908,17 +908,17 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_ccLine = 0; m_ccColumn = 0; - connect( m_ccTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) ); - connect( m_showStatusTextTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotStatusTextTimeout() ) ); + connect( m_ccTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) ); + connect( m_showStatusTextTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotStatusTextTimeout() ) ); computeFileEntryList(); CppSupportPart* cppSupport = m_pSupport; - connect( cppSupport->project(), TQT_SIGNAL( addedFilesToProject( const TQStringList& ) ), - this, TQT_SLOT( computeFileEntryList() ) ); - connect( cppSupport->project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList& ) ), - this, TQT_SLOT( computeFileEntryList() ) ); - connect( cppSupport, TQT_SIGNAL( synchronousParseReady( const TQString&, ParsedFilePointer ) ), this, TQT_SLOT( synchronousParseReady( const TQString&, ParsedFilePointer ) ) ); + connect( cppSupport->project(), TQ_SIGNAL( addedFilesToProject( const TQStringList& ) ), + this, TQ_SLOT( computeFileEntryList() ) ); + connect( cppSupport->project(), TQ_SIGNAL( removedFilesFromProject( const TQStringList& ) ), + this, TQ_SLOT( computeFileEntryList() ) ); + connect( cppSupport, TQ_SIGNAL( synchronousParseReady( const TQString&, ParsedFilePointer ) ), this, TQ_SLOT( synchronousParseReady( const TQString&, ParsedFilePointer ) ) ); m_bArgHintShow = false; m_bCompletionBoxShow = false; @@ -928,9 +928,9 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_repository = new CodeInformationRepository( cppSupport->codeRepository() ); - connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogRegistered( Catalog* )), this, TQT_SLOT( emptyCache() ) ); - connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogUnregistered( Catalog* )), this, TQT_SLOT( emptyCache() ) ); - connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogChanged( Catalog* )), this, TQT_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQ_SIGNAL(catalogRegistered( Catalog* )), this, TQ_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQ_SIGNAL(catalogUnregistered( Catalog* )), this, TQ_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQ_SIGNAL(catalogChanged( Catalog* )), this, TQ_SLOT( emptyCache() ) ); setupCodeInformationRepository(); @@ -945,22 +945,22 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { if ( part->partController() ->activePart() ) slotActivePartChanged( part->partController() ->activePart() ); - connect( part->partController( ), TQT_SIGNAL( partAdded( KParts::Part* ) ), - this, TQT_SLOT( slotPartAdded( KParts::Part* ) ) ); - connect( part->partController( ), TQT_SIGNAL( activePartChanged( KParts::Part* ) ), - this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) ); + connect( part->partController( ), TQ_SIGNAL( partAdded( KParts::Part* ) ), + this, TQ_SLOT( slotPartAdded( KParts::Part* ) ) ); + connect( part->partController( ), TQ_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQ_SLOT( slotActivePartChanged( KParts::Part* ) ) ); - connect( part, TQT_SIGNAL( fileParsed( const TQString& ) ), - this, TQT_SLOT( slotFileParsed( const TQString& ) ) ); - connect( part, TQT_SIGNAL( codeModelUpdated( const TQString& ) ), - this, TQT_SLOT( slotCodeModelUpdated( const TQString& ) ) ); + connect( part, TQ_SIGNAL( fileParsed( const TQString& ) ), + this, TQ_SLOT( slotFileParsed( const TQString& ) ) ); + connect( part, TQ_SIGNAL( codeModelUpdated( const TQString& ) ), + this, TQ_SLOT( slotCodeModelUpdated( const TQString& ) ) ); TDEAction * action = new TDEAction( i18n("Jump to declaration under cursor"), 0, CTRL + Key_Comma, - this, TQT_SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" ); + this, TQ_SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" ); action->plug( &m_DummyActionWidget ); action = new TDEAction( i18n("Jump to definition under cursor"), 0, CTRL + Key_Period, - this, TQT_SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" ); + this, TQ_SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" ); action->plug( &m_DummyActionWidget ); } @@ -1028,13 +1028,13 @@ void CppCodeCompletion::integratePart( KParts::Part * part ) { if ( m_pSupport ) { //The slot should connected even when automatic completion is disabled, so it can be enabled any time kdDebug( 9007 ) << k_funcinfo << "enabling code completion" << endl; - connect( part, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotTextChanged() ) ); - connect( part->widget(), TQT_SIGNAL( completionDone() ), this, - TQT_SLOT( slotCompletionBoxHidden() ) ); - connect( part->widget(), TQT_SIGNAL( completionAborted() ), this, - TQT_SLOT( slotCompletionBoxHidden() ) ); - connect( part->widget(), TQT_SIGNAL( argHintHidden() ), this, - TQT_SLOT( slotArgHintHidden() ) ); + connect( part, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( slotTextChanged() ) ); + connect( part->widget(), TQ_SIGNAL( completionDone() ), this, + TQ_SLOT( slotCompletionBoxHidden() ) ); + connect( part->widget(), TQ_SIGNAL( completionAborted() ), this, + TQ_SLOT( slotCompletionBoxHidden() ) ); + connect( part->widget(), TQ_SIGNAL( argHintHidden() ), this, + TQ_SLOT( slotArgHintHidden() ) ); } } } @@ -1047,7 +1047,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { emptyCache(); this->d->recoveryPoints.clear(); if ( m_activeHintInterface && m_activeView ) { - disconnect( m_activeView , TQT_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQT_SLOT( slotTextHint( int, int, TQString& ) ) ); + disconnect( m_activeView , TQ_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQ_SLOT( slotTextHint( int, int, TQString& ) ) ); m_activeHintInterface = 0; } @@ -1094,7 +1094,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { if ( m_activeHintInterface ) { #ifndef DISABLETOOLTIPS m_activeHintInterface->enableTextHints( 500 ); - connect( m_activeView, TQT_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQT_SLOT( slotTextHint( int, int, TQString& ) ) ); + connect( m_activeView, TQ_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQ_SLOT( slotTextHint( int, int, TQString& ) ) ); #endif } else { @@ -1537,7 +1537,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte else gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQ_SLOT( popupAction( int ) ) ); TQPopupMenu * b = PopupTracker::createPopup( m ); m->insertItem( i18n( "Body" ), b ); @@ -1551,7 +1551,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte TQStringList ls = prepareTextForMenu( type.macro.body(), 20, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - b->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + b->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } } @@ -1569,7 +1569,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte else gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQ_SLOT( popupAction( int ) ) ); DeclarationInfo i; i.file = includeFilePath; @@ -1617,7 +1617,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) ); /*if( type.sourceVariable && type.sourceVariable.name != "this" ) { - int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQ_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable ); }*/ @@ -2050,14 +2050,13 @@ void CppCodeCompletion::needRecoveryPoints() { if ( this->d->recoveryPoints.isEmpty() ) { kdDebug( 9007 ) << "missing recovery-points for file " << m_activeFileName << " they have to be computed now" << endl; - m_pSupport->backgroundParser() ->lock () - ; + m_pSupport->backgroundParser() ->lock(); std::vector<CppCodeCompletion> vec; - TranslationUnitAST * ast = *m_pSupport->backgroundParser() ->translationUnit( m_activeFileName ); + ParsedFilePointer pTransUnit = m_pSupport->backgroundParser() ->translationUnit( m_activeFileName ); m_pSupport->backgroundParser() ->unlock(); - if ( !ast ) { + if ( !pTransUnit ) { kdDebug( 9007 ) << "background-parser is missing the translation-unit. The file needs to be reparsed." << endl; m_pSupport->parseFileAndDependencies( m_activeFileName, true ); // m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).arg( m_activeFileName ), 2000 ); @@ -2500,8 +2499,8 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( start_expr != int( contents.length() ) ) expr = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); - if ( expr.startsWith( "SIGNAL" ) || expr.startsWith( "SLOT" ) ) { - m_completionMode = expr.startsWith( "SIGNAL" ) ? SignalCompletion : SlotCompletion; + if ( expr.startsWith( "TQ_SIGNAL" ) || expr.startsWith( "TQ_SLOT" ) ) { + m_completionMode = expr.startsWith( "TQ_SIGNAL" ) ? SignalCompletion : SlotCompletion; showArguments = false; int end_expr = start_expr - 1; @@ -2684,70 +2683,74 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { ///@todo is all this necessary? if ( !recoveredDecl.get() && !recoveredTypeSpec.get() ) { - TranslationUnitAST * ast = *m_pSupport->backgroundParser() ->translationUnit( m_activeFileName ); - if ( AST * node = findNodeAt( ast, line, column ) ) { - kdDebug( 9007 ) << "------------------- AST FOUND --------------------" << endl; - kdDebug( 9007 ) << "node-kind = " << nodeTypeToString( node->nodeType() ) << endl; + ParsedFilePointer pTransUnit = m_pSupport->backgroundParser() ->translationUnit(m_activeFileName); + if (pTransUnit) + { + TranslationUnitAST *ast = *pTransUnit; + if ( AST * node = findNodeAt( ast, line, column ) ) { + kdDebug( 9007 ) << "------------------- AST FOUND --------------------" << endl; + kdDebug( 9007 ) << "node-kind = " << nodeTypeToString( node->nodeType() ) << endl; - if ( FunctionDefinitionAST * def = functionDefinition( node ) ) { - kdDebug( 9007 ) << "------> found a function definition" << endl; + if ( FunctionDefinitionAST * def = functionDefinition( node ) ) { + kdDebug( 9007 ) << "------> found a function definition" << endl; - int startLine, startColumn; - def->getStartPosition( &startLine, &startColumn ); + int startLine, startColumn; + def->getStartPosition( &startLine, &startColumn ); - TQString contents = getText( startLine, startColumn, line, showArguments ? nCol : column ); + TQString contents = getText( startLine, startColumn, line, showArguments ? nCol : column ); - /// @todo remove code duplication - int start_expr = expressionAt( contents, contents.length() ); + /// @todo remove code duplication + int start_expr = expressionAt( contents, contents.length() ); - // kdDebug(9007) << "start_expr = " << start_expr << endl; - if ( start_expr != int( contents.length() ) ) - expr = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); + // kdDebug(9007) << "start_expr = " << start_expr << endl; + if ( start_expr != int( contents.length() ) ) + expr = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); - if ( expr.startsWith( "SIGNAL" ) || expr.startsWith( "SLOT" ) ) { - m_completionMode = expr.startsWith( "SIGNAL" ) ? SignalCompletion : SlotCompletion; + if ( expr.startsWith( "TQ_SIGNAL" ) || expr.startsWith( "TQ_SLOT" ) ) { + m_completionMode = expr.startsWith( "TQ_SIGNAL" ) ? SignalCompletion : SlotCompletion; - showArguments = false; - int end_expr = start_expr - 1; - while ( end_expr > 0 && contents[ end_expr ].isSpace() ) - --end_expr; + showArguments = false; + int end_expr = start_expr - 1; + while ( end_expr > 0 && contents[ end_expr ].isSpace() ) + --end_expr; - if ( contents[ end_expr ] != ',' ) { - expr = TQString(); + if ( contents[ end_expr ] != ',' ) { + expr = TQString(); + } else { + start_expr = expressionAt( contents, end_expr ); + expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace(); + } } else { - start_expr = expressionAt( contents, end_expr ); - expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace(); - } - } else { - int idx = expr.length() - 1; - while ( expr[ idx ].isLetterOrNumber() || expr[ idx ] == '_' ) - --idx; - - if ( idx != int( expr.length() ) - 1 ) { - ++idx; - word = expr.mid( idx ).stripWhiteSpace(); - expr = expr.left( idx ).stripWhiteSpace(); + int idx = expr.length() - 1; + while ( expr[ idx ].isLetterOrNumber() || expr[ idx ] == '_' ) + --idx; + + if ( idx != int( expr.length() ) - 1 ) { + ++idx; + word = expr.mid( idx ).stripWhiteSpace(); + expr = expr.left( idx ).stripWhiteSpace(); + } } - } - ctx = computeContext( def, line, column, startLine, startColumn ); + ctx = computeContext( def, line, column, startLine, startColumn ); - TQStringList scope; - scopeOfNode( def, scope ); - this_type = SimpleType( scope, getIncludeFiles() ); + TQStringList scope; + scopeOfNode( def, scope ); + this_type = SimpleType( scope, getIncludeFiles() ); - if ( scope.size() ) { /* - SimpleVariable var; - var.type = scope; - var.name = "this"; - ctx->add( var );*/ - //kdDebug(9007) << "add variable " << var.name << " with type " << var.type << endl; - } + if ( scope.size() ) { /* + SimpleVariable var; + var.type = scope; + var.name = "this"; + ctx->add( var );*/ + //kdDebug(9007) << "add variable " << var.name << " with type " << var.type << endl; + } - ExpressionInfo exp( expr ); - exp.t = ( ExpressionInfo::Type ) ( ExpressionInfo::NormalExpression | ExpressionInfo::TypeExpression ); - type = evaluateExpression( exp, ctx ); + ExpressionInfo exp( expr ); + exp.t = ( ExpressionInfo::Type ) ( ExpressionInfo::NormalExpression | ExpressionInfo::TypeExpression ); + type = evaluateExpression( exp, ctx ); + } } } } diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h index dcdb9a79..1ebee6ba 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -45,7 +45,7 @@ ///A little debugging class #include <tqpopupmenu.h> class PopupTracker : public TQObject { - Q_OBJECT + TQ_OBJECT public: static PopupTracker* pt; @@ -56,7 +56,7 @@ public: if( !pt ) pt = new PopupTracker(); TQPopupMenu* m = new TQPopupMenu( parent ); ++pendingPopups; - connect( m, TQT_SIGNAL(destroyed()), pt, TQT_SLOT(destroyedPopup()) ); + connect( m, TQ_SIGNAL(destroyed()), pt, TQ_SLOT(destroyedPopup()) ); return m; } @@ -94,7 +94,7 @@ typedef TDESharedPtr<SimpleTypeImpl> TypePointer; class CppCodeCompletion : public TQObject { - Q_OBJECT + TQ_OBJECT public: friend class SimpleType; diff --git a/languages/cpp/cppcodecompletionconfig.h b/languages/cpp/cppcodecompletionconfig.h index f7c8c18c..994bfc55 100644 --- a/languages/cpp/cppcodecompletionconfig.h +++ b/languages/cpp/cppcodecompletionconfig.h @@ -24,7 +24,7 @@ class TQDomDocument; */ class CppCodeCompletionConfig : public TQObject { - Q_OBJECT + TQ_OBJECT public: CppCodeCompletionConfig( CppSupportPart* part, TQDomDocument* dom ); diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index 35069349..1307e3d8 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -43,7 +43,7 @@ CppImplementationWidget::CppImplementationWidget( KDevLanguageSupport *part, TQStringList CppImplementationWidget::createClassFiles() { - TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\n\npublic:\n $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n"; + TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nTQ_OBJECT\n\npublic:\n $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n"; TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *parent, const char *name)\n :$BASECLASSNAME$(parent, name)\n{\n}\n"; if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem ) template_cpp += "\n#include \"$MOCINCLUDE$\"\n"; diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h index 040fc759..fd9bd319 100644 --- a/languages/cpp/cppimplementationwidget.h +++ b/languages/cpp/cppimplementationwidget.h @@ -29,7 +29,7 @@ class CppSupportPart; class CppImplementationWidget : public ImplementationWidget { - Q_OBJECT + TQ_OBJECT public: CppImplementationWidget( KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false ); diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index dda53df7..514974fe 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -79,20 +79,20 @@ CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, co accessMenu = new TQPopupMenu( this ); accessMenu->insertItem( i18n( "Use as Private" ), - this, TQT_SLOT( changeToPrivate() ), 0, 1 ); + this, TQ_SLOT( changeToPrivate() ), 0, 1 ); accessMenu->insertItem( i18n( "Use as Protected" ), - this, TQT_SLOT( changeToProtected() ), 0, 2 ); + this, TQ_SLOT( changeToProtected() ), 0, 2 ); accessMenu->insertItem( i18n( "Use as Public" ), - this, TQT_SLOT( changeToPublic() ), 0, 3 ); + this, TQ_SLOT( changeToPublic() ), 0, 3 ); accessMenu->insertSeparator(); accessMenu->insertItem( i18n( "Unset" ), - this, TQT_SLOT( changeToInherited() ), 0, 5 ); + this, TQ_SLOT( changeToInherited() ), 0, 5 ); overMenu = new TQPopupMenu( this ); overMenu->insertItem( i18n( "Extend Base Class Functionality" ), - this, TQT_SLOT( extendFunctionality() ), 0, 11 ); + this, TQ_SLOT( extendFunctionality() ), 0, 11 ); overMenu->insertItem( i18n( "Replace Base Class Method" ), - this, TQT_SLOT( replaceFunctionality() ), 0, 12 ); + this, TQ_SLOT( replaceFunctionality() ), 0, 12 ); compBasename = basename_edit->completionObject(); setCompletionBasename( m_part->codeModel() ); @@ -374,7 +374,7 @@ void CppNewClassDialog::checkTQWidgetInheritance( int val ) if ( baseclasses_view->childCount() == 0 ) { addBaseClass(); - basename_edit->setText( TQWIDGET_OBJECT_NAME_STRING ); + basename_edit->setText( "TQWidget" ); } /* constructors_cpp_edit->append(classname_edit->text() + "::" + classname_edit->text() + "(TQWidget *parent, const char *name):\n TQWidget(parent, name)\n{\n}\n"); @@ -396,7 +396,7 @@ void CppNewClassDialog::qobject_box_stateChanged( int val ) if ( baseclasses_view->childCount() == 0 ) { addBaseClass(); - basename_edit->setText( TQOBJECT_OBJECT_NAME_STRING ); + basename_edit->setText( "TQObject" ); } @@ -1171,7 +1171,7 @@ void CppNewClassDialog::setAccessForBase( TQString baseclass, TQString newAccess void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint &p, int /*c*/ ) { - if ( item && ( ( button == Qt::LeftButton ) || ( button == Qt::RightButton ) ) && ( item->depth() > 1 ) ) + if ( item && ( ( button == TQt::LeftButton ) || ( button == TQt::RightButton ) ) && ( item->depth() > 1 ) ) { accessMenu->setItemEnabled( 1, true ); accessMenu->setItemEnabled( 2, true ); @@ -1196,7 +1196,7 @@ void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewIt void CppNewClassDialog::methods_view_mouseButtonPressed( int button , TQListViewItem * item, const TQPoint&p , int /*c*/ ) { - if ( item && ( button == Qt::RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) ) + if ( item && ( button == TQt::RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) ) { overMenu->exec( p ); } @@ -1437,7 +1437,7 @@ void CppNewClassDialog::ClassGenerator::common_text() headeronly = dlg.headeronly_box->isChecked(); if ( ( dlg.baseclasses_view->childCount() == 0 ) && childClass ) - new TQListViewItem( dlg.baseclasses_view, TQWIDGET_OBJECT_NAME_STRING, "public" ); + new TQListViewItem( dlg.baseclasses_view, "TQWidget", "public" ); if ( objc && ( dlg.baseclasses_view->childCount() == 0 ) ) new TQListViewItem( dlg.baseclasses_view, "NSObject", "public" ); @@ -1962,7 +1962,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface() { if ( !it.current() ->text( 0 ).isEmpty() ) if ( !it.current() ->text( 3 ).isEmpty() ) - // if ((!childClass) || (it.current()->text(0) != TQWIDGET_OBJECT_NAME_STRING)) + // if ((!childClass) || (it.current()->text(0) != "TQWidget")) includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::fromLatin1( "#include " ) + ( it.current() ->text( 2 ).toInt() == 0 ? TQString( "<" ) : TQString( "\"" ) ) + it.current() ->text( 3 ) @@ -2013,7 +2013,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface() TQString qobjectStr; if ( childClass || qobject ) - qobjectStr = "Q_OBJECT\n"; + qobjectStr = "TQ_OBJECT\n"; TQString baseclass; diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h index 37c52ea5..1b6c43ba 100644 --- a/languages/cpp/cppnewclassdlg.h +++ b/languages/cpp/cppnewclassdlg.h @@ -112,7 +112,7 @@ private: class CppNewClassDialog : public CppNewClassDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index 03cd0909..4f827821 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -413,7 +413,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <enum>StrongFocus</enum> </property> <property name="whatsThis" stdset="0"> - <string>Insert the base class which your new class will be derived from. If you have checked 'Generate QWidget child class' the new class will be derived from QWidget. If no base class is named, the new class will not have a parent class. You can also use template classes here (like BaseClass<int, int>)</string> + <string>Insert the base class which your new class will be derived from. If you have checked 'Generate TQWidget child class' the new class will be derived from TQWidget. If no base class is named, the new class will not have a parent class. You can also use template classes here (like BaseClass<int, int>)</string> </property> </widget> <widget class="KLineEdit" row="0" column="2"> @@ -1236,7 +1236,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <tabstop>gen_config</tabstop> <tabstop>constructors_cpp_edit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">updateClassStore()</slot> <slot access="protected">access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint & p, int c )</slot> <slot access="protected">classNameChanged( const TQString & text )</slot> @@ -1278,7 +1278,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <slot access="protected">scopeboxActivated( int )</slot> <slot access="protected">classNamespaceChanged( const TQString & )</slot> <slot access="protected">headeronly_box_stateChanged(int val)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/cppsplitheadersourceconfig.h b/languages/cpp/cppsplitheadersourceconfig.h index c5a7eace..410f11c2 100644 --- a/languages/cpp/cppsplitheadersourceconfig.h +++ b/languages/cpp/cppsplitheadersourceconfig.h @@ -28,7 +28,7 @@ class TQDomDocument; class CppSplitHeaderSourceConfig : public TQObject { - Q_OBJECT + TQ_OBJECT public: CppSplitHeaderSourceConfig( CppSupportPart* part, TQDomDocument* dom ); diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index e444bfea..c94539de 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -201,10 +201,10 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri m_pCompletionConfig = new CppCodeCompletionConfig( this, projectDom() ); m_pSplitHeaderSourceConfig = new CppSplitHeaderSourceConfig( this, projectDom() ); - m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this ); connect( m_pSplitHeaderSourceConfig, TQT_SIGNAL( stored() ), - this, TQT_SLOT( splitHeaderSourceConfigStored() ) ); - connect( m_pCompletionConfig, TQT_SIGNAL( stored() ), - this, TQT_SLOT( codeCompletionConfigStored() ) ); + m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this ); connect( m_pSplitHeaderSourceConfig, TQ_SIGNAL( stored() ), + this, TQ_SLOT( splitHeaderSourceConfigStored() ) ); + connect( m_pCompletionConfig, TQ_SIGNAL( stored() ), + this, TQ_SLOT( codeCompletionConfigStored() ) ); m_qtBuildConfig = new QtBuildConfig( this, projectDom() ); m_qtBuildConfig->store(); @@ -215,44 +215,44 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri m_problemReporter = 0; m_textChangedTimer = new TQTimer( this ); - connect( m_textChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseCurrentFile()) ); + connect( m_textChangedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseCurrentFile()) ); m_cursorMovedTimer = new TQTimer( this ); - connect( m_cursorMovedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCursorPositionChanged()) ); + connect( m_cursorMovedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCursorPositionChanged()) ); // m_deleteParserStoreTimer = new TQTimer( this ); m_saveMemoryTimer = new TQTimer( this ); m_buildSafeFileSetTimer = new TQTimer( this ); // m_functionHintTimer = new TQTimer( this ); - connect( m_buildSafeFileSetTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(buildSafeFileSet()) ); - connect( m_saveMemoryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveMemory()) ); -// connect( m_deleteParserStoreTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDeleteParserStore()) ); + connect( m_buildSafeFileSetTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(buildSafeFileSet()) ); + connect( m_saveMemoryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSaveMemory()) ); +// connect( m_deleteParserStoreTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDeleteParserStore()) ); resetParserStoreTimer(); m_saveMemoryTimer->start( 240000, false ); //Free some memory every 4 minutes - // connect( m_functionHintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFunctionHint()) ); + // connect( m_functionHintTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFunctionHint()) ); setXMLFile( "kdevcppsupport.rc" ); m_catalogList.setAutoDelete( true ); - connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( projectOpened() ) ); - connect( core(), TQT_SIGNAL( projectClosed() ), this, TQT_SLOT( projectClosed() ) ); - connect( core(), TQT_SIGNAL( languageChanged() ), this, TQT_SLOT( projectOpened() ) ); - connect( partController(), TQT_SIGNAL( savedFile( const KURL& ) ), - this, TQT_SLOT( savedFile( const KURL& ) ) ); - connect( core(), TQT_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), - this, TQT_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); - connect( partController(), TQT_SIGNAL( activePartChanged( KParts::Part* ) ), - this, TQT_SLOT( activePartChanged( KParts::Part* ) ) ); - connect( partController(), TQT_SIGNAL( partRemoved( KParts::Part* ) ), - this, TQT_SLOT( partRemoved( KParts::Part* ) ) ); - - connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), - this, TQT_SLOT( configWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( projectOpened() ) ); + connect( core(), TQ_SIGNAL( projectClosed() ), this, TQ_SLOT( projectClosed() ) ); + connect( core(), TQ_SIGNAL( languageChanged() ), this, TQ_SLOT( projectOpened() ) ); + connect( partController(), TQ_SIGNAL( savedFile( const KURL& ) ), + this, TQ_SLOT( savedFile( const KURL& ) ) ); + connect( core(), TQ_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), + this, TQ_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); + connect( partController(), TQ_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQ_SLOT( activePartChanged( KParts::Part* ) ) ); + connect( partController(), TQ_SIGNAL( partRemoved( KParts::Part* ) ), + this, TQ_SLOT( partRemoved( KParts::Part* ) ) ); + + connect( core(), TQ_SIGNAL( configWidget( KDialogBase* ) ), + this, TQ_SLOT( configWidget( KDialogBase* ) ) ); m_switchHeaderSourceAction = new TDEAction( i18n( "Switch Header/Implementation" ), SHIFT + Key_F12, - this, TQT_SLOT( slotSwitchHeader() ), + this, TQ_SLOT( slotSwitchHeader() ), actionCollection(), "edit_switchheader" ); m_switchHeaderSourceAction->setToolTip( i18n( "Switch between header and implementation files" ) ); m_switchHeaderSourceAction->setWhatsThis( i18n( "<b>Switch Header/Implementation</b><p>" @@ -265,7 +265,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri TDEAction *action; action = new TDEAction( i18n( "Complete Text" ), CTRL + Key_Space, - this, TQT_SLOT( slotCompleteText() ), + this, TQ_SLOT( slotCompleteText() ), actionCollection(), "edit_complete_text" ); action->setToolTip( i18n( "Complete current expression" ) ); action->setWhatsThis( i18n( "<b>Complete Text</p><p>Completes current expression using " @@ -274,11 +274,11 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action->setEnabled( false ); m_createGetterSetterAction = new TDEAction( i18n( "Create Accessor Methods" ), 0, - this, TQT_SLOT( slotCreateAccessMethods() ), actionCollection(), + this, TQ_SLOT( slotCreateAccessMethods() ), actionCollection(), "edit_create_getter_setter" ); action = new TDEAction( i18n( "Make Member" ), 0, Key_F2, - this, TQT_SLOT( slotMakeMember() ), + this, TQ_SLOT( slotMakeMember() ), actionCollection(), "edit_make_member" ); action->setToolTip( i18n( "Make member" ) ); action->setWhatsThis( i18n( "<b>Make member</b><p>Creates a class member function in implementation file " @@ -286,7 +286,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action->plug( &m_DummyActionWidget ); action = new TDEAction( i18n( "Navigation Menu" ), 0, CTRL + ALT + Key_Space, - this, TQT_SLOT( slotNavigate() ), + this, TQ_SLOT( slotNavigate() ), actionCollection(), "edit_navigate" ); action->setToolTip( i18n( "Show the navigation-menu" ) ); action->setWhatsThis( i18n( "<b>Navigate</b><p>Shows a navigation-menu based on the type-evaluation of the item under the cursor." ) ); @@ -294,7 +294,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action = new TDEAction( i18n( "New Class..." ), "classnew", 0, - this, TQT_SLOT( slotNewClass() ), + this, TQ_SLOT( slotNewClass() ), actionCollection(), "project_newclass" ); action->setToolTip( i18n( "Generate a new class" ) ); action->setWhatsThis( i18n( "<b>New Class</b><p>Calls the <b>New Class</b> wizard." ) ); @@ -306,8 +306,8 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri withcpp = true; // daniel - connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); new KDevCppSupportIface( this ); //(void) dcopClient(); @@ -438,7 +438,7 @@ void CppSupportPart::projectConfigWidget( KDialogBase* dlg ) vbox = dlg->addVBoxPage( i18n( "C++ Support" ), i18n( "C++ Support" ), BarIcon( info() ->icon(), TDEIcon::SizeMedium ) ); CCConfigWidget* w = new CCConfigWidget( this, vbox ); - connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) ); + connect( dlg, TQ_SIGNAL( okClicked( ) ), w, TQ_SLOT( accept( ) ) ); } void CppSupportPart::configWidget( KDialogBase *dlg ) @@ -446,13 +446,13 @@ void CppSupportPart::configWidget( KDialogBase *dlg ) TQVBox * vbox = dlg->addVBoxPage( i18n( "C++ Class Generator" ), i18n( "C++ Class Generator" ), BarIcon( info() ->icon(), TDEIcon::SizeMedium ) ); ClassGeneratorConfig *w = new ClassGeneratorConfig( vbox, "classgenerator config widget" ); - connect( dlg, TQT_SIGNAL( okClicked() ), w, TQT_SLOT( storeConfig() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w, TQ_SLOT( storeConfig() ) ); vbox = dlg->addVBoxPage(i18n("C++ Parsing"), i18n("C++ Parsing"), BarIcon( "text-x-c++src", TDEIcon::SizeMedium) ); ConfigureProblemReporter* ww = new ConfigureProblemReporter( vbox ); ww->setPart( this ); - connect(dlg, TQT_SIGNAL(okClicked()), ww, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), ww, TQ_SLOT(accept())); } void CppSupportPart::activePartChanged( KParts::Part *part ) @@ -465,11 +465,11 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( m_activeView ) { - disconnect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, 0 ); + disconnect( m_activeView, TQ_SIGNAL( cursorPositionChanged() ), this, 0 ); } if ( m_activeDocument ) { - disconnect( m_activeDocument, TQT_SIGNAL(textChanged()), this, 0 ); + disconnect( m_activeDocument, TQ_SIGNAL(textChanged()), this, 0 ); } m_isTyping = false; @@ -500,14 +500,14 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( m_activeDocument ) { - connect( m_activeDocument, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_activeDocument, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_textChangedTimer->start( 250, true ); // kick the parse timer, we might want to parse the current file } if ( m_activeViewCursor ) { - connect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, TQT_SLOT(slotCursorMoved()) ); -// this, TQT_SLOT( slotCursorPositionChanged() ) ); + connect( m_activeView, TQ_SIGNAL( cursorPositionChanged() ), this, TQ_SLOT(slotCursorMoved()) ); +// this, TQ_SLOT( slotCursorPositionChanged() ) ); } @@ -516,8 +516,8 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( !textHintIface ) return ; - connect( view, TQT_SIGNAL( needTextHint( int, int, TQString& ) ), - this, TQT_SLOT( slotNeedTextHint( int, int, TQString& ) ) ); + connect( view, TQ_SIGNAL( needTextHint( int, int, TQString& ) ), + this, TQ_SLOT( slotNeedTextHint( int, int, TQString& ) ) ); textHintIface->enableTextHints( 1000 ); #endif @@ -551,17 +551,17 @@ void CppSupportPart::projectOpened( ) embedProblemReporter(); - connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), - m_problemReporter, TQT_SLOT( configWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL( configWidget( KDialogBase* ) ), + m_problemReporter, TQ_SLOT( configWidget( KDialogBase* ) ) ); - connect( project( ), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), - this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), - this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), - this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); - connect( project(), TQT_SIGNAL( projectCompiled() ), - this, TQT_SLOT( slotProjectCompiled() ) ); + connect( project( ), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQ_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQ_SLOT( removedFilesFromProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQ_SLOT( changedFilesInProject( const TQStringList & ) ) ); + connect( project(), TQ_SIGNAL( projectCompiled() ), + this, TQ_SLOT( slotProjectCompiled() ) ); m_timestamp.clear(); m_parseEmitWaiting.clear(); @@ -573,7 +573,7 @@ void CppSupportPart::projectOpened( ) m_buildSafeFileSetTimer->start( 500, true ); updateParserConfiguration(); //Necessary to respect custom include-paths and such - TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( initialParse( ) ) ); } void CppSupportPart::embedProblemReporter( bool force ) @@ -687,7 +687,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) MakeMemberHelper( text, atline, atcol ); if ( !text.isEmpty() ) { - id = popup->insertItem( i18n( "Make Member" ), this, TQT_SLOT( slotMakeMember() ) ); + id = popup->insertItem( i18n( "Make Member" ), this, TQ_SLOT( slotMakeMember() ) ); popup->setWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file " "based on the member declaration at the current line." ) ); } @@ -754,7 +754,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) } text += formatModelItem( *it, true ); text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); - int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) ); + int id = m2->insertItem( text, this, TQ_SLOT( gotoDeclarationLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); m2->setItemParameter( id, line ); @@ -795,7 +795,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) } text += formatModelItem( *it, true ); text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); - int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) ); + int id = m->insertItem( text, this, TQ_SLOT( gotoLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); m->setItemParameter( id, line ); @@ -821,7 +821,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) if ( mcontext->item() ->isClass() ) { m_activeClass = ( ClassModel* ) mcontext->item(); - int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQT_SLOT( slotExtractInterface() ) ); + int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQ_SLOT( slotExtractInterface() ) ); popup->setWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. " "No implementation code is extracted and no implementation code is created." ) ); } @@ -839,7 +839,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) if ( url.fileName().endsWith( ".ui" ) ) { m_contextFileName = url.path(); - int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) ); + int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQ_SLOT( slotCreateSubclass() ) ); popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) ); } } @@ -1393,13 +1393,13 @@ bool CppSupportPart::shouldSplitDocument(const KURL &url) return false; } -Qt::Orientation CppSupportPart::splitOrientation() const +TQt::Orientation CppSupportPart::splitOrientation() const { TQString o = splitHeaderSourceConfig()->orientation(); if ( o == "Vertical" ) - return Qt::Vertical; + return TQt::Vertical; else - return Qt::Horizontal; + return TQt::Horizontal; } void CppSupportPart::slotNewClass() @@ -1506,7 +1506,7 @@ bool CppSupportPart::parseProject( bool force ) uint offset; _jd->stream >> fn >> ts >> offset; - _jd->pcs[ fn ] = tqMakePair( ts, offset ); + _jd->pcs[ fn ] = qMakePair( ts, offset ); } } } @@ -1526,7 +1526,7 @@ bool CppSupportPart::parseProject( bool force ) _jd->backgroundCount = 0; _jd->cycle = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); m_saveMemoryTimer->stop(); //Do not regularly remove cached files that may still be needed while parsing(the cache anyway be full for the whole parsing-process) return true; @@ -1583,7 +1583,7 @@ void CppSupportPart::slotParseFiles() } ++( _jd->it ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); if( _jd->it == _jd->files.end()) { if( _jd->reparseList.isEmpty() ) { @@ -1639,11 +1639,11 @@ void CppSupportPart::slotParseFiles() _jd->progressBar->setTotalSteps( _jd->backgroundCount ); if( _jd->lastParse.msecsTo( TQTime::currentTime()) > 60000 && !m_backgroundParser->filesInQueue()) { _jd->backgroundCount = _jd->backgroundState; ///Stop waiting if there is no progress and no file in the background-parser - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); } else { int timeStep = 0; if( alwaysParseInBackground ) { - TQTimer::singleShot( 10, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( slotParseFiles() ) ); } else { if( _jd->it == _jd->reparseList.end() ) { /*_jd->it = _jd->files.end(); @@ -1659,7 +1659,7 @@ void CppSupportPart::slotParseFiles() timeStep = 1; }*/ } - TQTimer::singleShot( timeStep, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( timeStep, this, TQ_SLOT( slotParseFiles() ) ); } } } @@ -1699,25 +1699,29 @@ void CppSupportPart::slotNeedTextHint( int line, int column, TQString& textHint return ; m_backgroundParser->lock(); - TranslationUnitAST* ast = *m_backgroundParser->translationUnit( m_activeFileName ); - AST* node = 0; - if ( ast && ( node = findNodeAt( ast, line, column ) ) ) + ParsedFilePointer pTransUnit = m_backgroundParser->translationUnit(m_activeFileName); + if (pTransUnit) { + TranslationUnitAST* ast = *pTransUnit; + AST* node = 0; + if ( ast && ( node = findNodeAt( ast, line, column ) ) ) + { - while ( node && node->nodeType() != NodeType_FunctionDefinition ) - node = node->parent(); + while ( node && node->nodeType() != NodeType_FunctionDefinition ) + node = node->parent(); - if ( node ) - { - int startLine, startColumn; - int endLine, endColumn; - node->getStartPosition( &startLine, &startColumn ); - node->getEndPosition( &endLine, &endColumn ); + if ( node ) + { + int startLine, startColumn; + int endLine, endColumn; + node->getStartPosition( &startLine, &startColumn ); + node->getEndPosition( &endLine, &endColumn ); - if ( !node->text().isNull() ) - textHint = node->text(); - else - textHint = m_activeEditor->textLine( startLine ).simplifyWhiteSpace(); + if ( !node->text().isNull() ) + textHint = node->text(); + else + textHint = m_activeEditor->textLine( startLine ).simplifyWhiteSpace(); + } } } m_backgroundParser->unlock(); @@ -2082,9 +2086,9 @@ void CppSupportPart::splitHeaderSourceConfigStored( ) { TQString o = splitHeaderSourceConfig()->orientation(); if ( o == "Vertical" ) - emit splitOrientationChanged( Qt::Vertical ); + emit splitOrientationChanged( TQt::Vertical ); else if ( o == "Horizontal" ) - emit splitOrientationChanged( Qt::Horizontal ); + emit splitOrientationChanged( TQt::Horizontal ); } void CppSupportPart::removeWithReferences( const TQString & fileName ) @@ -3165,7 +3169,7 @@ void UIBlockTester::UIBlockTesterThread::stop() { UIBlockTester::UIBlockTester( uint milliseconds ) : m_thread( *this ), m_msecs( milliseconds ) { m_timer = new TQTimer( this ); m_timer->start( milliseconds/10 ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timer()) ); timer(); m_thread.start(); } diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index 15a272fd..dc4d4451 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -38,7 +38,7 @@ ///A class that helps detecting what exactly makes the UI block. To use it, just place a breakpoint on UIBlockTester::lockup() and inspect the execution-position of the main thread class UIBlockTester : public TQObject { - Q_OBJECT + TQ_OBJECT class UIBlockTesterThread : public TQThread { public: @@ -155,7 +155,7 @@ private: class CppSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: @@ -289,7 +289,7 @@ protected: virtual TQString formatClassName( const TQString &name ); virtual TQString unformatClassName( const TQString &name ); virtual bool shouldSplitDocument( const KURL &url ); - virtual Qt::Orientation splitOrientation() const; + virtual TQt::Orientation splitOrientation() const; virtual void addMethod( ClassDom klass ); virtual void addAttribute( ClassDom klass ); diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui index fcd6e684..1080ffc3 100644 --- a/languages/cpp/creategettersetter.ui +++ b/languages/cpp/creategettersetter.ui @@ -219,9 +219,9 @@ <tabstop>m_btnCancel</tabstop> <tabstop>m_btnOk</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotInlineChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/creategettersetterconfiguration.h b/languages/cpp/creategettersetterconfiguration.h index e556e9dd..474c4af8 100644 --- a/languages/cpp/creategettersetterconfiguration.h +++ b/languages/cpp/creategettersetterconfiguration.h @@ -34,7 +34,7 @@ class TQDomDocument; * @author Jonas Jacobi <j.jacobi@gmx.de> */ class CreateGetterSetterConfiguration : public TQObject{ -Q_OBJECT +TQ_OBJECT public: CreateGetterSetterConfiguration(CppSupportPart* part); diff --git a/languages/cpp/creategettersetterdialog.h b/languages/cpp/creategettersetterdialog.h index f5075b95..95ea4dd4 100644 --- a/languages/cpp/creategettersetterdialog.h +++ b/languages/cpp/creategettersetterdialog.h @@ -23,7 +23,7 @@ class CppSupportPart; */ class CreateGetterSetterDialog: public CreateGetterSetterDialogBase { - Q_OBJECT + TQ_OBJECT public: CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, TQWidget *parent = 0, const char *name = 0); diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index 893ac55b..a87ed5b6 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -212,7 +212,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const KService::Ptr ptr = *it; int error = 0; - KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, TQT_TQOBJECT(this), ptr->name().latin1(), TQStringList(), &error ); + KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, this, ptr->name().latin1(), TQStringList(), &error ); if ( importer ) { new PCSListViewItem( ptr, importer, importerListView ); @@ -276,7 +276,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) m_settings = importer->createSettingsPage( settingsPage ); setNextEnabled( currentPage(), false ); setHelpEnabled( currentPage(), false ); - connect( m_settings, TQT_SIGNAL( enabled( int ) ), this, TQT_SLOT( setNextPageEnabled( int ) ) ); + connect( m_settings, TQ_SIGNAL( enabled( int ) ), this, TQ_SLOT( setNextPageEnabled( int ) ) ); if ( m_settings ) { @@ -307,7 +307,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) m_part->removeCatalog( dbName ); m_jobData = new PCSJobData( dbName, fileList ); - TQTimer::singleShot( 0, this, TQT_SLOT(parseNext()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(parseNext()) ); } } @@ -340,7 +340,7 @@ void CreatePCSDialog::parseNext( ) ++(m_jobData->it); - TQTimer::singleShot( 0, this, TQT_SLOT(parseNext()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(parseNext()) ); } diff --git a/languages/cpp/createpcsdialog.h b/languages/cpp/createpcsdialog.h index 73b08620..9aab172b 100644 --- a/languages/cpp/createpcsdialog.h +++ b/languages/cpp/createpcsdialog.h @@ -20,7 +20,7 @@ class CppSupportPart; class CreatePCSDialog : public CreatePCSDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui index a128e877..14e859b0 100644 --- a/languages/cpp/createpcsdialogbase.ui +++ b/languages/cpp/createpcsdialogbase.ui @@ -159,10 +159,10 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>slotSelected(const TQString&)</slot> <slot>slotSelectionChanged(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/debugger/DESIGN.txt b/languages/cpp/debugger/DESIGN.txt index 627fd403..3f4b4786 100644 --- a/languages/cpp/debugger/DESIGN.txt +++ b/languages/cpp/debugger/DESIGN.txt @@ -30,7 +30,7 @@ necessary to clear already cached data for other threads. == Command execution == The controller has a queue of commands to send to gdb. A command typically -has a callback (pair of QObject* and a member pointer) to be called when +has a callback (pair of TQObject* and a member pointer) to be called when command is done. When the queue is non-empty, and debugger is not busy executing the previous diff --git a/languages/cpp/debugger/breakpoint.h b/languages/cpp/debugger/breakpoint.h index a313a814..28e7f1dd 100644 --- a/languages/cpp/debugger/breakpoint.h +++ b/languages/cpp/debugger/breakpoint.h @@ -46,7 +46,7 @@ enum BP_TYPES class Breakpoint : public TQObject { - Q_OBJECT + TQ_OBJECT public: Breakpoint(bool temporary=false, bool enabled=true); diff --git a/languages/cpp/debugger/dbgcontroller.h b/languages/cpp/debugger/dbgcontroller.h index 022a6fcf..8b55896b 100644 --- a/languages/cpp/debugger/dbgcontroller.h +++ b/languages/cpp/debugger/dbgcontroller.h @@ -67,7 +67,7 @@ enum DBGStateFlags /***************************************************************************/ class DbgController : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index 718345a1..f6791209 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -73,21 +73,21 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) topLayout->addWidget(pids_); pids_->setFont(TDEGlobalSettings::fixedFont()); - KButtonBox *buttonbox = new KButtonBox(this, Qt::Horizontal); + KButtonBox *buttonbox = new KButtonBox(this, TQt::Horizontal); buttonbox->addStretch(); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); buttonbox->layout(); topLayout->addWidget(buttonbox); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); // Default display to 40 chars wide, default height is okay resize( ((TDEGlobalSettings::fixedFont()).pointSize())*40, height()); topLayout->activate(); - TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); } @@ -133,8 +133,8 @@ void Dbg_PS_Dialog::slotInit() } #endif - connect( psProc_, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotProcessExited()) ); - connect( psProc_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); + connect( psProc_, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(slotProcessExited()) ); + connect( psProc_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); psProc_->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h index fd42fa2b..dc92245d 100644 --- a/languages/cpp/debugger/dbgpsdlg.h +++ b/languages/cpp/debugger/dbgpsdlg.h @@ -30,7 +30,7 @@ namespace GDBDebugger class Dbg_PS_Dialog : public KDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 05b92d8a..f9143fc0 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -107,13 +107,13 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) if (moving_) return; - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { TDEPopupMenu *menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - parent(), TQT_SLOT(slotDock())); + parent(), TQ_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify TDevelop"), - parent(), TQT_SLOT(slotIconifyAndDock())); + parent(), TQ_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; @@ -229,22 +229,22 @@ DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixm void DbgDocker::mousePressEvent(TQMouseEvent *e) { - if (!TQT_TQRECT_OBJECT(rect()).contains( e->pos())) + if (!rect().contains( e->pos())) return; switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: { // Not really a click, but it'll hold for the time being !!! emit clicked(); break; } - case Qt::RightButton: + case TQt::RightButton: { TDEPopupMenu* menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); - menu->insertItem(i18n("Activate"), toolBar_, TQT_SLOT(slotUndock())); - menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQT_SLOT(slotActivateAndUndock())); + menu->insertItem(i18n("Activate"), toolBar_, TQ_SLOT(slotUndock())); + menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQ_SLOT(slotActivateAndUndock())); menu->popup(e->globalPos()); break; } @@ -270,9 +270,9 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, docker_(0), dockWindow_(new KSystemTray(parent)) { - winModule_ = new KWinModule(TQT_TQOBJECT(this)); + winModule_ = new KWinModule(this); docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); - connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); + connect(docker_, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. // see slotDbgKdevFocus() for more comments @@ -285,7 +285,7 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, // KWin::setType(winId(), NET::Override); // So it has no decoration KWin::setType(winId(), NET::Dock); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setFrameStyle( TQFrame::Box | TQFrame::Plain ); setLineWidth(4); setMidLineWidth(0); @@ -310,17 +310,17 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, bKDevFocus_ = new DbgButton(BarIcon("tdevelop"), TQString(), this); bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), TQString(), this); - connect(bRun, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRun())); - connect(bInterrupt, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotPause())); - connect(bNext, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); - connect(bNexti, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOverInstruction())); - connect(bStep, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepInto())); - connect(bStepi, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepIntoInstruction())); - connect(bFinish, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOut())); - connect(bRunTo, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRunToCursor())); - connect(bView, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotMemoryView())); - connect(bKDevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKdevFocus())); - connect(bPrevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevFocus())); + connect(bRun, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRun())); + connect(bInterrupt, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotPause())); + connect(bNext, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver())); + connect(bNexti, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOverInstruction())); + connect(bStep, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepInto())); + connect(bStepi, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepIntoInstruction())); + connect(bFinish, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOut())); + connect(bRunTo, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRunToCursor())); + connect(bView, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotMemoryView())); + connect(bKDevFocus_, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotKdevFocus())); + connect(bPrevFocus_, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrevFocus())); TQToolTip::add( bRun, i18n("Continue with application execution, may start the application") ); TQToolTip::add( bInterrupt, i18n("Interrupt the application execution") ); diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h index 3616c831..717643b4 100644 --- a/languages/cpp/debugger/dbgtoolbar.h +++ b/languages/cpp/debugger/dbgtoolbar.h @@ -32,7 +32,7 @@ class DebuggerPart; class DbgDocker : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: @@ -50,7 +50,7 @@ private: class DbgToolBar : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/debuggerconfigwidget.h b/languages/cpp/debugger/debuggerconfigwidget.h index 3a52da93..1fa060a8 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.h +++ b/languages/cpp/debugger/debuggerconfigwidget.h @@ -25,7 +25,7 @@ class DebuggerPart; class DebuggerConfigWidget : public DebuggerConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui index 9d6dcbf1..b3d0ae5e 100644 --- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui +++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui @@ -156,9 +156,6 @@ If you are not "dlopen"ing libs then leave this unchecked.</string> <property name="text"> <string>Enable separate terminal for application &IO</string> </property> - <property name="accel"> - <string>Alt+I</string> - </property> <property name="whatsThis" stdset="0"> <string>This allows you to enter terminal input when your application contains terminal input code (e.g. cin, fgets, etc.). @@ -173,9 +170,6 @@ Otherwise leave it unchecked.</string> <property name="text"> <string>E&nable floating toolbar</string> </property> - <property name="accel"> - <string>Alt+N</string> - </property> <property name="whatsThis" stdset="0"> <string>Use the floating toolbar. This toolbar always stays on top of all windows so that if the app covers TDevelop @@ -192,9 +186,6 @@ This toolbar is in addition to the toolbar in TDevelop.</string> <property name="text"> <string>Display static &members</string> </property> - <property name="accel"> - <string>Alt+M</string> - </property> <property name="whatsThis" stdset="0"> <string>Displaying static members makes GDB slower in producing data within TDE and TQt. diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 6621cbf8..e2efd7b0 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -166,12 +166,12 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi mainWindow()->setViewAvailable(gdbOutputWidget, false); // gdbBreakpointWidget -> this - connect( gdbBreakpointWidget, TQT_SIGNAL(refreshBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( gdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( gdbBreakpointWidget, TQT_SIGNAL(gotoSourcePosition(const TQString&, int)), - this, TQT_SLOT(slotGotoSource(const TQString&, int)) ); + connect( gdbBreakpointWidget, TQ_SIGNAL(refreshBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( gdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( gdbBreakpointWidget, TQ_SIGNAL(gotoSourcePosition(const TQString&, int)), + this, TQ_SLOT(slotGotoSource(const TQString&, int)) ); viewerWidget = new ViewerWidget( controller, 0, "viewerWidget"); @@ -179,15 +179,15 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi i18n("Debug views"), i18n("Special debugger views")); mainWindow()->setViewAvailable(viewerWidget, false); - connect(viewerWidget, TQT_SIGNAL(setViewShown(bool)), - this, TQT_SLOT(slotShowView(bool))); + connect(viewerWidget, TQ_SIGNAL(setViewShown(bool)), + this, TQ_SLOT(slotShowView(bool))); // Now setup the actions TDEAction *action; // action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, action = new TDEAction(i18n("&Start"), "dbgrun", Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); action->setWhatsThis( i18n("<b>Start in debugger</b><p>" @@ -198,7 +198,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "about variables, frame stack, and so on.") ); action = new TDEAction(i18n("&Restart"), "dbgrestart", 0, - this, TQT_SLOT(slotRestart()), + this, TQ_SLOT(slotRestart()), actionCollection(), "debug_restart"); action->setToolTip( i18n("Restart program") ); action->setWhatsThis( i18n("<b>Restarts application</b><p>" @@ -208,33 +208,33 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Sto&p"), "process-stop", 0, - this, TQT_SLOT(slotStop()), + this, TQ_SLOT(slotStop()), actionCollection(), "debug_stop"); action->setToolTip( i18n("Stop debugger") ); action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger.")); action = new TDEAction(i18n("Interrupt"), "media-playback-pause", 0, - this, TQT_SLOT(slotPause()), + this, TQ_SLOT(slotPause()), actionCollection(), "debug_pause"); action->setToolTip( i18n("Interrupt application") ); action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current GDB command.")); action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0, - this, TQT_SLOT(slotRunToCursor()), + this, TQ_SLOT(slotRunToCursor()), actionCollection(), "debug_runtocursor"); action->setToolTip( i18n("Run to cursor") ); action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached.")); action = new TDEAction(i18n("Set E&xecution Position to Cursor"), "dbgjumpto", 0, - this, TQT_SLOT(slotJumpToCursor()), + this, TQ_SLOT(slotJumpToCursor()), actionCollection(), "debug_jumptocursor"); action->setToolTip( i18n("Jump to cursor") ); action->setWhatsThis(i18n("<b>Set Execution Position </b><p>Set the execution pointer to the current cursor position.")); action = new TDEAction(i18n("Step &Over"), "dbgnext", Key_F10, - this, TQT_SLOT(slotStepOver()), + this, TQ_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); action->setWhatsThis( i18n("<b>Step over</b><p>" @@ -245,14 +245,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Step over Ins&truction"), "dbgnextinst", 0, - this, TQT_SLOT(slotStepOverInstruction()), + this, TQ_SLOT(slotStepOverInstruction()), actionCollection(), "debug_stepoverinst"); action->setToolTip( i18n("Step over instruction") ); action->setWhatsThis(i18n("<b>Step over instruction</b><p>Steps over the next assembly instruction.")); action = new TDEAction(i18n("Step &Into"), "dbgstep", Key_F11, - this, TQT_SLOT(slotStepInto()), + this, TQ_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); action->setWhatsThis( i18n("<b>Step into</b><p>" @@ -262,14 +262,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Step into I&nstruction"), "dbgstepinst", 0, - this, TQT_SLOT(slotStepIntoInstruction()), + this, TQ_SLOT(slotStepIntoInstruction()), actionCollection(), "debug_stepintoinst"); action->setToolTip( i18n("Step into instruction") ); action->setWhatsThis(i18n("<b>Step into instruction</b><p>Steps into the next assembly instruction.")); action = new TDEAction(i18n("Step O&ut"), "dbgstepout", Key_F12, - this, TQT_SLOT(slotStepOut()), + this, TQ_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current function") ); action->setWhatsThis( i18n("<b>Step out</b><p>" @@ -281,7 +281,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Viewers"), "dbgmemview", 0, - this, TQT_SLOT(slotMemoryView()), + this, TQ_SLOT(slotMemoryView()), actionCollection(), "debug_memview"); action->setToolTip( i18n("Debugger viewers") ); action->setWhatsThis(i18n("<b>Debugger viewers</b><p>Various information about application being executed. There are 4 views available:<br>" @@ -292,7 +292,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Examine Core File..."), "application-x-core", 0, - this, TQT_SLOT(slotExamineCore()), + this, TQ_SLOT(slotExamineCore()), actionCollection(), "debug_core"); action->setToolTip( i18n("Examine core file") ); action->setWhatsThis( i18n("<b>Examine core file</b><p>" @@ -304,72 +304,72 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Attach to Process"), "connect_creating", 0, - this, TQT_SLOT(slotAttachProcess()), + this, TQ_SLOT(slotAttachProcess()), actionCollection(), "debug_attach"); action->setToolTip( i18n("Attach to process") ); action->setWhatsThis(i18n("<b>Attach to process</b><p>Attaches the debugger to a running process.")); action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0, - this, TQT_SLOT(toggleBreakpoint()), + this, TQ_SLOT(toggleBreakpoint()), actionCollection(), "debug_toggle_breakpoint"); action->setToolTip(i18n("Toggle breakpoint")); action->setWhatsThis(i18n("<b>Toggle breakpoint</b><p>Toggles the breakpoint at the current line in editor.")); - connect( mainWindow()->main()->guiFactory(), TQT_SIGNAL(clientAdded(KXMLGUIClient*)), - this, TQT_SLOT(guiClientAdded(KXMLGUIClient*)) ); + connect( mainWindow()->main()->guiFactory(), TQ_SIGNAL(clientAdded(KXMLGUIClient*)), + this, TQ_SLOT(guiClientAdded(KXMLGUIClient*)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( partController(), TQT_SIGNAL(loadedFile(const KURL &)), - gdbBreakpointWidget, TQT_SLOT(slotRefreshBP(const KURL &)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpoint(const TQString &, int)), - gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(editedBreakpoint(const TQString &, int)), - gdbBreakpointWidget, TQT_SLOT(slotEditBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), - gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); + connect( partController(), TQ_SIGNAL(loadedFile(const KURL &)), + gdbBreakpointWidget, TQ_SLOT(slotRefreshBP(const KURL &)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpoint(const TQString &, int)), + gdbBreakpointWidget, TQ_SLOT(slotToggleBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(editedBreakpoint(const TQString &, int)), + gdbBreakpointWidget, TQ_SLOT(slotEditBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + gdbBreakpointWidget, TQ_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStop(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectClosed()), - this, TQT_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStop(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectClosed()), + this, TQ_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); procLineMaker = new ProcessLineMaker(); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStdoutLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStderrLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStderrLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStdoutLine(const TQCString&))); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStderrLine(const TQCString&))); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStdoutLine(const TQCString&))); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStderrLine(const TQCString&))); // The output from tracepoints goes to "application" window, because // we don't have any better alternative, and using yet another window // is undesirable. Besides, this makes tracepoint look even more similar // to printf debugging. - connect( gdbBreakpointWidget, TQT_SIGNAL(tracingOutput(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); + connect( gdbBreakpointWidget, TQ_SIGNAL(tracingOutput(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStdout(const char*))); - connect(partController(), TQT_SIGNAL(savedFile(const KURL &)), - this, TQT_SLOT(slotFileSaved())); + connect(partController(), TQ_SIGNAL(savedFile(const KURL &)), + this, TQ_SLOT(slotFileSaved())); if (project()) - connect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotProjectCompiled())); + connect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotProjectCompiled())); setupController(); - TQTimer::singleShot(0, this, TQT_SLOT(setupDcop())); + TQTimer::singleShot(0, this, TQ_SLOT(setupDcop())); } void DebuggerPart::setupDcop() @@ -379,7 +379,7 @@ void DebuggerPart::setupDcop() if ((*it).find("drkonqi-") == 0) slotDCOPApplicationRegistered(*it); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), TQT_SLOT(slotDCOPApplicationRegistered(const TQCString&))); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), TQ_SLOT(slotDCOPApplicationRegistered(const TQCString&))); kapp->dcopClient()->setNotifications(true); } @@ -415,7 +415,7 @@ ASYNC DebuggerPart::slotDebugExternalProcess() if (attachProcess(pid) && m_drkonqi.isEmpty()) { m_drkonqi = kapp->dcopClient()->senderId(); - TQTimer::singleShot(15000, this, TQT_SLOT(slotCloseDrKonqi())); + TQTimer::singleShot(15000, this, TQ_SLOT(slotCloseDrKonqi())); mainWindow()->raiseView(framestackWidget); } @@ -497,7 +497,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) if (act) { int id = popup->insertItem( act->iconSet(), i18n("Run to &Cursor"), - this, TQT_SLOT(slotRunToCursor()), + this, TQ_SLOT(slotRunToCursor()), 0, -1, index); popup->setWhatsThis(id, act->whatsThis()); @@ -507,7 +507,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) if (econtext->url().isLocalFile()) { int id = popup->insertItem( i18n("Toggle Breakpoint"), - this, TQT_SLOT(toggleBreakpoint()), + this, TQ_SLOT(toggleBreakpoint()), 0, -1, index); index += running; popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); @@ -516,12 +516,12 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) { TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); int id = popup->insertItem( i18n("Evaluate: %1").arg(squeezed), - this, TQT_SLOT(contextEvaluate()), + this, TQ_SLOT(contextEvaluate()), 0, -1, index); index += running; popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor.")); int id2 = popup->insertItem( i18n("Watch: %1").arg(squeezed), - this, TQT_SLOT(contextWatch()), + this, TQ_SLOT(contextWatch()), 0, -1, index); index += running; popup->setWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list.")); @@ -562,8 +562,8 @@ void DebuggerPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Debugger"), i18n("Debugger"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); DebuggerConfigWidget *w = new DebuggerConfigWidget(this, vbox, "debugger config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(finished()), controller, TQT_SLOT(configure()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(finished()), controller, TQ_SLOT(configure()) ); } @@ -572,57 +572,57 @@ void DebuggerPart::setupController() VariableTree *variableTree = variableWidget->varTree(); // variableTree -> gdbBreakpointWidget - connect( variableTree, TQT_SIGNAL(toggleWatchpoint(const TQString &)), - gdbBreakpointWidget, TQT_SLOT(slotToggleWatchpoint(const TQString &))); + connect( variableTree, TQ_SIGNAL(toggleWatchpoint(const TQString &)), + gdbBreakpointWidget, TQ_SLOT(slotToggleWatchpoint(const TQString &))); // gdbOutputWidget -> controller - connect( gdbOutputWidget, TQT_SIGNAL(userGDBCmd(const TQString &)), - controller, TQT_SLOT(slotUserGDBCmd(const TQString&))); - connect( gdbOutputWidget, TQT_SIGNAL(breakInto()), - controller, TQT_SLOT(slotBreakInto())); + connect( gdbOutputWidget, TQ_SIGNAL(userGDBCmd(const TQString &)), + controller, TQ_SLOT(slotUserGDBCmd(const TQString&))); + connect( gdbOutputWidget, TQ_SIGNAL(breakInto()), + controller, TQ_SLOT(slotBreakInto())); - connect( controller, TQT_SIGNAL(breakpointHit(int)), - gdbBreakpointWidget, TQT_SLOT(slotBreakpointHit(int))); + connect( controller, TQ_SIGNAL(breakpointHit(int)), + gdbBreakpointWidget, TQ_SLOT(slotBreakpointHit(int))); // controller -> disassembleWidget - connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), - disassembleWidget, TQT_SLOT(slotShowStepInSource(const TQString&, int, const TQString&))); + connect( controller, TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + disassembleWidget, TQ_SLOT(slotShowStepInSource(const TQString&, int, const TQString&))); // controller -> this - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - this, TQT_SLOT(slotStatus(const TQString&, int))); - connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), - this, TQT_SLOT(slotShowStep(const TQString&, int))); - connect( controller, TQT_SIGNAL(debuggerAbnormalExit()), - this, TQT_SLOT(slotDebuggerAbnormalExit())); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + this, TQ_SLOT(slotStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + this, TQ_SLOT(slotShowStep(const TQString&, int))); + connect( controller, TQ_SIGNAL(debuggerAbnormalExit()), + this, TQ_SLOT(slotDebuggerAbnormalExit())); - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - this, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + this, TQ_SLOT(slotEvent(GDBController::event_t))); // controller -> procLineMaker - connect( controller, TQT_SIGNAL(ttyStdout(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); - connect( controller, TQT_SIGNAL(ttyStderr(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStderr(const char*))); + connect( controller, TQ_SIGNAL(ttyStdout(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStdout(const char*))); + connect( controller, TQ_SIGNAL(ttyStderr(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStderr(const char*))); // controller -> gdbOutputWidget - connect( controller, TQT_SIGNAL(gdbInternalCommandStdout(const char*)), - gdbOutputWidget, TQT_SLOT(slotInternalCommandStdout(const char*)) ); - connect( controller, TQT_SIGNAL(gdbUserCommandStdout(const char*)), - gdbOutputWidget, TQT_SLOT(slotUserCommandStdout(const char*)) ); + connect( controller, TQ_SIGNAL(gdbInternalCommandStdout(const char*)), + gdbOutputWidget, TQ_SLOT(slotInternalCommandStdout(const char*)) ); + connect( controller, TQ_SIGNAL(gdbUserCommandStdout(const char*)), + gdbOutputWidget, TQ_SLOT(slotUserCommandStdout(const char*)) ); - connect( controller, TQT_SIGNAL(gdbStderr(const char*)), - gdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - gdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(gdbStderr(const char*)), + gdbOutputWidget, TQ_SLOT(slotReceivedStderr(const char*)) ); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + gdbOutputWidget, TQ_SLOT(slotDbgStatus(const TQString&, int))); // controller -> viewerWidget - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - viewerWidget, TQT_SLOT(slotDebuggerState(const TQString&, int))); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + viewerWidget, TQ_SLOT(slotDebuggerState(const TQString&, int))); - connect(statusBarIndicator, TQT_SIGNAL(doubleClicked()), - controller, TQT_SLOT(explainDebuggerStatus())); + connect(statusBarIndicator, TQ_SIGNAL(doubleClicked()), + controller, TQ_SLOT(explainDebuggerStatus())); } @@ -857,18 +857,18 @@ void DebuggerPart::slotRun() if (rebuild) { - disconnect(TQT_SIGNAL(buildProject())); + disconnect(TQ_SIGNAL(buildProject())); // The KDevProject has no method to build the project, // so try connecting to a slot has is present to all // existing project managers. // Note: this assumes that 'slotBuild' will save // modified files. - if (connect(this, TQT_SIGNAL(buildProject()), - project(), TQT_SLOT(slotBuild()))) + if (connect(this, TQ_SIGNAL(buildProject()), + project(), TQ_SLOT(slotBuild()))) { - connect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotRun_part2())); + connect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotRun_part2())); emit buildProject(); rebuild = true; @@ -894,8 +894,8 @@ void DebuggerPart::slotRun_part2() { needRebuild_ = false; - disconnect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotRun_part2())); + disconnect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotRun_part2())); if (controller->stateIsOn( s_dbgNotStarted )) { diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h index 50479249..04efcb9a 100644 --- a/languages/cpp/debugger/debuggerpart.h +++ b/languages/cpp/debugger/debuggerpart.h @@ -46,7 +46,7 @@ class ViewerWidget; class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp index 90657b29..6d1122ee 100644 --- a/languages/cpp/debugger/debuggertracingdialog.cpp +++ b/languages/cpp/debugger/debuggertracingdialog.cpp @@ -19,11 +19,11 @@ namespace GDBDebugger { expressions->setButtons(KEditListBox::Add | KEditListBox::Remove); - connect(enable, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(enableOrDisable(int))); + connect(enable, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(enableOrDisable(int))); - connect(enableCustomFormat, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(enableOrDisableCustomFormat(int))); + connect(enableCustomFormat, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(enableOrDisableCustomFormat(int))); enable->setChecked(bp_->tracingEnabled()); expressions->setItems(bp_->tracedExpressions()); diff --git a/languages/cpp/debugger/debuggertracingdialog.h b/languages/cpp/debugger/debuggertracingdialog.h index d09a6a31..fa66c7f2 100644 --- a/languages/cpp/debugger/debuggertracingdialog.h +++ b/languages/cpp/debugger/debuggertracingdialog.h @@ -22,7 +22,7 @@ namespace GDBDebugger class DebuggerTracingDialog : public DebuggerTracingDialogBase { - Q_OBJECT + TQ_OBJECT public: DebuggerTracingDialog(Breakpoint* bp, diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui index b6e01791..4f42b213 100644 --- a/languages/cpp/debugger/debuggertracingdialogbase.ui +++ b/languages/cpp/debugger/debuggertracingdialogbase.ui @@ -130,9 +130,9 @@ If custom format string is not enabled, names and values of all expressions will <slot>reject()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>enableOrDisable()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/debugger/disassemblewidget.h b/languages/cpp/debugger/disassemblewidget.h index 54729aa4..5b085c0a 100644 --- a/languages/cpp/debugger/disassemblewidget.h +++ b/languages/cpp/debugger/disassemblewidget.h @@ -32,7 +32,7 @@ class GDBController; class DisassembleWidget : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp index 423fae89..e81bf590 100644 --- a/languages/cpp/debugger/framestackwidget.cpp +++ b/languages/cpp/debugger/framestackwidget.cpp @@ -57,11 +57,11 @@ FramestackWidget::FramestackWidget(GDBController* controller, // FIXME: maybe, all debugger components should derive from // a base class that does this connect. - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - this, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + this, TQ_SLOT(slotEvent(GDBController::event_t))); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); } diff --git a/languages/cpp/debugger/framestackwidget.h b/languages/cpp/debugger/framestackwidget.h index ca79c2f6..ed570245 100644 --- a/languages/cpp/debugger/framestackwidget.h +++ b/languages/cpp/debugger/framestackwidget.h @@ -90,7 +90,7 @@ private: */ class FramestackWidget : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index 47904817..c8064711 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -145,8 +145,8 @@ void BreakpointTableRow::appendEmptyRow() ComplexEditCell* act = new ComplexEditCell(table()); table()->setItem(row, Tracing, act); - TQObject::connect(act, TQT_SIGNAL(edit(TQTableItem*)), - table()->parent(), TQT_SLOT(editTracing(TQTableItem*))); + TQObject::connect(act, TQ_SIGNAL(edit(TQTableItem*)), + table()->parent(), TQ_SLOT(editTracing(TQTableItem*))); } /***************************************************************************/ @@ -251,39 +251,39 @@ controller_(controller) m_table->show(); - connect( newBreakpoint, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAddBlankBreakpoint(int)) ); + connect( newBreakpoint, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAddBlankBreakpoint(int)) ); - connect( m_table, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), - this, TQT_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); - connect( m_ctxMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotContextMenuSelect(int)) ); + connect( m_table, TQ_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), + this, TQ_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); + connect( m_ctxMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotContextMenuSelect(int)) ); - connect( m_table, TQT_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), - this, TQT_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); + connect( m_table, TQ_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), + this, TQ_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); - connect( m_table, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_SLOT(slotNewValue(int, int))); + connect( m_table, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(slotNewValue(int, int))); - connect( m_table, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotEditBreakpoint())); -// connect( m_table, TQT_SIGNAL(f2Pressed()), -// this, TQT_SLOT(slotEditBreakpoint())); - connect( m_table, TQT_SIGNAL(deletePressed()), - this, TQT_SLOT(slotRemoveBreakpoint())); + connect( m_table, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotEditBreakpoint())); +// connect( m_table, TQ_SIGNAL(f2Pressed()), +// this, TQ_SLOT(slotEditBreakpoint())); + connect( m_table, TQ_SIGNAL(deletePressed()), + this, TQ_SLOT(slotRemoveBreakpoint())); // This slot doesn't exist anymore -// connect( m_table, TQT_SIGNAL(insertPressed()), -// this, TQT_SLOT(slotAddBlankBreakpoint())); +// connect( m_table, TQ_SIGNAL(insertPressed()), +// this, TQ_SLOT(slotAddBlankBreakpoint())); // FIXME: maybe, all debugger components should derive from // a base class that does this connect. - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - this, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + this, TQ_SLOT(slotEvent(GDBController::event_t))); connect(controller, - TQT_SIGNAL(watchpointHit(int, const TQString&, const TQString&)), + TQ_SIGNAL(watchpointHit(int, const TQString&, const TQString&)), this, - TQT_SLOT(slotWatchpointHit(int, const TQString&, const TQString&))); + TQ_SLOT(slotWatchpointHit(int, const TQString&, const TQString&))); } /***************************************************************************/ @@ -453,8 +453,8 @@ BreakpointTableRow* GDBBreakpointWidget::addBreakpoint(Breakpoint *bp) BreakpointTableRow* btr = new BreakpointTableRow( m_table, TQTableItem::WhenCurrent, bp ); - connect(bp, TQT_SIGNAL(modified(Breakpoint*)), - this, TQT_SLOT(slotBreakpointModified(Breakpoint*))); + connect(bp, TQ_SIGNAL(modified(Breakpoint*)), + this, TQ_SLOT(slotBreakpointModified(Breakpoint*))); sendToGdb(*bp); @@ -686,7 +686,7 @@ void GDBBreakpointWidget::slotRemoveAllBreakpoints() void GDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const TQPoint &) { - if ( btn == Qt::LeftButton ) + if ( btn == TQt::LeftButton ) { // kdDebug(9012) << "in slotRowSelected row=" << row << endl; BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); @@ -1238,7 +1238,7 @@ TQWidget* ComplexEditCell::createEditor() const // than 20. b->setFixedWidth( 20 ); - connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit())); + connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit())); return box; } diff --git a/languages/cpp/debugger/gdbbreakpointwidget.h b/languages/cpp/debugger/gdbbreakpointwidget.h index c121e38e..3e3ce94d 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.h +++ b/languages/cpp/debugger/gdbbreakpointwidget.h @@ -43,7 +43,7 @@ class GDBController; class GDBBreakpointWidget : public TQHBox { - Q_OBJECT + TQ_OBJECT public: @@ -138,7 +138,7 @@ class BreakpointTableRow; */ class ComplexEditCell : public TQObject, public TQTableItem { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/gdbcommand.h b/languages/cpp/debugger/gdbcommand.h index 7000235a..946bc3aa 100644 --- a/languages/cpp/debugger/gdbcommand.h +++ b/languages/cpp/debugger/gdbcommand.h @@ -91,8 +91,8 @@ public: private: TQString command_; - TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this; - typedef void (TQT_BASE_OBJECT_NAME::* handler_t)(const GDBMI::ResultRecord&); + TQGuardedPtr<TQObject> handler_this; + typedef void (TQObject::* handler_t)(const GDBMI::ResultRecord&); handler_t handler_method; TQValueVector<TQString> lines; bool run; @@ -153,8 +153,8 @@ public: // GDBCommand overrides bool invokeHandler(const GDBMI::ResultRecord& r); private: - TQGuardedPtr<TQT_BASE_OBJECT_NAME> cli_handler_this; - typedef void (TQT_BASE_OBJECT_NAME::* cli_handler_t)(const TQValueVector<TQString>&); + TQGuardedPtr<TQObject> cli_handler_this; + typedef void (TQObject::* cli_handler_t)(const TQValueVector<TQString>&); cli_handler_t cli_handler_method; }; @@ -165,7 +165,7 @@ private: class SentinelCommand : public GDBCommand { public: - typedef void (TQT_BASE_OBJECT_NAME::*handler_method_t)(); + typedef void (TQObject::*handler_method_t)(); template<class Handler> SentinelCommand(Handler* handler_this, @@ -186,7 +186,7 @@ public: } private: - TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this; + TQGuardedPtr<TQObject> handler_this; handler_method_t handler_method; }; @@ -207,7 +207,7 @@ private: class ExpressionValueCommand : public TQObject, public GDBCommand { public: - typedef void (TQT_BASE_OBJECT_NAME::*handler_method_t)(const TQString&); + typedef void (TQObject::*handler_method_t)(const TQString&); template<class Handler> ExpressionValueCommand( @@ -226,7 +226,7 @@ public: } private: - TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this; + TQGuardedPtr<TQObject> handler_this; handler_method_t handler_method; }; diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index bca8b98d..be796329 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -798,17 +798,17 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en dbgProcess_ = new TDEProcess; - connect( dbgProcess_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotDbgWroteStdin(TDEProcess *)) ); + connect( dbgProcess_, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotDbgWroteStdin(TDEProcess *)) ); - connect( dbgProcess_, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotDbgProcessExited(TDEProcess*)) ); + connect( dbgProcess_, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotDbgProcessExited(TDEProcess*)) ); application_ = application; @@ -1101,8 +1101,8 @@ void GDBController::slotRun() tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); if (!config_dbgTerminal_) { - connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) ); - connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) ); + connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) ); + connect( tty_, TQ_SIGNAL(ErrOutput(const char*)), TQ_SIGNAL(ttyStderr(const char*)) ); } TQString tty(tty_->getSlave()); @@ -1459,9 +1459,9 @@ void GDBController::slotDbgStdout(TDEProcess *, char *buf, int buflen) FileSymbol file; file.contents = reply; - std::auto_ptr<GDBMI::Record> r(mi_parser_.parse(&file)); + std::unique_ptr<GDBMI::Record> r(mi_parser_.parse(&file)); - if (r.get() == 0) + if (!r) { // FIXME: Issue an error! kdDebug(9012) << "Invalid MI message: " << reply << "\n"; diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h index cf5d2eb6..f0f6389b 100644 --- a/languages/cpp/debugger/gdbcontroller.h +++ b/languages/cpp/debugger/gdbcontroller.h @@ -51,7 +51,7 @@ class STTY; class GDBController : public DbgController { - Q_OBJECT + TQ_OBJECT public: @@ -330,7 +330,7 @@ private: // After highting current line we need to do something more, // like announcing write watchpoints, and so need to have // access to the stop packet. So store it here. - std::auto_ptr<GDBMI::ResultRecord> last_stop_result; + std::unique_ptr<GDBMI::ResultRecord> last_stop_result; // Gdb 6.4 (and 6.3) does not support "character" format with MI, // so the only way it can work is via the "print" command. As gdb diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index deabf2c8..74ce3dc1 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -78,11 +78,11 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : slotDbgStatus( "", s_dbgNotStarted); - connect( m_userGDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotGDBCmd()) ); - connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); + connect( m_userGDBCmdEditor, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotGDBCmd()) ); + connect( m_Interrupt, TQ_SIGNAL(clicked()), TQ_SIGNAL(breakInto())); - connect( &updateTimer_, TQT_SIGNAL(timeout()), - this, TQT_SLOT(flushPending())); + connect( &updateTimer_, TQ_SIGNAL(timeout()), + this, TQ_SLOT(flushPending())); } /***************************************************************************/ @@ -325,7 +325,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) int id = popup->insertItem(i18n("Show Internal Commands"), this, - TQT_SLOT(toggleShowInternalCommands())); + TQ_SLOT(toggleShowInternalCommands())); popup->setItemChecked(id, parent_->showInternalCommands_); popup->setWhatsThis( @@ -338,7 +338,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) popup->insertItem(i18n("Copy All"), this, - TQT_SLOT(copyAll())); + TQ_SLOT(copyAll())); return popup; diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h index e7442b31..490ab93a 100644 --- a/languages/cpp/debugger/gdboutputwidget.h +++ b/languages/cpp/debugger/gdboutputwidget.h @@ -34,7 +34,7 @@ namespace GDBDebugger class GDBOutputWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -116,7 +116,7 @@ private: */ class OutputText : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: OutputText(GDBOutputWidget* parent) diff --git a/languages/cpp/debugger/gdbtable.h b/languages/cpp/debugger/gdbtable.h index 4b6cfece..9186622c 100644 --- a/languages/cpp/debugger/gdbtable.h +++ b/languages/cpp/debugger/gdbtable.h @@ -16,7 +16,7 @@ namespace GDBDebugger { class GDBTable : public TQTable { -Q_OBJECT +TQ_OBJECT public: GDBTable(TQWidget *parent = 0, const char *name = 0); diff --git a/languages/cpp/debugger/label_with_double_click.h b/languages/cpp/debugger/label_with_double_click.h index 409c80a3..8209f15a 100644 --- a/languages/cpp/debugger/label_with_double_click.h +++ b/languages/cpp/debugger/label_with_double_click.h @@ -6,7 +6,7 @@ class LabelWithDoubleClick : public TQLabel { - Q_OBJECT + TQ_OBJECT public: LabelWithDoubleClick(const TQString& s, TQWidget* parent); diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index 616b374f..86f7e61c 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -116,11 +116,11 @@ namespace GDBDebugger l->addSpacing(2); - connect(startAddressLineEdit, TQT_SIGNAL(returnPressed()), - okButton, TQT_SLOT(animateClick())); + connect(startAddressLineEdit, TQ_SIGNAL(returnPressed()), + okButton, TQ_SLOT(animateClick())); - connect(amountLineEdit, TQT_SIGNAL(returnPressed()), - okButton, TQT_SLOT(animateClick())); + connect(amountLineEdit, TQ_SIGNAL(returnPressed()), + okButton, TQ_SLOT(animateClick())); } }; @@ -162,8 +162,8 @@ namespace GDBDebugger { ok_ = true; - connect(real_widget, TQT_SIGNAL(bufferChanged(int, int)), - this, TQT_SLOT(memoryEdited(int, int))); + connect(real_widget, TQ_SIGNAL(bufferChanged(int, int)), + this, TQ_SLOT(memoryEdited(int, int))); khexedit2_real_widget = real_widget; @@ -197,22 +197,22 @@ namespace GDBDebugger rangeSelector_ = new MemoryRangeSelector(this); l->addWidget(rangeSelector_); - connect(rangeSelector_->okButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeMemoryRange())); + connect(rangeSelector_->okButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeMemoryRange())); - connect(rangeSelector_->cancelButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotHideRangeDialog())); + connect(rangeSelector_->cancelButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotHideRangeDialog())); connect(rangeSelector_->startAddressLineEdit, - TQT_SIGNAL(textChanged(const TQString&)), + TQ_SIGNAL(textChanged(const TQString&)), this, - TQT_SLOT(slotEnableOrDisable())); + TQ_SLOT(slotEnableOrDisable())); connect(rangeSelector_->amountLineEdit, - TQT_SIGNAL(textChanged(const TQString&)), + TQ_SIGNAL(textChanged(const TQString&)), this, - TQT_SLOT(slotEnableOrDisable())); + TQ_SLOT(slotEnableOrDisable())); l->addWidget(khexedit2_widget); @@ -436,11 +436,11 @@ namespace GDBDebugger toolBox_->setCurrentItem(widget); memoryViews_.push_back(widget); - connect(widget, TQT_SIGNAL(captionChanged(const TQString&)), - this, TQT_SLOT(slotChildCaptionChanged(const TQString&))); + connect(widget, TQ_SIGNAL(captionChanged(const TQString&)), + this, TQ_SLOT(slotChildCaptionChanged(const TQString&))); - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(slotChildDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(slotChildDestroyed(TQObject*))); } void ViewerWidget::slotDebuggerState(const TQString&, int state) @@ -466,7 +466,7 @@ namespace GDBDebugger TQValueVector<MemoryView*>::iterator i, e; for(i = memoryViews_.begin(), e = memoryViews_.end(); i != e; ++i) { - if (TQT_BASE_OBJECT(*i) == TQT_BASE_OBJECT(child)) + if (*i == child) { memoryViews_.erase(i); break; diff --git a/languages/cpp/debugger/memviewdlg.h b/languages/cpp/debugger/memviewdlg.h index b277a35b..37f0b0fc 100644 --- a/languages/cpp/debugger/memviewdlg.h +++ b/languages/cpp/debugger/memviewdlg.h @@ -33,7 +33,7 @@ namespace GDBDebugger class ViewerWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ViewerWidget(GDBController* controller, @@ -64,7 +64,7 @@ namespace GDBDebugger class MemoryView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MemoryView(GDBController* controller, diff --git a/languages/cpp/debugger/mi/miparser.cpp b/languages/cpp/debugger/mi/miparser.cpp index e078c04c..e950f2f3 100644 --- a/languages/cpp/debugger/mi/miparser.cpp +++ b/languages/cpp/debugger/mi/miparser.cpp @@ -97,7 +97,7 @@ bool MIParser::parsePrompt(Record *&record) bool MIParser::parseStreamRecord(Record *&record) { - std::auto_ptr<StreamRecord> stream(new StreamRecord); + std::unique_ptr<StreamRecord> stream(new StreamRecord); switch (lex->lookAhead()) { case '~': @@ -128,7 +128,7 @@ bool MIParser::parseResultRecord(Record *&record) TQString reason = lex->currentTokenText(); lex->nextToken(); - std::auto_ptr<ResultRecord> res(new ResultRecord); + std::unique_ptr<ResultRecord> res(new ResultRecord); res->reason = reason; if (lex->lookAhead() != ',') { @@ -151,7 +151,7 @@ bool MIParser::parseResult(Result *&result) TQString variable = lex->currentTokenText(); lex->nextToken(); - std::auto_ptr<Result> res(new Result); + std::unique_ptr<Result> res(new Result); res->variable = variable; if (lex->lookAhead() != '=') @@ -207,7 +207,7 @@ bool MIParser::parseList(Value *&value) { ADVANCE('['); - std::auto_ptr<ListValue> lst(new ListValue); + std::unique_ptr<ListValue> lst(new ListValue); // Note: can't use parseCSV here because of nested // "is this Value or Result" guessing. Too lazy to factor @@ -248,7 +248,7 @@ bool MIParser::parseList(Value *&value) bool MIParser::parseCSV(TupleValue** value, char start, char end) { - std::auto_ptr<TupleValue> tuple(new TupleValue); + std::unique_ptr<TupleValue> tuple(new TupleValue); if (!parseCSV(*tuple, start, end)) return false; diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index 6960ad6d..9d95ad0d 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -132,7 +132,7 @@ STTY::STTY(bool ext, const TQString &termAppName) if (fout >= 0) { ttySlave = TQString(tty_slave); out = new TQSocketNotifier(fout, TQSocketNotifier::Read, this); - connect( out, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OutReceived(int)) ); + connect( out, TQ_SIGNAL(activated(int)), this, TQ_SLOT(OutReceived(int)) ); } } } diff --git a/languages/cpp/debugger/stty.h b/languages/cpp/debugger/stty.h index 8c4cd2a4..818cd7fa 100644 --- a/languages/cpp/debugger/stty.h +++ b/languages/cpp/debugger/stty.h @@ -35,7 +35,7 @@ namespace GDBDebugger class STTY : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 5750d243..e46db5dc 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -104,14 +104,14 @@ VariableWidget::VariableWidget(GDBController* controller, topLayout->addItem(buttons); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddWatchVariable()) ); - connect( evalButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEvaluateExpression()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddWatchVariable()) ); + connect( evalButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEvaluateExpression()) ); - connect( watchVarEditor_, TQT_SIGNAL(returnPressed()), - TQT_SLOT(slotEvaluateExpression()) ); + connect( watchVarEditor_, TQ_SIGNAL(returnPressed()), + TQ_SLOT(slotEvaluateExpression()) ); - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - varTree_, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + varTree_, TQ_SLOT(slotEvent(GDBController::event_t))); // Setup help items. @@ -223,10 +223,10 @@ VariableTree::VariableTree(VariableWidget *parent, addColumn(i18n("Value")); // setResizeMode(AllColumns); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem*, int, const TQString&)), - this, TQT_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&))); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(itemRenamed( TQListViewItem*, int, const TQString&)), + this, TQ_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&))); } // ************************************************************************** @@ -1085,9 +1085,9 @@ VarItem::VarItem(TrimmableItem *parent, baseClassMember_(false), alive_(true) { - connect(this, TQT_SIGNAL(varobjNameChange(const TQString&, const TQString&)), + connect(this, TQ_SIGNAL(varobjNameChange(const TQString&, const TQString&)), varTree(), - TQT_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); + TQ_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); // User might have entered format together with expression: like @@ -1130,9 +1130,9 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, baseClassMember_(baseClassMember), alive_(true) { - connect(this, TQT_SIGNAL(varobjNameChange(const TQString&, const TQString&)), + connect(this, TQ_SIGNAL(varobjNameChange(const TQString&, const TQString&)), varTree(), - TQT_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); + TQ_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); expression_ = varobj["exp"].literal(); varobjName_ = varobj["name"].literal(); diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h index bf1116d3..902faad9 100644 --- a/languages/cpp/debugger/variablewidget.h +++ b/languages/cpp/debugger/variablewidget.h @@ -51,7 +51,7 @@ enum DataType { typeUnknown, typeValue, typePointer, typeReference, class VariableWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -85,7 +85,7 @@ private: class VariableTree : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: VariableTree(VariableWidget *parent, @@ -227,7 +227,7 @@ protected: class VarItem : public TQObject, public TrimmableItem { - Q_OBJECT + TQ_OBJECT public: enum format_t { natural, hexadecimal, decimal, character, binary }; diff --git a/languages/cpp/doc/cppannotations.toc b/languages/cpp/doc/cppannotations.toc index 7631c681..15cb3367 100644 --- a/languages/cpp/doc/cppannotations.toc +++ b/languages/cpp/doc/cppannotations.toc @@ -433,7 +433,6 @@ <tocsect3 name="18.3.4: Pointing to a newly allocated object" url="cplusplus18.html#l324"/> <tocsect3 name="18.3.5: Operators and members" url="cplusplus18.html#l325"/> <tocsect3 name="18.3.6: Using `unique_ptr' objects for arrays" url="cplusplus18.html#l326"/> - <tocsect3 name="18.3.7: The legacy class 'auto_ptr' (deprecated)" url="cplusplus18.html#l327"/> </tocsect2> <tocsect2 name="18.4: The class 'shared_ptr'" url="cplusplus18.html#l328"> <tocsect3 name="18.4.1: Defining `shared_ptr' objects" url="cplusplus18.html#l329"/> diff --git a/languages/cpp/doc/qt-kdev3.toc b/languages/cpp/doc/qt-kdev3.toc index ff9826cd..4675d7c2 100644 --- a/languages/cpp/doc/qt-kdev3.toc +++ b/languages/cpp/doc/qt-kdev3.toc @@ -16,7 +16,7 @@ <tocsect2 name="Designing the program" url="#Designing_the_Program"/> <tocsect2 name="Adding widgets" url="#Adding_Widgets"/> <tocsect2 name="Getting spaced out" url="#Getting_Spaced_Out"/> - <tocsect2 name="Signals and Q_SLOTS" url="#Signals_and_Slots"/> + <tocsect2 name="Signals and slots" url="#Signals_and_Slots"/> <tocsect2 name="Generating the source" url="#Generating_the_Source"/> <tocsect2 name="Implementing the slot" url="#Implementing_the_Slot"/> </tocsect1> diff --git a/languages/cpp/pcsimporter/CMakeLists.txt b/languages/cpp/pcsimporter/CMakeLists.txt index 2f904a5d..f734da91 100644 --- a/languages/cpp/pcsimporter/CMakeLists.txt +++ b/languages/cpp/pcsimporter/CMakeLists.txt @@ -12,4 +12,3 @@ add_subdirectory( qtimporter ) add_subdirectory( tdelibsimporter ) add_subdirectory( customimporter ) -add_subdirectory( qt4importer ) diff --git a/languages/cpp/pcsimporter/Makefile.am b/languages/cpp/pcsimporter/Makefile.am index 31533b36..9a7e1bb4 100644 --- a/languages/cpp/pcsimporter/Makefile.am +++ b/languages/cpp/pcsimporter/Makefile.am @@ -1,3 +1,3 @@ INCLUDES = METASOURCES = AUTO -SUBDIRS = qtimporter tdelibsimporter customimporter qt4importer +SUBDIRS = qtimporter tdelibsimporter customimporter diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h index 884a033d..83bea8c2 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h @@ -18,7 +18,7 @@ class SettingsDialog; class KDevCustomImporter : public KDevPCSImporter { -Q_OBJECT +TQ_OBJECT public: KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp index cdaf65b9..f08703b0 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp @@ -45,10 +45,10 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) grid->addMultiCellWidget( elb, 3, 3, 0, grid->numCols() ); - // connect( dbName_edit, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( validate() ) ); - connect( elb->addButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( validate() ) ); - connect( elb->removeButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( validate() ) ); - connect( elb, TQT_SIGNAL( added( const TQString& ) ), this, TQT_SLOT( validateDirectory( const TQString& ) ) ); + // connect( dbName_edit, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( validate() ) ); + connect( elb->addButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( validate() ) ); + connect( elb->removeButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( validate() ) ); + connect( elb, TQ_SIGNAL( added( const TQString& ) ), this, TQ_SLOT( validateDirectory( const TQString& ) ) ); } SettingsDialog::~SettingsDialog() diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.h b/languages/cpp/pcsimporter/customimporter/settingsdialog.h index 2b8e7fbd..6c9aaf2c 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.h @@ -18,7 +18,7 @@ class KEditListBox; class SettingsDialog : public SettingsDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui index 7fc72d0e..5d1ff666 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui @@ -55,9 +55,9 @@ </widget> </vbox> </widget> -<Q_SIGNALS> +<signals> <signal>enabled(int)</signal> -</Q_SIGNALS> +</signals> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt deleted file mode 100644 index 509a4f16..00000000 --- a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/languages/lib/interfaces - ${CMAKE_SOURCE_DIR}/lib/interfaces - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### other data ################################ - -tde_create_translated_desktop( - SOURCE kdevqt4importer.desktop - DESTINATION ${SERVICES_INSTALL_DIR} - PO_DIR tdevelop-desktops -) - - -##### libkdevqt4importer (module) ############### - -tde_add_kpart( libkdevqt4importer AUTOMOC - SOURCES - kdevqt4importer.cpp settingsdialogbase.ui - settingsdialog.cpp - LINK lang_interfaces-shared tdevelop-shared - DESTINATION ${PLUGIN_INSTALL_DIR} -) diff --git a/languages/cpp/pcsimporter/qt4importer/Makefile.am b/languages/cpp/pcsimporter/qt4importer/Makefile.am deleted file mode 100644 index 12f12104..00000000 --- a/languages/cpp/pcsimporter/qt4importer/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \ - -I$(top_srcdir)/lib/interfaces $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = libkdevqt4importer.la - -noinst_HEADERS = kdevqt4importer.h settingsdialog.h -libkdevqt4importer_la_SOURCES = kdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp -kde_services_DATA = kdevqt4importer.desktop -libkdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la -libkdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp deleted file mode 100644 index 0289c7a4..00000000 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003 by Roberto Raggi * - * roberto@kdevelop.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include "kdevqt4importer.h" -#include "kdevqt4importer.moc" -#include "settingsdialog.h" - -#include <kgenericfactory.h> -#include <tdetempfile.h> -#include <kprocess.h> -#include <kdebug.h> - -#include <tqtextstream.h> -#include <tqlabel.h> -#include <tqdir.h> - -K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) ) - -KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) - : KDevPCSImporter( parent, name ) -{ - m_qtfile = 0; -} - -KDevQt4Importer::~KDevQt4Importer() -{ - if (m_qtfile) - delete m_qtfile; - - m_qtfile = 0; -} - -TQStringList KDevQt4Importer::fileList() -{ - if( !m_settings ) - return TQStringList(); - - if (m_qtfile) - delete m_qtfile; - - KTempFile ifile; - TQTextStream &is = *ifile.textStream(); - - is << "#include <TQtCore/tqobjectdefs.h>\n" - << "#undef slots\n#undef signals\n#undef slots\n#undef signals" - << "#define slots slots\n" - << "#define signals signals\n" - << "#include <TQtCore/TQtCore>\n" - << "#include <TQtGui/TQtGui>\n" - << "#include <TQtNetwork/TQtNetwork>\n" - << "#include <TQtXml/TQtXml>\n" - << "#include <TQt3Support/TQt3Support>\n" - << "#include <TQtSql/TQtSql>\n" - << "#include <TQtTest/TQtTest>\n" - << "#include <TQtOpenGL/TQtOpenGL>\n"; - - - - TDEProcess proc; - proc << "cpp" << "-nostdinc" << "-xc++"; - - m_qtfile = new KTempFile(); - - // include paths - TQStringList paths = includePaths(); - for (TQStringList::Iterator it = paths.begin(); it != paths.end(); ++it) - proc << "-I" << *it; - - ifile.close(); - - TQString o; - o += "-o"; - o += m_qtfile->name(); - - proc << ifile.name() << o; - proc.start(TDEProcess::Block); - - return m_qtfile->name(); -} - -TQStringList KDevQt4Importer::includePaths() -{ - if( !m_settings || !m_qtfile) - return TQStringList(); - - TQStringList includePaths; - includePaths.push_back( m_settings->qtDir() ); - includePaths.push_back( m_settings->qtDir() + "/TQt" ); - - /// @todo add mkspec - return includePaths; -} - -TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) -{ - m_settings = new SettingsDialog( parent, name ); - return m_settings; -} - diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop deleted file mode 100644 index cd7697ee..00000000 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=KDevQt4Importer - -Comment=TDevelop Qt4 PCS Importer - -Type=Service -Icon=gear -X-TDE-ServiceTypes=TDevelop/PCSImporter -X-TDE-Library=libkdevqt4importer -X-TDevelop-PCSImporter= -X-TDevelop-Version=5 diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h deleted file mode 100644 index 3b9563f3..00000000 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h +++ /dev/null @@ -1,40 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003 by Roberto Raggi * - * roberto@kdevelop.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef KDEVTQTIMPORTER_H -#define KDEVTQTIMPORTER_H - -#include <kdevpcsimporter.h> -#include <tqguardedptr.h> - -class SettingsDialog; -class KTempFile; - -class KDevQt4Importer : public KDevPCSImporter -{ - Q_OBJECT - -public: - KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); - virtual ~KDevQt4Importer(); - - virtual TQString dbName() const { return TQString::fromLatin1("TQt4"); } - virtual TQStringList fileList(); - virtual TQStringList includePaths(); - - virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); - -private: - TQGuardedPtr<SettingsDialog> m_settings; - KTempFile *m_qtfile; -}; - -#endif diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp deleted file mode 100644 index 22c5b666..00000000 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp +++ /dev/null @@ -1,112 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003 by Roberto Raggi * - * roberto@kdevelop.org * - * * - * Copyright (C) 2006 by Jens Dagerbo * - * jens.dagerbo@swipnet.se * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include <tdelistbox.h> -#include <kcombobox.h> -#include <kurlrequester.h> -#include <kdebug.h> -#include <klineedit.h> -#include <tdemessagebox.h> -#include <tdelocale.h> - -#include <tqfile.h> -#include <tqdir.h> -#include <tqregexp.h> -#include <cstdlib> - -#include "settingsdialog.h" - -TQListBoxItem* TQListBox_selectedItem(TQListBox* cpTQListBox) -{ - if ( cpTQListBox->selectionMode() != TQListBox::Single ) - return 0; - if ( cpTQListBox->isSelected( cpTQListBox->currentItem() ) ) - return cpTQListBox->item(cpTQListBox->currentItem()); - return 0; -} - -SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl) - : SettingsDialogBase(parent,name,fl) -{ - TQStringList qtdirs; - qtdirs.push_back( ::getenv("TQTDIR") + TQString("/include") ); - qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" ); - qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" ); - qtdirs.push_back( "/usr/qt/4/include" ); - - for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) - { - TQString qtdir = *it; - if( !qtdir.isEmpty() && isValidTQtDir(qtdir) ) - if (!qtListBox->findItem(qtdir, ExactMatch)) - qtListBox->insertItem( qtdir ); - } - - qtUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - - connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); -} - -SettingsDialog::~SettingsDialog() -{ -} - -void SettingsDialog::slotSelectionChanged(TQListBoxItem* item) -{ - if( !qtListBox->selectedItem() ) - { - emit enabled( false ); - return; - } - - - emit enabled( true ); -} - -bool SettingsDialog::isValidTQtDir( const TQString & path ) const -{ - return TQFile::exists( path + "/TQtCore/TQtCore" ); -} - -TQString SettingsDialog::qtDir( ) const -{ - return qtListBox->currentText(); -} - -TQString SettingsDialog::configuration( ) const -{ - return ""; -} - -void SettingsDialog::addUrlButton_clicked( ) -{ - kdDebug(9000) << k_funcinfo << endl; - - if ( isValidTQtDir( qtUrl->url() ) ) - { - qtListBox->insertItem( qtUrl->url() ); - if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) - { - qtListBox->setSelected( item, true ); - } - qtUrl->lineEdit()->clear(); - } - else - { - KMessageBox::error( this, i18n("This does not appear to be a valid TQt4 include directory.\nPlease select a different directory."), i18n("Invalid Directory") ); - } -} - - -#include "settingsdialog.moc" diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h deleted file mode 100644 index 32065973..00000000 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h +++ /dev/null @@ -1,47 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003 by Roberto Raggi * - * roberto@kdevelop.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef SETTINGSDIALOG_H -#define SETTINGSDIALOG_H - -#include "settingsdialogbase.h" - -class SettingsDialog : public SettingsDialogBase -{ - Q_OBJECT - - -public: - SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~SettingsDialog(); - /*$PUBLIC_FUNCTIONS$*/ - - bool isValidTQtDir( const TQString& path ) const; - - TQString qtDir() const; - TQString configuration() const; - -public slots: - /*$PUBLIC_SLOTS$*/ - virtual void slotSelectionChanged(TQListBoxItem*); - -protected: - /*$PROTECTED_FUNCTIONS$*/ - -protected slots: - /*$PROTECTED_SLOTS$*/ - void addUrlButton_clicked(); - -}; - -#endif - - diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui deleted file mode 100644 index b0a48d2a..00000000 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui +++ /dev/null @@ -1,80 +0,0 @@ -<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> -<class>SettingsDialogBase</class> -<widget class="TQWidget"> - <property name="name"> - <cstring>SettingsDialogBase</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>346</width> - <height>275</height> - </rect> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>textLabel1_2</cstring> - </property> - <property name="text"> - <string>Qt4 include directories: -Only the selected entry will be used</string> - </property> - </widget> - <widget class="TQPushButton" row="2" column="1"> - <property name="name"> - <cstring>addUrlButton</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>&Add</string> - </property> - </widget> - <widget class="KURLRequester" row="2" column="0"> - <property name="name"> - <cstring>qtUrl</cstring> - </property> - </widget> - <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>qtListBox</cstring> - </property> - </widget> - </grid> -</widget> -<customwidgets> -</customwidgets> -<connections> - <connection> - <sender>qtListBox</sender> - <signal>selectionChanged(TQListBoxItem*)</signal> - <receiver>SettingsDialogBase</receiver> - <slot>slotSelectionChanged(TQListBoxItem*)</slot> - </connection> -</connections> -<forwards> - <forward>class TQListBoxItem;</forward> -</forwards> -<Q_SIGNALS> - <signal>enabled(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> - <slot>slotSelectionChanged(TQListBoxItem*)</slot> -</Q_SLOTS> -<layoutdefaults spacing="6" margin="11"/> -<includes> - <include location="global" impldecl="in implementation">kurlrequester.h</include> - <include location="global" impldecl="in implementation">tdelistbox.h</include> -</includes> -</UI> diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h index bad9973e..23c511da 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h @@ -19,7 +19,7 @@ class SettingsDialog; class KDevQtImporter : public KDevPCSImporter { - Q_OBJECT + TQ_OBJECT public: KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp index 2993c789..b79e4b17 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp @@ -56,7 +56,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) qtUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h index 32065973..796adf72 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h @@ -16,7 +16,7 @@ class SettingsDialog : public SettingsDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui index efba8920..af41060e 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui @@ -125,12 +125,12 @@ Only the selected entry will be used</string> <forwards> <forward>class TQListBoxItem;</forward> </forwards> -<Q_SIGNALS> +<signals> <signal>enabled(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotSelectionChanged(TQListBoxItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h index 14fb7cff..1e79cc12 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h +++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h @@ -19,7 +19,7 @@ class SettingsDialog; class KDevKDELibsImporter : public KDevPCSImporter { - Q_OBJECT + TQ_OBJECT public: KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp index 631d50d0..0c2ea291 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp @@ -53,7 +53,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) kdeUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.h b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.h index adcd182a..5893903d 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.h @@ -16,7 +16,7 @@ class SettingsDialog : public SettingsDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui index 8ac0d2db..7253be6d 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui @@ -118,12 +118,12 @@ Only the selected entry will be used</string> <forwards> <forward>class TQListBoxItem;</forward> </forwards> -<Q_SIGNALS> +<signals> <signal>enabled(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotSelectionChanged(TQListBoxItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index 49cb66f7..34a7fd9e 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -96,7 +96,7 @@ m_markIface( 0 ) "<tt>//FIXME fix this</tt>")); m_initCurrentTimer = new TQTimer( this ); - connect( m_initCurrentTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initCurrentList()) ); + connect( m_initCurrentTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(initCurrentList()) ); m_gridLayout = new TQGridLayout(this,2,3); m_errorList = new TDEListView(this); @@ -145,16 +145,16 @@ m_markIface( 0 ) m_gridLayout->addWidget(m_filterLabel,0,1,TQt::AlignRight); m_gridLayout->addWidget(m_filterEdit,0,2,TQt::AlignLeft); - connect( m_filterEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotFilter()) ); - connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )), - this, TQT_SLOT(slotFilter()) ); - connect( m_tabBar, TQT_SIGNAL(selected(int)), - this, TQT_SLOT(slotTabSelected(int)) ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); + connect( m_filterEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotFilter()) ); + connect( m_filterEdit, TQ_SIGNAL(textChanged( const TQString & )), + this, TQ_SLOT(slotFilter()) ); + connect( m_tabBar, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(slotTabSelected(int)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); // any editors that were open when we loaded the project needs to have their markType07 icon set too.. TQPtrListIterator<KParts::Part> it( *m_cppSupport->partController()->parts() ); @@ -225,11 +225,11 @@ void ProblemReporter::InitListView(TDEListView* listview) listview->addColumn( i18n("Problem") ); listview->setAllColumnsShowFocus( TRUE ); - connect( listview, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( listview, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); - connect( listview, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem* )) ); + connect( listview, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem* )) ); } diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h index 66bf9c62..01a14192 100644 --- a/languages/cpp/problemreporter.h +++ b/languages/cpp/problemreporter.h @@ -104,7 +104,7 @@ namespace KTextEditor class ProblemReporter: public TQWidget { - Q_OBJECT + TQ_OBJECT public: ProblemReporter( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 ); diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h index 6bbd71ef..e357a38f 100644 --- a/languages/cpp/qtbuildconfig.h +++ b/languages/cpp/qtbuildconfig.h @@ -31,7 +31,7 @@ class TQDomDocument; */ class QtBuildConfig : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/subclassing_template/CMakeLists.txt b/languages/cpp/subclassing_template/CMakeLists.txt index 3223a7d7..4da5b172 100644 --- a/languages/cpp/subclassing_template/CMakeLists.txt +++ b/languages/cpp/subclassing_template/CMakeLists.txt @@ -11,5 +11,4 @@ install( FILES subclass_template.h subclass_template.cpp - subclass_qt4_template.h subclass_qt4_template.cpp DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/subclassing ) diff --git a/languages/cpp/subclassing_template/Makefile.am b/languages/cpp/subclassing_template/Makefile.am index 4e722ca0..6ce03476 100644 --- a/languages/cpp/subclassing_template/Makefile.am +++ b/languages/cpp/subclassing_template/Makefile.am @@ -1,5 +1,4 @@ cppsupportdatadir = ${kde_datadir}/kdevcppsupport subclassingdir = ${cppsupportdatadir}/subclassing -subclassing_DATA = subclass_template.h subclass_template.cpp \ - subclass_qt4_template.h subclass_qt4_template.cpp +subclassing_DATA = subclass_template.h subclass_template.cpp diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.cpp b/languages/cpp/subclassing_template/subclass_qt4_template.cpp deleted file mode 100644 index 4531fa69..00000000 --- a/languages/cpp/subclassing_template/subclass_qt4_template.cpp +++ /dev/null @@ -1,16 +0,0 @@ - - -#include "$NEWFILENAMELC$.h" - -$NEWCLASS$::$NEWCLASS$(TQWidget* parent, TQt::WFlags fl) -: $TQTBASECLASS$( parent, fl ), Ui::$BASECLASS$() -{ - setupUi(this); -} - -$NEWCLASS$::~$NEWCLASS$() -{ -} - -/*$SPECIALIZATION$*/ - diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.h b/languages/cpp/subclassing_template/subclass_qt4_template.h deleted file mode 100644 index 62751c32..00000000 --- a/languages/cpp/subclassing_template/subclass_qt4_template.h +++ /dev/null @@ -1,29 +0,0 @@ - -#ifndef $NEWFILENAMEUC$_H -#define $NEWFILENAMEUC$_H - -#include <$TQTBASECLASS$> -#include "ui_$BASEFILENAME$.h" - -class $NEWCLASS$ : public $TQTBASECLASS$, private Ui::$BASECLASS$ -{ - Q_OBJECT - - -public: - $NEWCLASS$(TQWidget* parent = 0, TQt::WFlags fl = 0 ); - ~$NEWCLASS$(); - /*$PUBLIC_FUNCTIONS$*/ - -public slots: - /*$PUBLIC_SLOTS$*/ - -protected: - /*$PROTECTED_FUNCTIONS$*/ - -protected slots: - /*$PROTECTED_SLOTS$*/ - -}; - -#endif diff --git a/languages/cpp/subclassing_template/subclass_template.h b/languages/cpp/subclassing_template/subclass_template.h index 25bcf98c..5b68d851 100644 --- a/languages/cpp/subclassing_template/subclass_template.h +++ b/languages/cpp/subclassing_template/subclass_template.h @@ -6,7 +6,7 @@ class $NEWCLASS$ : public $BASECLASS$ { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 48bc3f91..96ec6385 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -191,13 +191,13 @@ void SubclassingDlg::readUiFile() // Special widget specific slots SlotItem *newSlot; - m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class",TQDIALOG_OBJECT_NAME_STRING); + m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog"); - if ( (m_qtBaseClassName==TQMAINWINDOW_OBJECT_NAME_STRING) || (m_qtBaseClassName==TQWIDGET_OBJECT_NAME_STRING) ) + if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") ) m_canBeModal = false; else m_canBeModal = true; - if (m_qtBaseClassName != TQWIDGET_OBJECT_NAME_STRING) + if (m_qtBaseClassName != "TQWidget") { newSlot = new SLOT_ACCEPT; newSlot->setOn(false); @@ -214,7 +214,7 @@ void SubclassingDlg::readUiFile() m_slots << newSlot; } - if (m_qtBaseClassName == TQWIZARD_OBJECT_NAME_STRING) + if (m_qtBaseClassName == "TQWizard") { newSlot = new SLOT_NEXT; m_slotView->insertItem(newSlot); @@ -369,10 +369,7 @@ void SubclassingDlg::accept() int qtVersion = DomUtil::readIntEntry( *m_cppSupport->project()->projectDom(), "/kdevcppsupport/qt/version", 3 ); if (m_creatingNewSubclass) { - if ( qtVersion == 3 ) - loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_template.h")); - else - loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_qt4_template.h")); + loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_template.h")); buffer = FileTemplate::read(m_cppSupport, "h") + buffer; TQFileInfo fi(m_filename + ".h"); @@ -464,10 +461,7 @@ void SubclassingDlg::accept() if (m_creatingNewSubclass) { - if ( qtVersion == 3 ) - loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_template.cpp")); - else - loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_qt4_template.cpp")); + loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_template.cpp")); buffer = FileTemplate::read(m_cppSupport, "cpp") + buffer; TQFileInfo fi(m_filename + ".cpp"); diff --git a/languages/cpp/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui index 67dcd97f..1b41e69e 100644 --- a/languages/cpp/subclassingdlgbase.ui +++ b/languages/cpp/subclassingdlgbase.ui @@ -233,9 +233,9 @@ <slot>onChangedClassName()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>onChangedClassName()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/tqtdesignercppintegration.cpp b/languages/cpp/tqtdesignercppintegration.cpp index 6132f758..10472ad8 100644 --- a/languages/cpp/tqtdesignercppintegration.cpp +++ b/languages/cpp/tqtdesignercppintegration.cpp @@ -68,7 +68,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function int funEndLine, funEndColumn; ( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); TQString access = accessID( *it ); - TQPair<int, int> funEndPoint = tqMakePair( funEndLine, funEndColumn ); + TQPair<int, int> funEndPoint = qMakePair( funEndLine, funEndColumn ); if ( !points.contains( access ) || points[ access ] < funEndPoint ) { @@ -98,7 +98,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function else { str.prepend( access + ":\n" ); - points[ access ] = tqMakePair( line - 1, 0 ); + points[ access ] = qMakePair( line - 1, 0 ); pt = points[ access ]; // end of class declaration } diff --git a/languages/cpp/tqtdesignercppintegration.h b/languages/cpp/tqtdesignercppintegration.h index ada0321a..be92a995 100644 --- a/languages/cpp/tqtdesignercppintegration.h +++ b/languages/cpp/tqtdesignercppintegration.h @@ -24,7 +24,7 @@ class QtDesignerCppIntegration : public QtDesignerIntegration { - Q_OBJECT + TQ_OBJECT public: QtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl ); |
