diff options
Diffstat (limited to 'languages')
178 files changed, 1655 insertions, 1673 deletions
diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index 1ca3abfd..05927d6e 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -56,8 +56,8 @@ AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStri setInstance (AdaSupportPartFactory::instance ()); d->problemReporter = new ProblemReporter (this); -// connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)), -// d->problemReporter, TQT_SLOT (configWidget (KDialogBase*))); +// connect (core (), TQ_SIGNAL (configWidget (KDialogBase*)), +// d->problemReporter, TQ_SLOT (configWidget (KDialogBase*))); d->problemReporter->setIcon( SmallIcon("application-vnd.tde.info") ); mainWindow( )->embedOutputView( d->problemReporter, i18n("Problems"), i18n("Problem reporter")); TQWhatsThis::add(d->problemReporter, i18n("<b>Problem reporter</b><p>This window shows various \"problems\" in your project. " @@ -65,15 +65,15 @@ AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStri setXMLFile ("adasupportpart.rc"); - connect (core (), TQT_SIGNAL (projectOpened ()), this, TQT_SLOT (projectOpened ())); - connect (core (), TQT_SIGNAL (projectClosed ()), this, TQT_SLOT (projectClosed ())); + connect (core (), TQ_SIGNAL (projectOpened ()), this, TQ_SLOT (projectOpened ())); + connect (core (), TQ_SIGNAL (projectClosed ()), this, TQ_SLOT (projectClosed ())); - connect (partController (), TQT_SIGNAL (savedFile (const KURL&)), - this, TQT_SLOT (savedFile (const KURL&))); + connect (partController (), TQ_SIGNAL (savedFile (const KURL&)), + this, TQ_SLOT (savedFile (const KURL&))); -// connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)), this, TQT_SLOT (configWidget (KDialogBase*))); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - d->problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); +// connect (core (), TQ_SIGNAL (configWidget (KDialogBase*)), this, TQ_SLOT (configWidget (KDialogBase*))); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + d->problemReporter, TQ_SLOT(configWidget(KDialogBase*)) ); // a small hack (robe) //classStore ()->globalScope ()->setName ("(default packages)"); @@ -102,14 +102,14 @@ KDevLanguageSupport::Features AdaSupportPart::features () void AdaSupportPart::projectOpened () { - 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 & ) ) ); - - TQTimer::singleShot (0, this, TQT_SLOT (initialParse ())); + 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 & ) ) ); + + TQTimer::singleShot (0, this, TQ_SLOT (initialParse ())); } @@ -126,8 +126,8 @@ void AdaSupportPart::initialParse () if (project ()) { mainWindow()->statusBar()->message( i18n("Updating...") ); - kapp->processEvents( ); - kapp->setOverrideCursor (waitCursor); + tdeApp->processEvents( ); + tdeApp->setOverrideCursor (waitCursor); int n = 0; TQStringList files = project ()->allFiles (); @@ -143,7 +143,7 @@ void AdaSupportPart::initialParse () TQString fn = project ()->projectDirectory () + "/" + *it; maybeParse (fn); - kapp->processEvents (500); + tdeApp->processEvents (500); } emit updatedSourceInfo(); @@ -151,7 +151,7 @@ void AdaSupportPart::initialParse () mainWindow( )->statusBar( )->removeWidget( bar ); delete bar; - kapp->restoreOverrideCursor (); + tdeApp->restoreOverrideCursor (); mainWindow( )->statusBar( )->message( i18n( "Done" ), 2000 ); /* mainWindow ()->statusBar ()->message (i18n ("Found 1 problem", "Found %n problems", d->problemReporter->childCount ()));*/ diff --git a/languages/ada/addclassdlg.ui b/languages/ada/addclassdlg.ui index 046b06ab..94006be8 100644 --- a/languages/ada/addclassdlg.ui +++ b/languages/ada/addclassdlg.ui @@ -420,9 +420,9 @@ <tabstop>PushButton2</tabstop> <tabstop>PushButton3</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>Public_toggled( bool )</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui index f2e03383..32a9b13d 100644 --- a/languages/ada/configproblemreporter.ui +++ b/languages/ada/configproblemreporter.ui @@ -78,12 +78,12 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">configproblemreporter.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/ada/configproblemreporter.ui.h b/languages/ada/configproblemreporter.ui.h index cd22ba1f..cda9f269 100644 --- a/languages/ada/configproblemreporter.ui.h +++ b/languages/ada/configproblemreporter.ui.h @@ -11,7 +11,7 @@ void ConfigureProblemReporter::init() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); bgParserCheckbox->setChecked( config->readBoolEntry("EnableAdaBgParser", true) ); delaySlider->setEnabled( bgParserCheckbox->isChecked() ); @@ -24,7 +24,7 @@ void ConfigureProblemReporter::destroy() void ConfigureProblemReporter::accept() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); config->writeEntry( "EnableAdaBgParser", bgParserCheckbox->isChecked() ); if( bgParserCheckbox->isChecked() ) diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index 12090860..6aade4e9 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -88,23 +88,23 @@ ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* parent, const addColumn( i18n("File") ); addColumn( i18n("Line") ); //addColumn( i18n("Column") ); - setAllColumnsShowFocus( TRUE ); + setAllColumnsShowFocus( true ); m_timer = new TQTimer( this ); - 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( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); + 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*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reparse()) ); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -134,7 +134,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) m_editor = dynamic_cast<KTextEditor::EditInterface*>( part ); if( m_editor ) - connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_document, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast<KTextEditor::MarkInterface*>( part ); @@ -244,9 +244,9 @@ void ProblemReporter::reportMessage( TQString message, void ProblemReporter::configure() { kdDebug() << "ProblemReporter::configure()" << endl; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); - m_active = config->readBoolEntry( "EnableAdaBgParser", TRUE ); + m_active = config->readBoolEntry( "EnableAdaBgParser", true ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); } @@ -255,8 +255,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) kdDebug() << "ProblemReporter::configWidget()" << endl; TQVBox *vbox = dlg->addVBoxPage(i18n("Ada Parsing"), i18n("Ada Parsing"), BarIcon( "text-x-src", TDEIcon::SizeMedium )); ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(configure())); } void ProblemReporter::slotPartAdded( KParts::Part* part ) diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index ca289234..6c86294a 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -15,7 +15,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kdevgenericfactory.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tdeaction.h> #include <tdeparts/part.h> @@ -43,19 +43,19 @@ BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStr setXMLFile("kdevbashsupport.rc"); TDEAction *action; - action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQ_SLOT(slotRun()),actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Starts an application.")); kdDebug() << "Creating BashSupportPart" << 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 *))); m_cc = new BashCodeCompletion(); } @@ -73,21 +73,21 @@ void BashSupportPart::projectConfigWidget(KDialogBase *dlg) Q_UNUSED( dlg ); // TQVBox *vbox = dlg->addVBoxPage(i18n("Bash")); // RubyConfigWidget *w = new RubyConfigWidget(*projectDom(), (TQWidget *)vbox, "Bash config widget"); -// connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); +// connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } void BashSupportPart::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())); } @@ -121,7 +121,7 @@ void BashSupportPart::parse() if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { @@ -129,7 +129,7 @@ void BashSupportPart::parse() parse(project()->projectDirectory() + "/" + *it); } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9014) << "No project" << endl; } @@ -183,7 +183,7 @@ void BashSupportPart::startApplication(const TQString &program) { kdDebug() << "starting application" << program << endl; if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend")) - appFrontend->startAppCommand(TQString(), program, TRUE); + appFrontend->startAppCommand(TQString(), program, true); } @@ -332,11 +332,11 @@ void BashCodeCompletion::setActiveEditorPart(KParts::Part *part) } disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice - connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), - this, TQT_SLOT(cursorPositionChanged())); - connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHidden())); - connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxAbort())); - connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHidden())); + connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), + this, TQ_SLOT(cursorPositionChanged())); + connect(part->widget(), TQ_SIGNAL(argHintHidden()), this, TQ_SLOT(argHintHidden())); + connect(part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionBoxAbort())); + connect(part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(completionBoxHidden())); } diff --git a/languages/bash/bashsupport_part.h b/languages/bash/bashsupport_part.h index 07b6104b..40488930 100644 --- a/languages/bash/bashsupport_part.h +++ b/languages/bash/bashsupport_part.h @@ -9,7 +9,7 @@ #include <tqguardedptr.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdialogbase.h> #include <codemodel.h> diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h index 1d1e61fd..81782fd7 100644 --- a/languages/cpp/addattributedialog.h +++ b/languages/cpp/addattributedialog.h @@ -32,7 +32,7 @@ class AddAttributeDialog : public AddAttributeDialogBase public: AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~AddAttributeDialog(); virtual void addAttribute(); diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui index 793d26b4..86ee3f25 100644 --- a/languages/cpp/addattributedialogbase.ui +++ b/languages/cpp/addattributedialogbase.ui @@ -353,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.h b/languages/cpp/addmethoddialog.h index 0362eae1..20275400 100644 --- a/languages/cpp/addmethoddialog.h +++ b/languages/cpp/addmethoddialog.h @@ -32,7 +32,7 @@ class AddMethodDialog : public AddMethodDialogBase public: AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~AddMethodDialog(); virtual void addMethod(); diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui index b4af8a5e..83af7489 100644 --- a/languages/cpp/addmethoddialogbase.ui +++ b/languages/cpp/addmethoddialogbase.ui @@ -436,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> @@ -444,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/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/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/cppcurseshello/main.cpp b/languages/cpp/app_templates/cppcurseshello/main.cpp index 3e23a5df..7d900513 100644 --- a/languages/cpp/app_templates/cppcurseshello/main.cpp +++ b/languages/cpp/app_templates/cppcurseshello/main.cpp @@ -25,7 +25,7 @@ int main() initscr(); start_color(); cbreak(); - keypad(stdscr, TRUE); + keypad(stdscr, true); noecho(); init_pair(1, COLOR_BLACK, COLOR_CYAN); diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp index a631186c..cca191c1 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp +++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp @@ -45,5 +45,5 @@ bool %{APPNAME}::remove(TQString arg) bool %{APPNAME}::exit() { - kapp->quit(); + tdeApp->quit(); } diff --git a/languages/cpp/app_templates/dcopservice/main.cpp b/languages/cpp/app_templates/dcopservice/main.cpp index cf1d3ae6..2e7f3722 100644 --- a/languages/cpp/app_templates/dcopservice/main.cpp +++ b/languages/cpp/app_templates/dcopservice/main.cpp @@ -1,6 +1,6 @@ %{CPP_TEMPLATE} -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kdebug.h> @@ -28,15 +28,15 @@ int main (int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutdata ); TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if (!KUniqueApplication::start()) + if (!TDEUniqueApplication::start()) { kdDebug() << "%{APPNAMELC} is already running!" << endl; return (0); } - KUniqueApplication app; + TDEUniqueApplication app; kdDebug() << "starting %{APPNAMELC} " << endl; // This app is started automatically, no need for session management app.disableSessionManagement(); diff --git a/languages/cpp/app_templates/kapp/Makefile.am b/languages/cpp/app_templates/kapp/Makefile.am index efe532d3..a6a4e597 100644 --- a/languages/cpp/app_templates/kapp/Makefile.am +++ b/languages/cpp/app_templates/kapp/Makefile.am @@ -16,4 +16,4 @@ $(templateName).tar.gz: ${dataFiles} archivedir = ${appwizarddatadir} archive_DATA = $(templateName).tar.gz ${templateName}.png -CLEANFILES = *.tar.gz
\ No newline at end of file +CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index 774efe8e..3fad8256 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(tdeApp, 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/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/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 4d80a74c..436807d4 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -4,7 +4,7 @@ #include <tdeaction.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> class PluginView : public KXMLGUIClient { @@ -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/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 8845fae3..c4bdd710 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -4,7 +4,7 @@ #include <tdeaction.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <tqlayout.h> @@ -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/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 69dcd7d8..25955e3f 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() { @@ -134,14 +134,14 @@ void %{APPNAME}Part::parse() if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug(9014) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9014) << "No project" << endl; } 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/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/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/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/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp index db665500..7b1a327d 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -5,7 +5,7 @@ #include <%{APPNAMELC}_factory.h> #include <%{APPNAMELC}_part.h> #include <%{APPNAMELC}_aboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kiconloader.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp index a1196404..428c2bc3 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp @@ -16,7 +16,7 @@ bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget ) { // If nothing is loaded, do initialize here - return TRUE; + return true; } KoView* %{APPNAME}Part::createViewInstance( TQWidget* parent, const char* name ) diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h index 57b57cb6..a8ffdd5e 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.h +++ b/languages/cpp/app_templates/kofficepart/kopart_part.h @@ -15,7 +15,7 @@ class %{APPNAME}Part : public KoDocument public: %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); - virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); + virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 ); virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index 601413ef..fed33236 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"); } @@ -32,7 +32,7 @@ void %{APPNAME}View::paintEvent( TQPaintEvent* ev ) /// @todo Scaling // Let the document do the drawing - koDocument()->paintEverything( painter, ev->rect(), FALSE, this ); + koDocument()->paintEverything( painter, ev->rect(), false, this ); painter.end(); } diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp index 48876c9a..7f85ba3e 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp @@ -1,6 +1,6 @@ #include <tqlabel.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tqstring.h> #include <tqwidget.h> diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index aedddf27..d415b838 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -20,7 +20,7 @@ public: /** * Construct a @ref KonqSidebarPlugin. * - * @param inst The sidebar's kinstance class. + * @param inst The sidebar's tdeinstance class. * @param parent The sidebar internal button info class responsible for this plugin. * @param widgetParent The container which will contain the plugins widget. * @param desktopName The filename of the configuration file. diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 759cbf5a..671017ee 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -53,8 +53,8 @@ // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, i18n("Could not find our part.")); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -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(tdeApp, 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(); } @@ -185,7 +185,7 @@ void %{APPNAME}::fileOpen() KURL url = KFileDialog::getOpenURL( TQString(), TQString(), this ); - if (url.isEmpty() == false) + if (!url.isEmpty()) { // About this function, the style guide ( // http://developer.kde.org/documentation/standards/kde/style/basics/index.html ) diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index adf210b3..6365ef3b 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -1,7 +1,7 @@ #include "%{APPNAMELC}_part.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> @@ -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); @@ -82,7 +82,7 @@ bool %{APPNAME}Part::openFile() { // m_file is always local so we can use TQFile on it TQFile file(m_file); - if (file.open(IO_ReadOnly) == false) + if (!file.open(IO_ReadOnly)) return false; // our example widget is text-based, so we use TQTextStream instead @@ -106,12 +106,12 @@ bool %{APPNAME}Part::openFile() bool %{APPNAME}Part::saveFile() { // if we aren't read-write, return immediately - if (isReadWrite() == false) + if (!isReadWrite()) return false; // m_file is always local, so we use TQFile TQFile file(m_file); - if (file.open(IO_WriteOnly) == false) + if (!file.open(IO_WriteOnly)) return false; // use TQTextStream to dump the text to the file @@ -130,7 +130,7 @@ void %{APPNAME}Part::fileOpen() // button is clicked TQString file_name = KFileDialog::getOpenFileName(); - if (file_name.isEmpty() == false) + if (!file_name.isEmpty()) openURL(file_name); } @@ -138,7 +138,7 @@ void %{APPNAME}Part::fileSaveAs() { // this slot is called whenever the File->Save As menu is selected, TQString file_name = KFileDialog::getSaveFileName(); - if (file_name.isEmpty() == false) + if (!file_name.isEmpty()) saveAs(file_name); } diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index c395d983..dc1a72d2 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -3,7 +3,7 @@ #include <tdehtml_part.h> #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <tdeglobal.h> @@ -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/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART index 4d23ce93..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 TQ_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. diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index 00e1adea..f918fe91 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(tdeApp, 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_tdemdi/QUICKSTART b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART index 4d23ce93..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 TQ_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. diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp index cde31592..bcd8563c 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}_part.h" #include <tdeparts/genericfactory.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> @@ -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); @@ -96,7 +96,7 @@ bool %{APPNAMELC}Part::openFile() { // m_file is always local so we can use TQFile on it TQFile file(m_file); - if (file.open(IO_ReadOnly) == false) + if (!file.open(IO_ReadOnly)) return false; // our example widget is text-based, so we use TQTextStream instead @@ -120,12 +120,12 @@ bool %{APPNAMELC}Part::openFile() bool %{APPNAMELC}Part::saveFile() { // if we aren't read-write, return immediately - if (isReadWrite() == false) + if (!isReadWrite()) return false; // m_file is always local, so we use TQFile TQFile file(m_file); - if (file.open(IO_WriteOnly) == false) + if (!file.open(IO_WriteOnly)) return false; // use TQTextStream to dump the text to the file @@ -144,7 +144,7 @@ void %{APPNAMELC}Part::fileOpen() // button is clicked TQString file_name = KFileDialog::getOpenFileName(); - if (file_name.isEmpty() == false) + if (!file_name.isEmpty()) openURL(file_name); } @@ -152,7 +152,7 @@ void %{APPNAMELC}Part::fileSaveAs() { // this slot is called whenever the File->Save As menu is selected, TQString file_name = KFileDialog::getSaveFileName(); - if (file_name.isEmpty() == false) + if (!file_name.isEmpty()) saveAs(file_name); } 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/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/tdemdikonsole.cpp b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp index d4092b03..22c399ef 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp @@ -35,7 +35,7 @@ void tdemdikonsole::respawn() ((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/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp index ecdd5127..9001f45e 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(tdeApp, 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/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp index 89ad08e5..a0c0d0ee 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp @@ -33,45 +33,45 @@ 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,TQt::Horizontal, 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/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/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index a77f413b..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,7 +130,7 @@ 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 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/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..a3b82a79 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(); @@ -157,7 +157,7 @@ void %{APPNAME}::load( const TQString &fileName ) TQTextStream ts( &f ); e->setText( ts.read() ); - e->setModified( FALSE ); + e->setModified( false ); setCaption( fileName ); statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 ); } @@ -182,7 +182,7 @@ void %{APPNAME}::save() t << text; f.close(); - e->setModified( FALSE ); + e->setModified( false ); setCaption( filename ); 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/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp index 1aab14b5..66a901d2 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(tdeApp, 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/tdeioslave/slave.cpp b/languages/cpp/app_templates/tdeioslave/slave.cpp index 8bf85fee..03bba9de 100644 --- a/languages/cpp/app_templates/tdeioslave/slave.cpp +++ b/languages/cpp/app_templates/tdeioslave/slave.cpp @@ -14,9 +14,9 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kurl.h> #include <ksock.h> diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp index 0d2bf1ff..869dfe96 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp @@ -34,14 +34,14 @@ extern "C" //----------------------------------------------------------------------------- //! dialog to setup screen saver parameters %{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name ) - : %{APPNAME}UI( parent, name, TRUE ) + : %{APPNAME}UI( parent, name, true ) { /// @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/wxhello/app.cpp b/languages/cpp/app_templates/wxhello/app.cpp index 6bcb3d47..1c761616 100644 --- a/languages/cpp/app_templates/wxhello/app.cpp +++ b/languages/cpp/app_templates/wxhello/app.cpp @@ -14,9 +14,9 @@ bool { %{APPNAME}Frame *frame = new %{APPNAME}Frame( wxT( "Hello World" ), wxPoint(50,50), wxSize(450,340) ); - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); - return TRUE; + return true; } %{APPNAME}Frame::%{APPNAME}Frame( const wxString& title, const wxPoint& pos, const wxSize& size ) @@ -40,7 +40,7 @@ bool void %{APPNAME}Frame::OnQuit( wxCommandEvent& WXUNUSED( event ) ) { - Close(TRUE); + Close(true); } void diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index a111acde..be28b31b 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -77,9 +77,9 @@ public: { m_deadlock.unlock(); // GET LOCK - kapp->lock (); + tdeApp->lock (); - //kdDebug(9007) << "-------> kapp locked" << endl; + //kdDebug(9007) << "-------> tdeApp locked" << endl; TQPtrList<KParts::Part> parts( *m_cppSupport->partController() ->parts() ); TQPtrListIterator<KParts::Part> it( parts ); @@ -94,15 +94,15 @@ public: contents = TQString( editIface->text().ascii() ); // deep copy - //kdDebug(9007) << "-------> kapp unlocked" << endl; + //kdDebug(9007) << "-------> tdeApp unlocked" << endl; break; } // RELEASE LOCK - kapp->unlock(); + tdeApp->unlock(); m_deadlock.lock(); - //kdDebug(9007) << "-------> kapp unlocked" << endl; + //kdDebug(9007) << "-------> tdeApp unlocked" << endl; } if( m_readFromDisk || contents == TQString() ) @@ -123,7 +123,7 @@ public: { bool ret = false; m_deadlock.unlock(); - kapp->lock (); + tdeApp->lock (); KParts::ReadOnlyPart *part = m_cppSupport->partController()->partForURL( KURL(fileName) ); KTextEditor::Document * doc = dynamic_cast<KTextEditor::Document*>( part ); @@ -131,7 +131,7 @@ public: if ( doc ) ret = doc->isModified(); - kapp->unlock(); + tdeApp->unlock(); m_deadlock.lock(); return ret; } @@ -475,11 +475,11 @@ void BackgroundParser::close() m_close = true; m_canParse.wakeAll(); } - kapp->unlock(); + tdeApp->unlock(); while ( running() ) sleep( 1 ); - kapp->lock(); + tdeApp->lock(); } bool BackgroundParser::filesInQueue() diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 9067d1e9..3969930f 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -30,7 +30,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefileitem.h> #include <kurlrequester.h> #include <keditlistbox.h> @@ -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(); @@ -510,9 +510,9 @@ 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); diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui index 49b6c553..294deadc 100644 --- a/languages/cpp/ccconfigwidgetbase.ui +++ b/languages/cpp/ccconfigwidgetbase.ui @@ -1655,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> @@ -1676,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.cpp b/languages/cpp/classgeneratorconfig.cpp index f8b42f52..d8c3f203 100644 --- a/languages/cpp/classgeneratorconfig.cpp +++ b/languages/cpp/classgeneratorconfig.cpp @@ -15,7 +15,7 @@ #include <tqfile.h> #include <tqfileinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include "cppsupportfactory.h" 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/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp index a1ad79b0..4c9dbd6e 100644 --- a/languages/cpp/codeinformationrepository.cpp +++ b/languages/cpp/codeinformationrepository.cpp @@ -32,7 +32,7 @@ my_unique( const TQValueList<KTextEditor::CompletionEntry>& entryList ) e.postfix + " "; if ( map.find( key ) == map.end() ) { - map[ key ] = TRUE; + map[ key ] = true; l << e; } } 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/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h index f65db442..b71f0c53 100644 --- a/languages/cpp/configproblemreporter.ui.h +++ b/languages/cpp/configproblemreporter.ui.h @@ -21,7 +21,7 @@ void ConfigureProblemReporter::init() { m_part = 0; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); problemReporterCheckbox->setChecked( config->readBoolEntry( "EnableProblemReporter", true ) ); bgParserCheckbox->setChecked( config->readBoolEntry( "EnableCppBgParser", true ) ); @@ -54,7 +54,7 @@ void ConfigureProblemReporter::setPart( CppSupportPart* part ) void ConfigureProblemReporter::accept() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "General Options" ); config->writeEntry( "EnableProblemReporter", problemReporterCheckbox->isChecked() ); config->writeEntry( "EnableCppBgParser", bgParserCheckbox->isChecked() ); @@ -83,7 +83,7 @@ void ConfigureProblemReporter::accept() void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b ) { delaySlider->setEnabled( b ); - if ( b == TRUE ) + if ( b ) delayLabel->show(); else delayLabel->hide(); diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index a62087ac..56cd0b50 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -256,7 +256,7 @@ static TQValueList<ItemType> unique( const TQValueList<ItemType>& entryList ) { e.text + " " + e.postfix + " " ).simplifyWhiteSpace().stripWhiteSpace(); if ( map.find( key ) == map.end() ) { - map[ key ] = TRUE; + map[ key ] = true; l << e; } } @@ -271,7 +271,7 @@ static TQStringList unique( const TQStringList& entryList ) { while ( it != entryList.end() ) { TQString e = *it++; if ( map.find( e ) == map.end() ) { - map[ e ] = TRUE; + map[ e ] = true; l << e; } } @@ -287,7 +287,7 @@ static TQStringList unique( const TQValueList<TQStringList>& entryList ) { TQStringList li = ( *it++ ); TQString e = li.join( "\n" ); if ( map.find( e ) == map.end() ) { - map[ e ] = TRUE; + map[ e ] = true; l += li; } } @@ -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 ) ) ); } } } @@ -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 ); @@ -2420,7 +2419,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { - showArguments = TRUE; + showArguments = true; } EvaluationResult type; @@ -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 7350a996..1ebee6ba 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -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; } diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index f04db100..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() ); diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index 6cef7a20..4f827821 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -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/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp index e58639e0..68c89488 100644 --- a/languages/cpp/cppsupport_utils.cpp +++ b/languages/cpp/cppsupport_utils.cpp @@ -120,7 +120,7 @@ static void typedefMap( TQMap<TQString, TQString> & map, ClassDom klass ) TQString formattedOpeningParenthesis(bool suppressSpace) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("AStyle"); bool use_spaces = config->readBoolEntry("PadParentheses", false); if (not use_spaces or suppressSpace) return "("; @@ -129,7 +129,7 @@ TQString formattedOpeningParenthesis(bool suppressSpace) TQString formattedClosingParenthesis(bool suppressSpace) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("AStyle"); bool use_spaces = config->readBoolEntry("PadParentheses", false); if (not use_spaces or suppressSpace) return ")"; diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp index cf5ff24a..a4a64ae0 100644 --- a/languages/cpp/cppsupportfactory.cpp +++ b/languages/cpp/cppsupportfactory.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <kdevplugininfo.h> #include "cppsupportfactory.h" diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index bd35d649..2e77030b 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -82,7 +82,7 @@ #include <kstatusbar.h> #include <tdeconfig.h> #include <tdeversion.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdetexteditor/document.h> @@ -178,7 +178,7 @@ class BackgroundParserConfig public: void readConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); m_useProblemReporter = config->readBoolEntry( "EnableProblemReporter", true ); m_useBackgroundParser = config->readBoolEntry( "EnableCppBgParser", true ); @@ -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." ) ); } } @@ -1464,7 +1464,7 @@ bool CppSupportPart::parseProject( bool force ) mainWindow() ->statusBar() ->message( i18n( "Updating..." ) ); - kapp->setOverrideCursor( waitCursor ); + tdeApp->setOverrideCursor( waitCursor ); _jd = new JobData; if( TQFileInfo( project() ->projectDirectory() + "/" + project()->projectName().lower() @@ -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() ) { @@ -1604,7 +1604,7 @@ void CppSupportPart::slotParseFiles() _jd->backgroundState = 0; _jd->cycle = 1; _jd->lastParse = TQTime::currentTime(); - kapp->restoreOverrideCursor( ); + tdeApp->restoreOverrideCursor( ); } } else // finished or interrupted @@ -1615,7 +1615,7 @@ void CppSupportPart::slotParseFiles() if ( !m_projectClosed ) { kdDebug( 9007 ) << "updating sourceinfo" << endl; - kapp->restoreOverrideCursor( ); + tdeApp->restoreOverrideCursor( ); emit updatedSourceInfo(); mainWindow( ) ->statusBar( ) ->message( i18n( "Done" ), 2000 ); TQFile::remove( project() ->projectDirectory() @@ -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(); @@ -1831,7 +1835,7 @@ void CppSupportPart::slotMakeMember() if ( !implFile.isEmpty() ) { partController() ->editDocument( KURL( implFile ) ); - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 500 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 500 ); } if ( atLine == -2 ) atLine = m_activeEditor->numLines() - 1; @@ -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/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/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index 893ac55b..00fce53b 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -29,8 +29,8 @@ #include <kiconloader.h> #include <tdelistview.h> #include <tdeapplication.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kstringhandler.h> #include <klineedit.h> @@ -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 9aab172b..df303173 100644 --- a/languages/cpp/createpcsdialog.h +++ b/languages/cpp/createpcsdialog.h @@ -24,7 +24,7 @@ class CreatePCSDialog : public CreatePCSDialogBase public: - CreatePCSDialog( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreatePCSDialog( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~CreatePCSDialog(); /*$PUBLIC_FUNCTIONS$*/ 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/dbgcontroller.cpp b/languages/cpp/debugger/dbgcontroller.cpp index 6ca94543..bc9d3cd5 100644 --- a/languages/cpp/debugger/dbgcontroller.cpp +++ b/languages/cpp/debugger/dbgcontroller.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include "dbgcontroller.h" -#include <kprocess.h> +#include <tdeprocess.h> /***************************************************************************/ diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index 63f6229b..1d311aff 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -19,7 +19,7 @@ #include <kdialog.h> #include <tdeglobalsettings.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kstdguiitem.h> #include <tdeversion.h> #include <tdelistview.h> @@ -80,14 +80,14 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) 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/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index f7d23b0c..bf503bad 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -21,7 +21,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <twinmodule.h> @@ -111,9 +111,9 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) 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; @@ -243,8 +243,8 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) { 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 @@ -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/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 6621cbf8..ea0c410d 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,83 +304,83 @@ 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() { - QCStringList objects = kapp->dcopClient()->registeredApplications(); + QCStringList objects = tdeApp->dcopClient()->registeredApplications(); for (QCStringList::Iterator it = objects.begin(); it != objects.end(); ++it) if ((*it).find("drkonqi-") == 0) slotDCOPApplicationRegistered(*it); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), TQT_SLOT(slotDCOPApplicationRegistered(const TQCString&))); - kapp->dcopClient()->setNotifications(true); + connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), TQ_SLOT(slotDCOPApplicationRegistered(const TQCString&))); + tdeApp->dcopClient()->setNotifications(true); } void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId) @@ -389,14 +389,14 @@ void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId) TQByteArray answer; TQCString replyType; - kapp->dcopClient()->call(appId, "krashinfo", "appName()", TQByteArray(), replyType, answer, true, 5000); + tdeApp->dcopClient()->call(appId, "krashinfo", "appName()", TQByteArray(), replyType, answer, true, 5000); TQDataStream d(answer, IO_ReadOnly); TQCString appName; d >> appName; if (appName.length() && project() && project()->mainProgram().endsWith(appName)) { - kapp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(TQString)", i18n("Debug in &TDevelop")); + tdeApp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(TQString)", i18n("Debug in &TDevelop")); connectDCOPSignal(appId, "krashinfo", "acceptDebuggingApplication()", "slotDebugExternalProcess()", true); } } @@ -407,15 +407,15 @@ ASYNC DebuggerPart::slotDebugExternalProcess() TQByteArray answer; TQCString replyType; - kapp->dcopClient()->call(kapp->dcopClient()->senderId(), "krashinfo", "pid()", TQByteArray(), replyType, answer, true, 5000); + tdeApp->dcopClient()->call(tdeApp->dcopClient()->senderId(), "krashinfo", "pid()", TQByteArray(), replyType, answer, true, 5000); TQDataStream d(answer, IO_ReadOnly); int pid; d >> pid; if (attachProcess(pid) && m_drkonqi.isEmpty()) { - m_drkonqi = kapp->dcopClient()->senderId(); - TQTimer::singleShot(15000, this, TQT_SLOT(slotCloseDrKonqi())); + m_drkonqi = tdeApp->dcopClient()->senderId(); + TQTimer::singleShot(15000, this, TQ_SLOT(slotCloseDrKonqi())); mainWindow()->raiseView(framestackWidget); } @@ -429,13 +429,13 @@ ASYNC DebuggerPart::slotDebugCommandLine(const TQString& /*command*/) void DebuggerPart::slotCloseDrKonqi() { - kapp->dcopClient()->send(m_drkonqi, "MainApplication-Interface", "quit()", TQByteArray()); + tdeApp->dcopClient()->send(m_drkonqi, "MainApplication-Interface", "quit()", TQByteArray()); m_drkonqi = ""; } DebuggerPart::~DebuggerPart() { - kapp->dcopClient()->setNotifications(false); + tdeApp->dcopClient()->setNotifications(false); if (variableWidget) mainWindow()->removeView(variableWidget); @@ -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/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/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/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/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index c777226a..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); @@ -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/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index bca8b98d..da53c0ec 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -30,7 +30,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <twin.h> #include <tqdatetime.h> @@ -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; @@ -984,7 +984,7 @@ void GDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); now = TQTime::currentTime(); if (!stateIsOn(s_dbgBusy) || start.msecsTo( now ) > 2000) break; @@ -1002,7 +1002,7 @@ void GDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); now = TQTime::currentTime(); if (!stateIsOn(s_attached) || start.msecsTo( now ) > 2000) break; @@ -1018,7 +1018,7 @@ void GDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); now = TQTime::currentTime(); if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000) break; @@ -1098,11 +1098,11 @@ void GDBController::slotRun() if (stateIsOn(s_appNotStarted)) { delete tty_; - tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); + tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *tdeApp->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"; @@ -1840,7 +1840,7 @@ int GDBController::qtVersion( ) const void GDBController::demandAttention() const { - if ( TQWidget * w = kapp->mainWidget() ) + if ( TQWidget * w = tdeApp->mainWidget() ) { KWin::demandAttention( w->winId(), true ); } diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h index ef7800b6..f0f6389b 100644 --- a/languages/cpp/debugger/gdbcontroller.h +++ b/languages/cpp/debugger/gdbcontroller.h @@ -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/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index 42ad9d4c..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) 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..2e39ce5f 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -26,11 +26,6 @@ #include <config.h> #endif -#ifdef __osf__ -#define _XOPEN_SOURCE_EXTENDED -#define O_NDELAY O_NONBLOCK -#endif - #include <sys/types.h> #include <sys/ioctl.h> #include <sys/stat.h> @@ -65,7 +60,7 @@ #include <tqfile.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include "stty.h" @@ -132,7 +127,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)) ); } } } @@ -155,7 +150,7 @@ STTY::~STTY() int STTY::findTTY() { int ptyfd = -1; - bool needGrantPty = TRUE; + bool needGrantPty = true; // Find a master pty that we can open //////////////////////////////// @@ -168,7 +163,7 @@ int STTY::findTTY() strncpy(tty_slave, ptsname(ptyfd), 50); grantpt(ptyfd); unlockpt(ptyfd); - needGrantPty = FALSE; + needGrantPty = false; #endif // first we try UNIX PTY's @@ -182,7 +177,7 @@ int STTY::findTTY() struct stat sbuf; sprintf(tty_slave,"/dev/pts/%d",ptyno); if (stat(tty_slave,&sbuf) == 0 && S_ISCHR(sbuf.st_mode)) - needGrantPty = FALSE; + needGrantPty = false; else { close(ptyfd); ptyfd = -1; @@ -227,7 +222,7 @@ int STTY::findTTY() } if (ptyfd >= 0) { - if (needGrantPty && !chownpty(ptyfd, TRUE)) { + if (needGrantPty && !chownpty(ptyfd, true)) { fprintf(stderr,"tdevelop: chownpty failed for device %s::%s.\n",pty_master,tty_slave); fprintf(stderr," : This means the session can be eavesdroped.\n"); fprintf(stderr," : Make sure konsole_grantpty is installed and setuid root.\n"); 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/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/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp index cc3f3244..338ea1c3 100644 --- a/languages/cpp/includepathresolver.cpp +++ b/languages/cpp/includepathresolver.cpp @@ -31,7 +31,7 @@ #include "tqdir.h" /* defines TQDir */ #include "tqregexp.h" /* defines TQRegExp */ #include "tdelocale.h" /* defines [function] i18n */ -#include "blockingkprocess.h" /* defines BlockingTDEProcess */ +#include "blockingtdeprocess.h" /* defines BlockingTDEProcess */ #include "includepathresolver.h" #include <sys/stat.h> #include <sys/time.h> @@ -39,7 +39,7 @@ #include <stdlib.h> #ifdef TEST -#include "blockingkprocess.cpp" +#include "blockingtdeprocess.cpp" #include <iostream> using namespace std; diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index 7ec48cfa..2b4cb5d1 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -15,7 +15,7 @@ #include <catalog.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <stdlib.h> #include <unistd.h> @@ -132,20 +132,6 @@ public: } } - else if ( qmakespec == "win32-borland" ) - { - TQString incl = getenv( "INCLUDE" ); - TQStringList includePaths = TQStringList::split( ';', incl ); - TQStringList::Iterator it = includePaths.begin(); - while ( it != includePaths.end() ) - { - addIncludePath( ( *it ).stripWhiteSpace() ); - ++it; - } - // ### I am sure there are more standard include paths on - // ### windows. I will fix that soon - // ### Also do the compiler specific defines on windows - } } private: 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/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/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/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/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp index 631d50d0..5c81906a 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp @@ -15,7 +15,7 @@ #include <tdelistbox.h> #include <kcombobox.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include <kdebug.h> #include <klineedit.h> @@ -41,8 +41,8 @@ TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox ) SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { - TDEApplication::kApplication()->dirs()->addResourceType("include","include"); - TQStringList tdedirs=TDEApplication::kApplication()->dirs()->findDirs("include",""); + tdeApp->dirs()->addResourceType("include","include"); + TQStringList tdedirs=tdeApp->dirs()->findDirs("include",""); for( TQStringList::Iterator it=tdedirs.begin(); it!=tdedirs.end(); ++it ) { TQString tdedir = *it; @@ -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/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..cb33ed94 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() ); @@ -223,13 +223,13 @@ void ProblemReporter::InitListView(TDEListView* listview) listview->addColumn( i18n("Line") ); listview->addColumn( i18n("Column") ); listview->addColumn( i18n("Problem") ); - listview->setAllColumnsShowFocus( TRUE ); + 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/setuphelper.cpp b/languages/cpp/setuphelper.cpp index 3d868c61..93456000 100644 --- a/languages/cpp/setuphelper.cpp +++ b/languages/cpp/setuphelper.cpp @@ -11,11 +11,11 @@ ***************************************************************************/ #include "setuphelper.h" -#include "blockingkprocess.h" +#include "blockingtdeprocess.h" #include "driver.h" #include <kdebug.h> #include "tdetempfile.h" /* defines [function] KTempDir */ -#include "kstandarddirs.h" /* defines [function] locateLocal */ +#include "tdestandarddirs.h" /* defines [function] locateLocal */ #include "tqdir.h" /* defines TQDir */ #include <stdio.h> diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 96ec6385..3b583e09 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -31,7 +31,7 @@ #include <tqpushbutton.h> #include <domutil.h> #include <tqdom.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <tqfile.h> @@ -313,7 +313,7 @@ bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal) replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); if (canBeModal) { - replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); + replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = false"); replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); } diff --git a/languages/cpp/subclassingdlg.h b/languages/cpp/subclassingdlg.h index 93fe9279..ee3a05d4 100644 --- a/languages/cpp/subclassingdlg.h +++ b/languages/cpp/subclassingdlg.h @@ -43,10 +43,10 @@ class SubclassingDlg : public SubclassingDlgBase public: SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, TQStringList &newFileNames, TQWidget* parent = 0, const char* name = 0, - bool modal = FALSE, WFlags fl = 0 ); + bool modal = false, WFlags fl = 0 ); SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, const TQString &filename, TQStringList &dummy, TQWidget* parent = 0, const char* name = 0, - bool modal = FALSE, WFlags fl = 0 ); + bool modal = false, WFlags fl = 0 ); ~SubclassingDlg(); private: 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/csharp/csharpdoc.cpp b/languages/csharp/csharpdoc.cpp index 3b1c9450..1438446e 100644 --- a/languages/csharp/csharpdoc.cpp +++ b/languages/csharp/csharpdoc.cpp @@ -8,9 +8,9 @@ #include <tqtextstream.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> -#include <kinstance.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeinstance.h> +#include <tdeprocess.h> #include <tdeversion.h> #include <tdeglobal.h> diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index 8ecb44eb..886b486e 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -28,7 +28,7 @@ #include <kstatusbar.h> #include "kdevmainwindow.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <stdlib.h> #include <unistd.h> @@ -55,35 +55,35 @@ CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const T setXMLFile("kdevcsharpsupport.rc"); - 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( 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&)) ); TDEAction *action; action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Runs the CSharp program") ); action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0, - this, TQT_SLOT(slotExecuteString()), + this, TQ_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Executes a string as CSharp code") ); action = new TDEAction( i18n("Start CSharp Interpreter"), "application-x-executable", 0, - this, TQT_SLOT(slotStartInterpreter()), + this, TQ_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Starts the CSharp interpreter without a program") ); action = new TDEAction( i18n("Find CSharp Function Documentation..."), 0, - this, TQT_SLOT(slotCSharpdocFunction()), + this, TQ_SLOT(slotCSharpdocFunction()), actionCollection(), "help_csharpdocfunction" ); action->setToolTip( i18n("Show the documentation page of a CSharp function") ); action = new TDEAction( i18n("Find CSharp FAQ Entry..."), 0, - this, TQT_SLOT(slotCSharpdocFAQ()), + this, TQ_SLOT(slotCSharpdocFAQ()), actionCollection(), "help_csharpdocfaq" ); action->setToolTip( i18n("Show the FAQ entry for a keyword") ); @@ -106,14 +106,14 @@ void CSharpSupportPart::projectOpened() { kdDebug(9007) << "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 // procsharpy initialized - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } @@ -262,9 +262,9 @@ void CSharpSupportPart::initialParse() if (project()) { //copy from cpp support : give user some feedback mainWindow()->statusBar()->message( i18n("Updating...") ); - kapp->processEvents( ); + tdeApp->processEvents( ); - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); // m_parser->initialParse(); @@ -281,7 +281,7 @@ void CSharpSupportPart::initialParse() //update progress bar bar->setProgress( n++ ); if( (n%5) == 0 ) - kapp->processEvents(); + tdeApp->processEvents(); } parseUseFiles(); emit updatedSourceInfo(); @@ -289,7 +289,7 @@ void CSharpSupportPart::initialParse() //remove progressbar mainWindow( )->statusBar( )->removeWidget( bar ); delete bar; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); mainWindow()->statusBar()->message( i18n("Done") ); } else { diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp index 6e019589..4e7efd73 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include "pgioptionsplugin.h" #include "pgioptionsfactory.h" diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index 170ff230..cd82ebab 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -29,7 +29,7 @@ #include <kdialogbase.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kregexp.h> #include <kdevgenericfactory.h> #include <tdeaction.h> @@ -55,17 +55,17 @@ FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const setXMLFile("kdevfortransupport.rc"); - 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( 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&)) ); TDEAction *action; action = new TDEAction( i18n("&Ftnchek"), 0, - this, TQT_SLOT(slotFtnchek()), + this, TQ_SLOT(slotFtnchek()), actionCollection(), "project_ftnchek" ); action->setToolTip(i18n("Run ftnchek")); action->setWhatsThis(i18n("<b>Run ftnchek</b><p>Runs <b>ftnchek</b> to check fortran programs for semantic errors. Configure ftnchek options in project settings dialog, <b>Ftnchek</b> tab.")); @@ -159,7 +159,7 @@ void FortranSupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Ftnchek"), i18n("Ftnchek"), BarIcon("tdevelop", TDEIcon::SizeMedium)); FtnchekConfigWidget *w = new FtnchekConfigWidget(*projectDom(), vbox, "ftnchek config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } @@ -167,16 +167,16 @@ void FortranSupportPart::projectOpened() { kdDebug(9019) << "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 parser = new FixedFormParser(codeModel()); - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } @@ -208,7 +208,7 @@ void FortranSupportPart::initialParse() kdDebug(9019) << "initialParse()" << endl; if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { TQFileInfo fileInfo( project()->projectDirectory(), *it ); @@ -217,7 +217,7 @@ void FortranSupportPart::initialParse() } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9019) << "No project" << endl; } diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java index 40bc6b93..00202b9d 100644 --- a/languages/java/app_templates/kappjava/app.java +++ b/languages/java/app_templates/kappjava/app.java @@ -43,10 +43,10 @@ public class %{APPNAME} extends TDEMainWindow setupGUI(); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL("signalChangeStatusbar(String)"), - this, SLOT("changeStatusbar(String)")); - connect(m_view, SIGNAL("signalChangeCaption(String)"), - this, SLOT("changeCaption(String)")); + connect(m_view, TQ_SIGNAL("signalChangeStatusbar(String)"), + this, TQ_SLOT("changeStatusbar(String)")); + connect(m_view, TQ_SIGNAL("signalChangeCaption(String)"), + this, TQ_SLOT("changeCaption(String)")); } @@ -76,20 +76,20 @@ public void load(KURL url) public void setupActions() { - TDEApplication kapp = TDEApplication.kApplication(); - KStdAction.openNew(this, SLOT("fileNew()"), actionCollection()); - KStdAction.open(this, SLOT("fileOpen()"), actionCollection()); - KStdAction.save(this, SLOT("fileSave()"), actionCollection()); - KStdAction.saveAs(this, SLOT("fileSaveAs()"), actionCollection()); - KStdAction.print(this, SLOT("filePrint()"), actionCollection()); - KStdAction.quit(kapp, SLOT("quit()"), actionCollection()); + TDEApplication tdeApp = TDEApplication.tdeApplication(); + 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(tdeApp, TQ_SLOT("quit()"), actionCollection()); - KStdAction.preferences(this, 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(tr("Cus&tom Menuitem"), new TDEShortcut(), - this, SLOT("optionsPreferences()"), + this, TQ_SLOT("optionsPreferences()"), actionCollection(), "custom_action"); } diff --git a/languages/java/app_templates/kappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java index ab327d4c..4b310179 100644 --- a/languages/java/app_templates/kappjava/app_client.java +++ b/languages/java/app_templates/kappjava/app_client.java @@ -2,10 +2,10 @@ * Copyright (C) %{YEAR} %{AUTHOR} <%{EMAIL}> */ -#include <kapp.h> +#include <tdeapplication.h> #include <dcopclient.h> -#include <qdatastream.h> -#include <qstring.h> +#include <tqdatastream.h> +#include <tqstring.h> int main(int argc, char **argv) { @@ -16,8 +16,8 @@ int main(int argc, char **argv) client->attach(); // do a 'send' for now - QByteArray data; - QDataStream ds(data, IO_WriteOnly); + TQByteArray data; + TQDataStream ds(data, IO_WriteOnly); if (argc > 1) ds << TQString(argv[1]); else diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java index 0d79ac31..4a1e9f84 100644 --- a/languages/java/app_templates/kappjava/appview.java +++ b/languages/java/app_templates/kappjava/appview.java @@ -71,10 +71,10 @@ public %{APPNAME}View(TQWidget parent) return; } - connect(m_html, SIGNAL("setWindowCaption(String)"), - this, SLOT("slotSetTitle(String)")); - connect(m_html, SIGNAL("setStatusBarText(String)"), - this, SLOT("slotOnURL(String)")); + connect(m_html, TQ_SIGNAL("setWindowCaption(String)"), + this, TQ_SLOT("slotSetTitle(String)")); + connect(m_html, TQ_SIGNAL("setStatusBarText(String)"), + this, TQ_SLOT("slotOnURL(String)")); } diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index 7c63a63f..ccc2032a 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -47,13 +47,13 @@ public: virtual TQString contents( const TQString& fileName ) { if( !m_readFromDisk ){ - //kdDebug(9013) << "-------> kapp is locked = " << kapp->locked() << endl; - bool needToLock = kapp->locked() == false; + //kdDebug(9013) << "-------> tdeApp is locked = " << tdeApp->locked() << endl; + bool needToLock = !tdeApp->locked(); if( needToLock ) - kapp->lock(); + tdeApp->lock(); - //kdDebug(9013) << "-------> kapp locked" << endl; + //kdDebug(9013) << "-------> tdeApp locked" << endl; TQPtrList<KParts::Part> parts( *m_javaSupport->partController()->parts() ); TQPtrListIterator<KParts::Part> it( parts ); @@ -68,16 +68,16 @@ public: TQString contents = TQString( editIface->text().ascii() ); // deep copy if( needToLock ) - kapp->unlock(); + tdeApp->unlock(); - //kdDebug(9013) << "-------> kapp unlocked" << endl; + //kdDebug(9013) << "-------> tdeApp unlocked" << endl; return contents; } if( needToLock ) - kapp->unlock(); - //kdDebug(9013) << "-------> kapp unlocked" << endl; + tdeApp->unlock(); + //kdDebug(9013) << "-------> tdeApp unlocked" << endl; } TQFile f( fileName ); diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui index 9bea48d7..c253e1d4 100644 --- a/languages/java/configproblemreporter.ui +++ b/languages/java/configproblemreporter.ui @@ -234,7 +234,7 @@ <tabstop>pushButton5</tabstop> <tabstop>pushButton6</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> @@ -244,7 +244,7 @@ <slot>removeSpecialHeader()</slot> <slot>moveUpSpecialHeader()</slot> <slot>moveDownSpecialHeader()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h index ef0510d3..72405f0d 100644 --- a/languages/java/configproblemreporter.ui.h +++ b/languages/java/configproblemreporter.ui.h @@ -11,7 +11,7 @@ void ConfigureProblemReporter::init() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); bgParserCheckbox->setChecked( config->readBoolEntry("EnableJavaBgParser", true) ); delaySlider->setEnabled( bgParserCheckbox->isChecked() ); @@ -25,7 +25,7 @@ void ConfigureProblemReporter::destroy() void ConfigureProblemReporter::accept() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); config->writeEntry( "EnableJavaBgParser", bgParserCheckbox->isChecked() ); if( bgParserCheckbox->isChecked() ) @@ -37,7 +37,7 @@ void ConfigureProblemReporter::accept() void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b ) { delaySlider->setEnabled( b ); - if ( b == TRUE ) + if ( b ) delayLabel->show(); else delayLabel->hide(); diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp index 299e283f..7757991e 100644 --- a/languages/java/javasupportfactory.cpp +++ b/languages/java/javasupportfactory.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <kdevplugininfo.h> #include "javasupportfactory.h" diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 80203576..ff2d120c 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -51,7 +51,7 @@ #include <kstatusbar.h> #include <tdeconfig.h> #include <tdeversion.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdetexteditor/document.h> @@ -135,37 +135,37 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr m_backgroundParser = new BackgroundParser( this, &m_eventConsumed ); m_backgroundParser->start(); - 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( 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(), 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( 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*))); m_problemReporter = new ProblemReporter( this, 0, "problemReporterWidget" ); m_problemReporter->setIcon( SmallIcon("application-vnd.tde.info") ); mainWindow( )->embedOutputView( m_problemReporter, i18n("Problems"), i18n("Problem reporter")); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - m_problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + m_problemReporter, TQ_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); TDEAction *action; 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>Generates a new class.<p>") ); // daniel - connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); new KDevJavaSupportIface( this ); //(void) dcopClient(); @@ -288,8 +288,8 @@ void JavaSupportPart::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 @@ -302,20 +302,20 @@ void JavaSupportPart::projectOpened( ) m_projectDirectory = URLUtil::canonicalPath( project()->projectDirectory() ); - 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_projectClosed = false; - TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( initialParse( ) ) ); } @@ -491,8 +491,8 @@ JavaSupportPart::parseProject( ) mainWindow()->statusBar()->message( i18n("Updating...") ); - kapp->processEvents( ); - kapp->setOverrideCursor( waitCursor ); + tdeApp->processEvents( ); + tdeApp->setOverrideCursor( waitCursor ); TQStringList files = modifiedFileList(); @@ -546,7 +546,7 @@ JavaSupportPart::parseProject( ) kdDebug(9013) << "parse file: " << absFilePath << endl; if( (n%5) == 0 ){ - kapp->processEvents(); + tdeApp->processEvents(); if( m_projectClosed ){ delete( bar ); @@ -574,7 +574,7 @@ JavaSupportPart::parseProject( ) if( m_projectClosed ){ kdDebug(9013) << "ABORT" << endl; - kapp->restoreOverrideCursor( ); + tdeApp->restoreOverrideCursor( ); return false; } } @@ -587,7 +587,7 @@ JavaSupportPart::parseProject( ) //mainWindow( )->statusBar( )->removeWidget( label ); //delete label; - kapp->restoreOverrideCursor( ); + tdeApp->restoreOverrideCursor( ); mainWindow( )->statusBar( )->message( i18n( "Done" ), 2000 ); return true; diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index e1fc4174..088032f2 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -93,21 +93,21 @@ ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const addColumn( i18n("Line") ); addColumn( i18n("Column") ); addColumn( i18n("Problem") ); - setAllColumnsShowFocus( TRUE ); + setAllColumnsShowFocus( true ); m_timer = new TQTimer( this ); - 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( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); + 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*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reparse()) ); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -137,7 +137,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) if( !m_javaSupport->isValidSource(m_fileName) ) return; - connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_document, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast<KTextEditor::MarkInterface*>( part ); if( !m_javaSupport->backgroundParser() ) @@ -227,9 +227,9 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p void ProblemReporter::configure() { kdDebug(9013) << "ProblemReporter::configure()" << endl; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); - m_active = config->readBoolEntry( "EnableJavaBgParser", TRUE ); + m_active = config->readBoolEntry( "EnableJavaBgParser", true ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); } @@ -239,8 +239,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); //FIXME adymo: unused functionality w->groupBox3->hide(); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(configure())); } void ProblemReporter::slotPartAdded( KParts::Part* part ) diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp index 436e0a95..8a204c7a 100644 --- a/languages/kjssupport/jscodecompletion.cpp +++ b/languages/kjssupport/jscodecompletion.cpp @@ -21,7 +21,7 @@ #include <kiconloader.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tdeaction.h> #include <tdeparts/part.h> @@ -82,11 +82,11 @@ void JSCodeCompletion::setActiveEditorPart( KParts::Part * part ) } disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice - connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), - this, TQT_SLOT(cursorPositionChanged())); - connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHidden())); - connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxAbort())); - connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHidden())); + connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), + this, TQ_SLOT(cursorPositionChanged())); + connect(part->widget(), TQ_SIGNAL(argHintHidden()), this, TQ_SLOT(argHintHidden())); + connect(part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionBoxAbort())); + connect(part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(completionBoxHidden())); } TQValueList< KTextEditor::CompletionEntry > JSCodeCompletion::getVars( const TQString & startText ) diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp index 71c680b4..a2e6b989 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -69,20 +69,20 @@ kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStrin setXMLFile("kdevkjssupport.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" ); m_build->setStatusText( i18n("Test the active script.") ); kdDebug() << "Creating kjssupport 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 TQString&)), this, TQT_SLOT(savedFile(const TQString&)) ); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + 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 TQString&)), this, TQ_SLOT(savedFile(const TQString&)) ); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part *))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); // Building kjs interpreter. @@ -140,14 +140,14 @@ void kjsSupportPart::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 kjsSupportPart::projectClosed() { @@ -202,7 +202,7 @@ void kjsSupportPart::parse() if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); m_problemReporter->clear(); @@ -214,7 +214,7 @@ void kjsSupportPart::parse() } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9014) << "No project" << endl; } @@ -427,7 +427,7 @@ void kjsSupportPart::contextMenu(TQPopupMenu * popupMenu, const Context *context m_selectedUI = fcontext->fileName(); if (m_selectedUI.right(3).lower() == ".ui") int id = popupMenu->insertItem(i18n("Implement Slots"), - this, TQT_SLOT(implementSlots())); + this, TQ_SLOT(implementSlots())); else m_selectedUI = TQString(); } diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp index 34d1f682..8c634bda 100644 --- a/languages/kjssupport/subclassingdlg.cpp +++ b/languages/kjssupport/subclassingdlg.cpp @@ -30,7 +30,7 @@ #include <tqpushbutton.h> #include <domutil.h> #include <tqdom.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <tqfile.h> @@ -332,7 +332,7 @@ bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal) replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); if (canBeModal) { - replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); + replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = false"); replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); } diff --git a/languages/kjssupport/subclassingdlg.h b/languages/kjssupport/subclassingdlg.h index 651120b0..43c4ba6d 100644 --- a/languages/kjssupport/subclassingdlg.h +++ b/languages/kjssupport/subclassingdlg.h @@ -43,10 +43,10 @@ class SubclassingDlg : public SubclassingDlgBase public: SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,TQStringList &newFileNames, TQWidget* parent = 0, const char* name = 0, - bool modal = FALSE, WFlags fl = 0 ); + bool modal = false, WFlags fl = 0 ); /* SubclassingDlg(CppSupportPart* kjsSupport, const TQString &formFile,const TQString &filename,TQStringList &dummy, TQWidget* parent = 0, const char* name = 0, - bool modal = FALSE, WFlags fl = 0 );*/ + bool modal = false, WFlags fl = 0 );*/ ~SubclassingDlg(); private: diff --git a/languages/kjssupport/subclassingdlgbase.ui b/languages/kjssupport/subclassingdlgbase.ui index 23ec7b34..250da264 100644 --- a/languages/kjssupport/subclassingdlgbase.ui +++ b/languages/kjssupport/subclassingdlgbase.ui @@ -245,9 +245,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>onChangedClassName()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/lib/debugger/Mainpage.dox b/languages/lib/debugger/Mainpage.dox index 3e0641a9..c0e6b077 100644 --- a/languages/lib/debugger/Mainpage.dox +++ b/languages/lib/debugger/Mainpage.dox @@ -12,16 +12,16 @@ This library contains classes to implement debugger support for a programming la Each debugger support plugin must interact with an editor to set breakpoints, jump to execution points, etc. This kind of interaction is implemented in @ref Debugger class. Your debugger support plugin just need to create -an instance of @ref Debugger class and connect its Q_SIGNALS, for example: +an instance of @ref Debugger class and connect its signals, for example: @code m_debugger = new Debugger( partController() ); -connect( m_debugger, SIGNAL(toggledBreakpoint(const TQString &, int)), - debuggerBreakpointWidget, SLOT(slotToggleBreakpoint(const TQString &, int)) ); -connect( m_debugger, SIGNAL(editedBreakpoint(const TQString &, int)), - debuggerBreakpointWidget, SLOT(slotEditBreakpoint(const TQString &, int)) ); -connect( m_debugger, SIGNAL(toggledBreakpointEnabled(const TQString &, int)), - debuggerBreakpointWidget, SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); +connect( m_debugger, TQ_SIGNAL(toggledBreakpoint(const TQString &, int)), + debuggerBreakpointWidget, TQ_SLOT(slotToggleBreakpoint(const TQString &, int)) ); +connect( m_debugger, TQ_SIGNAL(editedBreakpoint(const TQString &, int)), + debuggerBreakpointWidget, TQ_SLOT(slotEditBreakpoint(const TQString &, int)) ); +connect( m_debugger, TQ_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + debuggerBreakpointWidget, TQ_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); @endcode Then m_debugger instance can be used for example, to jump to the execution point: @code diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp index bc8356b7..111ca93c 100644 --- a/languages/lib/debugger/debugger.cpp +++ b/languages/lib/debugger/debugger.cpp @@ -16,8 +16,8 @@ Debugger *Debugger::s_instance = 0; Debugger::Debugger(KDevPartController *partController) :m_partController(partController) { - connect( m_partController, TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(partAdded(KParts::Part*)) ); + connect( m_partController, TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(partAdded(KParts::Part*)) ); } @@ -46,7 +46,7 @@ void Debugger::setBreakpoint(const TQString &fileName, int lineNum, int id, bool // Temporarily disconnect so we don't get confused by receiving extra // marksChanged signals - disconnect( part, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()) ); + disconnect( part, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()) ); iface->removeMark( lineNum, Breakpoint | ActiveBreakpoint | ReachedBreakpoint | DisabledBreakpoint ); BPItem bpItem(fileName, lineNum); @@ -71,7 +71,7 @@ void Debugger::setBreakpoint(const TQString &fileName, int lineNum, int id, bool BPList.append(BPItem(fileName, lineNum)); } - connect( part, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()) ); + connect( part, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()) ); } @@ -203,7 +203,7 @@ void Debugger::partAdded( KParts::Part* part ) iface->setPixmap((MarkInterface::MarkTypes)ExecutionPoint, *executionPointPixmap()); iface->setMarksUserChangable( Bookmark | Breakpoint ); - connect( part, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()) ); + connect( part, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()) ); } #include "debugger.moc" diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui index d2780bc1..45cebd8e 100644 --- a/languages/lib/designer_integration/implementationwidgetbase.ui +++ b/languages/lib/designer_integration/implementationwidgetbase.ui @@ -257,9 +257,9 @@ <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">classNameChanged(const TQString &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/pascal/PascalStoreWalkerTokenTypes.h b/languages/pascal/PascalStoreWalkerTokenTypes.h index 4631429c..1911fc9c 100644 --- a/languages/pascal/PascalStoreWalkerTokenTypes.h +++ b/languages/pascal/PascalStoreWalkerTokenTypes.h @@ -183,7 +183,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes { INHERITED = 172, NEW = 173, SELF = 174, - TQT_METHOD = 175, + METHOD = 175, ADDSUBOR = 176, ASSIGNEQUAL = 177, SIGN = 178, diff --git a/languages/pascal/PascalTokenTypes.h b/languages/pascal/PascalTokenTypes.h index 42e97d53..185197e4 100644 --- a/languages/pascal/PascalTokenTypes.h +++ b/languages/pascal/PascalTokenTypes.h @@ -186,7 +186,7 @@ struct CUSTOM_API PascalTokenTypes { INHERITED = 172, NEW = 173, SELF = 174, - TQT_METHOD = 175, + METHOD = 175, ADDSUBOR = 176, ASSIGNEQUAL = 177, SIGN = 178, diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp index 306fe5a0..bc586c0c 100644 --- a/languages/pascal/compiler/dccoptions/optiontabs.cpp +++ b/languages/pascal/compiler/dccoptions/optiontabs.cpp @@ -357,8 +357,8 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) layout3->addWidget(release); layout3->addWidget(debug); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions())); - connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions())); + connect(release, TQ_SIGNAL(clicked()), this, TQ_SLOT(setReleaseOptions())); + connect(debug, TQ_SIGNAL(clicked()), this, TQ_SLOT(setDebugOptions())); layout->addStretch(); } diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp index 86c77cda..4f39337d 100644 --- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp +++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp @@ -410,8 +410,8 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) TQPushButton *debug = new TQPushButton(i18n("Debug"), this); layout6->addWidget(release); layout6->addWidget(debug); - connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions())); - connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions())); + connect(release, TQ_SIGNAL(clicked()), this, TQ_SLOT(setReleaseOptions())); + connect(debug, TQ_SIGNAL(clicked()), this, TQ_SLOT(setDebugOptions())); layout->addStretch(); } diff --git a/languages/pascal/configproblemreporter.ui b/languages/pascal/configproblemreporter.ui index 020557a1..3ba64c82 100644 --- a/languages/pascal/configproblemreporter.ui +++ b/languages/pascal/configproblemreporter.ui @@ -77,12 +77,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp index 90532c22..bb00f039 100644 --- a/languages/pascal/pascalsupport_part.cpp +++ b/languages/pascal/pascalsupport_part.cpp @@ -55,19 +55,19 @@ PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const T setXMLFile("kdevpascalsupport.rc"); d->problemReporter = new ProblemReporter( this ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - d->problemReporter, TQT_SLOT(configWidget(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( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); - connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + d->problemReporter, TQ_SLOT(configWidget(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( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); + connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); mainWindow()->embedOutputView( d->problemReporter, i18n("Problems"), i18n("problem reporter") ); TQWhatsThis::add(d->problemReporter, i18n("<b>Problem reporter</b><p>This window shows various \"problems\" in your project. " @@ -89,17 +89,17 @@ PascalSupportPart::Features PascalSupportPart::features() void PascalSupportPart::projectOpened() { - 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(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(projectCompiled()), + this, TQ_SLOT(slotProjectCompiled()) ); m_projectFileList = project()->allFiles(); m_projectClosed = false; - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } void PascalSupportPart::projectClosed() @@ -138,7 +138,7 @@ void PascalSupportPart::addedFilesToProject(const TQStringList &fileList) { TQString fn = project()->projectDirectory() + "/" + *it; maybeParse( fn ); - kapp->processEvents( 500 ); + tdeApp->processEvents( 500 ); emit addedSourceInfo(fn); } } @@ -165,7 +165,7 @@ void PascalSupportPart::initialParse( ) if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); /// @todo Progress indicator! @@ -173,12 +173,12 @@ void PascalSupportPart::initialParse( ) for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it){ TQString fn = project()->projectDirectory() + "/" + *it; maybeParse( fn ); - kapp->processEvents( 500 ); + tdeApp->processEvents( 500 ); } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); mainWindow()->statusBar()->message( i18n("Found 1 problem", "Found %n problems", d->problemReporter->childCount()) ); } } diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index d0aaf01a..0d505e8f 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -82,23 +82,23 @@ ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* parent, con addColumn( i18n("File") ); addColumn( i18n("Line") ); //addColumn( i18n("Column") ); - setAllColumnsShowFocus( TRUE ); + setAllColumnsShowFocus( true ); m_timer = new TQTimer( this ); - 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( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); + 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*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reparse()) ); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -128,7 +128,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) m_editor = dynamic_cast<KTextEditor::EditInterface*>( part ); if( m_editor ) - connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_document, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast<KTextEditor::MarkInterface*>( part ); @@ -250,9 +250,9 @@ void ProblemReporter::reportMessage( TQString message, void ProblemReporter::configure() { kdDebug(9007) << "ProblemReporter::configure()" << endl; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); - m_active = config->readBoolEntry( "EnablePascalBgParser", TRUE ); + m_active = config->readBoolEntry( "EnablePascalBgParser", true ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); } @@ -262,8 +262,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) Q_UNUSED(dlg); /* TQVBox *vbox = dlg->addVBoxPage(i18n("Pascal Parsing")); ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure()));*/ + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(configure()));*/ } void ProblemReporter::slotPartAdded( KParts::Part* part ) diff --git a/languages/perl/perldoc.cpp b/languages/perl/perldoc.cpp index 4255d633..63a23af5 100644 --- a/languages/perl/perldoc.cpp +++ b/languages/perl/perldoc.cpp @@ -8,9 +8,9 @@ #include <tqtextstream.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> -#include <kinstance.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeinstance.h> +#include <tdeprocess.h> #include <tdeversion.h> #include <tdeglobal.h> diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index 1bcbb96b..910e9f7e 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -28,7 +28,7 @@ #include <kstatusbar.h> #include "kdevmainwindow.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <stdlib.h> #include <unistd.h> @@ -55,35 +55,35 @@ PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStr setXMLFile("kdevperlsupport.rc"); - 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( 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&)) ); TDEAction *action; action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Runs the Perl program") ); action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0, - this, TQT_SLOT(slotExecuteString()), + this, TQ_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Executes a string as Perl code") ); action = new TDEAction( i18n("Start Perl Interpreter"), "application-x-executable", 0, - this, TQT_SLOT(slotStartInterpreter()), + this, TQ_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Starts the Perl interpreter without a program") ); action = new TDEAction( i18n("Find Perl Function Documentation..."), 0, - this, TQT_SLOT(slotPerldocFunction()), + this, TQ_SLOT(slotPerldocFunction()), actionCollection(), "help_perldocfunction" ); action->setToolTip( i18n("Show the documentation page of a Perl function") ); action = new TDEAction( i18n("Find Perl FAQ Entry..."), 0, - this, TQT_SLOT(slotPerldocFAQ()), + this, TQ_SLOT(slotPerldocFAQ()), actionCollection(), "help_perldocfaq" ); action->setToolTip( i18n("Show the FAQ entry for a keyword") ); @@ -106,14 +106,14 @@ void PerlSupportPart::projectOpened() { kdDebug(9007) << "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(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } @@ -262,9 +262,9 @@ void PerlSupportPart::initialParse() if (project()) { //copy from cpp support : give user some feedback mainWindow()->statusBar()->message( i18n("Updating...") ); - kapp->processEvents( ); + tdeApp->processEvents( ); - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); m_parser->initialParse(); @@ -281,7 +281,7 @@ void PerlSupportPart::initialParse() //update progress bar bar->setProgress( n++ ); if( (n%5) == 0 ) - kapp->processEvents(); + tdeApp->processEvents(); } parseUseFiles(); emit updatedSourceInfo(); @@ -289,7 +289,7 @@ void PerlSupportPart::initialParse() //remove progressbar mainWindow( )->statusBar( )->removeWidget( bar ); delete bar; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); mainWindow()->statusBar()->message( i18n("Done") ); } else { diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index af301000..0a286653 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -22,8 +22,8 @@ #include "phpconfigdata.h" #include <kdevcore.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tqfile.h> @@ -119,11 +119,11 @@ void PHPCodeCompletion::setActiveEditorPart(KParts::Part *part) } disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice -// connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); - connect( part, TQT_SIGNAL(textChanged()), this, TQT_SLOT(cursorPositionChanged()) ); - connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHided())); - connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxHided())); - connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHided())); +// connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged())); + connect( part, TQ_SIGNAL(textChanged()), this, TQ_SLOT(cursorPositionChanged()) ); + connect(part->widget(), TQ_SIGNAL(argHintHidden()), this, TQ_SLOT(argHintHided())); + connect(part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionBoxHided())); + connect(part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(completionBoxHided())); } void PHPCodeCompletion::cursorPositionChanged(){ @@ -159,7 +159,7 @@ void PHPCodeCompletion::cursorPositionChanged(){ } if (m_config->getCodeCompletion()) { - if (m_completionBoxShow == true) { + if (m_completionBoxShow) { return; } @@ -204,7 +204,7 @@ bool PHPCodeCompletion::showCompletionBox(TQValueList<KTextEditor::CompletionEnt return false; } m_completionBoxShow = true; - m_codeInterface->showCompletionBox(list, max, FALSE); + m_codeInterface->showCompletionBox(list, max, false); return true; } return false; @@ -218,7 +218,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) { return false; TQRegExp Class("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); - Class.setCaseSensitive(FALSE); + Class.setCaseSensitive(false); if (Class.search(line) != -1) { TQString classname = Class.cap(1); @@ -234,7 +234,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) { for (funcIt = funcList.begin(); funcIt != funcList.end(); ++funcIt) { FunctionDom nFunc = *funcIt; - if ((function.isEmpty() || nFunc->name().startsWith(function, FALSE)) && nFunc->isStatic()) { + if ((function.isEmpty() || nFunc->name().startsWith(function, false)) && nFunc->isStatic()) { KTextEditor::CompletionEntry e; e.prefix = nClass->name() + " ::"; e.text = nFunc->name(); @@ -267,11 +267,11 @@ bool PHPCodeCompletion::checkForNew(TQString line, int col){ kdDebug(9018) << "checkForNew" << endl; TQValueList<KTextEditor::CompletionEntry> list; - if (line.find("new ", 0, FALSE) == -1) + if (line.find("new ", 0, false) == -1) return false; TQRegExp New("[& \t]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); - New.setCaseSensitive(FALSE); + New.setCaseSensitive(false); if (New.search(line) != -1) { list = getClasses( New.cap(1) ); @@ -297,11 +297,11 @@ bool PHPCodeCompletion::checkForExtends(TQString line, int col){ kdDebug(9018) << "checkForExtends" << endl; TQValueList<KTextEditor::CompletionEntry> list; - if (line.find("extends", 0, FALSE) == -1) + if (line.find("extends", 0, false) == -1) return false; TQRegExp extends("[ \t]*extends[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); - extends.setCaseSensitive(FALSE); + extends.setCaseSensitive(false); if (extends.search(line) != -1) { list = getClasses(extends.cap(1)); @@ -362,7 +362,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getClasses(TQString ClassList::Iterator classIt; for (classIt = classList.begin(); classIt != classList.end(); ++classIt) { ClassDom nClass = *classIt; - if (name == NULL || name.isEmpty() || nClass->name().startsWith(name, FALSE)) { + if (name == NULL || name.isEmpty() || nClass->name().startsWith(name, false)) { KTextEditor::CompletionEntry e; TQStringList::Iterator it = added.find(nClass->name()); @@ -383,7 +383,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars if (classname.isEmpty()) { TQValueList<FunctionCompletionEntry>::Iterator it; for( it = m_globalFunctions.begin(); it != m_globalFunctions.end(); ++it ) { - if((*it).text.startsWith(function, FALSE)){ + if((*it).text.startsWith(function, false)){ KTextEditor::CompletionEntry e; e = (*it); list.append(e); @@ -393,7 +393,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars FunctionList methodList = m_model->globalNamespace()->functionList(); FunctionList::Iterator methodIt; for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) { - if ((*methodIt)->name().startsWith(function, FALSE)){ + if ((*methodIt)->name().startsWith(function, false)){ KTextEditor::CompletionEntry e; e.text = (*methodIt)->name(); ArgumentDom pArg = (*methodIt)->argumentList().first(); @@ -416,7 +416,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars FunctionList::Iterator methodIt; for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) { FunctionDom pMethod = *methodIt; - if (function.isEmpty() || pMethod->name().startsWith(function, FALSE)) { + if (function.isEmpty() || pMethod->name().startsWith(function, false)) { KTextEditor::CompletionEntry e; ArgumentDom arg = pMethod->argumentList().first(); @@ -430,7 +430,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars VariableList::Iterator attrIt; for (attrIt = attrList.begin(); attrIt != attrList.end(); ++attrIt) { VariableDom pVar = *attrIt; - if (function.isEmpty() || pVar->name().startsWith(function, FALSE)) { + if (function.isEmpty() || pVar->name().startsWith(function, false)) { KTextEditor::CompletionEntry e; e.prefix = nClass->name() + " ::"; e.text = pVar->name(); @@ -517,7 +517,7 @@ TQStringList PHPCodeCompletion::getArguments(TQString classname, TQString functi TQString PHPCodeCompletion::getCurrentClassName() { kdDebug(9018) << "getCurrentClassName" << endl; TQRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$"); - Class.setCaseSensitive(FALSE); + Class.setCaseSensitive(false); for(int i = m_currentLine; i >= 0; i--){ TQString line = m_editInterface->textLine(i); @@ -577,7 +577,7 @@ TQString PHPCodeCompletion::getClassName(TQString varName, TQString classname) { for(int i = m_currentLine; i >= 0; i--){ TQString line = m_editInterface->textLine(i); - if (!line.isNull() && line.find(varName,0 , FALSE) != -1) { + if (!line.isNull() && line.find(varName,0 , false) != -1) { if (createmember.search(line) != -1) { TQString right = createmember.cap(1).stripWhiteSpace(); @@ -637,12 +637,12 @@ bool PHPCodeCompletion::checkForArgHint(TQString line, int col) { TQValueList<KTextEditor::CompletionEntry> list; TQStringList argsList; - if (m_argWidgetShow == true) + if (m_argWidgetShow) return false; if (line.find("::") != -1) { TQRegExp Static("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); - Static.setCaseSensitive(FALSE); + Static.setCaseSensitive(false); if (Static.search(line) != -1) { TQString classname = Static.cap(1); diff --git a/languages/php/phpconfigdata.cpp b/languages/php/phpconfigdata.cpp index 9c89f7db..4de70deb 100644 --- a/languages/php/phpconfigdata.cpp +++ b/languages/php/phpconfigdata.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "phpconfigdata.h" #include "domutil.h" #include <iostream> diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp index 6cddabdf..15006bf9 100644 --- a/languages/php/phpconfigwidget.cpp +++ b/languages/php/phpconfigwidget.cpp @@ -1,5 +1,5 @@ #include "domutil.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <klineedit.h> #include <tqcheckbox.h> #include <tqmultilineedit.h> @@ -8,7 +8,7 @@ #include <tqradiobutton.h> #include <tdefiledialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "phpinfodlg.h" #include "phpconfigwidget.h" @@ -129,8 +129,8 @@ void PHPConfigWidget::slotAboutClicked() proc << exe_edit->text(); proc << "-m"; - connect( &proc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPInfo (TDEProcess*, char*, int))); + connect( &proc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedPHPInfo (TDEProcess*, char*, int))); proc.start(TDEProcess::Block,TDEProcess::Stdout); PHPInfoDlg dlg(this,"phpinfo",true); dlg.php_edit->setText(m_phpInfo); diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui index 09124bf8..4213cca5 100644 --- a/languages/php/phpconfigwidgetbase.ui +++ b/languages/php/phpconfigwidgetbase.ui @@ -544,12 +544,12 @@ the internal web browser. Please make sure that the webserver was compiled with <tabstop>zend_edit</tabstop> <tabstop>zend_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotAboutClicked()</slot> <slot>slotPHPExeButtonClicked()</slot> <slot>slotPHPIniButtonClicked()</slot> <slot>slotZendButtonClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index 2ee5bbf3..5d8dccdc 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -136,12 +136,12 @@ PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* parent, const char* 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( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(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*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); slotActivePartChanged( part->partController()->activePart() ); } @@ -184,13 +184,13 @@ void PHPErrorView::InitListView(TDEListView* listview) listview->addColumn( i18n("Line") ); listview->addColumn( i18n("Column") ); listview->addColumn( i18n("Problem") ); - listview->setAllColumnsShowFocus( TRUE ); + 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/php/phpfile.cpp b/languages/php/phpfile.cpp index 92d2fc4c..8bc0ba0a 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -22,7 +22,7 @@ #include <tqregexp.h> #include <urlutil.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <kdevpartcontroller.h> @@ -39,14 +39,14 @@ PHPFile::PHPFile(PHPSupportPart *phpSupport, const TQString& fileName) m_fileinfo = new TQFileInfo(fileName); m_part = phpSupport; modified = true; - inClass = FALSE; - inMethod = FALSE; + inClass = false; + inMethod = false; /* phpCheckProc = new KShellProcess("/bin/sh"); - connect(phpCheckProc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStdout (TDEProcess*, char*, int))); - connect(phpCheckProc, TQT_SIGNAL(receivedStderr (TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStderr (TDEProcess*, char*, int))); - connect(phpCheckProc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPHPCheckExited(TDEProcess*))); + connect(phpCheckProc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedPHPCheckStdout (TDEProcess*, char*, int))); + connect(phpCheckProc, TQ_SIGNAL(receivedStderr (TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedPHPCheckStderr (TDEProcess*, char*, int))); + connect(phpCheckProc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotPHPCheckExited(TDEProcess*))); */ } @@ -71,7 +71,7 @@ TQStringList PHPFile::readFromEditor() { TQStringList contents; - kapp->lock(); + tdeApp->lock(); TQPtrList<KParts::Part> parts( *m_part->partController()->parts() ); TQPtrListIterator<KParts::Part> it( parts ); while( it.current() ){ @@ -85,7 +85,7 @@ TQStringList PHPFile::readFromEditor() contents = TQStringList::split("\n", editIface->text().ascii(), true); break; } - kapp->unlock(); + tdeApp->unlock(); return contents; } @@ -120,8 +120,8 @@ void PHPFile::Analyse() { postEvent( new FileParseEvent( Event_StartParse, this->fileName() ) ); - inClass = FALSE; - inMethod = FALSE; + inClass = false; + inMethod = false; /* m_contents = readFromEditor(); @@ -138,36 +138,36 @@ void PHPFile::Analyse() { } bool PHPFile::ParseClass(TQString line, int lineNo) { - if (line.find("class ", 0, FALSE) == -1) - return FALSE; + if (line.find("class ", 0, false) == -1) + return false; TQRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$"); - Class.setCaseSensitive(FALSE); + Class.setCaseSensitive(false); if (Class.search(line) != -1) { - if (AddClass(Class.cap(2), Class.cap(4), lineNo) == FALSE) - return FALSE; + if (!AddClass(Class.cap(2), Class.cap(4), lineNo)) + return false; /// @fixme Activate when it exists in ClassModel // if (Class.cap(1).lower() == "abstract") // SetClass("abstract"); - return TRUE; + return true; } - return FALSE; + return false; } bool PHPFile::ParseFunction(TQString line, int lineNo) { - if (line.find("function", 0, FALSE) == -1) - return FALSE; + if (line.find("function", 0, false) == -1) + return false; TQRegExp function("^[ \t]*(final|abstract|static|)[ \t]*(public|private|protected|)[ \t]*(static|)[ \t]*function[ \t&]*([_a-zA-Z\x7f-\xff][_a-zA-Z0-9\x7f-\xff]*)[ \t]*\\(([_a-zA-Z\x7f-\xff]*[_$, &'\\\"0-9A-Za-z\x7f-\xff\t-=]*)\\).*$"); - function.setCaseSensitive(FALSE); + function.setCaseSensitive(false); if (function.search(line) != -1) { - if (AddFunction(function.cap(4), function.cap(5), lineNo) == FALSE) - return FALSE; + if (!AddFunction(function.cap(4), function.cap(5), lineNo)) + return false; if (function.cap(3).lower() == "static" || function.cap(1).lower() == "static") SetFunction("static"); @@ -175,7 +175,7 @@ bool PHPFile::ParseFunction(TQString line, int lineNo) { if (function.cap(1).lower() == "abstract") { SetFunction("abstract"); CloseFunction( lineNo ); - return FALSE; + return false; } /// @fixme Activate when it exists in FunctionModel @@ -191,22 +191,22 @@ bool PHPFile::ParseFunction(TQString line, int lineNo) { if (function.cap(2).lower() == "protected") SetFunction("protected"); - return TRUE; + return true; } - return FALSE; + return false; } bool PHPFile::ParseVariable(TQString line, int lineNo) { if (line.find("var") == -1 && line.find("public") == -1 && line.find("private") == -1 && line.find("protected") == -1) - return FALSE; + return false; TQRegExp variable("^[ \t]*(var|public|private|protected|static)[ \t]*\\$([a-zA-Z_\x7f-\xff][0-9A-Za-z_\x7f-\xff]*)[ \t;=].*$"); - variable.setCaseSensitive(FALSE); + variable.setCaseSensitive(false); if (variable.search(line) != -1) { - if (AddVariable(variable.cap(2), "", lineNo) == FALSE) - return FALSE; + if (!AddVariable(variable.cap(2), "", lineNo)) + return false; if (variable.cap(1).lower() == "private") SetVariable( "private" ); @@ -220,117 +220,117 @@ bool PHPFile::ParseVariable(TQString line, int lineNo) { if (variable.cap(1).lower() == "static") SetVariable( "static" ); - return TRUE; + return true; } - return FALSE; + return false; } bool PHPFile::ParseThisMember(TQString line, int lineNo) { - if (line.find("$this->", 0, FALSE) == -1) - return FALSE; + if (line.find("$this->", 0, false) == -1) + return false; TQRegExp createthis; - createthis.setCaseSensitive(FALSE); + createthis.setCaseSensitive(false); createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*([0-9]*)[ \t]*;"); if (createthis.search(line) != -1) { - if (AddVariable(createthis.cap(1), "integer", lineNo, TRUE) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createthis.cap(1), "integer", lineNo, true)) + return false; + return true; } - if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) { + if (line.find("true", 0, false) != -1 || line.find("false", 0, false) != -1) { createthis.setPattern("\\$(this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;"); if (createthis.search(line) != -1) { - if (AddVariable(createthis.cap(1), "boolean", lineNo, TRUE) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createthis.cap(1), "boolean", lineNo, true)) + return false; + return true; } } - if (line.find("new", 0, FALSE) != -1) { + if (line.find("new", 0, false) != -1) { createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); if (createthis.search(line) != -1) { - if (AddVariable(createthis.cap(1), createthis.cap(2), lineNo, TRUE) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createthis.cap(1), createthis.cap(2), lineNo, true)) + return false; + return true; } } - if (line.find("array", 0, FALSE) != -1) { + if (line.find("array", 0, false) != -1) { createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+"); if (createthis.search(line) != -1) { - if (AddVariable(createthis.cap(1), "array", lineNo, TRUE) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createthis.cap(1), "array", lineNo, true)) + return false; + return true; } } - return FALSE; + return false; } bool PHPFile::ParseMember(TQString line, int lineNo) { - if (line.find("$", 0, FALSE) == -1) - return FALSE; + if (line.find("$", 0, false) == -1) + return false; /// @todo Ajouter plus de test .... TQRegExp createmember; - createmember.setCaseSensitive(FALSE); + createmember.setCaseSensitive(false); createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*([0-9]*)[ \t]*;"); if (createmember.search(line) != -1) { - if (AddVariable(createmember.cap(1), "integer", lineNo) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createmember.cap(1), "integer", lineNo)) + return false; + return true; } createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*[\"']+(.*)[\"']+[ \t]*;"); if (createmember.search(line) != -1) { - if (AddVariable(createmember.cap(1), "string", lineNo) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createmember.cap(1), "string", lineNo)) + return false; + return true; } - if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) { + if (line.find("true", 0, false) != -1 || line.find("false", 0, false) != -1) { createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;"); if (createmember.search(line) != -1) { - if (AddVariable(createmember.cap(1), "boolean", lineNo) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createmember.cap(1), "boolean", lineNo)) + return false; + return true; } } - if (line.find("new", 0, FALSE) != -1) { + if (line.find("new", 0, false) != -1) { createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); if (createmember.search(line) != -1) { - if (AddVariable(createmember.cap(1), createmember.cap(2), lineNo) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createmember.cap(1), createmember.cap(2), lineNo)) + return false; + return true; } } - if (line.find("array", 0, FALSE) != -1) { + if (line.find("array", 0, false) != -1) { createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+"); if (createmember.search(line) != -1) { - if (AddVariable(createmember.cap(1), "array", lineNo) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createmember.cap(1), "array", lineNo)) + return false; + return true; } } - return FALSE; + return false; } bool PHPFile::ParseReturn(TQString line, int lineNo) { TQString rettype; - if (line.find("return", 0, FALSE) == -1) - return FALSE; + if (line.find("return", 0, false) == -1) + return false; TQRegExp typeex; - typeex.setCaseSensitive(FALSE); + typeex.setCaseSensitive(false); typeex.setPattern("return[ \t]*(\\(|)([a-zA-Z_\x7f-\xff$][a-zA-Z0-9_\x7f-\xff]*)(\\)|)[ \t]*;"); if (typeex.search(line) != -1) { @@ -362,37 +362,37 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) { } SetFunction("result", rettype); - return TRUE; + return true; } bool PHPFile::ParseTodo(TQString line, int lineNo) { - if (line.find("todo", 0, FALSE) == -1) - return FALSE; + if (line.find("todo", 0, false) == -1) + return false; TQRegExp todo("/[/]+[ \t]*[@]*todo([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$"); - todo.setCaseSensitive(FALSE); + todo.setCaseSensitive(false); if (todo.search(line) != -1) { AddTodo( todo.cap(2), lineNo ); - return TRUE; + return true; } - return FALSE; + return false; } bool PHPFile::ParseFixme(TQString line, int lineNo) { - if (line.find("fixme", 0, FALSE) == -1) - return FALSE; + if (line.find("fixme", 0, false) == -1) + return false; TQRegExp fixme("/[/]+[ \t]*[@]*fixme([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$"); - fixme.setCaseSensitive(FALSE); + fixme.setCaseSensitive(false); if (fixme.search(line) != -1) { AddFixme( fixme.cap(2), lineNo ); - return TRUE; + return true; } - return FALSE; + return false; } void PHPFile::ParseSource() { @@ -405,13 +405,13 @@ void PHPFile::ParseSource() { TQRegExp includere("^[ \t]*(include|require|include_once|require_once)[ \t]*(\\(|)[ \t]*[\"'](.*)[\"'][ \t]*(\\)|)[ \t]*;$"); - includere.setCaseSensitive(FALSE); + includere.setCaseSensitive(false); for ( TQStringList::Iterator it = m_contents.begin(); it != m_contents.end(); ++it ) { line = (*it).local8Bit(); if (!line.isNull()) { - if (line.find("include", 0, FALSE) != -1 || line.find("require", 0, FALSE) != -1) { + if (line.find("include", 0, false) != -1 || line.find("require", 0, false) != -1) { if (includere.search(line) != -1) { TQStringList include_path; include_path = include_path.split(":", m_part->getIncludePath()); @@ -431,7 +431,7 @@ void PHPFile::ParseSource() { } - if ( inMethod == TRUE ) { + if ( inMethod ) { bracketFuncOpen += line.contains("{"); bracketFuncClose += line.contains("}"); if (bracketFuncOpen == bracketFuncClose && bracketFuncOpen != 0 && bracketFuncClose != 0) { @@ -439,31 +439,31 @@ void PHPFile::ParseSource() { } } - if ( inMethod == FALSE ) { + if ( !inMethod ) { bracketOpen += line.contains("{"); bracketClose += line.contains("}"); - if (bracketOpen == bracketClose && bracketOpen != 0 && bracketClose != 0 && inClass == TRUE) { + if (bracketOpen == bracketClose && bracketOpen != 0 && bracketClose != 0 && inClass) { CloseClass( lineNo ); } } - if ( inClass == FALSE ) { - if (ParseClass(line, lineNo) == TRUE) { + if ( !inClass ) { + if (ParseClass(line, lineNo)) { bracketOpen = line.contains("{"); bracketClose = line.contains("}"); } } - if ( inClass == TRUE ) { + if ( inClass ) { ParseThisMember(line, lineNo); } - if (ParseFunction(line, lineNo) == TRUE) { + if (ParseFunction(line, lineNo)) { bracketFuncOpen = line.contains("{"); bracketFuncClose = line.contains("}"); } - if ( inMethod == TRUE ) + if ( inMethod ) ParseReturn(line, lineNo); ParseVariable(line, lineNo); @@ -480,7 +480,7 @@ void PHPFile::PHPCheck() { // int status = 0; m_phpCheckOutput = ""; -/// @todo try with kprocess in futur version actually this create zombie +/// @todo try with tdeprocess in futur version actually this create zombie /* phpCheckProc->clearArguments(); @@ -582,58 +582,58 @@ void PHPFile::postEvent(FileParseEvent *event) { bool PHPFile::AddClass(TQString name, TQString extends, int start) { postEvent( new FileParseEvent( Event_AddClass, this->fileName(), name, extends, start ) ); - inClass = TRUE; - return TRUE; + inClass = true; + return true; } bool PHPFile::SetClass(TQString arguments) { postEvent( new FileParseEvent( Event_SetClass, this->fileName(), "", arguments ) ); - return TRUE; + return true; } bool PHPFile::CloseClass(int end) { postEvent( new FileParseEvent( Event_CloseClass, this->fileName(), end ) ); - inClass = FALSE; - return TRUE; + inClass = false; + return true; } bool PHPFile::AddFunction(TQString name, TQString arguments, int start) { postEvent( new FileParseEvent( Event_AddFunction, this->fileName(), name, arguments, start ) ); - inMethod = TRUE; - return TRUE; + inMethod = true; + return true; } bool PHPFile::SetFunction(TQString name, TQString arguments) { postEvent( new FileParseEvent( Event_SetFunction, this->fileName(), name, arguments ) ); - return TRUE; + return true; } bool PHPFile::CloseFunction(int end) { postEvent( new FileParseEvent( Event_CloseFunction, this->fileName(), end ) ); - inMethod = FALSE; - return TRUE; + inMethod = false; + return true; } bool PHPFile::AddVariable(TQString name, TQString type, int position, bool classvar) { postEvent( new FileParseEvent( Event_AddVariable, this->fileName(), name, type, position, classvar ) ); - return TRUE; + return true; } bool PHPFile::SetVariable(TQString arguments) { postEvent( new FileParseEvent( Event_SetVariable, this->fileName(), "", arguments ) ); - return TRUE; + return true; } bool PHPFile::AddTodo(TQString arguments, int position) { postEvent( new FileParseEvent( Event_AddTodo, this->fileName(), "", arguments, position ) ); - inClass = TRUE; - return TRUE; + inClass = true; + return true; } bool PHPFile::AddFixme(TQString arguments, int position) { postEvent( new FileParseEvent( Event_AddFixme, this->fileName(), "", arguments, position ) ); - inClass = TRUE; - return TRUE; + inClass = true; + return true; } #include "phpfile.moc" diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h index da4da636..2db93552 100644 --- a/languages/php/phpfile.h +++ b/languages/php/phpfile.h @@ -27,7 +27,7 @@ #include <tqthread.h> #include <urlutil.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <kdevproject.h> @@ -98,7 +98,7 @@ private: bool SetFunction(TQString name, TQString arguments = ""); bool CloseFunction(int end); - bool AddVariable(TQString name, TQString type, int position, bool classvar = FALSE); + bool AddVariable(TQString name, TQString type, int position, bool classvar = false); bool SetVariable(TQString arguments); bool AddTodo(TQString arguments, int position); diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 061bb956..58316af2 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -24,8 +24,8 @@ #include <tqregexp.h> #include <tqtextedit.h> #include <tdeglobal.h> -#include <kstandarddirs.h> -#include <kinstance.h> +#include <tdestandarddirs.h> +#include <tdeinstance.h> #include <kdebug.h> using namespace std; @@ -49,13 +49,13 @@ PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString m_baseClassEdit->setCompletionObject( comp ); /// @todo change it to KLineEdit - connect(m_baseClassEdit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); - connect(m_classNameEdit,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(classNameTextChanged(const TQString&))); - connect(m_fileNameEdit,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(fileNameTextChanged(const TQString&))); - connect(m_dirButton,TQT_SIGNAL(clicked()), - this,TQT_SLOT(slotDirButtonClicked())); + connect(m_baseClassEdit,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); + connect(m_classNameEdit,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(classNameTextChanged(const TQString&))); + connect(m_fileNameEdit,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(fileNameTextChanged(const TQString&))); + connect(m_dirButton,TQ_SIGNAL(clicked()), + this,TQ_SLOT(slotDirButtonClicked())); } PHPNewClassDlg::~PHPNewClassDlg(){ } diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp index 6b725dc8..99bc4b71 100644 --- a/languages/php/phpparser.cpp +++ b/languages/php/phpparser.cpp @@ -150,7 +150,7 @@ void PHPParser::close() m_canParse.wakeAll(); while (running()) { - kapp->processEvents(); + tdeApp->processEvents(); } } diff --git a/languages/php/phpsupport_event.h b/languages/php/phpsupport_event.h index 28713efb..c3dfcd02 100644 --- a/languages/php/phpsupport_event.h +++ b/languages/php/phpsupport_event.h @@ -51,7 +51,7 @@ public: m_name = ""; m_arguments = ""; m_position = 0; - m_global = FALSE; + m_global = false; } FileParseEvent(long event, const TQString& fileName, int position ) @@ -59,20 +59,20 @@ public: { m_name = ""; m_arguments = ""; - m_global = FALSE; + m_global = false; } FileParseEvent(long event, const TQString& fileName, const TQString& name, const TQString& arguments ) : TQCustomEvent(event), m_fileName( fileName ), m_name( name ), m_arguments( arguments ) { m_position = 0; - m_global = FALSE; + m_global = false; } FileParseEvent(long event, const TQString& fileName, const TQString& name, const TQString& arguments, int position ) : TQCustomEvent(event), m_fileName( fileName ), m_name( name ), m_arguments( arguments ), m_position( position ) { - m_global = FALSE; + m_global = false; } FileParseEvent(long event, const TQString& fileName, const TQString& name, const TQString& arguments, int position, bool global ) diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 252b2167..ab73766c 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -38,7 +38,7 @@ #include <tdehtmlview.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kregexp.h> #include <kstatusbar.h> #include <tdeparts/browserextension.h> @@ -79,23 +79,23 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin setXMLFile("kdevphpsupport.rc"); - 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( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_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( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); TDEAction *action; action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Executes script on a terminal or a webserver.")); action = new TDEAction( i18n("&New Class..."),0, - this, TQT_SLOT(slotNewClass()), + this, TQ_SLOT(slotNewClass()), actionCollection(), "project_new_class" ); action->setToolTip(i18n("New class")); action->setWhatsThis(i18n("<b>New class</b><p>Runs New Class wizard.")); @@ -107,29 +107,29 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin mainWindow()->embedOutputView(m_phpErrorView, i18n("Problems"), i18n("Problems")); phpExeProc = new KShellProcess("/bin/sh"); - connect( phpExeProc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPExeStdout (TDEProcess*, char*, int))); - connect( phpExeProc, TQT_SIGNAL(receivedStderr (TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPExeStderr (TDEProcess*, char*, int))); - connect( phpExeProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotPHPExeExited(TDEProcess*))); + connect( phpExeProc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedPHPExeStdout (TDEProcess*, char*, int))); + connect( phpExeProc, TQ_SIGNAL(receivedStderr (TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedPHPExeStderr (TDEProcess*, char*, int))); + connect( phpExeProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotPHPExeExited(TDEProcess*))); m_htmlView = new PHPHTMLView(this); mainWindow()->embedOutputView(m_htmlView->view(), i18n("PHP"), i18n("PHP")); - connect( m_htmlView, TQT_SIGNAL(started(TDEIO::Job*)), - this, TQT_SLOT(slotWebJobStarted(TDEIO::Job*))); + connect( m_htmlView, TQ_SIGNAL(started(TDEIO::Job*)), + this, TQ_SLOT(slotWebJobStarted(TDEIO::Job*))); configData = new PHPConfigData(projectDom()); - connect( configData, TQT_SIGNAL(configStored()), - this, TQT_SLOT(slotConfigStored())); + connect( configData, TQ_SIGNAL(configStored()), + this, TQ_SLOT(slotConfigStored())); m_codeCompletion = new PHPCodeCompletion(this, configData); - new TDEAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQT_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text"); + new TDEAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQ_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text"); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); - connect( this, TQT_SIGNAL(fileParsed( PHPFile* )), this, TQT_SLOT(slotfileParsed( PHPFile* ))); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part *))); + connect( this, TQ_SIGNAL(fileParsed( PHPFile* )), this, TQ_SLOT(slotfileParsed( PHPFile* ))); } PHPSupportPart::~PHPSupportPart() @@ -180,7 +180,7 @@ void PHPSupportPart::slotActivePartChanged(KParts::Part *part) { if (m_editInterface) { // connect to the editor disconnect(part, 0, this, 0 ); // to make sure that it is't connected twice if (configData->getRealtimeParsing()) { - connect(part,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged())); + connect(part,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged())); } m_codeCompletion->setActiveEditorPart(part); } @@ -210,7 +210,7 @@ void PHPSupportPart::slotConfigStored() { void PHPSupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n( "PHP Specific" ), i18n("PHP Settings"), BarIcon( "text-x-src", TDEIcon::SizeMedium )); PHPConfigWidget* w = new PHPConfigWidget(configData,vbox, "php config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } void PHPSupportPart::slotNewClass() { @@ -242,7 +242,7 @@ bool PHPSupportPart::validateConfig() { TQVBox *vbox = dlg.addVBoxPage(i18n("PHP Settings")); PHPConfigWidget* w = new PHPConfigWidget(configData,vbox, "php config widget"); - connect( &dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( &dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); dlg.exec(); } if (configData->validateConfig()) { @@ -298,10 +298,10 @@ void PHPSupportPart::slotWebJobStarted(TDEIO::Job* job) { if (job && job->className() == TQString("TDEIO::TransferJob")) { kdDebug(9018) << endl << "job started" << job->progressId(); TDEIO::TransferJob *tjob = static_cast<TDEIO::TransferJob*>(job); - connect( tjob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotWebData(TDEIO::Job*, const TQByteArray&))); - connect( tjob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotWebResult(TDEIO::Job*))); + connect( tjob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotWebData(TDEIO::Job*, const TQByteArray&))); + connect( tjob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotWebResult(TDEIO::Job*))); } } @@ -381,10 +381,10 @@ void PHPSupportPart::projectOpened() { kdDebug(9018) << "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 &)) ); if (!m_parser) { m_parser = new PHPParser( this ); @@ -393,7 +393,7 @@ void PHPSupportPart::projectOpened() // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(500, this, TQT_SLOT( initialParse() ) ); + TQTimer::singleShot(500, this, TQ_SLOT( initialParse() ) ); } void PHPSupportPart::initialParse( ) @@ -426,7 +426,7 @@ bool PHPSupportPart::parseProject() kdDebug(9018) << "parseProject()" << endl; mainWindow() ->statusBar() ->message( i18n( "Updating..." ) ); - kapp->setOverrideCursor( waitCursor ); + tdeApp->setOverrideCursor( waitCursor ); _jd = new JobData; @@ -442,15 +442,15 @@ bool PHPSupportPart::parseProject() _jd->it = _jd->files.begin(); _jd->dir.setPath( project()->projectDirectory() ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); - return TRUE; + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); + return true; } void PHPSupportPart::slotParseFiles() { kdDebug(9018) << "slotParseFiles()" << endl; - kapp->lock(); + tdeApp->lock(); if ( _jd->it != _jd->files.end() ) { @@ -470,11 +470,11 @@ void PHPSupportPart::slotParseFiles() ++( _jd->it ); } - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); } else // finished or interrupted { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); mainWindow()->statusBar()->removeWidget( _jd->progressBar ); mainWindow()->statusBar()->message( i18n( "Done" ), 2000 ); @@ -486,7 +486,7 @@ void PHPSupportPart::slotParseFiles() _jd = 0; } - kapp->unlock(); + tdeApp->unlock(); } void PHPSupportPart::addedFilesToProject(const TQStringList &fileList) @@ -570,7 +570,7 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev ) if ( ev->type() < Event_AddFile || ev->type() > Event_AddFixme ) return; - kapp->lock(); + tdeApp->lock(); FileParseEvent* event = (FileParseEvent*) ev; NamespaceDom ns = codeModel()->globalNamespace(); @@ -609,7 +609,7 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev ) nClass->setStartPosition( event->posititon(), 0); m_file->addClass( nClass ); - if ( event->arguments().isEmpty() != TRUE ) + if ( !event->arguments().isEmpty() ) nClass->addBaseClass( event->arguments() ); ns->addClass( nClass ); @@ -690,10 +690,10 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev ) nVariable->setStartPosition( event->posititon(), 0 ); nVariable->setAccess(VariableModel::Public); - if ( event->arguments().isEmpty() != TRUE ) + if ( !event->arguments().isEmpty() ) nVariable->setType( event->arguments() ); - if ( LastClass != NULL && ( LastMethod == NULL || event->global() == TRUE ) ) { + if ( LastClass != NULL && ( LastMethod == NULL || event->global() ) ) { // kdDebug(9018) << "AddVariable To Class " << LastClass->name() << " " << nVariable->name() << endl; LastClass->addVariable(nVariable); } else { @@ -736,8 +736,8 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev ) } - kapp->unlock(); - kapp->processEvents(); + tdeApp->unlock(); + tdeApp->processEvents(); } PHPErrorView *PHPSupportPart::ErrorView( ) { diff --git a/languages/python/app_templates/pyqt/app.py b/languages/python/app_templates/pyqt/app.py index d2207de3..960dcf40 100644 --- a/languages/python/app_templates/pyqt/app.py +++ b/languages/python/app_templates/pyqt/app.py @@ -262,7 +262,7 @@ def main(args): app=QApplication(args) mainWindow = %{APPNAME}() mainWindow.show() - app.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) + app.connect(app, TQ_SIGNAL("lastWindowClosed()"), app, TQ_SLOT("quit()")) app.exec_loop() diff --git a/languages/python/app_templates/pyqt/templates-ui-mainwin b/languages/python/app_templates/pyqt/templates-ui-mainwin index 5ce4dec8..62d6d51a 100644 --- a/languages/python/app_templates/pyqt/templates-ui-mainwin +++ b/languages/python/app_templates/pyqt/templates-ui-mainwin @@ -400,7 +400,7 @@ <slot>helpAbout()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>fileNew()</slot> <slot>fileOpen()</slot> <slot>fileSave()</slot> @@ -416,6 +416,6 @@ <slot>helpIndex()</slot> <slot>helpContents()</slot> <slot>helpAbout()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp index 86027d3a..489cdb35 100644 --- a/languages/python/pydoc.cpp +++ b/languages/python/pydoc.cpp @@ -6,9 +6,9 @@ #include <unistd.h> #include <tqtextstream.h> -#include <kstandarddirs.h> -#include <kinstance.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeinstance.h> +#include <tdeprocess.h> #include <tdeversion.h> #include <tdeglobal.h> #include <tdelocale.h> diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index 68baf71e..333d5c82 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -49,37 +49,37 @@ PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const T setXMLFile("kdevpythonsupport.rc"); - 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( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + 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( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); TDEAction *action; action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Execute program") ); action->setWhatsThis(i18n("<b>Execute program</b><p>Runs the Python program.")); action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0, - this, TQT_SLOT(slotExecuteString()), + this, TQ_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Execute string") ); action->setWhatsThis(i18n("<b>Execute String</b><p>Executes a string as Python code.")); action = new TDEAction( i18n("Start Python Interpreter"), "application-x-executable", 0, - this, TQT_SLOT(slotStartInterpreter()), + this, TQ_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Start Python interpreter") ); action->setWhatsThis(i18n("<b>Start python interpreter</b><p>Starts the Python interpreter without a program")); action = new TDEAction( i18n("Python Documentation..."), 0, - this, TQT_SLOT(slotPydoc()), + this, TQ_SLOT(slotPydoc()), actionCollection(), "help_pydoc" ); action->setToolTip( i18n("Python documentation") ); action->setWhatsThis(i18n("<b>Python documentation</b><p>Shows a Python documentation page.")); @@ -99,7 +99,7 @@ void PythonSupportPart::contextMenu(TQPopupMenu *popup, const Context *context) if (url.fileName().endsWith(".ui")) { m_contextFileName = url.fileName(); - 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.")); } } @@ -110,7 +110,7 @@ void PythonSupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Python")); PythonConfigWidget *w = new PythonConfigWidget(*projectDom(), vbox, "python config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } @@ -118,14 +118,14 @@ void PythonSupportPart::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(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } @@ -154,7 +154,7 @@ void PythonSupportPart::initialParse() kdDebug(9014) << "initialParse()" << endl; if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug(9014) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; @@ -162,7 +162,7 @@ void PythonSupportPart::initialParse() } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9014) << "No project" << endl; } diff --git a/languages/ruby/app_templates/dcopservice/app.cpp b/languages/ruby/app_templates/dcopservice/app.cpp index 04770335..09d2f1fa 100644 --- a/languages/ruby/app_templates/dcopservice/app.cpp +++ b/languages/ruby/app_templates/dcopservice/app.cpp @@ -2,8 +2,8 @@ #include <tqstring.h> #include <tqfileinfo.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> int main(int argc, char **argv) { TDEInstance * instance = new TDEInstance("%{APPNAMELC}"); diff --git a/languages/ruby/app_templates/dcopservice/dcopservice.rb b/languages/ruby/app_templates/dcopservice/dcopservice.rb index b0e59b6d..487d4804 100644 --- a/languages/ruby/app_templates/dcopservice/dcopservice.rb +++ b/languages/ruby/app_templates/dcopservice/dcopservice.rb @@ -31,7 +31,7 @@ class %{APPNAME} < KDE::DCOPObject end def exit() - $kapp.quit() + $tdeApp.quit() return true end end diff --git a/languages/ruby/app_templates/kapp/app.cpp b/languages/ruby/app_templates/kapp/app.cpp index 04770335..09d2f1fa 100644 --- a/languages/ruby/app_templates/kapp/app.cpp +++ b/languages/ruby/app_templates/kapp/app.cpp @@ -2,8 +2,8 @@ #include <tqstring.h> #include <tqfileinfo.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> int main(int argc, char **argv) { TDEInstance * instance = new TDEInstance("%{APPNAMELC}"); diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/kapp/app.rb index af807fe9..39b919da 100644 --- a/languages/ruby/app_templates/kapp/app.rb +++ b/languages/ruby/app_templates/kapp/app.rb @@ -9,7 +9,7 @@ class %{APPNAMESC} < KDE::MainWindow - Q_SLOTS 'fileNew()', + slots 'fileNew()', 'fileOpen()', 'fileSave()', 'fileSaveAs()', @@ -41,10 +41,10 @@ class %{APPNAMESC} < KDE::MainWindow setupGUI(); # allow the view to change the statusbar and caption - connect(@view, SIGNAL('signalChangeStatusbar(const TQString&)'), - self, SLOT('changeStatusbar(const TQString&)')) - connect(@view, SIGNAL('signalChangeCaption(const TQString&)'), - self, SLOT('changeCaption(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeStatusbar(const TQString&)'), + self, TQ_SLOT('changeStatusbar(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeCaption(const TQString&)'), + self, TQ_SLOT('changeCaption(const TQString&)')) end @@ -74,19 +74,19 @@ class %{APPNAMESC} < KDE::MainWindow end def setupActions() - KDE::StdAction.openNew(self, SLOT('fileNew()'), actionCollection()) - KDE::StdAction.open(self, SLOT('fileOpen()'), actionCollection()) - KDE::StdAction.save(self, SLOT('fileSave()'), actionCollection()) - KDE::StdAction.saveAs(self, SLOT('fileSaveAs()'), actionCollection()) - KDE::StdAction.print(self, SLOT('filePrint()'), actionCollection()) - KDE::StdAction.quit($kapp, SLOT('quit()'), actionCollection()) + KDE::StdAction.openNew(self, TQ_SLOT('fileNew()'), actionCollection()) + KDE::StdAction.open(self, TQ_SLOT('fileOpen()'), actionCollection()) + KDE::StdAction.save(self, TQ_SLOT('fileSave()'), actionCollection()) + KDE::StdAction.saveAs(self, TQ_SLOT('fileSaveAs()'), actionCollection()) + KDE::StdAction.print(self, TQ_SLOT('filePrint()'), actionCollection()) + KDE::StdAction.quit($tdeApp, TQ_SLOT('quit()'), actionCollection()) - KDE::StdAction.preferences(self, SLOT('optionsPreferences()'), actionCollection()) + KDE::StdAction.preferences(self, 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 custom = KDE::Action.new(i18n("Cus&tom Menuitem"), KDE::Shortcut.new(), - self, SLOT('optionsPreferences()'), + self, TQ_SLOT('optionsPreferences()'), actionCollection(), "custom_action") end diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb index 3fed1ce1..7ee8133f 100644 --- a/languages/ruby/app_templates/kapp/appview.rb +++ b/languages/ruby/app_templates/kapp/appview.rb @@ -15,14 +15,14 @@ class %{APPNAMESC}View < TQt::Widget # # Use this signal to change the content of the statusbar # - Q_SIGNALS 'signalChangeStatusbar(const TQString&)' + signals 'signalChangeStatusbar(const TQString&)' # # Use this signal to change the content of the caption # - Q_SIGNALS 'signalChangeCaption(const TQString&)' + signals 'signalChangeCaption(const TQString&)' - Q_SLOTS 'slotOnURL(const TQString&)', + slots 'slotOnURL(const TQString&)', 'slotSetTitle(const TQString&)' def initialize(parent) @@ -71,10 +71,10 @@ class %{APPNAMESC}View < TQt::Widget return end - connect(@html, SIGNAL('setWindowCaption(const TQString&)'), - self, SLOT('slotSetTitle(const TQString&)')) - connect(@html, SIGNAL('setStatusBarText(const TQString&)'), - self, SLOT('slotOnURL(const TQString&)')) + connect(@html, TQ_SIGNAL('setWindowCaption(const TQString&)'), + self, TQ_SLOT('slotSetTitle(const TQString&)')) + connect(@html, TQ_SIGNAL('setStatusBarText(const TQString&)'), + self, TQ_SLOT('slotOnURL(const TQString&)')) end diff --git a/languages/ruby/app_templates/kxt/app.cpp b/languages/ruby/app_templates/kxt/app.cpp index 04770335..09d2f1fa 100644 --- a/languages/ruby/app_templates/kxt/app.cpp +++ b/languages/ruby/app_templates/kxt/app.cpp @@ -2,8 +2,8 @@ #include <tqstring.h> #include <tqfileinfo.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> int main(int argc, char **argv) { TDEInstance * instance = new TDEInstance("%{APPNAMELC}"); diff --git a/languages/ruby/app_templates/kxt/app.rb b/languages/ruby/app_templates/kxt/app.rb index 59a7c266..c8485460 100644 --- a/languages/ruby/app_templates/kxt/app.rb +++ b/languages/ruby/app_templates/kxt/app.rb @@ -9,7 +9,7 @@ class %{APPNAMESC} < KDE::MainWindow - Q_SLOTS 'fileNew()', + slots 'fileNew()', 'optionsPreferences()', 'newToolbarConfig()', 'changeStatusbar(const TQString&)', @@ -40,23 +40,23 @@ class %{APPNAMESC} < KDE::MainWindow setupGUI(); # allow the view to change the statusbar and caption - connect(@view, SIGNAL('signalChangeStatusbar(const TQString&)'), - self, SLOT('changeStatusbar(const TQString&)')) - connect(@view, SIGNAL('signalChangeCaption(const TQString&)'), - self, SLOT('changeCaption(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeStatusbar(const TQString&)'), + self, TQ_SLOT('changeStatusbar(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeCaption(const TQString&)'), + self, TQ_SLOT('changeCaption(const TQString&)')) end def setupActions() - KDE::StdAction.openNew(self, SLOT('fileNew()'), actionCollection()) - KDE::StdAction.quit($kapp, SLOT('quit()'), actionCollection()) + KDE::StdAction.openNew(self, TQ_SLOT('fileNew()'), actionCollection()) + KDE::StdAction.quit($tdeApp, TQ_SLOT('quit()'), actionCollection()) - KDE::StdAction.preferences(self, SLOT('optionsPreferences()'), actionCollection()) + KDE::StdAction.preferences(self, 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 custom = KDE::Action.new(i18n("Swi&tch Colors"), KDE::Shortcut.new(), - @view, SLOT('switchColors()'), + @view, TQ_SLOT('switchColors()'), actionCollection(), "switch_action") end @@ -76,7 +76,7 @@ class %{APPNAMESC} < KDE::MainWindow # to the names of the variables in the .kcfg file dialog = KDE::ConfigDialog.new(self, "settings", Settings.instance, KDE::DialogBase::Swallow) dialog.addPage(Prefs.new(), i18n("General"), "package_settings") - connect(dialog, SIGNAL('settingsChanged()'), @view, SLOT('settingsChanged()')) + connect(dialog, TQ_SIGNAL('settingsChanged()'), @view, TQ_SLOT('settingsChanged()')) dialog.show() end diff --git a/languages/ruby/app_templates/kxt/appview.rb b/languages/ruby/app_templates/kxt/appview.rb index 4f63037f..2557b9da 100644 --- a/languages/ruby/app_templates/kxt/appview.rb +++ b/languages/ruby/app_templates/kxt/appview.rb @@ -15,14 +15,14 @@ class %{APPNAMESC}View < %{APPNAMESC}view_base # # Use this signal to change the content of the statusbar # - Q_SIGNALS 'signalChangeStatusbar(const TQString&)' + signals 'signalChangeStatusbar(const TQString&)' # # Use this signal to change the content of the caption # - Q_SIGNALS 'signalChangeCaption(const TQString&)' + signals 'signalChangeCaption(const TQString&)' - Q_SLOTS 'switchColors()', + slots 'switchColors()', 'settingsChanged()' def initialize(parent) diff --git a/languages/ruby/app_templates/qtrubyapp/main.rb b/languages/ruby/app_templates/qtrubyapp/main.rb index 431ea442..f76c9dac 100644 --- a/languages/ruby/app_templates/qtrubyapp/main.rb +++ b/languages/ruby/app_templates/qtrubyapp/main.rb @@ -5,6 +5,6 @@ a = TQt::Application.new( ARGV ) mw = %{APPNAMESC}.new mw.caption = "%{APPNAMESC}" mw.show -a.connect( a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()') ) +a.connect( a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()') ) a.exec diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb index df98824d..ceae4ad1 100644 --- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb +++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb @@ -1,6 +1,6 @@ class %{APPNAMESC} < TQt::MainWindow - Q_SLOTS 'newDoc()', + slots 'newDoc()', 'choose()', 'load( const TQString& )', 'save()', @@ -18,15 +18,15 @@ class %{APPNAMESC} < TQt::MainWindow openIcon = TQt::Pixmap.new( "fileopen.xpm" ) fileOpen = TQt::ToolButton.new( TQt::IconSet.new(openIcon), tr("Open File"), nil, - self, SLOT('choose()'), fileTools, "open file" ) + self, TQ_SLOT('choose()'), fileTools, "open file" ) saveIcon = TQt::Pixmap.new( "filesave.xpm" ) fileSave = TQt::ToolButton.new( TQt::IconSet.new(saveIcon), tr("Save File"), nil, - self, SLOT('save()'), fileTools, "save file" ) + self, TQ_SLOT('save()'), fileTools, "save file" ) printIcon = TQt::Pixmap.new( "fileprint.xpm" ) filePrint = TQt::ToolButton.new( TQt::IconSet.new(printIcon), tr("Print File"), nil, - self, SLOT('print()'), fileTools, "print file" ) + self, TQ_SLOT('print()'), fileTools, "print file" ) TQt::WhatsThis.whatsThisButton( fileTools ) @@ -58,40 +58,40 @@ class %{APPNAMESC} < TQt::MainWindow menuBar().insertItem( tr("&File"), file ) - file.insertItem( tr("&New"), self, SLOT('newDoc()'), TQt::KeySequence.new(CTRL+Key_N) ) + file.insertItem( tr("&New"), self, TQ_SLOT('newDoc()'), TQt::KeySequence.new(CTRL+Key_N) ) id = file.insertItem( TQt::IconSet.new(openIcon), tr("&Open..."), - self, SLOT('choose()'), TQt::KeySequence.new(CTRL+Key_O) ) + self, TQ_SLOT('choose()'), TQt::KeySequence.new(CTRL+Key_O) ) file.setWhatsThis( id, fileOpenText ) id = file.insertItem( TQt::IconSet.new(saveIcon), tr("&Save"), - self, SLOT('save()'), TQt::KeySequence.new(CTRL+Key_S) ) + self, TQ_SLOT('save()'), TQt::KeySequence.new(CTRL+Key_S) ) file.setWhatsThis( id, fileSaveText ) - id = file.insertItem( tr("Save &As..."), self, SLOT('saveAs()') ) + id = file.insertItem( tr("Save &As..."), self, TQ_SLOT('saveAs()') ) file.setWhatsThis( id, fileSaveText ) file.insertSeparator() id = file.insertItem( TQt::IconSet.new(printIcon), tr("&Print..."), - self, SLOT('print()'), TQt::KeySequence.new(CTRL+Key_P) ) + self, TQ_SLOT('print()'), TQt::KeySequence.new(CTRL+Key_P) ) file.setWhatsThis( id, filePrintText ) file.insertSeparator() - file.insertItem( tr("&Close"), self, SLOT('close()'), TQt::KeySequence.new(CTRL+Key_W) ) + file.insertItem( tr("&Close"), self, TQ_SLOT('close()'), TQt::KeySequence.new(CTRL+Key_W) ) - file.insertItem( tr("&Quit"), $tqApp, SLOT( 'closeAllWindows()' ), TQt::KeySequence.new(CTRL+Key_Q) ) + file.insertItem( tr("&Quit"), $tqApp, TQ_SLOT( 'closeAllWindows()' ), TQt::KeySequence.new(CTRL+Key_Q) ) menuBar().insertSeparator() help = TQt::PopupMenu.new( self ) menuBar().insertItem( tr("&Help"), help ) - help.insertItem( tr("&About"), self, SLOT('about()'), TQt::KeySequence.new(Key_F1) ) - help.insertItem( tr("About &Qt"), self, SLOT('aboutQt()') ) + help.insertItem( tr("&About"), self, TQ_SLOT('about()'), TQt::KeySequence.new(Key_F1) ) + help.insertItem( tr("About &Qt"), self, TQ_SLOT('aboutQt()') ) help.insertSeparator() - help.insertItem( tr("What's &This"), self, SLOT('whatsThis()'), TQt::KeySequence.new(SHIFT+Key_F1) ) + help.insertItem( tr("What's &This"), self, TQ_SLOT('whatsThis()'), TQt::KeySequence.new(SHIFT+Key_F1) ) @e = TQt::TextEdit.new( self, "editor" ) @e.setFocus() diff --git a/languages/ruby/debugger/dbgcontroller.cpp b/languages/ruby/debugger/dbgcontroller.cpp index 7ee560b7..51e01c30 100644 --- a/languages/ruby/debugger/dbgcontroller.cpp +++ b/languages/ruby/debugger/dbgcontroller.cpp @@ -20,7 +20,7 @@ ***************************************************************************/ #include "dbgcontroller.h" -#include <kprocess.h> +#include <tdeprocess.h> /***************************************************************************/ diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index b012f0be..fe2c000e 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -25,7 +25,7 @@ #include <kdialog.h> #include <tdeglobalsettings.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kstdguiitem.h> #include <tdeversion.h> @@ -78,8 +78,8 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) 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())); psProc_ = new KShellProcess("/bin/sh"); #ifdef USE_SOLARIS @@ -106,8 +106,8 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) } #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); // Default display to 40 chars wide, default height is okay diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index 07c0b415..138f1a8c 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -27,7 +27,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <twinmodule.h> @@ -117,9 +117,9 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) 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; @@ -242,8 +242,8 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) { 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; } @@ -269,9 +269,9 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* 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 @@ -306,14 +306,14 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), TQString(), this); bKDevFocus_ = new DbgButton(BarIcon("tdevelop"), 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(bStep, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepInto())); - connect(bFinish, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOut())); - connect(bRunTo, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRunToCursor())); - 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(bStep, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepInto())); + connect(bFinish, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOut())); + connect(bRunTo, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRunToCursor())); + 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/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index bfa5de96..1ce6946e 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -38,7 +38,7 @@ #include <dcopclient.h> #include <tqtimer.h> #include <kstringhandler.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kdevcore.h" #include "kdevproject.h" @@ -148,19 +148,19 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ mainWindow()->setViewAvailable(rdbOutputWidget, false); // rdbBreakpointWidget -> this - connect( rdbBreakpointWidget, TQT_SIGNAL(refreshBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( rdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( rdbBreakpointWidget, TQT_SIGNAL(gotoSourcePosition(const TQString&, int)), - this, TQT_SLOT(slotGotoSource(const TQString&, int)) ); + connect( rdbBreakpointWidget, TQ_SIGNAL(refreshBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( rdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( rdbBreakpointWidget, TQ_SIGNAL(gotoSourcePosition(const TQString&, int)), + this, TQ_SLOT(slotGotoSource(const TQString&, int)) ); // Now setup the actions TDEAction *action; // action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, action = new TDEAction(i18n("&Start"), "dbgrun", CTRL+SHIFT+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>" @@ -171,26 +171,26 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ "about variables, frame stack, and so on.") ); 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 RDB 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("Step &Over"), "dbgnext", 0, - 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>" @@ -201,7 +201,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ action = new TDEAction(i18n("Step &Into"), "dbgstep", 0, - 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>" @@ -212,7 +212,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ action = new TDEAction(i18n("Step O&ut"), "dbgstepout", 0, - this, TQT_SLOT(slotStepOut()), + this, TQ_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current method") ); action->setWhatsThis( i18n("<b>Step out</b><p>" @@ -224,53 +224,53 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ 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( partController(), TQT_SIGNAL(loadedFile(const KURL &)), - rdbBreakpointWidget, TQT_SLOT(slotRefreshBP(const KURL &)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpoint(const TQString &, int)), - rdbBreakpointWidget, TQT_SLOT(slotToggleBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(editedBreakpoint(const TQString &, int)), - rdbBreakpointWidget, TQT_SLOT(slotEditBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), - rdbBreakpointWidget, TQT_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); + connect( partController(), TQ_SIGNAL(loadedFile(const KURL &)), + rdbBreakpointWidget, TQ_SLOT(slotRefreshBP(const KURL &)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpoint(const TQString &, int)), + rdbBreakpointWidget, TQ_SLOT(slotToggleBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(editedBreakpoint(const TQString &, int)), + rdbBreakpointWidget, TQ_SLOT(slotEditBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + rdbBreakpointWidget, 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, 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(receivedStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStderrLine(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&)) ); setupController(); - TQTimer::singleShot(0, this, TQT_SLOT(setupDcop())); + TQTimer::singleShot(0, this, TQ_SLOT(setupDcop())); } RubyDebuggerPart::~RubyDebuggerPart() { - kapp->dcopClient()->setNotifications(false); + tdeApp->dcopClient()->setNotifications(false); if (variableWidget) mainWindow()->removeView(variableWidget); @@ -311,16 +311,16 @@ void RubyDebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); if (econtext->url().isLocalFile()) { - int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQT_SLOT(toggleBreakpoint()) ); + int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQ_SLOT(toggleBreakpoint()) ); popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); } if (!m_contextIdent.isEmpty()) { TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); - int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQT_SLOT(contextWatch()) ); + int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQ_SLOT(contextWatch()) ); popup->setWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list.")); - id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQT_SLOT(contextRubyInspect()) ); + id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQ_SLOT(contextRubyInspect()) ); popup->setWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor.")); } } @@ -362,74 +362,74 @@ void RubyDebuggerPart::setupController() controller = new RDBController(variableTree, framestackWidget, *projectDom()); // this -> controller - connect( this, TQT_SIGNAL(rubyInspect(const TQString&)), - controller, TQT_SLOT(slotRubyInspect(const TQString&))); + connect( this, TQ_SIGNAL(rubyInspect(const TQString&)), + controller, TQ_SLOT(slotRubyInspect(const TQString&))); // variableTree -> framestackWidget - connect( variableTree, TQT_SIGNAL(selectFrame(int, int)), - framestackWidget, TQT_SLOT(slotSelectFrame(int, int))); + connect( variableTree, TQ_SIGNAL(selectFrame(int, int)), + framestackWidget, TQ_SLOT(slotSelectFrame(int, int))); // framestackWidget -> variableTree - connect( framestackWidget, TQT_SIGNAL(frameActive(int, int, const TQString&)), - variableTree, TQT_SLOT(slotFrameActive(int, int, const TQString&))); + connect( framestackWidget, TQ_SIGNAL(frameActive(int, int, const TQString&)), + variableTree, TQ_SLOT(slotFrameActive(int, int, const TQString&))); // variableTree -> controller - connect( variableTree, TQT_SIGNAL(expandItem(VarItem*, const TQCString&)), - controller, TQT_SLOT(slotExpandItem(VarItem*, const TQCString&))); - connect( variableTree, TQT_SIGNAL(fetchGlobals(bool)), - controller, TQT_SLOT(slotFetchGlobals(bool))); - connect( variableTree, TQT_SIGNAL(addWatchExpression(const TQString&, bool)), - controller, TQT_SLOT(slotAddWatchExpression(const TQString&, bool))); - connect( variableTree, TQT_SIGNAL(removeWatchExpression(int)), - controller, TQT_SLOT(slotRemoveWatchExpression(int))); + connect( variableTree, TQ_SIGNAL(expandItem(VarItem*, const TQCString&)), + controller, TQ_SLOT(slotExpandItem(VarItem*, const TQCString&))); + connect( variableTree, TQ_SIGNAL(fetchGlobals(bool)), + controller, TQ_SLOT(slotFetchGlobals(bool))); + connect( variableTree, TQ_SIGNAL(addWatchExpression(const TQString&, bool)), + controller, TQ_SLOT(slotAddWatchExpression(const TQString&, bool))); + connect( variableTree, TQ_SIGNAL(removeWatchExpression(int)), + controller, TQ_SLOT(slotRemoveWatchExpression(int))); // framestackWidget -> controller - connect( framestackWidget, TQT_SIGNAL(selectFrame(int,int,const TQString&)), - controller, TQT_SLOT(slotSelectFrame(int,int,const TQString&))); + connect( framestackWidget, TQ_SIGNAL(selectFrame(int,int,const TQString&)), + controller, TQ_SLOT(slotSelectFrame(int,int,const TQString&))); // rdbBreakpointWidget -> controller - connect( rdbBreakpointWidget, TQT_SIGNAL(clearAllBreakpoints()), - controller, TQT_SLOT(slotClearAllBreakpoints())); - connect( rdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), - controller, TQT_SLOT(slotBPState(const Breakpoint &))); + connect( rdbBreakpointWidget, TQ_SIGNAL(clearAllBreakpoints()), + controller, TQ_SLOT(slotClearAllBreakpoints())); + connect( rdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)), + controller, TQ_SLOT(slotBPState(const Breakpoint &))); // rdbOutputWidget -> controller - connect( rdbOutputWidget, TQT_SIGNAL(userRDBCmd(const TQString &)), - controller, TQT_SLOT(slotUserRDBCmd(const TQString&))); - connect( rdbOutputWidget, TQT_SIGNAL(breakInto()), - controller, TQT_SLOT(slotBreakInto())); + connect( rdbOutputWidget, TQ_SIGNAL(userRDBCmd(const TQString &)), + controller, TQ_SLOT(slotUserRDBCmd(const TQString&))); + connect( rdbOutputWidget, TQ_SIGNAL(breakInto()), + controller, TQ_SLOT(slotBreakInto())); // controller -> rdbBreakpointWidget - connect( controller, TQT_SIGNAL(acceptPendingBPs()), - rdbBreakpointWidget, TQT_SLOT(slotSetPendingBPs())); - connect( controller, TQT_SIGNAL(unableToSetBPNow(int)), - rdbBreakpointWidget, TQT_SLOT(slotUnableToSetBPNow(int))); - connect( controller, TQT_SIGNAL(rawRDBBreakpointList (char*)), - rdbBreakpointWidget, TQT_SLOT(slotParseRDBBrkptList(char*))); - connect( controller, TQT_SIGNAL(rawRDBBreakpointSet(char*, int)), - rdbBreakpointWidget, TQT_SLOT(slotParseRDBBreakpointSet(char*, int))); + connect( controller, TQ_SIGNAL(acceptPendingBPs()), + rdbBreakpointWidget, TQ_SLOT(slotSetPendingBPs())); + connect( controller, TQ_SIGNAL(unableToSetBPNow(int)), + rdbBreakpointWidget, TQ_SLOT(slotUnableToSetBPNow(int))); + connect( controller, TQ_SIGNAL(rawRDBBreakpointList (char*)), + rdbBreakpointWidget, TQ_SLOT(slotParseRDBBrkptList(char*))); + connect( controller, TQ_SIGNAL(rawRDBBreakpointSet(char*, int)), + rdbBreakpointWidget, TQ_SLOT(slotParseRDBBreakpointSet(char*, int))); // 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, 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))); // 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 -> rdbOutputWidget - connect( controller, TQT_SIGNAL(rdbStdout(const char*)), - rdbOutputWidget, TQT_SLOT(slotReceivedStdout(const char*)) ); - connect( controller, TQT_SIGNAL(rdbStderr(const char*)), - rdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - rdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(rdbStdout(const char*)), + rdbOutputWidget, TQ_SLOT(slotReceivedStdout(const char*)) ); + connect( controller, TQ_SIGNAL(rdbStderr(const char*)), + rdbOutputWidget, TQ_SLOT(slotReceivedStderr(const char*)) ); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + rdbOutputWidget, TQ_SLOT(slotDbgStatus(const TQString&, int))); } diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp index 4d90092f..024cff2c 100644 --- a/languages/ruby/debugger/framestackwidget.cpp +++ b/languages/ruby/debugger/framestackwidget.cpp @@ -51,8 +51,8 @@ FramestackWidget::FramestackWidget(TQWidget *parent, const char *name, WFlags f) setSorting(0); header()->hide(); - 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/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index 0c1fea0b..92170f52 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -239,34 +239,34 @@ RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) : m_ctxMenu->insertItem( i18n( "Disable" ), BW_ITEM_Disable ); m_ctxMenu->insertItem( i18n( "Delete" ), BW_ITEM_Delete ); - connect( addMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAddBlankBreakpoint(int)) ); - connect( m_delete, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveBreakpoint()) ); - connect( m_edit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditBreakpoint()) ); - connect( m_removeAll, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveAllBreakpoints()) ); - - 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, TQT_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), - this, TQT_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); - - connect( m_table, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_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, TQT_SIGNAL(insertPressed()), - this, TQT_SLOT(slotAddBreakpoint())); + connect( addMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAddBlankBreakpoint(int)) ); + connect( m_delete, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveBreakpoint()) ); + connect( m_edit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditBreakpoint()) ); + connect( m_removeAll, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveAllBreakpoints()) ); + + 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, TQ_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), + this, TQ_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); + + connect( m_table, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(slotNewValue(int, int))); + + 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())); + connect( m_table, TQ_SIGNAL(insertPressed()), + this, TQ_SLOT(slotAddBreakpoint())); } /***************************************************************************/ diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp index 16ce7179..a9580249 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -43,7 +43,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqdatetime.h> #include <tqfileinfo.h> @@ -130,8 +130,8 @@ RDBController::RDBController(VariableTree *varTree, FramestackWidget *frameStack bind(masterSocket_, (const struct sockaddr*) &sockaddr, sizeof(sockaddr)); listen(masterSocket_, 1); acceptNotifier_ = new TQSocketNotifier(masterSocket_, TQSocketNotifier::Read, this); - TQObject::connect( acceptNotifier_, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAcceptConnection(int)) ); + TQObject::connect( acceptNotifier_, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAcceptConnection(int)) ); configure(); cmdList_.setAutoDelete(true); @@ -693,11 +693,11 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& Q_ASSERT (!dbgProcess_ && !tty_); // tty_ = new STTY(config_dbgTerminal_, "konsole"); - tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); + tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *tdeApp->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()); @@ -716,17 +716,17 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& 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*)) ); rubyInterpreter_ = ruby_interpreter; characterCoding_ = character_coding; @@ -797,7 +797,7 @@ void RDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->processEvents(20); + tdeApp->processEvents(20); now = TQTime::currentTime(); if (!stateIsOn(s_appBusy) || start.msecsTo( now ) > 2000) break; @@ -816,7 +816,7 @@ void RDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->processEvents(20); + tdeApp->processEvents(20); now = TQTime::currentTime(); if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000) break; @@ -1199,8 +1199,8 @@ void RDBController::slotAcceptConnection(int masterSocket) } socketNotifier_ = new TQSocketNotifier(socket_, TQSocketNotifier::Read, 0); - TQObject::connect( socketNotifier_, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotReadFromSocket(int)) ); + TQObject::connect( socketNotifier_, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotReadFromSocket(int)) ); setStateOff(s_dbgNotStarted); emit dbgStatus ("", state_); diff --git a/languages/ruby/debugger/rdbcontroller.h b/languages/ruby/debugger/rdbcontroller.h index f28302db..5e10d848 100644 --- a/languages/ruby/debugger/rdbcontroller.h +++ b/languages/ruby/debugger/rdbcontroller.h @@ -149,7 +149,7 @@ private: int stdoutSizeofBuf_; // size of the buffer for holding stdout piped // from the ruby program int stdoutOutputLen_; // amount of data in the output buffer - char* stdoutOutput_; // buffer for the output from kprocess + char* stdoutOutput_; // buffer for the output from tdeprocess TQCString holdingZone_; int rdbSizeofBuf_; // size of the output buffer from rdb diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp index 575d60ad..52ba2c0f 100644 --- a/languages/ruby/debugger/rdboutputwidget.cpp +++ b/languages/ruby/debugger/rdboutputwidget.cpp @@ -81,8 +81,8 @@ RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) : slotDbgStatus( "", s_dbgNotStarted); - connect( m_userRDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotRDBCmd()) ); - connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); + connect( m_userRDBCmdEditor, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotRDBCmd()) ); + connect( m_Interrupt, TQ_SIGNAL(clicked()), TQ_SIGNAL(breakInto())); } /***************************************************************************/ diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp index 73ea4784..2e52096d 100644 --- a/languages/ruby/debugger/stty.cpp +++ b/languages/ruby/debugger/stty.cpp @@ -26,11 +26,6 @@ #include <config.h> #endif -#ifdef __osf__ -#define _XOPEN_SOURCE_EXTENDED -#define O_NDELAY O_NONBLOCK -#endif - #include <sys/types.h> #include <sys/ioctl.h> #include <sys/stat.h> @@ -64,7 +59,7 @@ #include <tqfile.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include "stty.h" @@ -131,7 +126,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)) ); } } } @@ -160,7 +155,7 @@ STTY::~STTY() int STTY::findTTY() { int ptyfd = -1; - bool needGrantPty = TRUE; + bool needGrantPty = true; // Find a master pty that we can open //////////////////////////////// @@ -173,7 +168,7 @@ int STTY::findTTY() strncpy(tty_slave, ptsname(ptyfd), 50); grantpt(ptyfd); unlockpt(ptyfd); - needGrantPty = FALSE; + needGrantPty = false; #endif // first we try UNIX PTY's @@ -187,7 +182,7 @@ int STTY::findTTY() struct stat sbuf; sprintf(tty_slave,"/dev/pts/%d",ptyno); if (stat(tty_slave,&sbuf) == 0 && S_ISCHR(sbuf.st_mode)) - needGrantPty = FALSE; + needGrantPty = false; else { close(ptyfd); ptyfd = -1; @@ -232,7 +227,7 @@ int STTY::findTTY() } if (ptyfd >= 0) { - if (needGrantPty && !chownpty(ptyfd, TRUE)) { + if (needGrantPty && !chownpty(ptyfd, true)) { fprintf(stderr,"tdevelop: chownpty failed for device %s::%s.\n",pty_master,tty_slave); fprintf(stderr," : This means the session can be eavesdroped.\n"); fprintf(stderr," : Make sure konsole_grantpty is installed and setuid root.\n"); diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index 94fd4e88..c4173dfb 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -71,8 +71,8 @@ VariableWidget::VariableWidget(TQWidget *parent, const char *name) topLayout->addWidget(varTree_, 10); topLayout->addLayout( vbox ); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddWatchExpression()) ); - connect( watchVarEditor_, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotAddWatchExpression()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddWatchExpression()) ); + connect( watchVarEditor_, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotAddWatchExpression()) ); } @@ -145,11 +145,11 @@ VariableTree::VariableTree(VariableWidget *parent, const char *name) addColumn(i18n("Variable"), 100 ); addColumn(i18n("Value"), 100 ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(pressed(TQListViewItem*)), - this, TQT_SLOT(slotPressed(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(pressed(TQListViewItem*)), + this, TQ_SLOT(slotPressed(TQListViewItem*)) ); watchRoot_ = new WatchRoot(this); } diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index db9576b3..ead9194f 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -25,7 +25,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kdevgenericfactory.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tdeaction.h> #include <tdeparts/part.h> @@ -49,26 +49,26 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr TDEAction *action; action = new TDEAction( i18n("&Run"), "application-x-executable", SHIFT + Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Starts an application.")); action->setIcon("ruby_run.png"); action = new TDEAction( i18n("Run Test Under Cursor"), "application-x-executable", ALT + Key_F9, - this, TQT_SLOT(slotRunTestUnderCursor()), + this, TQ_SLOT(slotRunTestUnderCursor()), actionCollection(), "build_execute_test_function" ); action->setToolTip(i18n("Run Test Under Cursor")); action->setWhatsThis(i18n("<b>Run Test Under Cursor</b><p>Runs the function under the cursor as test.")); - action = new TDEAction( i18n("Launch Browser"), "network", 0, this, TQT_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" ); + action = new TDEAction( i18n("Launch Browser"), "network", 0, this, TQ_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" ); action->setToolTip(i18n("Launch Browser")); action->setWhatsThis(i18n("<b>Launch Browser</b><p>Opens a web browser pointing to the Ruby Rails server") ); - action = new TDEAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQT_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" ); - action = new TDEAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQT_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" ); - action = new TDEAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQT_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" ); - action = new TDEAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQT_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" ); + action = new TDEAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQ_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" ); + action = new TDEAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQ_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" ); + action = new TDEAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQ_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" ); + action = new TDEAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQ_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" ); kdDebug() << "Creating RubySupportPart" << endl; @@ -78,14 +78,14 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr mainWindow()->embedOutputView( m_shellWidget, i18n("Ruby Shell"), i18n("Ruby Shell")); mainWindow()->raiseView( m_shellWidget ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -101,7 +101,7 @@ void RubySupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Ruby"), i18n("Ruby"), BarIcon("ruby_config.png", TDEIcon::SizeMedium, TDEIcon::DefaultState, RubySupportPart::instance())); RubyConfigWidget *w = new RubyConfigWidget(*projectDom(), (TQWidget *)vbox, "ruby config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } void RubySupportPart::projectOpened() @@ -114,10 +114,10 @@ void RubySupportPart::projectOpened() m_shellWidget->activate(); m_shellWidget->setAutoReactivateOnClose( true ); - 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 &)) ); TQFileInfo program(mainProgram()); @@ -134,7 +134,7 @@ void RubySupportPart::projectOpened() // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } void RubySupportPart::maybeParse(const TQString fileName) @@ -157,7 +157,7 @@ void RubySupportPart::initialParse() kdDebug() << "initialParse()" << endl; if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug() << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; @@ -165,7 +165,7 @@ void RubySupportPart::initialParse() } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug() << "No project" << endl; } @@ -518,7 +518,7 @@ void RubySupportPart::parse(const TQString &fileName) void RubySupportPart::slotRun () { // if we can't save all parts, then the user canceled - if ( partController()->saveAllFiles() == false ) + if ( !partController()->saveAllFiles() ) return; TQFileInfo program(mainProgram()); if (mainProgram().endsWith("script/server")) { @@ -668,7 +668,7 @@ void RubySupportPart::contextMenu( TQPopupMenu * popup, const Context * context if (url.fileName().endsWith(".ui")) { m_contextFileName = url.fileName(); - 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.")); } } @@ -686,7 +686,7 @@ void RubySupportPart::slotCreateSubclass() void RubySupportPart::slotBrowse() { - kapp->invokeBrowser("http://localhost:3000/"); + tdeApp->invokeBrowser("http://localhost:3000/"); } void RubySupportPart::slotSwitchToController() @@ -875,7 +875,7 @@ void RubySupportPart::slotSwitchToView() void RubySupportPart::slotRunTestUnderCursor() { // if we can't save all parts, then the user canceled - if ( partController()->saveAllFiles() == false ) + if ( !partController()->saveAllFiles() ) return; KParts::ReadOnlyPart *ro_part = dynamic_cast<KParts::ReadOnlyPart*>(partController()->activePart()); diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index 1d1a5b14..6ef46f2c 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -37,8 +37,8 @@ SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, m_combo->setMinimumWidth( 200 ); m_combo->setMaximumWidth( 400 ); - connect( m_combo, TQT_SIGNAL(activated(const TQString&)), receiver, slot ); - connect( m_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(activated(int)) ); + connect( m_combo, TQ_SIGNAL(activated(const TQString&)), receiver, slot ); + connect( m_combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(activated(int)) ); setShortcutConfigurable( false ); setAutoSized( true ); diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui index cfa61833..81e20b78 100644 --- a/languages/sql/sqlconfigwidget.ui +++ b/languages/sql/sqlconfigwidget.ui @@ -164,10 +164,10 @@ <variable access="private">TQDomDocument* doc;</variable> <variable access="private">bool changed;</variable> </variables> -<Q_SIGNALS> +<signals> <signal>newConfigSaved()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>init()</slot> <slot>valueChanged( int, int )</slot> <slot>removeDb()</slot> @@ -176,7 +176,7 @@ <slot>accept()</slot> <slot>setProjectDom( TQDomDocument * doc )</slot> <slot>loadConfig()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/sql/sqloutputwidget.cpp b/languages/sql/sqloutputwidget.cpp index d845e6e0..83b8e74e 100644 --- a/languages/sql/sqloutputwidget.cpp +++ b/languages/sql/sqloutputwidget.cpp @@ -27,7 +27,7 @@ class TQCustomSqlCursor: public TQSqlCursor { public: - TQCustomSqlCursor( const TQString & query = TQString(), bool autopopulate = TRUE, TQSqlDatabase* db = 0 ) : + TQCustomSqlCursor( const TQString & query = TQString(), bool autopopulate = true, TQSqlDatabase* db = 0 ) : TQSqlCursor( TQString(), autopopulate, db ) { exec( query ); @@ -42,15 +42,15 @@ public: TQCustomSqlCursor( const TQCustomSqlCursor & other ): TQSqlCursor( other ) {} bool select( const TQString & /*filter*/, const TQSqlIndex & /*sort*/ = TQSqlIndex() ) { return exec( lastQuery() ); } - TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const + TQSqlIndex primaryIndex( bool /*prime*/ = true ) const { return TQSqlIndex(); } - int insert( bool /*invalidate*/ = TRUE ) - { return FALSE; } - int update( bool /*invalidate*/ = TRUE ) - { return FALSE; } - int del( bool /*invalidate*/ = TRUE ) - { return FALSE; } - void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {} + int insert( bool /*invalidate*/ = true ) + { return false; } + int update( bool /*invalidate*/ = true ) + { return false; } + int del( bool /*invalidate*/ = true ) + { return false; } + void setName( const TQString& /*name*/, bool /*autopopulate*/ = true ) {} }; diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index 96e8ed4f..096d49d9 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -40,20 +40,20 @@ SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStri setXMLFile( "kdevsqlsupport.rc" ); TDEAction *action; - action = new TDEAction( i18n( "&Run" ), "application-x-executable", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" ); + action = new TDEAction( i18n( "&Run" ), "application-x-executable", Key_F9, this, TQ_SLOT( slotRun() ), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Executes a SQL script.")); - dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQT_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" ); + dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQ_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" ); kdDebug( 9000 ) << "Creating SQLSupportPart" << 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( core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(projectOpened()) ); - connect( partController(), TQT_SIGNAL( savedFile( const KURL& ) ), this, TQT_SLOT( savedFile( const KURL& ) ) ); + 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( core(), TQ_SIGNAL(languageChanged()), this, TQ_SLOT(projectOpened()) ); + connect( partController(), TQ_SIGNAL( savedFile( const KURL& ) ), this, TQ_SLOT( savedFile( const KURL& ) ) ); m_widget = new SqlOutputWidget(); mainWindow()->embedOutputView( m_widget, i18n( "SQL" ), i18n( "Output of SQL commands" ) ); @@ -136,22 +136,22 @@ void SQLSupportPart::projectConfigWidget( KDialogBase *dlg ) SqlConfigWidget *w = new SqlConfigWidget( (TQWidget*)vbox, "SQL config widget" ); w->setProjectDom( projectDom() ); w->loadConfig(); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( w, TQT_SIGNAL(newConfigSaved()), this, TQT_SLOT(loadConfig()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( w, TQ_SIGNAL(newConfigSaved()), this, TQ_SLOT(loadConfig()) ); } void SQLSupportPart::projectOpened() { - 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 & ) ) ); loadConfig(); // 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() ) ); } diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h index 921743e2..6747522d 100644 --- a/languages/sql/sqlsupport_part.h +++ b/languages/sql/sqlsupport_part.h @@ -4,7 +4,7 @@ #include <tqguardedptr.h> #include <tqstringlist.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdialogbase.h> #include "kdevplugin.h" |