diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 14:24:33 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-21 23:12:29 +0900 |
| commit | 0b6a83b773c37ee6949d73346c4a669aa1fc98b8 (patch) | |
| tree | 03606cf5d79c9c08b77909997c4301fb34bc783c | |
| parent | 19ccb502fc61ce7dfa1d030d833d2b1f898051f4 (diff) | |
| download | tdevelop-0b6a83b773c37ee6949d73346c4a669aa1fc98b8.tar.gz tdevelop-0b6a83b773c37ee6949d73346c4a669aa1fc98b8.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 35fbd60457d1e51e6a0df5d181d1a0f00ad75a2c)
360 files changed, 3291 insertions, 3291 deletions
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index f778c9b2..4cd401a5 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -54,17 +54,17 @@ AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStrin TDEAction *action; action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, - this, TQT_SLOT(slotBuild()), + this, TQ_SLOT(slotBuild()), actionCollection(), "build_build" ); action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_execute" ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); // m_widget = new AdaProjectWidget(this); @@ -374,8 +374,8 @@ void AdaProjectPart::projectConfigWidget( KDialogBase * dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Ada Compiler")); AdaProjectOptionsDlg *w = new AdaProjectOptionsDlg(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(loadProjectConfig()) ); } void AdaProjectPart::loadProjectConfig( ) @@ -405,7 +405,7 @@ void AdaProjectPart::configWidget( KDialogBase * dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Ada Compiler")); AdaGlobalOptionsDlg *w = new AdaGlobalOptionsDlg(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index f53357da..3c71e490 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -53,7 +53,7 @@ AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStrin setXMLFile("kdevantproject.rc"); m_buildProjectAction = new TDEAction(i18n("&Build Project"), "make_tdevelop", Key_F8, - this, TQT_SLOT(slotBuild()), + this, TQ_SLOT(slotBuild()), actionCollection(), "build_build" ); m_buildProjectAction->setToolTip(i18n("Build project")); m_buildProjectAction->setWhatsThis(i18n("<b>Build project</b><p>Executes <b>ant dist</b> command to build the project.")); @@ -65,9 +65,9 @@ AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStrin m_targetMenu = menu->popupMenu(); - connect(m_targetMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTargetMenuActivated(int))); - 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(m_targetMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTargetMenuActivated(int))); + 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 *))); m_antOptionsWidget = 0; } @@ -497,7 +497,7 @@ void AntProjectPart::projectConfigWidget(KDialogBase *dlg) ++i; } - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(optionsAccepted())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(optionsAccepted())); vbox = dlg->addVBoxPage(i18n("Classpath")); m_classPathWidget = new ClassPathWidget(vbox); @@ -563,13 +563,13 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context) if (inProject) { int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr), - this, TQT_SLOT(slotRemoveFromProject()) ); + this, TQ_SLOT(slotRemoveFromProject()) ); popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project.")); } else { int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr), - this, TQT_SLOT(slotAddToProject()) ); + this, TQ_SLOT(slotAddToProject()) ); popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project.")); } } diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index efdff38f..b98b0edb 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -87,14 +87,14 @@ void AddExistingDirectoriesDialog::init() importView->setMode ( TDEIconView::Select ); importView->setItemsMovable ( false ); - connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) ); + connect ( okButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotOk () ) ); - connect ( addSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSelected() ) ); - connect ( addAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddAll() ) ); - connect ( removeSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveSelected() ) ); - connect ( removeAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveAll() ) ); + connect ( addSelectedButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddSelected() ) ); + connect ( addAllButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddAll() ) ); + connect ( removeSelectedButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveSelected() ) ); + connect ( removeAllButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveAll() ) ); - connect ( importView, TQT_SIGNAL ( dropped( TQDropEvent* ) ), this, TQT_SLOT ( slotDropped ( TQDropEvent* ) ) ); + connect ( importView, TQ_SIGNAL ( dropped( TQDropEvent* ) ), this, TQ_SLOT ( slotDropped ( TQDropEvent* ) ) ); importView->setSelectionMode ( KFile::Multi ); diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index 20dbf41b..ade9121d 100644 --- a/buildtools/autotools/addexistingfilesdlg.cpp +++ b/buildtools/autotools/addexistingfilesdlg.cpp @@ -128,14 +128,14 @@ void AddExistingFilesDialog::init() importView->setMode ( TDEIconView::Select ); importView->setItemsMovable ( false ); - connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) ); + connect ( okButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotOk () ) ); - connect ( addSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSelected() ) ); - connect ( addAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddAll() ) ); - connect ( removeSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveSelected() ) ); - connect ( removeAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveAll() ) ); + connect ( addSelectedButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddSelected() ) ); + connect ( addAllButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddAll() ) ); + connect ( removeSelectedButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveSelected() ) ); + connect ( removeAllButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveAll() ) ); - connect ( importView, TQT_SIGNAL ( dropped( TQDropEvent* ) ), this, TQT_SLOT ( slotDropped ( TQDropEvent* ) ) ); + connect ( importView, TQ_SIGNAL ( dropped( TQDropEvent* ) ), this, TQ_SLOT ( slotDropped ( TQDropEvent* ) ) ); importView->setSelectionMode ( KFile::Multi ); diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp index d3f71637..0840eca5 100644 --- a/buildtools/autotools/addfiledlg.cpp +++ b/buildtools/autotools/addfiledlg.cpp @@ -43,8 +43,8 @@ AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget, TQWidget *parent, const char *name) : AddFileDlgBase(parent, name, true) { - connect ( createButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); - connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); + connect ( createButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( accept() ) ); + connect ( cancelButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( reject() ) ); directoryLabel->setText ( spitem->path ); if ( item->name.isEmpty() ) diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp index 85f6f0fd..f7e13956 100644 --- a/buildtools/autotools/addprefixdlg.cpp +++ b/buildtools/autotools/addprefixdlg.cpp @@ -30,14 +30,14 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path name_edit = new KLineEdit(nameEdit, this); name_edit->setFocus(); name_label->setBuddy(name_edit); - connect( name_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) ); + connect( name_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotPrefixChanged() ) ); TQLabel *path_label = new TQLabel(i18n("&Path:"), this); path_edit = new KLineEdit(pathEdit, this); path_label->setBuddy(path_edit); TQFontMetrics fm(path_edit->fontMetrics()); path_edit->setMinimumWidth(fm.width('X')*35); - connect( path_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) ); + connect( path_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotPrefixChanged() ) ); TQVBoxLayout *layout = new TQVBoxLayout(this, 10); @@ -57,8 +57,8 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path m_pOk = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( m_pOk, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotPrefixChanged(); diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index 59cebc53..4ad97fd6 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -37,8 +37,8 @@ AddSubprojectDialog::AddSubprojectDialog(AutoProjectPart *part, AutoSubprojectVi { setIcon(SmallIcon("folder_new.png")); - connect( createButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( createButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); m_subProject = item; m_subprojectView = view; diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp index 92cc834c..e9ce04d8 100644 --- a/buildtools/autotools/addtargetdlg.cpp +++ b/buildtools/autotools/addtargetdlg.cpp @@ -50,7 +50,7 @@ AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item if (widget->kdeMode()) ldflagsother_edit->setText("$(all_libraries)"); - connect( filename_edit, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotFileNameChanged (const TQString&) ) ); + connect( filename_edit, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotFileNameChanged (const TQString&) ) ); setIcon ( SmallIcon ( "targetnew_tdevelop.png" ) ); diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp index fe7de2a3..d745de2a 100644 --- a/buildtools/autotools/addtranslationdlg.cpp +++ b/buildtools/autotools/addtranslationdlg.cpp @@ -54,8 +54,8 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare TQPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); ok_button->setDefault(true); - connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( ok_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancel_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 8feeef70..3c4ae477 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -79,10 +79,10 @@ AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* par buildTargetAction->setEnabled( false ); executeTargetAction->setEnabled( false ); removeDetailAction->setEnabled(false); - connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); - connect( m_listView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged( ) ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged( ) ) ); } @@ -177,7 +177,7 @@ void AutoDetailsView::initActions() TDEActionCollection * actions = new TDEActionCollection( this ); targetOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - this, TQT_SLOT( slotTargetOptions() ), actions, + this, TQ_SLOT( slotTargetOptions() ), actions, "target options" ); targetOptionsAction->setWhatsThis(i18n("<b>Options</b><p>Target options dialog that " "provides settings for linker flags and lists " @@ -188,7 +188,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button1, tr2i18n( "Create New File..." ) ); addNewFileAction = new AutoToolsAction( i18n( "Create New File..." ), "document-new", 0, - this, TQT_SLOT( slotAddNewFile() ), actions, + this, TQ_SLOT( slotAddNewFile() ), actions, "add new file" ); addNewFileAction->setWhatsThis(i18n("<b>Create new file</b><p>Creates a new file and " "adds it to a currently selected target.")); @@ -197,7 +197,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button2, tr2i18n( "Add Existing Files..." ) ); addExistingFileAction = new AutoToolsAction( i18n( "Add Existing Files..." ), "fileimport", 0, - this, TQT_SLOT( slotAddExistingFile() ), actions, + this, TQ_SLOT( slotAddExistingFile() ), actions, "add existing file" ); addExistingFileAction->setWhatsThis(i18n("<b>Add existing files</b><p>Adds existing " "file to a currently selected target. Header " @@ -208,12 +208,12 @@ void AutoDetailsView::initActions() addExistingFileAction->setEnabled( false ); addIconAction = new TDEAction( i18n( "Add Icon..." ), "iconadd_tdevelop", 0, - this, TQT_SLOT( slotAddIcon() ), actions, "add icon" ); + this, TQ_SLOT( slotAddIcon() ), actions, "add icon" ); addIconAction->setWhatsThis(i18n("<b>Add icon</b><p>Adds an icon to a KDEICON target.")); TQToolTip::add( m_button4, tr2i18n( "Build Target")); buildTargetAction = new AutoToolsAction( i18n( "Build Target..." ), "launch", 0, - this, TQT_SLOT( slotBuildTarget() ), actions, + this, TQ_SLOT( slotBuildTarget() ), actions, "build target" ); buildTargetAction->setWhatsThis(i18n("<b>Build target</b><p>Constructs a series of " "make commands to build the selected target. " @@ -223,7 +223,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button5, tr2i18n( "Execute Target...")); executeTargetAction = new AutoToolsAction( i18n( "Execute Target..." ), "application-x-executable", 0, - this, TQT_SLOT( slotExecuteTarget() ), actions, + this, TQ_SLOT( slotExecuteTarget() ), actions, "execute target" ); executeTargetAction->setWhatsThis(i18n("<b>Execute target</b><p>Executes the target " "and tries to build in case it is not built.")); @@ -231,7 +231,7 @@ void AutoDetailsView::initActions() executeTargetAction->setEnabled( false ); setActiveTargetAction = new TDEAction( i18n( "Make Target Active" ), "", 0, - this, TQT_SLOT( slotSetActiveTarget() ), actions, + this, TQ_SLOT( slotSetActiveTarget() ), actions, "set active target" ); setActiveTargetAction->setWhatsThis(i18n("<b>Make target active</b><p>Marks the " "currently selected target as 'active'. New " @@ -242,7 +242,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button3, tr2i18n( "Remove")); removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "edit-delete", 0, this, - TQT_SLOT( slotRemoveDetail() ), actions, + TQ_SLOT( slotRemoveDetail() ), actions, "remove detail" ); removeDetailAction->setWhatsThis(i18n("<b>Remove</b><p>Shows a list of targets " "dependent on the selected target or file and " @@ -251,12 +251,12 @@ void AutoDetailsView::initActions() removeDetailAction->plug( m_button3 ); removeDetailAction->setEnabled( false ); - connect( m_listView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); - connect( m_listView, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); - connect( m_listView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( m_listView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( m_listView, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + this, TQ_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( m_listView, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); } TQString AutoDetailsView::getUiFileLink(const TQString& relpath, const TQString& filename) diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index c1008072..8646fc8c 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -91,7 +91,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr TDEAction *action; action = new TDEAction( i18n("Add Translation..."), 0, - this, TQT_SLOT(slotAddTranslation()), + this, TQ_SLOT(slotAddTranslation()), actionCollection(), "project_addtranslation" ); action->setToolTip(i18n("Add translation")); action->setWhatsThis(i18n("<b>Add translation</b><p>Creates .po file for the selected language.")); @@ -102,7 +102,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setEnabled(false); action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, - this, TQT_SLOT(slotBuild()), + this, TQ_SLOT(slotBuild()), actionCollection(), "build_build" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" @@ -111,7 +111,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("Build &Active Target"), "make_tdevelop", Key_F7, - this, TQT_SLOT(slotBuildActiveTarget()), + this, TQ_SLOT(slotBuildActiveTarget()), actionCollection(), "build_buildactivetarget" ); action->setToolTip(i18n("Build active target")); action->setWhatsThis(i18n("<b>Build active target</b><p>Constructs a series of make commands to build an active target. " @@ -121,7 +121,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("Compile &File"), "make_tdevelop", - this, TQT_SLOT(slotCompileFile()), + this, TQ_SLOT(slotCompileFile()), actionCollection(), "build_compilefile" ); action->setToolTip(i18n("Compile file")); action->setWhatsThis(i18n("<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" @@ -130,7 +130,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("Run Configure"), 0, - this, TQT_SLOT(slotConfigure()), + this, TQ_SLOT(slotConfigure()), actionCollection(), "build_configure" ); action->setToolTip(i18n("Run configure")); action->setWhatsThis(i18n("<b>Run configure</b><p>Executes <b>configure</b> with flags, arguments " @@ -139,21 +139,21 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("Run automake && friends"), 0, - this, TQT_SLOT(slotMakefilecvs()), + this, TQ_SLOT(slotMakefilecvs()), actionCollection(), "build_makefilecvs" ); action->setToolTip(i18n("Run automake && friends")); action->setWhatsThis(i18n("<b>Run automake && friends</b><p>Executes<br><b>make -f Makefile.cvs</b><br><b>./configure</b><br>commands from the project directory.")); action->setGroup("autotools"); action = new TDEAction( i18n("Update admin module"), 0, - this, TQT_SLOT(slotUpdateAdminDirectory()), + this, TQ_SLOT(slotUpdateAdminDirectory()), actionCollection(), "build_updateadmin" ); action->setToolTip(i18n("Update admin module")); action->setWhatsThis(i18n("<b>Update admin module</b><p>Recreates the project admin directory using the version present on the local system.")); action->setGroup("autotools"); action = new TDEAction( i18n("Install"), 0, - this, TQT_SLOT(slotInstall()), + this, TQ_SLOT(slotInstall()), actionCollection(), "build_install" ); action->setToolTip(i18n("Install")); action->setWhatsThis(i18n("<b>Install</b><p>Runs <b>make install</b> command from the project directory.<br>" @@ -162,7 +162,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("Install (as root user)"), 0, - this, TQT_SLOT(slotInstallWithKdesu()), + this, TQ_SLOT(slotInstallWithKdesu()), actionCollection(), "build_install_tdesu" ); action->setToolTip(i18n("Install as root user")); action->setWhatsThis(i18n("<b>Install</b><p>Runs <b>make install</b> command from the project directory with root privileges.<br>" @@ -172,7 +172,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("&Clean Project"), 0, - this, TQT_SLOT(slotClean()), + this, TQ_SLOT(slotClean()), actionCollection(), "build_clean" ); action->setToolTip(i18n("Clean project")); action->setWhatsThis(i18n("<b>Clean project</b><p>Runs <b>make clean</b> command from the project directory.<br>" @@ -181,7 +181,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("&Distclean"), 0, - this, TQT_SLOT(slotDistClean()), + this, TQ_SLOT(slotDistClean()), actionCollection(), "build_distclean" ); action->setToolTip(i18n("Distclean")); action->setWhatsThis(i18n("<b>Distclean</b><p>Runs <b>make distclean</b> command from the project directory.<br>" @@ -190,7 +190,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("Make Messages && Merge"), 0, - this, TQT_SLOT(slotMakeMessages()), + this, TQ_SLOT(slotMakeMessages()), actionCollection(), "build_messages" ); action->setToolTip(i18n("Make messages && merge")); action->setWhatsThis(i18n("<b>Make messages && merge</b><p>Runs <b>make package-messages</b> command from the project directory.<br>" @@ -214,32 +214,32 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr if (!DomUtil::readBoolEntry(dom, "/kdevautoproject/run/disable_default")) { //ok we handle the execute in this kpart action = new TDEAction( i18n("Execute Program"), "application-x-executable", SHIFT+Key_F9, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Execute program")); action->setWhatsThis(i18n("<b>Execute program</b><p>Executes the currently active target or the main program specified in project settings, <b>Run Options</b> tab.")); action->setGroup("autotools"); } - connect( buildConfigAction, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotBuildConfigChanged(const TQString&)) ); - connect( buildConfigAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotBuildConfigAboutToShow()) ); + connect( buildConfigAction, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotBuildConfigChanged(const TQString&)) ); + connect( buildConfigAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotBuildConfigAboutToShow()) ); -// connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); +// connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("Configure Options"), CONFIGURE_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("Run Options"), RUN_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("Make Options"), MAKE_OPTIONS, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), - this, TQT_SLOT(slotCommandFinished(const TQString&)) ); - connect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), - this, TQT_SLOT(slotCommandFailed(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), + this, TQ_SLOT(slotCommandFinished(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFailed(const TQString&)), + this, TQ_SLOT(slotCommandFailed(const TQString&)) ); setWantautotools(); @@ -265,7 +265,7 @@ void AutoProjectPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * pag case CONFIGURE_OPTIONS: { ConfigureOptionsWidget *w2 = new ConfigureOptionsWidget(this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w2, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w2, TQ_SLOT(accept()) ); } break; @@ -276,7 +276,7 @@ void AutoProjectPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * pag { //ok we handle the execute in this kpart RunOptionsWidget *w3 = new RunOptionsWidget(*projectDom(), "/kdevautoproject", buildDirectory(), page ); - connect( dlg, TQT_SIGNAL(okClicked()), w3, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w3, TQ_SLOT(accept()) ); } } break; @@ -284,7 +284,7 @@ void AutoProjectPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * pag case MAKE_OPTIONS: { MakeOptionsWidget *w4 = new MakeOptionsWidget(*projectDom(), "/kdevautoproject", page ); - connect( dlg, TQT_SIGNAL(okClicked()), w4, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w4, TQ_SLOT(accept()) ); } break; } @@ -1197,7 +1197,7 @@ void AutoProjectPart::slotExecute() if (appFrontend()->isRunning()) { if (KMessageBox::questionYesNo(m_widget, i18n("Your application is currently running. Do you want to restart it?"), i18n("Application Already Running"), i18n("&Restart Application"), i18n("Do &Nothing")) == KMessageBox::No) return; - connect(appFrontend(), TQT_SIGNAL(processExited()), TQT_SLOT(slotExecute2())); + connect(appFrontend(), TQ_SIGNAL(processExited()), TQ_SLOT(slotExecute2())); appFrontend()->stopApplication(); return; } @@ -1221,8 +1221,8 @@ void AutoProjectPart::executeTarget(const TQDir& dir, const TargetItem* titem) if( DomUtil::readBoolEntry(*projectDom(), "/kdevautoproject/run/autocompile", true) && is_dirty ) { - connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteTargetAfterBuild(const TQString&)) ); - connect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotNotExecuteTargetAfterBuildFailed(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), this, TQ_SLOT(slotExecuteTargetAfterBuild(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFailed(const TQString&)), this, TQ_SLOT(slotNotExecuteTargetAfterBuildFailed(const TQString&)) ); m_runProg=titem->name; m_executeTargetAfterBuild.first = dir; @@ -1268,8 +1268,8 @@ void AutoProjectPart::slotExecuteTargetAfterBuild(const TQString& command) kdDebug(9020) << "slotExecuteTargetAfterBuild " << command << endl; if ( m_executeAfterBuild && constructMakeCommandLine(m_executeTargetAfterBuild.first.path(), m_executeTargetAfterBuild.second->name) == command ) { - disconnect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteAfterTargetBuild()) ); - disconnect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotExecuteAfterTargetBuildFailed()) ); + disconnect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), this, TQ_SLOT(slotExecuteAfterTargetBuild()) ); + disconnect( makeFrontend(), TQ_SIGNAL(commandFailed(const TQString&)), this, TQ_SLOT(slotExecuteAfterTargetBuildFailed()) ); kdDebug(9020) << "slotExecuteTargetAfterBuild " << endl; executeTarget(m_executeTargetAfterBuild.first, m_executeTargetAfterBuild.second); } @@ -1282,8 +1282,8 @@ void AutoProjectPart::slotNotExecuteTargetAfterBuildFailed(const TQString& comma if ( constructMakeCommandLine(m_executeTargetAfterBuild.first.path(), m_executeTargetAfterBuild.second->name) == command ) { m_executeAfterBuild=false; - disconnect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteTargetAfterBuild()) ); - disconnect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotNotExecuteTargetAfterBuildFailed()) ); + disconnect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), this, TQ_SLOT(slotExecuteTargetAfterBuild()) ); + disconnect( makeFrontend(), TQ_SIGNAL(commandFailed(const TQString&)), this, TQ_SLOT(slotNotExecuteTargetAfterBuildFailed()) ); } } @@ -1312,7 +1312,7 @@ TQString AutoProjectPart::environString() const */ void AutoProjectPart::slotExecute2() { - disconnect(appFrontend(), TQT_SIGNAL(processExited()), this, TQT_SLOT(slotExecute2())); + disconnect(appFrontend(), TQ_SIGNAL(processExited()), this, TQ_SLOT(slotExecute2())); if (m_runProg.isEmpty()){ // Do not execute non executable targets diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index aa4c9e34..1b732dde 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -113,8 +113,8 @@ void AutoProjectWidget::initDetailview ( TQWidget* parent ) void AutoProjectWidget::initActions() { - connect( m_subprojectView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); + connect( m_subprojectView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); } AutoSubprojectView* AutoProjectWidget::getSubprojectView () diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 42764783..439a79fd 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -118,8 +118,8 @@ AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPar m_listView->header()->hide(); m_listView->addColumn( TQString() ); - connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); initActions(); } @@ -173,7 +173,7 @@ void AutoSubprojectView::initActions() TDEActionCollection * actions = new TDEActionCollection( this ); subProjectOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - this, TQT_SLOT( slotSubprojectOptions() ), actions, "subproject options" ); + this, TQ_SLOT( slotSubprojectOptions() ), actions, "subproject options" ); subProjectOptionsAction->setWhatsThis(i18n("<qt><b>Options</b><p>Shows subproject options dialog " "that provides settings for compiler, include paths, " "prefixes and build order.</qt>")); @@ -181,24 +181,24 @@ void AutoSubprojectView::initActions() TQToolTip::add( m_button1, tr2i18n( "Add new subproject...")); addSubprojectAction = new AutoToolsAction( i18n( "Add new subproject..." ), "folder-new", 0, - this, TQT_SLOT( slotAddSubproject() ), actions, "add subproject" ); + this, TQ_SLOT( slotAddSubproject() ), actions, "add subproject" ); addSubprojectAction->setWhatsThis(i18n("<qt><b>Add new subproject</b><p>Creates a new " "subproject in currently selected subproject.</qt>")); addSubprojectAction->plug( m_button1 ); removeSubprojectAction = new TDEAction( i18n( "Remove Subproject..." ), "remove_subdir", 0, - this, TQT_SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); + this, TQ_SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); removeSubprojectAction->setWhatsThis(i18n("<qt><b>Remove subproject</b><p>Removes the subproject. Asks if the " "subproject should be also removed from disk. Only subprojects " "which do not hold other subprojects can be removed.</qt>")); addExistingSubprojectAction = new TDEAction( i18n( "Add Existing Subprojects..." ), "fileimport", 0, - this, TQT_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); + this, TQ_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); addExistingSubprojectAction->setWhatsThis(i18n("<qt><b>Add existing subprojects</b><p>Imports existing " "subprojects containing Makefile.am.</qt>")); TQToolTip::add( m_button2, tr2i18n( "Add Target...")); addTargetAction = new AutoToolsAction( i18n( "Add Target..." ), "targetnew_tdevelop", 0, - this, TQT_SLOT( slotAddTarget() ), actions, "add target" ); + this, TQ_SLOT( slotAddTarget() ), actions, "add target" ); addTargetAction->setWhatsThis(i18n( "<qt><b>Add target</b><p>Adds a new target to " "the currently selected subproject. Target can be a " "binary program, library, script, also a collection of " @@ -207,19 +207,19 @@ void AutoSubprojectView::initActions() TQToolTip::add( m_button3, tr2i18n( "Add Service...")); addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_tdevelop", 0, this, - TQT_SLOT( slotAddService() ), actions, "add service" ); + TQ_SLOT( slotAddService() ), actions, "add service" ); addServiceAction->setWhatsThis(i18n("<qt><b>Add service</b><p>Creates a .desktop file describing the service.</qt>")); addServiceAction->plug( m_button3 ); TQToolTip::add( m_button4, tr2i18n( "Add Application...")); addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window-new", 0, this, - TQT_SLOT( slotAddApplication() ), actions, "add application" ); + TQ_SLOT( slotAddApplication() ), actions, "add application" ); addApplicationAction->setWhatsThis(i18n("<qt><b>Add application</b><p>Creates an application .desktop file.</qt>")); addApplicationAction->plug( m_button4 ); TQToolTip::add( m_button5, tr2i18n( "Build")); buildSubprojectAction = new AutoToolsAction( i18n( "Build" ), "launch", 0, this, - TQT_SLOT( slotBuildSubproject() ), actions, "build subproject" ); + TQ_SLOT( slotBuildSubproject() ), actions, "build subproject" ); buildSubprojectAction->setWhatsThis(i18n("<qt><b>Build</b><p>Runs <b>make</b> from the directory of " "the selected subproject.<br> Environment variables and " "make arguments can be specified in the project settings " @@ -227,7 +227,7 @@ void AutoSubprojectView::initActions() buildSubprojectAction->plug( m_button5 ); forceReeditSubprojectAction = new TDEAction( i18n( "Force Reedit" ), 0, 0, this, - TQT_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); + TQ_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); forceReeditSubprojectAction->setWhatsThis(i18n("<qt><b>Force Reedit</b><p>Runs <b>make force-reedit</b> " "from the directory of the selected subproject.<br>This " "recreates makefile (tip: and solves most of .moc related " @@ -239,20 +239,20 @@ void AutoSubprojectView::initActions() forceReeditSubprojectAction->setEnabled(false); cleanSubprojectAction = new TDEAction( i18n( "Clean" ), 0, 0, this, - TQT_SLOT( slotCleanSubproject() ), actions, "clean subproject" ); + TQ_SLOT( slotCleanSubproject() ), actions, "clean subproject" ); cleanSubprojectAction->setWhatsThis(i18n("<qt><b>Clean</b><p>Runs <b>make clean</b> from the directory of " "the selected subproject.<br> Environment variables and make " "arguments can be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); installSubprojectAction = new TDEAction( i18n( "Install" ), 0, 0, this, - TQT_SLOT( slotInstallSubproject() ), actions, "install subproject" ); + TQ_SLOT( slotInstallSubproject() ), actions, "install subproject" ); installSubprojectAction->setWhatsThis(i18n("<qt><b>Install</b><p>Runs <b>make install</b> from the directory " "of the selected subproject.<br> Environment variables and " "make arguments can be specified in the project settings " "dialog, <b>Make Options</b> tab.</qt>")); installSuSubprojectAction = new TDEAction( i18n( "Install (as root user)" ), 0, 0, - this, TQT_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); + this, TQ_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); installSuSubprojectAction->setWhatsThis(i18n("<qt><b>Install as root user</b><p>Runs <b>make install</b> " "command from the directory of the selected subproject " "with root privileges.<br> It is executed via tdesu " @@ -261,18 +261,18 @@ void AutoSubprojectView::initActions() "<b>Make Options</b> tab.</qt>")); expandAction = new TDEAction( i18n( "Expand Subtree" ), 0, 0, this, - TQT_SLOT(slotExpandTree()), actions, "expandAction" ); + TQ_SLOT(slotExpandTree()), actions, "expandAction" ); collapseAction = new TDEAction( i18n( "Collapse Subtree" ), 0, 0, this, - TQT_SLOT(slotCollapseTree()), actions, "collapseAction" ); + TQ_SLOT(slotCollapseTree()), actions, "collapseAction" ); otherAction = new TDEAction( i18n( "Manage Custom Commands..." ), 0, 0, this, - TQT_SLOT( slotManageBuildCommands() ), actions, "manage custom commands" ); + TQ_SLOT( slotManageBuildCommands() ), actions, "manage custom commands" ); otherAction->setWhatsThis(i18n("<qt><b>Manage custom commands</b><p>Allows to create, edit and " "delete custom build commands which appears in the subproject " "context menu.<br></qt>")); - connect( m_listView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( m_listView, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); } void AutoSubprojectView::slotContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ) @@ -315,7 +315,7 @@ void AutoSubprojectView::slotContextMenu( TDEListView *, TQListViewItem *item, c popup.insertSeparator(); separate = false; } - int id = popup.insertItem(it.key(), this, TQT_SLOT(slotCustomBuildCommand(int))); + int id = popup.insertItem(it.key(), this, TQ_SLOT(slotCustomBuildCommand(int))); m_commandList.append(it.data()); popup.setItemParameter(id, m_commandList.findIndex(it.data())); } diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index c520a3de..fbaf91a8 100644 --- a/buildtools/autotools/autotoolsaction.cpp +++ b/buildtools/autotools/autotoolsaction.cpp @@ -110,7 +110,7 @@ int AutoToolsAction::plug( TQWidget* w, int index ) if ( ::tqt_cast<TQToolButton*>( w ) ) { TQToolButton* tb = static_cast<TQToolButton*>( w ); - connect( tb, TQT_SIGNAL( clicked() ), this, TQT_SLOT( activate() ) ); + connect( tb, TQ_SIGNAL( clicked() ), this, TQ_SLOT( activate() ) ); int id = getToolButtonID(); if ( !icon().isEmpty() ) diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index fc67a82e..1bb58e15 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -138,10 +138,10 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP d->baseUI->newFileList->insertItem( new TQListViewItem( d->baseUI->newFileList, fileName ) ); } - connect ( d->baseUI->subprojectComboBox, TQT_SIGNAL ( activated ( const TQString& ) ), - this, TQT_SLOT( slotSubprojectChanged ( const TQString& ) ) ); - connect ( d->baseUI->targetComboBox, TQT_SIGNAL ( activated ( const TQString& ) ), - this, TQT_SLOT( slotTargetChanged ( const TQString& ) ) ); + connect ( d->baseUI->subprojectComboBox, TQ_SIGNAL ( activated ( const TQString& ) ), + this, TQ_SLOT( slotSubprojectChanged ( const TQString& ) ) ); + connect ( d->baseUI->targetComboBox, TQ_SIGNAL ( activated ( const TQString& ) ), + this, TQ_SLOT( slotTargetChanged ( const TQString& ) ) ); } diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index 81431117..33c280f4 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -237,7 +237,7 @@ void ConfigureOptionsWidget::saveSettings(const TQString &config) DomUtil::writeEntry(dom, prefix + "f77flags", f77flags_edit->text()); if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes) - TQTimer::singleShot(0, m_part, TQT_SLOT(slotConfigure())); + TQTimer::singleShot(0, m_part, TQ_SLOT(slotConfigure())); } diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index 85bb32c0..b4bc9e39 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -119,20 +119,20 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, lo->addWidget(filterBox); // slots and signals - connect( filter, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotFilterChanged(const TQString&) ) ); - connect( filter, TQT_SIGNAL( activated(const TQString&) ), TQT_SLOT( slotFilterChanged(const TQString&) ) ); - connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ), TQT_SLOT( filterReturnPressed(const TQString&) ) ); + connect( filter, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotFilterChanged(const TQString&) ) ); + connect( filter, TQ_SIGNAL( activated(const TQString&) ), TQ_SLOT( slotFilterChanged(const TQString&) ) ); + connect( filter, TQ_SIGNAL( returnPressed(const TQString&) ), TQ_SLOT( filterReturnPressed(const TQString&) ) ); - connect( home, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( home() ) ); - connect( up, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( cdUp() ) ); - connect( back, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( back() ) ); - connect( forward, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( forward() ) ); + connect( home, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( home() ) ); + connect( up, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( cdUp() ) ); + connect( back, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( back() ) ); + connect( forward, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( forward() ) ); - connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), this, TQT_SLOT( cmbPathActivated( const KURL& ) )); - //connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )), this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) )); - connect( dir, TQT_SIGNAL(urlEntered(const KURL&)), this, TQT_SLOT(dirUrlEntered(const KURL&)) ); + connect( cmbPath, TQ_SIGNAL( urlActivated( const KURL& )), this, TQ_SLOT( cmbPathActivated( const KURL& ) )); + //connect( cmbPath, TQ_SIGNAL( returnPressed( const TQString& )), this, TQ_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect( dir, TQ_SIGNAL(urlEntered(const KURL&)), this, TQ_SLOT(dirUrlEntered(const KURL&)) ); - connect( dir, TQT_SIGNAL(finishedLoading()), this, TQT_SLOT(dirFinishedLoading()) ); + connect( dir, TQ_SIGNAL(finishedLoading()), this, TQ_SLOT(dirFinishedLoading()) ); // dirUrlEntered( dir->url() ); diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp index e265a969..5b173a54 100644 --- a/buildtools/autotools/removefiledlg.cpp +++ b/buildtools/autotools/removefiledlg.cpp @@ -75,8 +75,8 @@ RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* p else targetLabel->setText ( item->name ); - connect ( removeButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); - connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); + connect ( removeButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( accept() ) ); + connect ( cancelButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( reject() ) ); setIcon ( SmallIcon ( "editdelete.png" ) ); diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp index c9068ec8..fc88c913 100644 --- a/buildtools/autotools/removetargetdlg.cpp +++ b/buildtools/autotools/removetargetdlg.cpp @@ -53,8 +53,8 @@ RemoveTargetDialog::RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPa else targetLabel->setText ( titem->name ); - connect ( removeButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); - connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); + connect ( removeButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( accept() ) ); + connect ( cancelButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( reject() ) ); setIcon ( SmallIcon ( "edit-delete" ) ); diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp index bff524bb..1a12453f 100644 --- a/buildtools/autotools/subprojectoptionsdlg.cpp +++ b/buildtools/autotools/subprojectoptionsdlg.cpp @@ -79,7 +79,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj prefix_listview->setSorting(-1); buildorder_listview->setSorting(-1); - connect( prefix_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( editPrefixClicked() ) ); + connect( prefix_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( editPrefixClicked() ) ); // Insert all subdirectories as possible include directories TQStringList l = widget->allSubprojects(); diff --git a/buildtools/autotools/tdefilednddetailview.cpp b/buildtools/autotools/tdefilednddetailview.cpp index c4b4f504..fc8ab08a 100644 --- a/buildtools/autotools/tdefilednddetailview.cpp +++ b/buildtools/autotools/tdefilednddetailview.cpp @@ -191,9 +191,9 @@ void KFileDnDDetailView::setAutoOpenTime( const int& time ){ void KFileDnDDetailView::useAutoOpenTimer( bool use ){ m_useAutoOpenTimer = use; if( use ) - connect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); + connect( &m_autoOpenTimer, TQ_SIGNAL( timeout() ),this, TQ_SLOT( slotOpenFolder() ) ); else { - disconnect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); + disconnect( &m_autoOpenTimer, TQ_SIGNAL( timeout() ),this, TQ_SLOT( slotOpenFolder() ) ); m_dropItem = 0L; m_autoOpenTimer.stop(); } diff --git a/buildtools/autotools/tdefiledndiconview.cpp b/buildtools/autotools/tdefiledndiconview.cpp index f1f9afae..5109f2c8 100644 --- a/buildtools/autotools/tdefiledndiconview.cpp +++ b/buildtools/autotools/tdefiledndiconview.cpp @@ -168,9 +168,9 @@ void KFileDnDIconView::setAutoOpenTime( const int& time ){ void KFileDnDIconView::useAutoOpenTimer( bool use ){ m_useAutoOpenTimer = use; if ( use ) - connect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); + connect( &m_autoOpenTimer, TQ_SIGNAL( timeout() ),this, TQ_SLOT( slotOpenFolder() ) ); else { - disconnect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); + disconnect( &m_autoOpenTimer, TQ_SIGNAL( timeout() ),this, TQ_SLOT( slotOpenFolder() ) ); m_dropItem = 0L; m_autoOpenTimer.stop(); } diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp index 74c0d08f..f36dc78a 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.cpp +++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp @@ -44,10 +44,10 @@ CustomBuildOptionsWidget::CustomBuildOptionsWidget(TQDomDocument &dom, // This connection must not be made before the ant->setChecked() line, // because at this time makeToggled() would crash - connect( make_button, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(makeToggled(bool)) ); - connect( other_button, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(otherToggled(bool)) ); + connect( make_button, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(makeToggled(bool)) ); + connect( other_button, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(otherToggled(bool)) ); } diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp index 9dfad3e5..1500995d 100644 --- a/buildtools/custommakefiles/custommanagerwidget.cpp +++ b/buildtools/custommakefiles/custommanagerwidget.cpp @@ -44,7 +44,7 @@ CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, TQWidget* par m_blacklistBox->setButtons( KEditListBox::Add | KEditListBox::Remove ); m_blacklistBox->insertStringList( DomUtil::readListEntry( m_dom, "kdevcustomproject/blacklist","path") ); grid->addWidget( m_blacklistBox, 0, 1 ); - connect(m_blacklistBox, TQT_SIGNAL(added(const TQString&)), this, TQT_SLOT(checkUrl(const TQString&))); + connect(m_blacklistBox, TQ_SIGNAL(added(const TQString&)), this, TQ_SLOT(checkUrl(const TQString&))); } void CustomManagerWidget::checkUrl(const TQString& url) diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index cbbb4315..746e9fe4 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -76,12 +76,12 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TDEAction *action; - action = new TDEAction( i18n( "Re-Populate Project" ), 0, this, TQT_SLOT( populateProject() ), actionCollection(), "repopulate_project" ); + action = new TDEAction( i18n( "Re-Populate Project" ), 0, this, TQ_SLOT( populateProject() ), actionCollection(), "repopulate_project" ); action->setToolTip( i18n( "Re-Populate Project" ) ); action->setWhatsThis( i18n( "<b>Re-Populate Project</b><p>Re-Populates the project, searching through the project directory and adding all files that match one of the wildcards set in the custom manager options of the project filelist." ) ); action = new TDEAction( i18n( "&Build Project" ), "make_tdevelop", Key_F8, - this, TQT_SLOT( slotBuild() ), + this, TQ_SLOT( slotBuild() ), actionCollection(), "build_build" ); action->setToolTip( i18n( "Build project" ) ); action->setWhatsThis( i18n( "<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" @@ -89,7 +89,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Build Options</b> tab." ) ); action = new TDEAction( i18n( "&Build Active Directory" ), "make_tdevelop", Key_F7, - this, TQT_SLOT( slotBuildActiveDir() ), + this, TQ_SLOT( slotBuildActiveDir() ), actionCollection(), "build_buildactivetarget" ); action->setToolTip( i18n( "Build active directory" ) ); action->setWhatsThis( i18n( "<b>Build active directory</b><p>Constructs a series of make commands to build the active directory. " @@ -97,7 +97,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Make Options</b> tab." ) ); action = new TDEAction( i18n( "Compile &File" ), "make_tdevelop", - this, TQT_SLOT( slotCompileFile() ), + this, TQ_SLOT( slotCompileFile() ), actionCollection(), "build_compilefile" ); action->setToolTip( i18n( "Compile file" ) ); action->setWhatsThis( i18n( "<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" @@ -105,7 +105,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Build Options</b> tab." ) ); action = new TDEAction( i18n( "Install" ), 0, - this, TQT_SLOT( slotInstall() ), + this, TQ_SLOT( slotInstall() ), actionCollection(), "build_install" ); action->setToolTip( i18n( "Install" ) ); action->setWhatsThis( i18n( "<b>Install</b><p>Runs <b>make install</b> command from the project directory.<br>" @@ -113,7 +113,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Make Options</b> tab." ) ); action = new TDEAction( i18n( "Install Active Directory" ), 0, - this, TQT_SLOT( slotInstallActiveDir() ), + this, TQ_SLOT( slotInstallActiveDir() ), actionCollection(), "build_installactivetarget" ); action->setToolTip( i18n( "Install active directory" ) ); action->setWhatsThis( i18n( "<b>Install active directory</b><p>Runs <b>make install</b> command from the active directory.<br>" @@ -121,7 +121,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Make Options</b> tab." ) ); action = new TDEAction( i18n( "Install (as root user)" ), 0, - this, TQT_SLOT( slotInstallWithKdesu() ), + this, TQ_SLOT( slotInstallWithKdesu() ), actionCollection(), "build_install_tdesu" ); action->setToolTip( i18n( "Install as root user" ) ); action->setWhatsThis( i18n( "<b>Install</b><p>Runs <b>make install</b> command from the project directory with root privileges.<br>" @@ -130,7 +130,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Make Options</b> tab." ) ); action = new TDEAction( i18n( "&Clean Project" ), 0, - this, TQT_SLOT( slotClean() ), + this, TQ_SLOT( slotClean() ), actionCollection(), "build_clean" ); action->setToolTip( i18n( "Clean project" ) ); action->setWhatsThis( i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project directory.<br>" @@ -138,7 +138,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Build Options</b> tab." ) ); action = new TDEAction( i18n( "Execute Program" ), "application-x-executable", 0, - this, TQT_SLOT( slotExecute() ), + this, TQ_SLOT( slotExecute() ), actionCollection(), "build_execute" ); action->setToolTip( i18n( "Execute program" ) ); action->setWhatsThis( i18n( "<b>Execute program</b><p>Executes the main program specified in project settings, <b>Run Options</b> tab. " @@ -162,27 +162,27 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "Environment variables can be specified in the project " "settings dialog, <b>Build Options</b> tab." ) ); - connect( m_targetMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( updateTargetMenu() ) ); - connect( m_targetMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( targetMenuActivated( int ) ) ); - connect( m_targetObjectFilesMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( targetObjectFilesMenuActivated( int ) ) ); - connect( m_targetOtherFilesMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( targetOtherFilesMenuActivated( int ) ) ); - connect( m_makeEnvironmentsSelector->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( updateMakeEnvironmentsMenu() ) ); - connect( m_makeEnvironmentsSelector->popupMenu(), TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( makeEnvironmentsMenuActivated( int ) ) ); - 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( makeFrontend(), TQT_SIGNAL( commandFinished( const TQString& ) ), - this, TQT_SLOT( slotCommandFinished( const TQString& ) ) ); - connect( makeFrontend(), TQT_SIGNAL( commandFailed( const TQString& ) ), - this, TQT_SLOT( slotCommandFailed( const TQString& ) ) ); + connect( m_targetMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( updateTargetMenu() ) ); + connect( m_targetMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( targetMenuActivated( int ) ) ); + connect( m_targetObjectFilesMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( targetObjectFilesMenuActivated( int ) ) ); + connect( m_targetOtherFilesMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( targetOtherFilesMenuActivated( int ) ) ); + connect( m_makeEnvironmentsSelector->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( updateMakeEnvironmentsMenu() ) ); + connect( m_makeEnvironmentsSelector->popupMenu(), TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( makeEnvironmentsMenuActivated( int ) ) ); + 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 * ) ) ); + + connect( makeFrontend(), TQ_SIGNAL( commandFinished( const TQString& ) ), + this, TQ_SLOT( slotCommandFinished( const TQString& ) ) ); + connect( makeFrontend(), TQ_SIGNAL( commandFailed( const TQString& ) ), + this, TQ_SLOT( slotCommandFailed( const TQString& ) ) ); } @@ -195,26 +195,26 @@ void CustomProjectPart::projectConfigWidget( KDialogBase *dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage( i18n( "Custom Manager" ), i18n( "Custom Manager" ), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ) ); CustomManagerWidget *w0 = new CustomManagerWidget( this, vbox ); - connect( dlg, TQT_SIGNAL( okClicked() ), w0, TQT_SLOT( accept() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w0, TQ_SLOT( accept() ) ); vbox = dlg->addVBoxPage( i18n( "Run Options" ), i18n( "Run Options" ), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ) ); RunOptionsWidget *w1 = new RunOptionsWidget( *projectDom(), "/kdevcustomproject", buildDirectory(), vbox ); - connect( dlg, TQT_SIGNAL( okClicked() ), w1, TQT_SLOT( accept() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w1, TQ_SLOT( accept() ) ); vbox = dlg->addVBoxPage( i18n( "Build Options" ), i18n( "Build Options" ), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ) ); TQTabWidget *buildtab = new TQTabWidget( vbox ); CustomBuildOptionsWidget *w2 = new CustomBuildOptionsWidget( *projectDom(), buildtab ); - connect( dlg, TQT_SIGNAL( okClicked() ), w2, TQT_SLOT( accept() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w2, TQ_SLOT( accept() ) ); buildtab->addTab( w2, i18n( "&Build" ) ); CustomOtherConfigWidget *w4 = new CustomOtherConfigWidget( this, "/kdevcustomproject", buildtab ); - connect( dlg, TQT_SIGNAL( okClicked() ), w4, TQT_SLOT( accept() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w4, TQ_SLOT( accept() ) ); buildtab->addTab( w4, i18n( "&Other" ) ); CustomMakeConfigWidget *w3 = new CustomMakeConfigWidget( this, "/kdevcustomproject", buildtab ); buildtab->addTab( w3, i18n( "Ma&ke" ) ); w2->setMakeOptionsWidget( buildtab, w3, w4 ); - connect( dlg, TQT_SIGNAL( okClicked() ), w3, TQT_SLOT( accept() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w3, TQ_SLOT( accept() ) ); } @@ -241,7 +241,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context m_contextDirName = fcontext->urls().first().path(); m_contextDirName = m_contextDirName.mid( project()->projectDirectory().length() + 1 ); int id = popup->insertItem( i18n( "Make Active Directory" ), - this, TQT_SLOT( slotChooseActiveDirectory() ) ); + this, TQ_SLOT( slotChooseActiveDirectory() ) ); popup->setWhatsThis( id, i18n( "<b>Make active directory</b><p>" "Chooses this directory as the destination for new files created using wizards " "like the <i>New Class</i> wizard." ) ); @@ -257,7 +257,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context if ( isInBlacklist( m_contextDirName ) ) { id = popup->insertItem( i18n( "Remove from blacklist" ), - this, TQT_SLOT( slotChangeBlacklist() ) ); + this, TQ_SLOT( slotChangeBlacklist() ) ); popup->setWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>" "Removes the given file or directory from the " "blacklist if it is already in it.<br>The blacklist contains files and" @@ -267,7 +267,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context else { id = popup->insertItem( i18n( "Add to blacklist" ), - this, TQT_SLOT( slotChangeBlacklist() ) ); + this, TQ_SLOT( slotChangeBlacklist() ) ); popup->setWhatsThis( id, i18n( "<b>Add to blacklist</b><p>" "Adds the given file or directory to the blacklist.<br>The blacklist contains files and" " directories that should be ignored even if they match a project filetype " @@ -317,13 +317,13 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context if ( m_contextAddFiles.size() > 0 ) { int id = popup->insertItem( i18n( "Add Selected File/Dir(s) to Project" ), - this, TQT_SLOT( slotAddToProject() ) ); + this, TQ_SLOT( slotAddToProject() ) ); popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. " "Note that the files should be manually added to the corresponding makefile or build.xml." ) ); if ( dirAddRecursive ) { int id = popup->insertItem( i18n( "Add Selected Dir(s) to Project (recursive)" ), - this, TQT_SLOT( slotAddToProjectRecursive() ) ); + this, TQ_SLOT( slotAddToProjectRecursive() ) ); popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. " "Note that the files should be manually added to the corresponding makefile or build.xml." ) ); } @@ -332,14 +332,14 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context if ( m_contextRemoveFiles.size() > 0 ) { int id = popup->insertItem( i18n( "Remove Selected File/Dir(s) From Project" ), - this, TQT_SLOT( slotRemoveFromProject() ) ); + this, TQ_SLOT( slotRemoveFromProject() ) ); popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. " "Note that the files should be manually excluded from the corresponding makefile or build.xml." ) ); if ( dirDelRecursive ) { int id = popup->insertItem( i18n( "Remove Selected Dir(s) From Project (recursive)" ), - this, TQT_SLOT( slotRemoveFromProjectRecursive() ) ); + this, TQ_SLOT( slotRemoveFromProjectRecursive() ) ); popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. " "Note that the files should be manually excluded from the corresponding makefile or build.xml." ) ); } diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp index 8681e0d7..9e7c08b6 100644 --- a/buildtools/lib/widgets/addenvvardlg.cpp +++ b/buildtools/lib/widgets/addenvvardlg.cpp @@ -38,13 +38,13 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) varname_edit->setFocus(); varname_label->setBuddy(varname_edit); - connect( varname_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + connect( varname_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged() ) ); TQLabel *value_label = new TQLabel(i18n("&Value:"), this); value_edit = new KLineEdit(this); value_label->setBuddy(value_edit); TQFontMetrics fm(value_edit->fontMetrics()); value_edit->setMinimumWidth(fm.width('X')*35); - connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + connect( value_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged() ) ); TQVBoxLayout *layout = new TQVBoxLayout(this, 10); @@ -65,8 +65,8 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) m_pOk = buttonbox->addButton( KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( m_pOk, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotTextChanged(); diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp index f02d5b56..64bb9471 100644 --- a/buildtools/lib/widgets/addfilesdialog.cpp +++ b/buildtools/lib/widgets/addfilesdialog.cpp @@ -36,7 +36,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, m_extraWidget->insertItem(i18n("Create Symbolic Link(s)"), 1); m_extraWidget->insertItem(i18n("Add Relative Path(s)"), 2); m_extraWidget->setCurrentItem(config->readNumEntry("Mode")); - connect(m_extraWidget, TQT_SIGNAL(activated(int)), this, TQT_SLOT(storePreferred(int))); + connect(m_extraWidget, TQ_SIGNAL(activated(int)), this, TQ_SLOT(storePreferred(int))); setPreviewWidget(m_extraWidget); @@ -55,7 +55,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, m_extraWidget->insertItem(i18n("Create Symbolic Link(s)"), 1); m_extraWidget->insertItem(i18n("Add Relative Path(s)"), 2); m_extraWidget->setCurrentItem(config->readNumEntry("Mode")); - connect(m_extraWidget, TQT_SIGNAL(activated(int)), this, TQT_SLOT(storePreferred(int))); + connect(m_extraWidget, TQ_SIGNAL(activated(int)), this, TQ_SLOT(storePreferred(int))); setOperationMode(Opening); } diff --git a/buildtools/lib/widgets/environmentvariableswidget.cpp b/buildtools/lib/widgets/environmentvariableswidget.cpp index 3c3e448f..cf06d012 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.cpp +++ b/buildtools/lib/widgets/environmentvariableswidget.cpp @@ -72,7 +72,7 @@ EnvironmentVariablesWidget::EnvironmentVariablesWidget(TQDomDocument &dom, const m_dom(dom), m_configGroup(configGroup) { readEnvironment(dom, configGroup); - connect( listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( editVarClicked() ) ); + connect( listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( editVarClicked() ) ); } diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index d4670adb..63f5e42d 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -60,23 +60,23 @@ PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const T TDEAction *action; action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, - this, TQT_SLOT(slotBuild()), + this, TQ_SLOT(slotBuild()), actionCollection(), "build_build" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("<b>Build project</b><p>Runs the compiler on a main source file of the project. " "The compiler and the main source file can be set in project settings, <b>Pascal Compiler</b> tab.")); action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Execute program")); action->setWhatsThis(i18n("<b>Execute program</b><p>Executes the main program specified in project settings, <b>Run options</b> tab. " "If nothing is set, the binary file with the same name as the main source file name is executed.")); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); // m_widget = new PascalProjectWidget(this); @@ -397,12 +397,12 @@ void PascalProjectPart::projectConfigWidget( KDialogBase * dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Pascal Compiler")); PascalProjectOptionsDlg *w = new PascalProjectOptionsDlg(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(loadProjectConfig()) ); vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium )); RunOptionsWidget *w3 = new RunOptionsWidget(*projectDom(), "/kdevpascalproject", buildDirectory(), vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w3, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w3, TQ_SLOT(accept()) ); } @@ -433,7 +433,7 @@ void PascalProjectPart::configWidget( KDialogBase * dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Pascal Compiler")); PascalGlobalOptionsDlg *w = new PascalGlobalOptionsDlg(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name) diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index 22388b2d..f61caaf6 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -18,7 +18,7 @@ ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent, const char* name, bool modal, WFlags fl) : ChooseSubprojectDlgBase(parent,name, modal,fl), m_widget(widget) { - connect(subprojects_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(itemSelected(TQListViewItem *))); + connect(subprojects_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(itemSelected(TQListViewItem *))); if( m_widget->m_rootSubproject) { ChooseItem *it = new ChooseItem(m_widget->m_rootSubproject, subprojects_view, m_widget->m_rootSubproject->text(0)); diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 66ab0b5b..de9b7f6e 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -92,7 +92,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS const TQIconSet icon(SmallIcon("compfile")); action = new TDEAction( i18n("Compile &File"), "compfile", 0, - m_widget, TQT_SLOT(slotBuildOpenFile()), + m_widget, TQ_SLOT(slotBuildOpenFile()), actionCollection(),"build_compilefile" ); action->setToolTip(i18n("Compile file")); action->setWhatsThis(i18n("<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" @@ -101,7 +101,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, - m_widget, TQT_SLOT(slotBuildProject()), + m_widget, TQ_SLOT(slotBuildProject()), actionCollection(), "build_build_project" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" @@ -109,7 +109,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Rebuild Project"),"rebuild" , 0, - m_widget, TQT_SLOT(slotRebuildProject()), + m_widget, TQ_SLOT(slotRebuildProject()), actionCollection(),"build_rebuild_project" ); action->setToolTip(i18n("Rebuild project")); action->setWhatsThis(i18n("<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from the project directory.<br>" @@ -117,7 +117,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Install Project"),"install" , 0, - m_widget, TQT_SLOT(slotInstallProject()), + m_widget, TQ_SLOT(slotInstallProject()), actionCollection(),"build_install_project" ); action->setToolTip(i18n("Install project")); action->setWhatsThis(i18n("<b>Install project</b><p>Runs <b>make install</b> from the project directory.<br>" @@ -125,7 +125,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Clean Project"), 0, - m_widget, TQT_SLOT(slotCleanProject()), + m_widget, TQ_SLOT(slotCleanProject()), actionCollection(), "build_clean_project" ); action->setToolTip(i18n("Clean project")); action->setWhatsThis(i18n("<b>Clean project</b><p>Runs <b>make clean</b> command from the project directory.<br>" @@ -133,7 +133,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Dist-Clean Project"), 0, - m_widget, TQT_SLOT(slotDistCleanProject()), + m_widget, TQ_SLOT(slotDistCleanProject()), actionCollection(), "build_distclean_project" ); action->setToolTip(i18n("Dist-Clean project")); action->setWhatsThis(i18n("<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the " @@ -141,13 +141,13 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", SHIFT+Key_F9, - this, TQT_SLOT(slotBuildAndExecuteProject()), + this, TQ_SLOT(slotBuildAndExecuteProject()), actionCollection(), "build_execute_project" ); action->setToolTip(i18n("Execute main program")); action->setWhatsThis(i18n("<b>Execute program</b><p>Executes the currently selected subproject if it is an application or the program specified in project settings, <b>Run Options</b> tab.")); action = new TDEAction( i18n("&Build Subproject"), "make_tdevelop", Key_F7, - m_widget, TQT_SLOT(slotBuildTarget()), + m_widget, TQ_SLOT(slotBuildTarget()), actionCollection(), "build_build_target" ); action->setToolTip(i18n("Build subproject")); action->setWhatsThis(i18n("<b>Build subproject</b><p>Runs <b>make</b> from the current subproject directory. " @@ -156,7 +156,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Rebuild Subproject"), "rebuild", 0, - m_widget, TQT_SLOT(slotRebuildTarget()), + m_widget, TQ_SLOT(slotRebuildTarget()), actionCollection(),"build_rebuild_target" ); action->setToolTip(i18n("Rebuild subproject")); action->setWhatsThis(i18n("<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from the current subproject directory. " @@ -165,7 +165,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Install Subproject"), "install", 0, - m_widget, TQT_SLOT(slotInstallTarget()), + m_widget, TQ_SLOT(slotInstallTarget()), actionCollection(),"build_install_target" ); action->setToolTip(i18n("Install subproject")); action->setWhatsThis(i18n("<b>Install subproject</b><p>Runs <b>make install</b> from the current subproject directory. " @@ -174,7 +174,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Clean Subproject"), 0, - m_widget, TQT_SLOT(slotCleanTarget()), + m_widget, TQ_SLOT(slotCleanTarget()), actionCollection(), "build_clean_target" ); action->setToolTip(i18n("Clean subproject")); action->setWhatsThis(i18n("<b>Clean subproject</b><p>Runs <b>make clean</b> from the current subproject directory. " @@ -183,7 +183,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Dist-Clean Subproject"), 0, - m_widget, TQT_SLOT(slotDistCleanTarget()), + m_widget, TQ_SLOT(slotDistCleanTarget()), actionCollection(), "build_distclean_target" ); action->setToolTip(i18n("Dist-Clean subproject")); action->setWhatsThis(i18n("<b>Dist-Clean subproject</b><p>Runs <b>make distclean</b> from the current" @@ -192,18 +192,18 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("Execute Subproject"), "application-x-executable", 0, - this, TQT_SLOT(slotBuildAndExecuteTarget()), + this, TQ_SLOT(slotBuildAndExecuteTarget()), actionCollection(), "build_execute_target" ); action->setToolTip(i18n("Execute subproject")); action->setWhatsThis(i18n("<b>Execute subproject</b><p>Executes the target program for the currently selected subproject. " "This action is allowed only if a type of the subproject is 'application'. The type of the subproject can be " "defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu).")); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), - this, TQT_SLOT(slotCommandFinished(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), + this, TQ_SLOT(slotCommandFinished(const TQString&)) ); TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); TQString m_qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", ""); @@ -280,9 +280,9 @@ void TrollProjectPart::projectConfigWidget(KDialogBase *dlg) QMakeOptionsWidget *qm = new QMakeOptionsWidget( projectDirectory(), *projectDom(), "/kdevtrollproject", vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w4, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), qm, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), optdlg, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w4, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), qm, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), optdlg, TQ_SLOT(accept()) ); } diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index d9aafdb0..919ca69e 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -156,16 +156,16 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) ); // Project button connections - connect ( addSubdirButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSubproject () ) ); - connect ( createScopeButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotCreateScope () ) ); + connect ( addSubdirButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddSubproject () ) ); + connect ( createScopeButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotCreateScope () ) ); - connect ( buildProjectButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildProject () ) ); - connect ( rebuildProjectButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRebuildProject () ) ); - connect ( executeProjectButton, TQT_SIGNAL ( clicked () ), m_part, TQT_SLOT ( slotBuildAndExecuteProject () ) ); + connect ( buildProjectButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotBuildProject () ) ); + connect ( rebuildProjectButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRebuildProject () ) ); + connect ( executeProjectButton, TQ_SIGNAL ( clicked () ), m_part, TQ_SLOT ( slotBuildAndExecuteProject () ) ); - connect ( projectconfButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotConfigureProject () ) ); + connect ( projectconfButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotConfigureProject () ) ); // Project tree overview = new TrollListView( this, overviewContainer, SubprojectView, "project overview widget" ); @@ -175,10 +175,10 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) overview->addColumn( TQString() ); // Project tree connections - connect( overview, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); - connect( overview, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotOverviewContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( overview, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); + connect( overview, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotOverviewContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); ///////////////// @@ -284,30 +284,30 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) details->header() ->hide(); details->addColumn( TQString() ); // Detail button connections - connect ( addfilesButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddFiles () ) ); - connect ( newfileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotNewFile () ) ); - connect ( removefileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveFile () ) ); - connect ( buildFileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildSelectedFile () ) ); - connect ( excludeFileFromScopeButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotExcludeFileFromScopeButton() ) ); + connect ( addfilesButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddFiles () ) ); + connect ( newfileButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotNewFile () ) ); + connect ( removefileButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveFile () ) ); + connect ( buildFileButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotBuildSelectedFile () ) ); + connect ( excludeFileFromScopeButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotExcludeFileFromScopeButton() ) ); // Detail tree connections - connect( details, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotDetailsSelectionChanged( TQListViewItem* ) ) ); - connect( details, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); - connect( details, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); - - connect ( buildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildTarget () ) ); - connect ( rebuildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRebuildTarget () ) ); - connect ( executeTargetButton, TQT_SIGNAL ( clicked () ), m_part, TQT_SLOT ( slotBuildAndExecuteTarget () ) ); + connect( details, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotDetailsSelectionChanged( TQListViewItem* ) ) ); + connect( details, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( details, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + + connect ( buildTargetButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotBuildTarget () ) ); + connect ( rebuildTargetButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRebuildTarget () ) ); + connect ( executeTargetButton, TQ_SIGNAL ( clicked () ), m_part, TQ_SLOT ( slotBuildAndExecuteTarget () ) ); buildTargetButton->setEnabled( false ); rebuildTargetButton->setEnabled( false ); executeTargetButton->setEnabled( false ); m_configDlg = new ProjectConfigurationDlg( overview, this, this ); - connect( m_part->dirWatch(), TQT_SIGNAL( dirty(const TQString&) ), this, TQT_SLOT( slotProjectDirty(const TQString&) ) ); + connect( m_part->dirWatch(), TQ_SIGNAL( dirty(const TQString&) ), this, TQ_SLOT( slotProjectDirty(const TQString&) ) ); } diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index 9308792a..001565b2 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -54,8 +54,8 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part, TQPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); ok_button->setDefault(true); - connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( ok_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancel_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); buttonbox->layout(); TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index 42ce8935..600ce07d 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -51,17 +51,17 @@ ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const T if (!extension<KDevCreateFile>("TDevelop/CreateFile")) { TDEAction *action; action = new TDEAction( i18n("New File..."), 0, - this, TQT_SLOT(slotNewFile()), + this, TQ_SLOT(slotNewFile()), actionCollection(), "file_newfile" ); action->setWhatsThis( i18n("<b>New file</b><p>Creates a new file.") ); action->setToolTip( i18n("Create a new file") ); } new TDEAction( i18n("Rescan Project"), 0, CTRL+ALT+Key_R, - this, TQT_SLOT(rescan()), + this, TQ_SLOT(rescan()), actionCollection(), "rescan" ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -74,7 +74,7 @@ void ScriptProjectPart::projectConfigWidget(KDialogBase *dlg) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Script Project Options"), i18n("Script Project Options"), BarIcon("tdevelop", TDEIcon::SizeMedium)); ScriptOptionsWidget *w = new ScriptOptionsWidget(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index fc21e33a..0dbe8dbe 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -1420,23 +1420,23 @@ The corresponding part of the setup in C++ is: </para> <programlisting> - KStdAction::zoomIn ( this, SLOT(slotZoomIn()), actionCollection() ); - KStdAction::zoomOut ( this, SLOT(slotZoomOut()), actionCollection() ); - KStdAction::zoom ( this, SLOT(slotZoom()), actionCollection() ); + KStdAction::zoomIn ( this, TQ_SLOT(slotZoomIn()), actionCollection() ); + KStdAction::zoomOut ( this, TQ_SLOT(slotZoomOut()), actionCollection() ); + KStdAction::zoom ( this, TQ_SLOT(slotZoom()), actionCollection() ); new TDEAction ( i18n("&Half size"), ALT+Key_0, - this, SLOT(slotHalfSize()), + this, TQ_SLOT(slotHalfSize()), actionCollection(), "zoom50" ); new TDEAction ( i18n("&Normal size"), ALT+Key_1, - this, SLOT(slotDoubleSize()), + this, TQ_SLOT(slotDoubleSize()), actionCollection(), "zoom100" ); new TDEAction ( i18n("&Double size"), ALT+Key_2, - this, SLOT(slotDoubleSize()), + this, TQ_SLOT(slotDoubleSize()), actionCollection(), "zoom200" ); new TDEAction ( i18n("&Fill Screen"), ALT+Key_3, - this, SLOT(slotFillScreen()), + this, TQ_SLOT(slotFillScreen()), actionCollection(), "zoomMaxpect" ); new TDEAction ( i18n("Fullscreen &Mode"), CTRL+SHIFT+Key_F, - this, SLOT(slotFullScreen()), + this, TQ_SLOT(slotFullScreen()), actionCollection(), "fullscreen" ); </programlisting> @@ -2409,8 +2409,8 @@ void FooClass::findType() { KURL url("http://developer.kde.org/favicon.ico"); TDEIO::MimetypeJob *job = TDEIO::mimetype(url); - connect( job, SIGNAL(result(TDEIO::Job*)), - this, SLOT(mimeResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(mimeResult(TDEIO::Job*)) ); } void FooClass::mimeResult(TDEIO::Job *job) @@ -2603,8 +2603,8 @@ deletes itself. Thus, a typical use case will look like this: void FooClass::makeDirectory() { SimpleJob *job = TDEIO::mkdir(KURL("file:/home/bernd/tdeiodir")); - connect( job, SIGNAL(result(TDEIO::Job*)), - this, SLOT(mkdirResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(mkdirResult(TDEIO::Job*)) ); } void FooClass::mkdirResult(TDEIO::Job *job) @@ -2942,8 +2942,8 @@ void FooClass::printModifiedDate() { KURL url("http://developer.kde.org/documentation/kde2arch/index.html"); TDEIO::TransferJob *job = TDEIO::get(url, true, false); - connect( job, SIGNAL(result(TDEIO::Job*)), - this, SLOT(transferResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(transferResult(TDEIO::Job*)) ); } void FooClass::transferResult(TDEIO::Job *job) diff --git a/doc/tde_app_devel/index.docbook b/doc/tde_app_devel/index.docbook index 4ab2cd22..f24131a9 100644 --- a/doc/tde_app_devel/index.docbook +++ b/doc/tde_app_devel/index.docbook @@ -479,7 +479,7 @@ hello.resize( 100, 30 ); a.setMainWidget( &hello ); -TQObject::connect(&hello, SIGNAL( clicked() ), &a, SLOT( quit() )); +TQObject::connect(&hello, TQ_SIGNAL( clicked() ), &a, TQ_SLOT( quit() )); hello.show(); return a.exec(); @@ -488,7 +488,7 @@ return a.exec(); </para> <para> You see, the only addition to give the button more interaction is to use a <methodname>connect() -</methodname> method: <methodname>connect(&hello, SIGNAL( clicked() ), &a, SLOT( quit() ))</methodname>; +</methodname> method: <methodname>connect(&hello, TQ_SIGNAL( clicked() ), &a, TQ_SLOT( quit() ))</methodname>; is all you have to add. What is the meaning now? The class declaration of TQObject says about the <methodname>connect()</methodname> method: </para> @@ -573,7 +573,7 @@ hello.resize( 100, 30 ); a.setTopWidget( &hello ); -TQObject::connect(&hello, SIGNAL( clicked() ), &a, SLOT( quit() )); +TQObject::connect(&hello, TQ_SIGNAL( clicked() ), &a, TQ_SLOT( quit() )); hello.show(); return a.exec(); @@ -924,10 +924,10 @@ Let's have a look at the constructor and see how this instance is called 16 statusBar()->show(); 17 18 // allow the view to change the statusbar and caption -19 connect(m_view, SIGNAL(signalChangeStatusbar(const TQString&)), -20 this, SLOT(changeStatusbar(const TQString&))); -21 connect(m_view, SIGNAL(signalChangeCaption(const TQString&)), -22 this, SLOT(changeCaption(const TQString&))); +19 connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), +20 this, TQ_SLOT(changeStatusbar(const TQString&))); +21 connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), +22 this, TQ_SLOT(changeCaption(const TQString&))); 23 24 } </programlisting> diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp index c700823d..b8b28e86 100644 --- a/editors/editor-chooser/editorchooser_part.cpp +++ b/editors/editor-chooser/editorchooser_part.cpp @@ -21,7 +21,7 @@ EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const T { setInstance(EditorChooserFactory::instance()); - connect(core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(configWidget(KDialogBase*))); + connect(core(), TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(configWidget(KDialogBase*))); } @@ -34,7 +34,7 @@ void EditorChooserPart::configWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Editor"), i18n("Editor"), BarIcon("kate", TDEIcon::SizeMedium) ); EditorChooserWidget *w = new EditorChooserWidget(vbox); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); } diff --git a/embedded/visualboyadvance/vbaconfigwidget.cpp b/embedded/visualboyadvance/vbaconfigwidget.cpp index f2f53c23..730d8615 100644 --- a/embedded/visualboyadvance/vbaconfigwidget.cpp +++ b/embedded/visualboyadvance/vbaconfigwidget.cpp @@ -98,7 +98,7 @@ VBAConfigWidget::VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *parent, co } addOptionsEdit->setText(addOptions); - connect(emuPathButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(emuPathButtonClicked())); + connect(emuPathButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(emuPathButtonClicked())); } VBAConfigWidget::~VBAConfigWidget(){ } diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp index effee085..f1191501 100644 --- a/embedded/visualboyadvance/visualboyadvance_part.cpp +++ b/embedded/visualboyadvance/visualboyadvance_part.cpp @@ -31,11 +31,11 @@ VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, c TDEAction *action; action = new TDEAction( i18n("Execute Program"), "application-x-executable", Key_F9, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_execute" ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -70,7 +70,7 @@ void VisualBoyAdvancePart::projectConfigWidget(KDialogBase *dlg){ TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium )); VBAConfigWidget* w = new VBAConfigWidget(this,vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp index 64ea116f..c76f13b6 100644 --- a/kdevdesigner/designer/actiondnd.cpp +++ b/kdevdesigner/designer/actiondnd.cpp @@ -135,8 +135,8 @@ QDesignerToolBarSeparator::QDesignerToolBarSeparator(TQt::Orientation o , TQTool const char* name ) : TQWidget( parent, name ) { - connect( parent, TQT_SIGNAL(orientationChanged(TQt::Orientation)), - this, TQT_SLOT(setOrientation(TQt::Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(TQt::Orientation)), + this, TQ_SLOT(setOrientation(TQt::Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); @@ -260,7 +260,7 @@ void QDesignerToolBar::findFormWindow() void QDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); - connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); if ( ::tqt_cast<TQActionGroup*>(a) ) { ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); diff --git a/kdevdesigner/designer/actioneditorimpl.cpp b/kdevdesigner/designer/actioneditorimpl.cpp index 59063f8d..f97e8a47 100644 --- a/kdevdesigner/designer/actioneditorimpl.cpp +++ b/kdevdesigner/designer/actioneditorimpl.cpp @@ -54,17 +54,17 @@ ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) buttonConnect->setEnabled( FALSE ); TQPopupMenu *popup = new TQPopupMenu( this ); - popup->insertItem( i18n( "New &Action" ), this, TQT_SLOT( newAction() ) ); - popup->insertItem( i18n( "New Action &Group" ), this, TQT_SLOT( newActionGroup() ) ); - popup->insertItem( i18n( "New &Dropdown Action Group" ), this, TQT_SLOT( newDropDownActionGroup() ) ); + popup->insertItem( i18n( "New &Action" ), this, TQ_SLOT( newAction() ) ); + popup->insertItem( i18n( "New Action &Group" ), this, TQ_SLOT( newActionGroup() ) ); + popup->insertItem( i18n( "New &Dropdown Action Group" ), this, TQ_SLOT( newDropDownActionGroup() ) ); buttonNewAction->setPopup( popup ); buttonNewAction->setPopupDelay( 0 ); - connect( listActions, TQT_SIGNAL( insertAction() ), this, TQT_SLOT( newAction() ) ); - connect( listActions, TQT_SIGNAL( insertActionGroup() ), this, TQT_SLOT( newActionGroup() ) ); - connect( listActions, TQT_SIGNAL( insertDropDownActionGroup() ), this, TQT_SLOT( newDropDownActionGroup() ) ); - connect( listActions, TQT_SIGNAL( deleteAction() ), this, TQT_SLOT( deleteAction() ) ); - connect( listActions, TQT_SIGNAL( connectAction() ), this, TQT_SLOT( connectionsClicked() ) ); + connect( listActions, TQ_SIGNAL( insertAction() ), this, TQ_SLOT( newAction() ) ); + connect( listActions, TQ_SIGNAL( insertActionGroup() ), this, TQ_SLOT( newActionGroup() ) ); + connect( listActions, TQ_SIGNAL( insertDropDownActionGroup() ), this, TQ_SLOT( newDropDownActionGroup() ) ); + connect( listActions, TQ_SIGNAL( deleteAction() ), this, TQ_SLOT( deleteAction() ) ); + connect( listActions, TQ_SIGNAL( connectAction() ), this, TQ_SLOT( connectionsClicked() ) ); } void ActionEditor::closeEvent( TQCloseEvent *e ) @@ -103,8 +103,8 @@ TQAction *ActionEditor::newActionEx() { ActionItem *i = new ActionItem( listActions, (bool)FALSE ); TQAction *a = i->action(); - TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->action() ); TQString n = "Action"; formWindow->unify( i->action(), n, TRUE ); @@ -159,8 +159,8 @@ void ActionEditor::newAction() else i = new ActionItem( listActions, (bool)FALSE ); TQAction *a = i->action(); - TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->action() ); TQString n = "Action"; formWindow->unify( i->action(), n, TRUE ); @@ -195,8 +195,8 @@ void ActionEditor::newActionGroup() else i = new ActionItem( listActions, TRUE ); TQAction *ag = i->actionGroup(); - TQObject::connect( ag, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( ag, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->actionGroup() ); MetaDataBase::setPropertyChanged( i->actionGroup(), "usesDropDown", TRUE ); TQString n = "ActionGroup"; @@ -237,10 +237,10 @@ void ActionEditor::setFormWindow( FormWindow *fw ) i->setText( 0, a->name() ); i->setPixmap( 0, a->iconSet().pixmap() ); // make sure we don't duplicate the connection - TQObject::disconnect( a, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject * ) ) ); - TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject* ) ) ); + TQObject::disconnect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); if ( ::tqt_cast<TQActionGroup*>(a) ) { insertChildActions( i ); } @@ -269,10 +269,10 @@ void ActionEditor::insertChildActions( ActionItem *i ) i2->setText( 0, a->name() ); i2->setPixmap( 0, a->iconSet().pixmap() ); // make sure we don't duplicate the connection - TQObject::disconnect( o, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject * ) ) ); - TQObject::connect( o, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject * ) ) ); + TQObject::disconnect( o, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); + TQObject::connect( o, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); if ( ::tqt_cast<TQActionGroup*>(a) ) insertChildActions( i2 ); } diff --git a/kdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp index 21a1dc6d..8f99679a 100644 --- a/kdevdesigner/designer/actionlistview.cpp +++ b/kdevdesigner/designer/actionlistview.cpp @@ -36,8 +36,8 @@ ActionListView::ActionListView( TQWidget *parent, const char *name ) setShowSortIndicator( TRUE ); setResizeMode( LastColumn ); setRootIsDecorated( TRUE ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); } ActionItem::ActionItem( TQListView *lv, TQAction *ac ) diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp index b6a305c1..4b3b3109 100644 --- a/kdevdesigner/designer/command.cpp +++ b/kdevdesigner/designer/command.cpp @@ -1880,7 +1880,7 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index, action ); toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } else { TQObjectList clo = action->childrenListObject(); if ( !clo.isEmpty() ) { @@ -1901,11 +1901,11 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index + (i++), ac ); } - TQObject::connect( o, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( o, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -1920,7 +1920,7 @@ void AddActionToToolBarCommand::unexecute() toolBar->removeAction( action ); action->removeFrom( toolBar ); - TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); if ( !::tqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { @@ -1936,7 +1936,7 @@ void AddActionToToolBarCommand::unexecute() o->removeEventFilter( toolBar ); toolBar->removeAction( (TQAction*)o ); } - TQObject::disconnect( o, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::disconnect( o, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } } diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h index 7dcd6530..77e294b1 100644 --- a/kdevdesigner/designer/configtoolboxdialog.ui.h +++ b/kdevdesigner/designer/configtoolboxdialog.ui.h @@ -40,10 +40,10 @@ void ConfigToolboxDialog::init() ListViewDnd *commonDnd = new ListViewDnd( listViewCommon ); commonDnd->setDragMode( ListViewDnd::Both | ListViewDnd::Move | ListViewDnd::Flat ); - TQObject::connect( toolsDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ), - commonDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) ); - TQObject::connect( commonDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ), - commonDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( toolsDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + commonDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( commonDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + commonDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); TQDict<TQListViewItem> groups; TQAction *a; diff --git a/kdevdesigner/designer/connectiondialog.ui.h b/kdevdesigner/designer/connectiondialog.ui.h index ea73e46c..0e0877da 100644 --- a/kdevdesigner/designer/connectiondialog.ui.h +++ b/kdevdesigner/designer/connectiondialog.ui.h @@ -69,10 +69,10 @@ static TQPixmap *validConnection = 0; void ConnectionDialog::init() { - connect( connectionsTable, TQT_SIGNAL( currentChanged( int, int ) ), - this, TQT_SLOT( updateEditSlotsButton() ) ); - connect( connectionsTable, TQT_SIGNAL( resorted() ), - this, TQT_SLOT( updateConnectionContainers() ) ); + connect( connectionsTable, TQ_SIGNAL( currentChanged( int, int ) ), + this, TQ_SLOT( updateEditSlotsButton() ) ); + connect( connectionsTable, TQ_SIGNAL( resorted() ), + this, TQ_SLOT( updateConnectionContainers() ) ); buttonEditSlots->setEnabled( FALSE ); if ( !invalidConnection ) { @@ -144,13 +144,13 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject re->setSlot( sl ); sl->setSlot( sl ); - connect( re, TQT_SIGNAL( currentReceiverChanged( TQObject * ) ), - this, TQT_SLOT( updateEditSlotsButton() ) ); + connect( re, TQ_SIGNAL( currentReceiverChanged( TQObject * ) ), + this, TQ_SLOT( updateEditSlotsButton() ) ); ConnectionContainer *c = new ConnectionContainer( this, se, si, re, sl, row ); connections.append( c ); - connect( c, TQT_SIGNAL( changed( ConnectionContainer * ) ), - this, TQT_SLOT( updateConnectionState( ConnectionContainer * ) ) ); + connect( c, TQ_SIGNAL( changed( ConnectionContainer * ) ), + this, TQ_SLOT( updateConnectionState( ConnectionContainer * ) ) ); connectionsTable->setCurrentCell( row, 0 ); diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp index 9f0c2b5e..322d9e4b 100644 --- a/kdevdesigner/designer/connectionitems.cpp +++ b/kdevdesigner/designer/connectionitems.cpp @@ -122,26 +122,26 @@ void ConnectionItem::slotChanged( const TQString & ) void ConnectionItem::setSender( SenderItem *i ) { - connect( i, TQT_SIGNAL( currentSenderChanged( TQObject * ) ), - this, TQT_SLOT( senderChanged( TQObject * ) ) ); + connect( i, TQ_SIGNAL( currentSenderChanged( TQObject * ) ), + this, TQ_SLOT( senderChanged( TQObject * ) ) ); } void ConnectionItem::setReceiver( ReceiverItem *i ) { - connect( i, TQT_SIGNAL( currentReceiverChanged( TQObject * ) ), - this, TQT_SLOT( receiverChanged( TQObject * ) ) ); + connect( i, TQ_SIGNAL( currentReceiverChanged( TQObject * ) ), + this, TQ_SLOT( receiverChanged( TQObject * ) ) ); } void ConnectionItem::setSignal( SignalItem *i ) { - connect( i, TQT_SIGNAL( currentSignalChanged( const TQString & ) ), - this, TQT_SLOT( signalChanged( const TQString & ) ) ); + connect( i, TQ_SIGNAL( currentSignalChanged( const TQString & ) ), + this, TQ_SLOT( signalChanged( const TQString & ) ) ); } void ConnectionItem::setSlot( SlotItem *i ) { - connect( i, TQT_SIGNAL( currentSlotChanged( const TQString & ) ), - this, TQT_SLOT( slotChanged( const TQString & ) ) ); + connect( i, TQ_SIGNAL( currentSlotChanged( const TQString & ) ), + this, TQ_SLOT( slotChanged( const TQString & ) ) ); } void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg, @@ -245,8 +245,8 @@ TQWidget *SenderItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( senderChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( senderChanged( const TQString & ) ) ); return cb; } @@ -302,8 +302,8 @@ TQWidget *ReceiverItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( receiverChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( receiverChanged( const TQString & ) ) ); return cb; } @@ -371,8 +371,8 @@ TQWidget *SignalItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SIGNAL( currentSignalChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SIGNAL( currentSignalChanged( const TQString & ) ) ); return cb; } @@ -502,8 +502,8 @@ TQWidget *SlotItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SIGNAL( currentSlotChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SIGNAL( currentSlotChanged( const TQString & ) ) ); return cb; } diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h index 115f9f27..0883b961 100644 --- a/kdevdesigner/designer/connectionitems.h +++ b/kdevdesigner/designer/connectionitems.h @@ -176,10 +176,10 @@ public: i2->setConnection( this ); i3->setConnection( this ); i4->setConnection( this ); - connect( i1, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); - connect( i2, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); - connect( i3, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); - connect( i4, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); + connect( i1, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i2, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i3, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i4, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); } bool isModified() const { return mod; } diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp index 56c3bebf..cc736635 100644 --- a/kdevdesigner/designer/customwidgeteditorimpl.cpp +++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp @@ -58,10 +58,10 @@ CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw ) : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); checkTimer = new TQTimer( this ); - connect( checkTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( checkWidgetName() ) ); + connect( checkTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( checkWidgetName() ) ); editClass->setEnabled( FALSE ); editHeader->setEnabled( FALSE ); diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp index b3ce1b32..e71718a0 100644 --- a/kdevdesigner/designer/dbconnectionsimpl.cpp +++ b/kdevdesigner/designer/dbconnectionsimpl.cpp @@ -54,7 +54,7 @@ static bool blockChanges = FALSE; DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) : DatabaseConnectionBase( parent, name, modal, fl ), project( pro ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); connectionWidget = new DatabaseConnectionWidget( grp ); grpLayout->addWidget( connectionWidget, 0, 0 ); #ifndef TQT_NO_SQL diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp index 5befa1e4..c871e301 100644 --- a/kdevdesigner/designer/designerappiface.cpp +++ b/kdevdesigner/designer/designerappiface.cpp @@ -129,13 +129,13 @@ void DesignerInterfaceImpl::updateFunctionList() void DesignerInterfaceImpl::onProjectChange( TQObject *receiver, const char *slot ) { - TQObject::connect( mainWindow, TQT_SIGNAL( projectChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( projectChanged() ), receiver, slot ); } void DesignerInterfaceImpl::onFormChange( TQObject *receiver, const char *slot ) { - TQObject::connect( mainWindow, TQT_SIGNAL( formWindowChanged() ), receiver, slot ); - TQObject::connect( mainWindow, TQT_SIGNAL( editorChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( formWindowChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( editorChanged() ), receiver, slot ); } bool DesignerInterfaceImpl::singleProjectMode() const @@ -952,7 +952,7 @@ void DesignerFormWindowImpl::setSignalList( const TQStringList &lst ) void DesignerFormWindowImpl::onModificationChange( TQObject *receiver, const char *slot ) { - TQObject::connect( formWindow, TQT_SIGNAL( modificationChanged( bool, FormWindow * ) ), receiver, slot ); + TQObject::connect( formWindow, TQ_SIGNAL( modificationChanged( bool, FormWindow * ) ), receiver, slot ); } void DesignerFormWindowImpl::addMenu( const TQString &text, const TQString &name ) diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp index 1bdbf9e3..40c7eae2 100644 --- a/kdevdesigner/designer/editfunctionsimpl.cpp +++ b/kdevdesigner/designer/editfunctionsimpl.cpp @@ -52,7 +52,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); id = 0; functList.clear(); @@ -111,9 +111,9 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) // Connect listview signal to signal-relay TQObject::connect( functionListView, - TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), + TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), this, - TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); + TQ_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "functionName" TQObjectList *l = parent->queryList( "TQLineEdit", "functionName" ); @@ -122,9 +122,9 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) while ( (obj = itemsLineEditIt.current()) != 0 ) { ++itemsLineEditIt; TQObject::connect( this, - TQT_SIGNAL( itemRenamed( const TQString & ) ), + TQ_SIGNAL( itemRenamed( const TQString & ) ), obj, - TQT_SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; } diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp index 0f4c426e..6923e94c 100644 --- a/kdevdesigner/designer/filechooser.cpp +++ b/kdevdesigner/designer/filechooser.cpp @@ -41,15 +41,15 @@ FileChooser::FileChooser( TQWidget *parent, const char *name ) lineEdit = new TQLineEdit( this, "filechooser_lineedit" ); layout->addWidget( lineEdit ); - connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) ); + connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( fileNameChanged( const TQString & ) ) ); button = new TQPushButton( "...", this, "filechooser_button" ); button->setFixedWidth( button->fontMetrics().width( " ... " ) ); layout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( chooseFile() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( chooseFile() ) ); setFocusProxy( lineEdit ); } diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp index abbd8991..ef111031 100644 --- a/kdevdesigner/designer/formfile.cpp +++ b/kdevdesigner/designer/formfile.cpp @@ -77,7 +77,7 @@ FormFile::FormFile( const TQString &fn, bool temp, Project *p, const char *name if ( !temp ) checkFileName( FALSE ); - connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewStatus(FormFile* ))); + connect(this, TQ_SIGNAL(somethingChanged(FormFile* )), this, TQ_SLOT(emitNewStatus(FormFile* ))); } FormFile::~FormFile() @@ -97,7 +97,7 @@ void FormFile::setFormWindow( FormWindow *f ) if ( fw ) fw->setFormFile( this ); parseCode( cod, FALSE ); - TQTimer::singleShot( 0, this, TQT_SLOT( notifyFormWindowChange() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( notifyFormWindowChange() ) ); } void FormFile::setEditor( SourceEditor *e ) diff --git a/kdevdesigner/designer/formsettingsimpl.cpp b/kdevdesigner/designer/formsettingsimpl.cpp index f82ae552..412d6067 100644 --- a/kdevdesigner/designer/formsettingsimpl.cpp +++ b/kdevdesigner/designer/formsettingsimpl.cpp @@ -43,7 +43,7 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) : FormSettingsBase( parent, 0, TRUE ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( fw ); if ( info.classNameChanged && !info.className.isEmpty() ) editClassName->setText( info.className ); diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp index cff5fd2f..ab4aed7e 100644 --- a/kdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -172,30 +172,30 @@ void FormWindow::init() setFocusPolicy( TQWidget::ClickFocus ); sizePreviewLabel = 0; checkSelectionsTimer = new TQTimer( this, "checkSelectionsTimer" ); - connect( checkSelectionsTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( invalidCheckedSelections() ) ); + connect( checkSelectionsTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( invalidCheckedSelections() ) ); updatePropertiesTimer = new TQTimer( this ); - connect( updatePropertiesTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( updatePropertiesTimerDone() ) ); + connect( updatePropertiesTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updatePropertiesTimerDone() ) ); showPropertiesTimer = new TQTimer( this ); //!!!! - connect( showPropertiesTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( showPropertiesTimerDone() ) ); + connect( showPropertiesTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( showPropertiesTimerDone() ) ); selectionChangedTimer = new TQTimer( this ); - connect( selectionChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( selectionChangedTimerDone() ) ); + connect( selectionChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( selectionChangedTimerDone() ) ); windowsRepaintWorkaroundTimer = new TQTimer( this ); - connect( windowsRepaintWorkaroundTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( windowsRepaintWorkaroundTimerTimeout() ) ); + connect( windowsRepaintWorkaroundTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( windowsRepaintWorkaroundTimerTimeout() ) ); insertParent = 0; - connect( &commands, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - this, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) ); + connect( &commands, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + this, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) ); propShowBlocked = FALSE; setIcon( SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()) ); - connect( &commands, TQT_SIGNAL( modificationChanged( bool ) ), - this, TQT_SLOT( modificationChanged( bool ) ) ); + connect( &commands, TQ_SIGNAL( modificationChanged( bool ) ), + this, TQ_SLOT( modificationChanged( bool ) ) ); buffer = 0; TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this ); @@ -2222,7 +2222,7 @@ void FormWindow::editConnections() ConnectionDialog dlg( mainwindow ); mainWindow()->statusMessage( i18n( "Edit connections...") ); dlg.addConnection( startWidget, endWidget, TQString(), TQString() ); - TQTimer::singleShot( 0, &dlg, TQT_SLOT(ensureConnectionVisible()) ); + TQTimer::singleShot( 0, &dlg, TQ_SLOT(ensureConnectionVisible()) ); dlg.exec(); } @@ -2753,7 +2753,7 @@ void FormWindow::setFormFile( FormFile *f ) { ff = f; if ( ff ) - connect( this, TQT_SIGNAL( modificationChanged(bool, const TQString&) ), ff, TQT_SLOT( formWindowChangedSomehow() ) ); + connect( this, TQ_SIGNAL( modificationChanged(bool, const TQString&) ), ff, TQ_SLOT( formWindowChangedSomehow() ) ); } bool FormWindow::canBeBuddy( const TQWidget *w ) const diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp index f5193421..138b9499 100644 --- a/kdevdesigner/designer/hierarchyview.cpp +++ b/kdevdesigner/designer/hierarchyview.cpp @@ -193,20 +193,20 @@ HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) ); (void)*selectedBack; // hack setPalette( p ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); if ( doConnects ) { - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( objectDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), - this, TQT_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( objectDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), + this, TQ_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); } deselect = TRUE; setColumnWidthMode( 1, Manual ); @@ -612,8 +612,8 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) if ( !tabWidgetMenu ) tabWidgetMenu = formWindow->mainWindow()->setupTabWidgetHierarchyMenu( - this, TQT_SLOT( addTabPage() ), - TQT_SLOT( removeTabPage() ) ); + this, TQ_SLOT( addTabPage() ), + TQ_SLOT( removeTabPage() ) ); tabWidgetMenu->popup( p ); } } @@ -681,8 +681,8 @@ FormDefinitionView::FormDefinitionView( TQWidget *parent, FormWindow *fw ) { header()->hide(); removeColumn( 1 ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, TQT_SLOT( renamed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); popupOpen = FALSE; } @@ -1268,7 +1268,7 @@ HierarchyView::HierarchyView( TQWidget *parent ) ClassBrowser cb( ciface->createClassBrowser( this ), ciface ); addTab( cb.lv, i18n( "Class Declarations" ) ); setTabToolTip( cb.lv, i18n( "List of all classes and its declarations of the current source file" ) ); - ciface->onClick( this, TQT_SLOT( jumpTo( const TQString &, const TQString &, int ) ) ); + ciface->onClick( this, TQ_SLOT( jumpTo( const TQString &, const TQString &, int ) ) ); classBrowsers->insert( *it, cb ); setTabEnabled( cb.lv, FALSE ); } @@ -1356,7 +1356,7 @@ void HierarchyView::showClasses( SourceEditor *se ) return; lastSourceEditor = se; - TQTimer::singleShot( 100, this, TQT_SLOT( showClassesTimeout() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( showClassesTimeout() ) ); } void HierarchyView::showClassesTimeout() diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp index 32a81412..340047ac 100644 --- a/kdevdesigner/designer/iconvieweditorimpl.cpp +++ b/kdevdesigner/designer/iconvieweditorimpl.cpp @@ -40,7 +40,7 @@ IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); iconview = (TQIconView*)editWidget; itemText->setText( "" ); diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp index 8c8917a2..1e4a208c 100644 --- a/kdevdesigner/designer/kdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -62,7 +62,7 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widge setReadWrite(true); setModified(false); - connect(m_widget, TQT_SIGNAL(formModified(bool )), this, TQT_SLOT(formModified(bool))); + connect(m_widget, TQ_SIGNAL(formModified(bool )), this, TQ_SLOT(formModified(bool))); } void KDevDesignerPart::setupDesignerWindow() @@ -87,48 +87,48 @@ static TQIconSet createPartIconSet( const TQString &name ) void KDevDesignerPart::setupActions( ) { TDEAction *action; - action = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - action = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - action = KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection()); + action = KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + action = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + action = KStdAction::close(this, TQ_SLOT(fileClose()), actionCollection()); stateSync(action, m_widget->actionFileClose); - action = KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + action = KStdAction::save(this, TQ_SLOT(save()), actionCollection()); stateSync(action, m_widget->actionFileSave); - action = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + action = KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); stateSync(action, m_widget->actionFileSaveAs); - action = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(fileSaveAs()), actionCollection(), "file_saveall"); + action = new TDEAction(i18n("Save Al&l"), 0, this, TQ_SLOT(fileSaveAs()), actionCollection(), "file_saveall"); stateSync(action, m_widget->actionFileSaveAll); - new TDEAction(i18n("Create &Template..."), 0, this, TQT_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate"); + new TDEAction(i18n("Create &Template..."), 0, this, TQ_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate"); - action = KStdAction::undo(this, TQT_SLOT(editUndo()), actionCollection()); + action = KStdAction::undo(this, TQ_SLOT(editUndo()), actionCollection()); stateSync(action, m_widget->actionEditUndo); - action = KStdAction::redo(this, TQT_SLOT(editRedo()), actionCollection()); + action = KStdAction::redo(this, TQ_SLOT(editRedo()), actionCollection()); stateSync(action, m_widget->actionEditRedo); - action = KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection()); + action = KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection()); stateSync(action, m_widget->actionEditCut); - action = KStdAction::copy(this, TQT_SLOT(editCopy()), actionCollection()); + action = KStdAction::copy(this, TQ_SLOT(editCopy()), actionCollection()); stateSync(action, m_widget->actionEditCopy); - action = KStdAction::paste(this, TQT_SLOT(editPaste()), actionCollection()); + action = KStdAction::paste(this, TQ_SLOT(editPaste()), actionCollection()); stateSync(action, m_widget->actionEditPaste); - action = new TDEAction(i18n("&Delete"), Key_Delete, this, TQT_SLOT(editDelete()), actionCollection(), "edit_delete"); + action = new TDEAction(i18n("&Delete"), Key_Delete, this, TQ_SLOT(editDelete()), actionCollection(), "edit_delete"); stateSync(action, m_widget->actionEditDelete); - action = KStdAction::selectAll(this, TQT_SLOT(editSelectAll()), actionCollection()); + action = KStdAction::selectAll(this, TQ_SLOT(editSelectAll()), actionCollection()); stateSync(action, m_widget->actionEditSelectAll); - action = new TDEAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()), actionCollection(), "edit_accels"); + action = new TDEAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQ_SLOT(editAccels()), actionCollection(), "edit_accels"); stateSync(action, m_widget->actionEditAccels); - action = new TDEAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQT_SLOT(editFunctions()), actionCollection(), "edit_functions"); + action = new TDEAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQ_SLOT(editFunctions()), actionCollection(), "edit_functions"); stateSync(action, m_widget->actionEditFunctions); - action = new TDEAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQT_SLOT(editConnections()), actionCollection(), "edit_connections"); + action = new TDEAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQ_SLOT(editConnections()), actionCollection(), "edit_connections"); stateSync(action, m_widget->actionEditConnections); - action = new TDEAction(i18n("&Form Settings..."), 0, this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_formsettings"); + action = new TDEAction(i18n("&Form Settings..."), 0, this, TQ_SLOT(editFormSettings()), actionCollection(), "edit_formsettings"); stateSync(action, m_widget->actionEditFormSettings); - action = new TDEAction(i18n("&Add File..."), 0, this, TQT_SLOT(projectAddFile()), actionCollection(), "project_addfile"); + action = new TDEAction(i18n("&Add File..."), 0, this, TQ_SLOT(projectAddFile()), actionCollection(), "project_addfile"); stateSync(action, m_widget->actionProjectAddFile); - action = new TDEAction(i18n("&Image Collection..."), 0, this, TQT_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection"); + action = new TDEAction(i18n("&Image Collection..."), 0, this, TQ_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection"); stateSync(action, m_widget->actionEditPixmapCollection); - action = new TDEAction(i18n("&Database Connections..."), 0, this, TQT_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections"); + action = new TDEAction(i18n("&Database Connections..."), 0, this, TQ_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections"); stateSync(action, m_widget->actionEditDatabaseConnections); - action = new TDEAction(i18n("&Designer Project Settings..."), 0, this, TQT_SLOT(projectSettings()), actionCollection(), "project_settings"); + action = new TDEAction(i18n("&Designer Project Settings..."), 0, this, TQ_SLOT(projectSettings()), actionCollection(), "project_settings"); stateSync(action, m_widget->actionEditProjectSettings); TDERadioAction *toggle; @@ -141,34 +141,34 @@ void KDevDesignerPart::setupActions( ) setupToolsAction(toggle, m_widget->actionOrderTool); toggle = new TDERadioAction(i18n("Set &Buddy"), createPartIconSet("designer_setbuddy.png"), Key_F12, actionCollection(), "tools_setbuddy"); setupToolsAction(toggle, m_widget->actionBuddyTool); - new TDEAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox"); - new TDEAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets"); + new TDEAction(i18n("Configure Toolbox..."), 0, this, TQ_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox"); + new TDEAction(i18n("Edit &Custom Widgets..."), 0, this, TQ_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets"); - action = new TDEAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize"); + action = new TDEAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQ_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize"); stateSync(action, m_widget->actionEditAdjustSize); - action = new TDEAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h"); + action = new TDEAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQ_SLOT(layoutHLayout()), actionCollection(), "layout_h"); stateSync(action, m_widget->actionEditHLayout); - action = new TDEAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v"); + action = new TDEAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQ_SLOT(layoutVLayout()), actionCollection(), "layout_v"); stateSync(action, m_widget->actionEditVLayout); - action = new TDEAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid"); + action = new TDEAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQ_SLOT(layoutGridLayout()), actionCollection(), "layout_grid"); stateSync(action, m_widget->actionEditGridLayout); - action = new TDEAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith"); + action = new TDEAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQ_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith"); stateSync(action, m_widget->actionEditSplitHorizontal); - action = new TDEAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv"); + action = new TDEAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQ_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv"); stateSync(action, m_widget->actionEditSplitVertical); - action = new TDEAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break"); + action = new TDEAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQ_SLOT(layoutBreak()), actionCollection(), "layout_break"); stateSync(action, m_widget->actionEditBreakLayout); toggle = new TDERadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer"); setupToolsAction(toggle, m_widget->actionInsertSpacer); - action = new TDEAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview"); + action = new TDEAction(i18n("Preview &Form"), CTRL + Key_T, this, TQ_SLOT(windowPreview()), actionCollection(), "window_preview"); stateSync(action, m_widget->actionPreview); - action = new TDEAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQT_SLOT(windowNext()), actionCollection(), "window_next"); + action = new TDEAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQ_SLOT(windowNext()), actionCollection(), "window_next"); stateSync(action, m_widget->actionWindowNext); - action = new TDEAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQT_SLOT(windowPrev()), actionCollection(), "window_prev"); + action = new TDEAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQ_SLOT(windowPrev()), actionCollection(), "window_prev"); stateSync(action, m_widget->actionWindowPrevious); - action = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection()); + action = KStdAction::preferences(this, TQ_SLOT(editPreferences()), actionCollection()); action->setText(i18n("Configure &KDevDesigner...")); stateSync(action, m_widget->actionEditPreferences); } @@ -217,7 +217,7 @@ void KDevDesignerPart::stateSync( TDEAction * tdeaction, TQAction * qaction ) DesignerAction *ac = dynamic_cast<DesignerAction*>(qaction); if (!ac) return; - connect(ac, TQT_SIGNAL(actionEnabled(bool )), tdeaction, TQT_SLOT(setEnabled(bool ))); + connect(ac, TQ_SIGNAL(actionEnabled(bool )), tdeaction, TQ_SLOT(setEnabled(bool ))); } void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * action ) @@ -227,8 +227,8 @@ void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * act toggle->setGroup("tools"); toggle->setExclusiveGroup("tools"); - connect(action, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); - connect(toggle, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToggleActionOn(bool))); + connect(action, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(setToggleActionChecked(bool ))); + connect(toggle, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToggleActionOn(bool))); toggle->setChecked(action->isOn()); m_actionMap[action] = toggle; m_actionMap2[toggle] = action; @@ -495,9 +495,9 @@ void KDevDesignerPart::setToggleActionOn( bool b ) TQAction *qaction = m_actionMap2[action]; if (!qaction) return; - disconnect(qaction, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); + disconnect(qaction, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(setToggleActionChecked(bool ))); qaction->setOn(b); - connect(qaction, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); + connect(qaction, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(setToggleActionChecked(bool ))); } void KDevDesignerPart::openProject( const TQString & // projectFile diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp index 62684a76..7c593025 100644 --- a/kdevdesigner/designer/layout.cpp +++ b/kdevdesigner/designer/layout.cpp @@ -142,8 +142,8 @@ void Layout::setup() // widgets to get informed if one gets deleted to be able to // handle that and do not crash in this case for ( w = widgets.first(); w; w = widgets.next() ) { - connect( w, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( widgetDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( widgetDestroyed() ) ); startPoint = TQPoint( TQMIN( startPoint.x(), w->x() ), TQMIN( startPoint.y(), w->y() ) ); geometries.insert( w, TQRect( w->pos(), w->size() ) ); diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp index 85a321ab..67720ed9 100644 --- a/kdevdesigner/designer/listboxeditorimpl.cpp +++ b/kdevdesigner/designer/listboxeditorimpl.cpp @@ -43,7 +43,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); listbox = (TQListBox*)editWidget; itemText->setText( "" ); @@ -65,8 +65,8 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow ListBoxDnd *editorDnd = new ListBoxDnd( preview ); editorDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( editorDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), - editorDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( editorDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + editorDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); ListBoxRename *editorRename = new ListBoxRename( preview ); @@ -76,9 +76,9 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow while ( (obj = it.current()) != 0 ) { ++it; TQObject::connect( editorRename, - TQT_SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), obj, - TQT_SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; diff --git a/kdevdesigner/designer/listboxrename.cpp b/kdevdesigner/designer/listboxrename.cpp index e5b705b9..05999779 100644 --- a/kdevdesigner/designer/listboxrename.cpp +++ b/kdevdesigner/designer/listboxrename.cpp @@ -48,8 +48,8 @@ ListBoxRename::ListBoxRename( TQListBox * eventSource, const char * name ) ed->hide(); ed->setFrame( FALSE ); - TQObject::connect( ed, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( renameClickedItem() ) ); + TQObject::connect( ed, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( renameClickedItem() ) ); } bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) @@ -63,7 +63,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) if ( clickedItem && clickedItem->isSelected() && (clickedItem == src->itemAt( pos )) ) { - TQTimer::singleShot( 500, this, TQT_SLOT( showLineEdit() ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( showLineEdit() ) ); activity = FALSE; // no drags or clicks for 500 ms before we start the renaming } else { // new item clicked activity = TRUE; diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp index 8e4c2a32..32f71562 100644 --- a/kdevdesigner/designer/listvieweditorimpl.cpp +++ b/kdevdesigner/designer/listvieweditorimpl.cpp @@ -49,7 +49,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); itemText->setEnabled( FALSE ); itemChoosePixmap->setEnabled( FALSE ); itemDeletePixmap->setEnabled( FALSE ); @@ -71,8 +71,8 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw // Clamp on drag and drop to TQListView ListViewDnd *itemsDnd = new ListViewDnd( itemsPreview ); itemsDnd->setDragMode( ListViewDnd::Internal | ListViewDnd::Move ); - TQObject::connect( itemsDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ), - itemsDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( itemsDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + itemsDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); // Enable rename for all TQListViewItems TQListViewItemIterator it = ((TQListView *)itemsPreview)->firstChild(); @@ -81,9 +81,9 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw // Connect listview signal to signal-relay TQObject::connect( itemsPreview, - TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), + TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), this, - TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); + TQ_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "itemText" TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" ); @@ -92,24 +92,24 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw while ( (obj = itemsLineEditIt.current()) != 0 ) { ++itemsLineEditIt; TQObject::connect( this, - TQT_SIGNAL( itemRenamed( const TQString & ) ), + TQ_SIGNAL( itemRenamed( const TQString & ) ), obj, - TQT_SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; // Clamp on drag and drop to TQListBox ListBoxDnd *columnsDnd = new ListBoxDnd( colPreview ); columnsDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( columnsDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), - columnsDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( columnsDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + columnsDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); // Clamp on rename to TQListBox ListBoxRename *columnsRename = new ListBoxRename( colPreview ); TQObject::connect( columnsRename, - TQT_SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), this, - TQT_SLOT( columnTextChanged( const TQString & ) ) ); + TQ_SLOT( columnTextChanged( const TQString & ) ) ); // Find TQLineEdit "colText" and connect l = parent->queryList( "TQLineEdit", "colText" ); @@ -117,9 +117,9 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw while ( (obj = columnsLineEditIt.current()) != 0 ) { ++columnsLineEditIt; TQObject::connect( columnsRename, - TQT_SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), obj, - TQT_SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; } diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index 8bdc87a8..cd1bcd93 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -173,12 +173,12 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons savePluginPaths = FALSE; updateFunctionsTimer = new TQTimer( this ); - connect( updateFunctionsTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( doFunctionsChanged() ) ); + connect( updateFunctionsTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doFunctionsChanged() ) ); autoSaveTimer = new TQTimer( this ); - connect( autoSaveTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( fileSaveAll() ) ); + connect( autoSaveTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( fileSaveAll() ) ); set_splash_status( "Loading Plugins..." ); setupPluginManagers(); @@ -234,8 +234,8 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons setupRMBMenus(); - connect( this, TQT_SIGNAL( projectChanged() ), this, TQT_SLOT( emitProjectSignals() ) ); - connect( this, TQT_SIGNAL( hasActiveWindow(bool) ), this, TQT_SLOT( emitProjectSignals() ) ); + connect( this, TQ_SIGNAL( projectChanged() ), this, TQ_SLOT( emitProjectSignals() ) ); + connect( this, TQ_SIGNAL( hasActiveWindow(bool) ), this, TQ_SLOT( emitProjectSignals() ) ); emit hasActiveForm( FALSE ); emit hasActiveWindow( FALSE ); @@ -247,8 +247,8 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons as -= TQSize( 30, 30 ); resize( TQSize( 1200, 1000 ).boundedTo( as ) ); - connect( tqApp->clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( clipboardChanged() ) ); + connect( tqApp->clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( clipboardChanged() ) ); clipboardChanged(); layoutChilds = FALSE; layoutSelected = FALSE; @@ -276,7 +276,7 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons statusBar()->setSizeGripEnabled( TRUE ); set_splash_status( "Initialization Done." ); /* if ( shStartDialog ) - TQTimer::singleShot( 0, this, TQT_SLOT( showStartDialog() ));*/ + TQTimer::singleShot( 0, this, TQ_SLOT( showStartDialog() ));*/ if ( autoSaveEnabled ) autoSaveTimer->start( autoSaveInterval * 1000 ); @@ -333,8 +333,8 @@ void MainWindow::setupMDI() qworkspace = new TQWorkspace( vbox ); qworkspace->setPaletteBackgroundPixmap( UserIcon( "designer_background.png", KDevDesignerPartFactory::instance() ) ); qworkspace->setScrollBarsEnabled( TRUE ); - connect( qworkspace, TQT_SIGNAL( windowActivated( TQWidget * ) ), - this, TQT_SLOT( activeWindowChanged( TQWidget * ) ) ); + connect( qworkspace, TQ_SIGNAL( windowActivated( TQWidget * ) ), + this, TQ_SLOT( activeWindowChanged( TQWidget * ) ) ); lastActiveFormWindow = 0; qworkspace->setAcceptDrops( TRUE ); } @@ -418,7 +418,7 @@ void MainWindow::setupWorkspace() QCompletionEdit *edit = new QCompletionEdit( vbox ); TQToolTip::add( edit, i18n( "Start typing the buffer you want to switch to here (ALT+B)" ) ); TQAccel *a = new TQAccel( this ); - a->connectItem( a->insertItem( ALT + Key_B ), edit, TQT_SLOT( setFocus() ) ); + a->connectItem( a->insertItem( ALT + Key_B ), edit, TQ_SLOT( setFocus() ) ); wspace = new Workspace( vbox, this ); wspace->setBufferEdit( edit ); wspace->setCurrentProject( currentProject ); @@ -1036,7 +1036,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) } lastPressWidget = (TQWidget*)o; if ( passiveInteractor ) - TQTimer::singleShot( 0, formWindow(), TQT_SLOT( visibilityChanged() ) ); + TQTimer::singleShot( 0, formWindow(), TQ_SLOT( visibilityChanged() ) ); if ( currentTool() == CONNECT_TOOL || currentTool() == BUDDY_TOOL ) return TRUE; return !passiveInteractor; @@ -1055,8 +1055,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ( (FormWindow*)w )->handleMouseRelease( (TQMouseEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); if ( passiveInteractor ) { - TQTimer::singleShot( 0, this, TQT_SLOT( selectionChanged() ) ); - TQTimer::singleShot( 0, formWindow(), TQT_SLOT( visibilityChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( selectionChanged() ) ); + TQTimer::singleShot( 0, formWindow(), TQ_SLOT( visibilityChanged() ) ); } return !passiveInteractor; case TQEvent::MouseMove: @@ -1285,16 +1285,16 @@ void MainWindow::insertFormWindow( FormWindow *fw ) "<p>You can have several forms open, and all open forms are listed " "in the <b>Form List</b>.") ); - connect( fw, TQT_SIGNAL( showProperties( TQObject * ) ), - this, TQT_SLOT( showProperties( TQObject * ) ) ); - connect( fw, TQT_SIGNAL( updateProperties( TQObject * ) ), - this, TQT_SLOT( updateProperties( TQObject * ) ) ); - connect( this, TQT_SIGNAL( currentToolChanged() ), - fw, TQT_SLOT( currentToolChanged() ) ); - connect( fw, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( selectionChanged() ) ); - connect( fw, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - this, TQT_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); + connect( fw, TQ_SIGNAL( showProperties( TQObject * ) ), + this, TQ_SLOT( showProperties( TQObject * ) ) ); + connect( fw, TQ_SIGNAL( updateProperties( TQObject * ) ), + this, TQ_SLOT( updateProperties( TQObject * ) ) ); + connect( this, TQ_SIGNAL( currentToolChanged() ), + fw, TQ_SLOT( currentToolChanged() ) ); + connect( fw, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( selectionChanged() ) ); + connect( fw, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + this, TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); if ( !mblockNewForms ) { } else { @@ -3562,11 +3562,11 @@ bool MainWindow::openProjectSettings( Project *pro ) continue; dia.tabWidget->addTab( t.w, t.title ); if ( t.receiver ) { - connect( dia.buttonOk, TQT_SIGNAL( clicked() ), senderObject, TQT_SLOT( emitAcceptSignal() ) ); - connect( senderObject, TQT_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); - connect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + connect( dia.buttonOk, TQ_SIGNAL( clicked() ), senderObject, TQ_SLOT( emitAcceptSignal() ) ); + connect( senderObject, TQ_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); + connect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); senderObject->emitInitSignal(); - disconnect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + disconnect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); } } @@ -3691,11 +3691,11 @@ void MainWindow::showGUIStuff( bool b ) menubar->removeItem( toolsMenuId ); menubar->removeItem( toolsMenuId + 1 ); menubar->removeItem( toolsMenuId + 2 ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings->setEnabled( FALSE ); actionEditSource->setEnabled( FALSE ); actionEditConnections->setEnabled( FALSE ); @@ -3728,11 +3728,11 @@ void MainWindow::showGUIStuff( bool b ) menubar->insertItem( i18n( "&Tools" ), toolsMenu, toolsMenuId, toolsMenuIndex ); menubar->insertItem( i18n( "&Layout" ), layoutMenu, toolsMenuId + 1, toolsMenuIndex + 1 ); menubar->insertItem( i18n( "&Preview" ), previewMenu, toolsMenuId + 2, toolsMenuIndex + 2 ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings->setEnabled( TRUE ); actionEditSource->setEnabled( TRUE ); actionEditConnections->setEnabled( TRUE ); diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp index 96d0a4dc..86837088 100644 --- a/kdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -127,101 +127,101 @@ void MainWindow::setupEditActions() actionEditUndo = new DesignerAction( i18n("Undo"), createIconSet( "designer_undo.png" ),i18n("&Undo: Not Available"), CTRL + Key_Z, this, 0 ); actionEditUndo->setStatusTip( i18n( "Undoes the last action" ) ); actionEditUndo->setWhatsThis( whatsThisFrom( "Edit|Undo" ) ); - connect( actionEditUndo, TQT_SIGNAL( activated() ), this, TQT_SLOT( editUndo() ) ); + connect( actionEditUndo, TQ_SIGNAL( activated() ), this, TQ_SLOT( editUndo() ) ); actionEditUndo->setEnabled( FALSE ); actionEditRedo = new DesignerAction( i18n( "Redo" ), createIconSet("designer_redo.png"), i18n( "&Redo: Not Available" ), CTRL + Key_Y, this, 0 ); actionEditRedo->setStatusTip( i18n( "Redoes the last undone operation") ); actionEditRedo->setWhatsThis( whatsThisFrom( "Edit|Redo" ) ); - connect( actionEditRedo, TQT_SIGNAL( activated() ), this, TQT_SLOT( editRedo() ) ); + connect( actionEditRedo, TQ_SIGNAL( activated() ), this, TQ_SLOT( editRedo() ) ); actionEditRedo->setEnabled( FALSE ); actionEditCut = new DesignerAction( i18n( "Cut" ), createIconSet("designer_editcut.png"), i18n( "Cu&t" ), CTRL + Key_X, this, 0 ); actionEditCut->setStatusTip( i18n( "Cuts the selected widgets and puts them on the clipboard" ) ); actionEditCut->setWhatsThis( whatsThisFrom( "Edit|Cut" ) ); - connect( actionEditCut, TQT_SIGNAL( activated() ), this, TQT_SLOT( editCut() ) ); + connect( actionEditCut, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCut() ) ); actionEditCut->setEnabled( FALSE ); actionEditCopy = new DesignerAction( i18n( "Copy" ), createIconSet("designer_editcopy.png"), i18n( "&Copy" ), CTRL + Key_C, this, 0 ); actionEditCopy->setStatusTip( i18n( "Copies the selected widgets to the clipboard" ) ); actionEditCopy->setWhatsThis( whatsThisFrom( "Edit|Copy" ) ); - connect( actionEditCopy, TQT_SIGNAL( activated() ), this, TQT_SLOT( editCopy() ) ); + connect( actionEditCopy, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCopy() ) ); actionEditCopy->setEnabled( FALSE ); actionEditPaste = new DesignerAction( i18n( "Paste" ), createIconSet("designer_editpaste.png"), i18n( "&Paste" ), CTRL + Key_V, this, 0 ); actionEditPaste->setStatusTip( i18n( "Pastes the clipboard's contents" ) ); actionEditPaste->setWhatsThis( whatsThisFrom( "Edit|Paste" ) ); - connect( actionEditPaste, TQT_SIGNAL( activated() ), this, TQT_SLOT( editPaste() ) ); + connect( actionEditPaste, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPaste() ) ); actionEditPaste->setEnabled( FALSE ); actionEditDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Delete, this, 0 ); actionEditDelete->setStatusTip( i18n( "Deletes the selected widgets" ) ); actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) ); - connect( actionEditDelete, TQT_SIGNAL( activated() ), this, TQT_SLOT( editDelete() ) ); + connect( actionEditDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) ); actionEditDelete->setEnabled( FALSE ); #ifdef TQ_WS_MAC TQAction *macDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Backspace, this, 0 ); - connect( macDelete, TQT_SIGNAL( activated() ), this, TQT_SLOT( editDelete() ) ); + connect( macDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) ); #endif actionEditSelectAll = new DesignerAction( i18n( "Select All" ), TQPixmap(), i18n( "Select &All" ), CTRL + Key_A, this, 0 ); actionEditSelectAll->setStatusTip( i18n( "Selects all widgets" ) ); actionEditSelectAll->setWhatsThis( whatsThisFrom( "Edit|Select All" ) ); - connect( actionEditSelectAll, TQT_SIGNAL( activated() ), this, TQT_SLOT( editSelectAll() ) ); + connect( actionEditSelectAll, TQ_SIGNAL( activated() ), this, TQ_SLOT( editSelectAll() ) ); actionEditSelectAll->setEnabled( TRUE ); actionEditRaise = new DesignerAction( i18n( "Bring to Front" ), createIconSet("designer_editraise.png"), i18n( "Bring to &Front" ), 0, this, 0 ); actionEditRaise->setStatusTip( i18n( "Raises the selected widgets" ) ); actionEditRaise->setWhatsThis( i18n( "Raises the selected widgets" ) ); - connect( actionEditRaise, TQT_SIGNAL( activated() ), this, TQT_SLOT( editRaise() ) ); + connect( actionEditRaise, TQ_SIGNAL( activated() ), this, TQ_SLOT( editRaise() ) ); actionEditRaise->setEnabled( FALSE ); actionEditLower = new DesignerAction( i18n( "Send to Back" ), createIconSet("designer_editlower.png"), i18n( "Send to &Back" ), 0, this, 0 ); actionEditLower->setStatusTip( i18n( "Lowers the selected widgets" ) ); actionEditLower->setWhatsThis( i18n( "Lowers the selected widgets" ) ); - connect( actionEditLower, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLower() ) ); + connect( actionEditLower, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLower() ) ); actionEditLower->setEnabled( FALSE ); actionEditAccels = new DesignerAction( i18n( "Check Accelerators" ), TQPixmap(), i18n( "Chec&k Accelerators" ), ALT + Key_R, this, 0 ); actionEditAccels->setStatusTip( i18n("Checks if the accelerators used in the form are unique") ); actionEditAccels->setWhatsThis( whatsThisFrom( "Edit|Check Accelerator" ) ); - connect( actionEditAccels, TQT_SIGNAL( activated() ), this, TQT_SLOT( editAccels() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditAccels, TQ_SIGNAL( activated() ), this, TQ_SLOT( editAccels() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); actionEditFunctions = new DesignerAction( i18n( "Slots" ), createIconSet("designer_editslots.png"), i18n( "S&lots..." ), 0, this, 0 ); actionEditFunctions->setStatusTip( i18n("Opens a dialog for editing slots") ); actionEditFunctions->setWhatsThis( whatsThisFrom( "Edit|Slots" ) ); - connect( actionEditFunctions, TQT_SIGNAL( activated() ), this, TQT_SLOT( editFunctions() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditFunctions, TQ_SIGNAL( activated() ), this, TQ_SLOT( editFunctions() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); actionEditConnections = new DesignerAction( i18n( "Connections" ), createIconSet("designer_connecttool.png"), i18n( "Co&nnections..." ), 0, this, 0 ); actionEditConnections->setStatusTip( i18n("Opens a dialog for editing connections") ); actionEditConnections->setWhatsThis( whatsThisFrom( "Edit|Connections" ) ); - connect( actionEditConnections, TQT_SIGNAL( activated() ), this, TQT_SLOT( editConnections() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditConnections, TQ_SIGNAL( activated() ), this, TQ_SLOT( editConnections() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); actionEditSource = new DesignerAction( i18n( "Source" ), TQIconSet(), i18n( "&Source..." ), CTRL + Key_E, this, 0 ); actionEditSource->setStatusTip( i18n("Opens an editor to edit the form's source code") ); actionEditSource->setWhatsThis( whatsThisFrom( "Edit|Source" ) ); - connect( actionEditSource, TQT_SIGNAL( activated() ), this, TQT_SLOT( editSource() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditSource, TQ_SIGNAL( activated() ), this, TQ_SLOT( editSource() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings = new DesignerAction( i18n( "Form Settings" ), TQPixmap(), i18n( "&Form Settings..." ), 0, this, 0 ); actionEditFormSettings->setStatusTip( i18n("Opens a dialog to change the form's settings") ); actionEditFormSettings->setWhatsThis( whatsThisFrom( "Edit|Form Settings" ) ); - connect( actionEditFormSettings, TQT_SIGNAL( activated() ), this, TQT_SLOT( editFormSettings() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditFormSettings, TQ_SIGNAL( activated() ), this, TQ_SLOT( editFormSettings() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditPreferences = new DesignerAction( i18n( "Preferences" ), TQPixmap(), i18n( "Preferences..." ), 0, this, 0 ); actionEditPreferences->setStatusTip( i18n("Opens a dialog to change preferences") ); actionEditPreferences->setWhatsThis( whatsThisFrom( "Edit|Preferences" ) ); - connect( actionEditPreferences, TQT_SIGNAL( activated() ), this, TQT_SLOT( editPreferences() ) ); + connect( actionEditPreferences, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPreferences() ) ); /* TQToolBar *tb = new TQToolBar( this, "Edit" ); tb->setCloseMode( TQDockWindow::Undocked ); @@ -240,7 +240,7 @@ void MainWindow::setupEditActions() #endif TQPopupMenu *menu = new TQPopupMenu( this, "Edit" ); - connect( menu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( updateEditorUndoRedo() ) ); + connect( menu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( updateEditorUndoRedo() ) ); menubar->insertItem( i18n( "&Edit" ), menu ); actionEditUndo->addTo( menu ); actionEditRedo->addTo( menu ); @@ -270,25 +270,25 @@ void MainWindow::setupSearchActions() { actionSearchFind = new DesignerAction( i18n( "Find" ), createIconSet( "designer_searchfind.png" ), i18n( "&Find..." ), CTRL + Key_F, this, 0 ); - connect( actionSearchFind, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchFind() ) ); + connect( actionSearchFind, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchFind() ) ); actionSearchFind->setEnabled( FALSE ); actionSearchFind->setWhatsThis( whatsThisFrom( "Search|Find" ) ); actionSearchIncremetal = new DesignerAction( i18n( "Find Incremental" ), TQIconSet(), i18n( "Find &Incremental" ), ALT + Key_I, this, 0 ); - connect( actionSearchIncremetal, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchIncremetalFindMenu() ) ); + connect( actionSearchIncremetal, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchIncremetalFindMenu() ) ); actionSearchIncremetal->setEnabled( FALSE ); actionSearchIncremetal->setWhatsThis( whatsThisFrom( "Search|Find Incremental" ) ); actionSearchReplace = new DesignerAction( i18n( "Replace" ), TQIconSet(), i18n( "&Replace..." ), CTRL + Key_R, this, 0 ); - connect( actionSearchReplace, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchReplace() ) ); + connect( actionSearchReplace, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchReplace() ) ); actionSearchReplace->setEnabled( FALSE ); actionSearchReplace->setWhatsThis( whatsThisFrom( "Search|Replace" ) ); actionSearchGotoLine = new DesignerAction( i18n( "Goto Line" ), TQIconSet(), i18n( "&Goto Line..." ), ALT + Key_G, this, 0 ); - connect( actionSearchGotoLine, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchGotoLine() ) ); + connect( actionSearchGotoLine, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchGotoLine() ) ); actionSearchGotoLine->setEnabled( FALSE ); actionSearchGotoLine->setWhatsThis( whatsThisFrom( "Search|Goto line" ) ); @@ -300,10 +300,10 @@ void MainWindow::setupSearchActions() incrementalSearch = new TQLineEdit( 0 ); incrementalSearch->hide(); TQToolTip::add( incrementalSearch, i18n( "Incremental search (Alt+I)" ) ); - connect( incrementalSearch, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( searchIncremetalFind() ) ); - connect( incrementalSearch, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( searchIncremetalFindNext() ) ); + connect( incrementalSearch, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( searchIncremetalFind() ) ); + connect( incrementalSearch, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( searchIncremetalFindNext() ) ); incrementalSearch->setEnabled( FALSE ); TQPopupMenu *menu = new TQPopupMenu( this, "Search" ); @@ -320,56 +320,56 @@ void MainWindow::setupLayoutActions() if ( !actionGroupTools ) { actionGroupTools = new TQActionGroup( this ); actionGroupTools->setExclusive( TRUE ); - connect( actionGroupTools, TQT_SIGNAL( selected(TQAction*) ), this, TQT_SLOT( toolSelected(TQAction*) ) ); + connect( actionGroupTools, TQ_SIGNAL( selected(TQAction*) ), this, TQ_SLOT( toolSelected(TQAction*) ) ); } actionEditAdjustSize = new DesignerAction( i18n( "Adjust Size" ), createIconSet("designer_adjustsize.png"), i18n( "Adjust &Size" ), CTRL + Key_J, this, 0 ); actionEditAdjustSize->setStatusTip(i18n("Adjusts the size of the selected widget") ); actionEditAdjustSize->setWhatsThis( whatsThisFrom( "Layout|Adjust Size" ) ); - connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), this, TQT_SLOT( editAdjustSize() ) ); + connect( actionEditAdjustSize, TQ_SIGNAL( activated() ), this, TQ_SLOT( editAdjustSize() ) ); actionEditAdjustSize->setEnabled( FALSE ); actionEditHLayout = new DesignerAction( i18n( "Lay Out Horizontally" ), createIconSet("designer_edithlayout.png"), i18n( "Lay Out &Horizontally" ), CTRL + Key_H, this, 0 ); actionEditHLayout->setStatusTip(i18n("Lays out the selected widgets horizontally") ); actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally" ) ); - connect( actionEditHLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutHorizontal() ) ); + connect( actionEditHLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutHorizontal() ) ); actionEditHLayout->setEnabled( FALSE ); actionEditVLayout = new DesignerAction( i18n( "Lay Out Vertically" ), createIconSet("designer_editvlayout.png"), i18n( "Lay Out &Vertically" ), CTRL + Key_L, this, 0 ); actionEditVLayout->setStatusTip(i18n("Lays out the selected widgets vertically") ); actionEditVLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically" ) ); - connect( actionEditVLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutVertical() ) ); + connect( actionEditVLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutVertical() ) ); actionEditVLayout->setEnabled( FALSE ); actionEditGridLayout = new DesignerAction( i18n( "Lay Out in a Grid" ), createIconSet("designer_editgrid.png"), i18n( "Lay Out in a &Grid" ), CTRL + Key_G, this, 0 ); actionEditGridLayout->setStatusTip(i18n("Lays out the selected widgets in a grid") ); actionEditGridLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out in a Grid" ) ); - connect( actionEditGridLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutGrid() ) ); + connect( actionEditGridLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutGrid() ) ); actionEditGridLayout->setEnabled( FALSE ); actionEditSplitHorizontal = new DesignerAction( i18n( "Lay Out Horizontally (in Splitter)" ), createIconSet("designer_editvlayoutsplit.png"), i18n( "Lay Out Horizontally (in S&plitter)" ), 0, this, 0 ); actionEditSplitHorizontal->setStatusTip(i18n("Lays out the selected widgets horizontally in a splitter") ); actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally (in Splitter)" ) ); - connect( actionEditSplitHorizontal, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutHorizontalSplit() ) ); + connect( actionEditSplitHorizontal, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutHorizontalSplit() ) ); actionEditSplitHorizontal->setEnabled( FALSE ); actionEditSplitVertical = new DesignerAction( i18n( "Lay Out Vertically (in Splitter)" ), createIconSet("designer_edithlayoutsplit.png"), i18n( "Lay Out Vertically (in Sp&litter)" ), 0, this, 0 ); actionEditSplitVertical->setStatusTip(i18n("Lays out the selected widgets vertically in a splitter") ); actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically (in Splitter)" ) ); - connect( actionEditSplitVertical, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutVerticalSplit() ) ); + connect( actionEditSplitVertical, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutVerticalSplit() ) ); actionEditSplitVertical->setEnabled( FALSE ); actionEditBreakLayout = new DesignerAction( i18n( "Break Layout" ), createIconSet("designer_editbreaklayout.png"), i18n( "&Break Layout" ), CTRL + Key_B, this, 0 ); actionEditBreakLayout->setStatusTip(i18n("Breaks the selected layout") ); actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) ); - connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editBreakLayout() ) ); + connect( actionEditBreakLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editBreakLayout() ) ); actionEditBreakLayout->setEnabled( FALSE ); int id = WidgetDatabase::idFromClassName( "Spacer" ); @@ -424,8 +424,8 @@ void MainWindow::setupToolActions() if ( !actionGroupTools ) { actionGroupTools = new TQActionGroup( this ); actionGroupTools->setExclusive( TRUE ); - connect( actionGroupTools, TQT_SIGNAL( selected(TQAction*) ), - this, TQT_SLOT( toolSelected(TQAction*) ) ); + connect( actionGroupTools, TQ_SIGNAL( selected(TQAction*) ), + this, TQ_SLOT( toolSelected(TQAction*) ) ); } actionPointerTool = new DesignerAction( i18n("Pointer"), createIconSet("designer_pointer.png"), @@ -492,8 +492,8 @@ void MainWindow::setupToolActions() "custom widgets") ); actionToolsCustomWidget->setWhatsThis( whatsThisFrom( "Tools|Custom|Edit Custom" "Widgets" ) ); - connect( actionToolsCustomWidget, TQT_SIGNAL( activated() ), - this, TQT_SLOT( toolsCustomWidget() ) ); + connect( actionToolsCustomWidget, TQ_SIGNAL( activated() ), + this, TQ_SLOT( toolsCustomWidget() ) ); for ( int j = 0; j < WidgetDatabase::numWidgetGroups(); ++j ) { TQString grp = WidgetDatabase::widgetGroup( j ); @@ -605,7 +605,7 @@ void MainWindow::setupToolActions() TQAction *a = new DesignerAction( i18n( "Configure Toolbox" ), i18n( "Configure Toolbox..." ), 0, this ); a->setStatusTip( i18n( "Opens a dialog to configure the common " "widgets page of the toolbox") ); - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( toolsConfigure() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( toolsConfigure() ) ); mmenu->insertSeparator(); a->addTo( mmenu ); resetTool(); @@ -633,7 +633,7 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_N ); a->setStatusTip( i18n( "Creates a new project, form or source file." ) ); a->setWhatsThis( whatsThisFrom( "File|New" ) ); - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileNew() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNew() ) ); a->addTo( tb ); a->addTo( fileMenu ); actionNewFile = a; @@ -653,7 +653,7 @@ void MainWindow::setupFileActions() newForm->setIconSet( createIconSet("designer_form.png") ); newForm->setAccel( CTRL + Key_N ); newForm->setStatusTip( i18n( "Creates a new dialog." ) ); - connect( newForm, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileNewDialog() ) ); + connect( newForm, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNewDialog() ) ); DesignerAction *newFile = new DesignerAction( a, 0 ); newFile->setText( i18n( "New File" ) ); @@ -661,7 +661,7 @@ void MainWindow::setupFileActions() newFile->setIconSet( createIconSet("designer_filenew.png") ); newFile->setAccel( ALT + Key_N ); newFile->setStatusTip( i18n( "Creates a new file." ) ); - connect( newFile, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileNewFile() ) ); + connect( newFile, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNewFile() ) ); actionNewFile = newFile; a->addTo( tb ); @@ -677,7 +677,7 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_O ); a->setStatusTip( i18n( "Opens an existing project, form or source file ") ); a->setWhatsThis( whatsThisFrom( "File|Open" ) ); - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileOpen() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileOpen() ) ); if ( !singleProject ) { a->addTo( tb ); a->addTo( fileMenu ); @@ -691,8 +691,8 @@ void MainWindow::setupFileActions() a->setMenuText( i18n( "&Close" ) ); a->setStatusTip( i18n( "Closes the current project or document" ) ); a->setWhatsThis(whatsThisFrom( "File|Close" ) ); - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileClose() ) ); - connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileClose() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) { a->addTo( fileMenu ); fileMenu->insertSeparator(); @@ -706,8 +706,8 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_S ); a->setStatusTip( i18n( "Saves the current project or document" ) ); a->setWhatsThis(whatsThisFrom( "File|Save" ) ); - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileSave() ) ); - connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSave() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( tb ); a->addTo( fileMenu ); @@ -717,8 +717,8 @@ void MainWindow::setupFileActions() a->setMenuText( i18n( "Save &As..." ) ); a->setStatusTip( i18n( "Saves the current form with a new filename" ) ); a->setWhatsThis( whatsThisFrom( "File|Save As" ) ); - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileSaveAs() ) ); - connect( this, TQT_SIGNAL( hasActiveWindow(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSaveAs() ) ); + connect( this, TQ_SIGNAL( hasActiveWindow(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) a->addTo( fileMenu ); @@ -728,8 +728,8 @@ void MainWindow::setupFileActions() a->setMenuText( i18n( "Sa&ve All" ) ); a->setStatusTip( i18n( "Saves all open documents" ) ); a->setWhatsThis( whatsThisFrom( "File|Save All" ) ); - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileSaveAll() ) ); - connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSaveAll() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) { a->addTo( fileMenu ); fileMenu->insertSeparator(); @@ -740,7 +740,7 @@ void MainWindow::setupFileActions() a->setMenuText( i18n( "Create &Template..." ) ); a->setStatusTip( i18n( "Creates a new template" ) ); a->setWhatsThis( whatsThisFrom( "File|Create Template" ) ); - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileCreateTemplate() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileCreateTemplate() ) ); if ( !singleProject ) a->addTo( fileMenu ); @@ -755,14 +755,14 @@ void MainWindow::setupFileActions() fileMenu->insertItem( i18n( "Recently Opened Projects" ), recentlyProjectsMenu ); } - connect( recentlyFilesMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( setupRecentlyFilesMenu() ) ); - connect( recentlyProjectsMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( setupRecentlyProjectsMenu() ) ); - connect( recentlyFilesMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( recentlyFilesMenuActivated( int ) ) ); - connect( recentlyProjectsMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( recentlyProjectsMenuActivated( int ) ) ); + connect( recentlyFilesMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupRecentlyFilesMenu() ) ); + connect( recentlyProjectsMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupRecentlyProjectsMenu() ) ); + connect( recentlyFilesMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( recentlyFilesMenuActivated( int ) ) ); + connect( recentlyProjectsMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( recentlyProjectsMenuActivated( int ) ) ); if ( !singleProject ) fileMenu->insertSeparator(); @@ -778,7 +778,7 @@ void MainWindow::setupFileActions() a->setText( i18n( "Close" ) ); a->setMenuText( i18n( "&Close" ) ); } - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileQuit() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileQuit() ) ); a->addTo( fileMenu ); } @@ -792,8 +792,8 @@ void MainWindow::setupProjectActions() ag->setMenuText( i18n( "Active Project" ) ); ag->setExclusive( TRUE ); ag->setUsesDropDown( TRUE ); - connect( ag, TQT_SIGNAL( selected( TQAction * ) ), this, TQT_SLOT( projectSelected( TQAction * ) ) ); - connect( ag, TQT_SIGNAL( selected( TQAction * ) ), this, TQT_SIGNAL( projectChanged() ) ); + connect( ag, TQ_SIGNAL( selected( TQAction * ) ), this, TQ_SLOT( projectSelected( TQAction * ) ) ); + connect( ag, TQ_SIGNAL( selected( TQAction * ) ), this, TQ_SIGNAL( projectChanged() ) ); DesignerAction *a = new DesignerAction( i18n( "<No Project>" ), i18n( "<No Project>" ), 0, ag, 0, TRUE ); eProject = new Project( "", i18n( "<No Project>" ), projectSettingsPluginManager, TRUE ); projects.insert( a, eProject ); @@ -809,9 +809,9 @@ void MainWindow::setupProjectActions() actionProjectAddFile = a; a->setStatusTip( i18n("Adds a file to the current project") ); a->setWhatsThis( whatsThisFrom( "Project|Add File" ) ); - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( projectInsertFile() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( projectInsertFile() ) ); a->setEnabled( FALSE ); - connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) a->addTo( projectMenu ); @@ -819,9 +819,9 @@ void MainWindow::setupProjectActions() i18n( "&Image Collection..." ), 0, this, 0 ); actionEditPixmapCollection->setStatusTip( i18n("Opens a dialog for editing the current project's image collection") ); actionEditPixmapCollection->setWhatsThis( whatsThisFrom( "Project|Image Collection" ) ); - connect( actionEditPixmapCollection, TQT_SIGNAL( activated() ), this, TQT_SLOT( editPixmapCollection() ) ); + connect( actionEditPixmapCollection, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPixmapCollection() ) ); actionEditPixmapCollection->setEnabled( FALSE ); - connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, TQT_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, TQ_SLOT( setEnabled(bool) ) ); actionEditPixmapCollection->addTo( projectMenu ); #ifndef TQT_NO_SQL @@ -829,9 +829,9 @@ void MainWindow::setupProjectActions() i18n( "&Database Connections..." ), 0, this, 0 ); actionEditDatabaseConnections->setStatusTip( i18n("Opens a dialog for editing the current project's database connections") ); actionEditDatabaseConnections->setWhatsThis( whatsThisFrom( "Project|Database Connections" ) ); - connect( actionEditDatabaseConnections, TQT_SIGNAL( activated() ), this, TQT_SLOT( editDatabaseConnections() ) ); + connect( actionEditDatabaseConnections, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDatabaseConnections() ) ); //actionEditDatabaseConnections->setEnabled( FALSE ); - //connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, TQT_SLOT( setEnabled(bool) ) ); + //connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) actionEditDatabaseConnections->addTo( projectMenu ); #endif @@ -840,9 +840,9 @@ void MainWindow::setupProjectActions() i18n( "&Project Settings..." ), 0, this, 0 ); actionEditProjectSettings->setStatusTip( i18n("Opens a dialog to change the project's settings") ); actionEditProjectSettings->setWhatsThis( whatsThisFrom( "Project|Project Settings" ) ); - connect( actionEditProjectSettings, TQT_SIGNAL( activated() ), this, TQT_SLOT( editProjectSettings() ) ); + connect( actionEditProjectSettings, TQ_SIGNAL( activated() ), this, TQ_SLOT( editProjectSettings() ) ); actionEditProjectSettings->setEnabled( FALSE ); - connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, TQT_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditProjectSettings->addTo( projectMenu ); } @@ -859,14 +859,14 @@ void MainWindow::setupPreviewActions() a->setAccel( CTRL + Key_T ); a->setStatusTip( i18n("Opens a preview") ); a->setWhatsThis( whatsThisFrom( "Preview|Preview Form" ) ); - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( previewForm() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( previewForm() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( menu ); menu->insertSeparator(); TQSignalMapper *mapper = new TQSignalMapper( this ); - connect( mapper, TQT_SIGNAL(mapped(const TQString&)), this, TQT_SLOT(previewForm(const TQString&)) ); + connect( mapper, TQ_SIGNAL(mapped(const TQString&)), this, TQ_SLOT(previewForm(const TQString&)) ); TQStringList styles = TQStyleFactory::keys(); for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { TQString info; @@ -890,8 +890,8 @@ void MainWindow::setupPreviewActions() "<p>Use the preview to test the design and " "signal-slot connections of the current form. %2</p>").arg( *it ).arg( info ) ); mapper->setMapping( a, *it ); - connect( a, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map()) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL(activated()), mapper, TQ_SLOT(map()) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( menu ); } } @@ -905,38 +905,38 @@ void MainWindow::setupWindowActions() actionWindowTile = new DesignerAction( i18n( "Tile" ), i18n( "&Tile" ), 0, this ); actionWindowTile->setStatusTip( i18n("Tiles the windows so that they are all visible") ); actionWindowTile->setWhatsThis( whatsThisFrom( "Window|Tile" ) ); - connect( actionWindowTile, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( tile() ) ); + connect( actionWindowTile, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( tile() ) ); actionWindowCascade = new DesignerAction( i18n( "Cascade" ), i18n( "&Cascade" ), 0, this ); actionWindowCascade->setStatusTip( i18n("Cascades the windows so that all their title bars are visible") ); actionWindowCascade->setWhatsThis( whatsThisFrom( "Window|Cascade" ) ); - connect( actionWindowCascade, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( cascade() ) ); + connect( actionWindowCascade, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( cascade() ) ); actionWindowClose = new DesignerAction( i18n( "Close" ), i18n( "Cl&ose" ), CTRL + Key_F4, this ); actionWindowClose->setStatusTip( i18n( "Closes the active window") ); actionWindowClose->setWhatsThis( whatsThisFrom( "Window|Close" ) ); - connect( actionWindowClose, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( closeActiveWindow() ) ); + connect( actionWindowClose, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( closeActiveWindow() ) ); actionWindowCloseAll = new DesignerAction( i18n( "Close All" ), i18n( "Close Al&l" ), 0, this ); actionWindowCloseAll->setStatusTip( i18n( "Closes all form windows") ); actionWindowCloseAll->setWhatsThis( whatsThisFrom( "Window|Close All" ) ); - connect( actionWindowCloseAll, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( closeAllWindows() ) ); + connect( actionWindowCloseAll, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( closeAllWindows() ) ); actionWindowNext = new DesignerAction( i18n( "Next" ), i18n( "Ne&xt" ), CTRL + Key_F6, this ); actionWindowNext->setStatusTip( i18n( "Activates the next window" ) ); actionWindowNext->setWhatsThis( whatsThisFrom( "Window|Next" ) ); - connect( actionWindowNext, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( activateNextWindow() ) ); + connect( actionWindowNext, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( activateNextWindow() ) ); actionWindowPrevious = new DesignerAction( i18n( "Previous" ), i18n( "Pre&vious" ), CTRL + SHIFT + Key_F6, this ); actionWindowPrevious->setStatusTip( i18n( "Activates the previous window" ) ); actionWindowPrevious->setWhatsThis( whatsThisFrom( "Window|Previous" ) ); - connect( actionWindowPrevious, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( activatePreviousWindow() ) ); + connect( actionWindowPrevious, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( activatePreviousWindow() ) ); // } if ( !windowMenu ) { windowMenu = new TQPopupMenu( this, "Window" ); menubar->insertItem( i18n( "&Window" ), windowMenu ); - connect( windowMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( setupWindowActions() ) ); + connect( windowMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupWindowActions() ) ); } else { windowMenu->clear(); } @@ -971,7 +971,7 @@ void MainWindow::setupWindowActions() else itemText += w->caption(); - int id = windowMenu->insertItem( itemText, this, TQT_SLOT( windowsMenuActivated( int ) ) ); + int id = windowMenu->insertItem( itemText, this, TQ_SLOT( windowsMenuActivated( int ) ) ); windowMenu->setItemParameter( id, i ); windowMenu->setItemChecked( id, qworkspace->activeWindow() == windows.at( i ) ); } @@ -982,28 +982,28 @@ void MainWindow::setupHelpActions() actionHelpContents = new DesignerAction( i18n( "Contents" ), i18n( "&Contents" ), Key_F1, this, 0 ); actionHelpContents->setStatusTip( i18n("Opens the online help") ); actionHelpContents->setWhatsThis( whatsThisFrom( "Help|Contents" ) ); - connect( actionHelpContents, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpContents() ) ); + connect( actionHelpContents, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpContents() ) ); actionHelpManual = new DesignerAction( i18n( "Manual" ), i18n( "&Manual" ), CTRL + Key_M, this, 0 ); actionHelpManual->setStatusTip( i18n("Opens the TQt Designer manual") ); actionHelpManual->setWhatsThis( whatsThisFrom( "Help|Manual" ) ); - connect( actionHelpManual, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpManual() ) ); + connect( actionHelpManual, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpManual() ) ); actionHelpAbout = new DesignerAction( i18n("About"), TQPixmap(), i18n("&About"), 0, this, 0 ); actionHelpAbout->setStatusTip( i18n("Displays information about TQt Designer") ); actionHelpAbout->setWhatsThis( whatsThisFrom( "Help|About" ) ); - connect( actionHelpAbout, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpAbout() ) ); + connect( actionHelpAbout, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpAbout() ) ); actionHelpAboutTQt = new DesignerAction( i18n("About TQt"), TQPixmap(), i18n("About &TQt"), 0, this, 0 ); actionHelpAboutTQt->setStatusTip( i18n("Displays information about the TQt Toolkit") ); actionHelpAboutTQt->setWhatsThis( whatsThisFrom( "Help|About TQt" ) ); - connect( actionHelpAboutTQt, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpAboutTQt() ) ); + connect( actionHelpAboutTQt, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpAboutTQt() ) ); actionHelpWhatsThis = new DesignerAction( i18n("What's This?"), TQIconSet( whatsthis_image, whatsthis_image ), i18n("What's This?"), SHIFT + Key_F1, this, 0 ); actionHelpWhatsThis->setStatusTip( i18n("\"What's This?\" context sensitive help") ); actionHelpWhatsThis->setWhatsThis( whatsThisFrom( "Help|What's This?" ) ); - connect( actionHelpWhatsThis, TQT_SIGNAL( activated() ), this, TQT_SLOT( whatsThis() ) ); + connect( actionHelpWhatsThis, TQ_SIGNAL( activated() ), this, TQ_SLOT( whatsThis() ) ); /* TQToolBar *tb = new TQToolBar( this, "Help" ); tb->setCloseMode( TQDockWindow::Undocked ); @@ -1424,8 +1424,8 @@ void MainWindow::fileCreateTemplate() } dia.editName->setText( i18n( "NewTemplate" ) ); - connect( dia.buttonCreate, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( createNewTemplate() ) ); + connect( dia.buttonCreate, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( createNewTemplate() ) ); dia.exec(); } @@ -1857,7 +1857,7 @@ void MainWindow::editPreferences() statusMessage( i18n( "Edit preferences..." ) ); Preferences *dia = new Preferences( this, 0, TRUE ); prefDia = dia; - connect( dia->helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( dia->helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia->buttonColor->setEditor( StyledButton::ColorEditor ); dia->buttonPixmap->setEditor( StyledButton::PixmapEditor ); dia->groupBoxGrid->setChecked( sGrid ); @@ -1891,11 +1891,11 @@ void MainWindow::editPreferences() Tab t = *it; dia->tabWidget->addTab( t.w, t.title ); if ( t.receiver ) { - connect( dia->buttonOk, TQT_SIGNAL( clicked() ), senderObject, TQT_SLOT( emitAcceptSignal() ) ); - connect( senderObject, TQT_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); - connect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + connect( dia->buttonOk, TQ_SIGNAL( clicked() ), senderObject, TQ_SLOT( emitAcceptSignal() ) ); + connect( senderObject, TQ_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); + connect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); senderObject->emitInitSignal(); - disconnect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + disconnect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); } } diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp index fc9a7560..dbe5bcd8 100644 --- a/kdevdesigner/designer/multilineeditorimpl.cpp +++ b/kdevdesigner/designer/multilineeditorimpl.cpp @@ -56,7 +56,7 @@ ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar, setAccel( key ); addTo( toolBar ); tag = tagstr; - connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( wasActivated() ) ); + connect( this, TQ_SIGNAL( activated() ), this, TQ_SLOT( wasActivated() ) ); } ToolBarItem::~ToolBarItem() @@ -103,26 +103,26 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget ToolBarItem *it = new ToolBarItem( this, basicToolBar, i18n( "Italic" ), "i", BarIcon( "designer_textitalic.png", KDevDesignerPartFactory::instance() ), CTRL+Key_I ); it->addTo( stylesMenu ); - connect( it, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( it, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *b = new ToolBarItem( this, basicToolBar, i18n( "Bold" ), "b", BarIcon( "designer_textbold.png", KDevDesignerPartFactory::instance() ), CTRL+Key_B ); b->addTo( stylesMenu ); - connect( b, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( b, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ul = new ToolBarItem( this, basicToolBar, i18n( "Underline" ), "u", BarIcon( "designer_textunderline.png" , KDevDesignerPartFactory::instance()), CTRL+Key_U ); ul->addTo( stylesMenu ); - connect( ul, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( ul, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *tt = new ToolBarItem( this, basicToolBar, i18n( "Typewriter" ), "tt", BarIcon( "designer_textteletext.png", KDevDesignerPartFactory::instance() ) ); tt->addTo( stylesMenu ); - connect( tt, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( tt, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); basicToolBar->addSeparator(); @@ -134,39 +134,39 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget brAction->setText( i18n("Break" ) ); brAction->addTo( basicToolBar ); brAction->addTo( layoutMenu ); - connect( brAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( insertBR() ) ); + connect( brAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( insertBR() ) ); ToolBarItem *p = new ToolBarItem( this, basicToolBar, i18n( "Paragraph" ), "p", BarIcon( "designer_textparagraph.png", KDevDesignerPartFactory::instance() ) ); p->addTo( layoutMenu ); - connect( p, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( p, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); layoutMenu->insertSeparator(); basicToolBar->addSeparator(); ToolBarItem *al = new ToolBarItem( this, basicToolBar, i18n( "Align left" ), "p align=\"left\"", BarIcon( "designer_textleft.png", KDevDesignerPartFactory::instance() ) ); al->addTo( layoutMenu ); - connect( al, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( al, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ac = new ToolBarItem( this, basicToolBar, i18n( "Align center" ), "p align=\"center\"", BarIcon( "designer_textcenter.png", KDevDesignerPartFactory::instance() ) ); ac->addTo( layoutMenu ); - connect( ac, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( ac, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ar = new ToolBarItem( this, basicToolBar, i18n( "Align right" ), "p align=\"right\"", BarIcon( "designer_textright.png", KDevDesignerPartFactory::instance() ) ); ar->addTo( layoutMenu ); - connect( ar, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( ar, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *block = new ToolBarItem( this, basicToolBar, i18n( "Blockquote" ), "blockquote", BarIcon( "designer_textjustify.png", KDevDesignerPartFactory::instance() ) ); block->addTo( layoutMenu ); - connect( block, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( block, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); TQPopupMenu *fontMenu = new TQPopupMenu( this ); @@ -179,33 +179,33 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget fontAction->setText( i18n("Font" ) ); fontAction->addTo( fontToolBar ); fontAction->addTo( fontMenu ); - connect( fontAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( showFontDialog() ) ); + connect( fontAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( showFontDialog() ) ); ToolBarItem *fp1 = new ToolBarItem( this, fontToolBar, i18n( "Fontsize +1" ), "font size=\"+1\"", BarIcon( "designer_textlarger.png", KDevDesignerPartFactory::instance() ) ); - connect( fp1, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( fp1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *fm1 = new ToolBarItem( this, fontToolBar, i18n( "Fontsize -1" ), "font size=\"-1\"", BarIcon( "designer_textsmaller.png", KDevDesignerPartFactory::instance() ) ); - connect( fm1, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( fm1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h1 = new ToolBarItem( this, fontToolBar, i18n( "Headline 1" ), "h1", BarIcon( "designer_texth1.png", KDevDesignerPartFactory::instance() ) ); - connect( h1, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( h1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h2 = new ToolBarItem( this, fontToolBar, i18n( "Headline 2" ), "h2", BarIcon( "designer_texth2.png", KDevDesignerPartFactory::instance() ) ); - connect( h2, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( h2, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h3 = new ToolBarItem( this, fontToolBar, i18n( "Headline 3" ), "h3", BarIcon( "designer_texth3.png", KDevDesignerPartFactory::instance() ) ); - connect( h3, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( h3, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); TQPopupMenu *optionsMenu = new TQPopupMenu( this ); menuBar->insertItem( i18n( "O&ptions" ), optionsMenu ); @@ -217,12 +217,12 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget wrapAction->setText( i18n( "Word Wrapping" ) ); wrapAction->addTo( optionsToolBar ); wrapAction->addTo( optionsMenu ); - connect( wrapAction, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( changeWrapMode( bool ) ) ); + connect( wrapAction, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( changeWrapMode( bool ) ) ); oldDoWrap = doWrap; wrapAction->setOn( doWrap ); - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); textEdit->document()->setFormatter( new TQTextFormatterBreakInWords ); textEdit->document()->setUseFormatCollection( FALSE ); textEdit->document()->setPreProcessor( new SyntaxHighlighter_HTML ); diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp index 73844f9d..629d53ff 100644 --- a/kdevdesigner/designer/newformimpl.cpp +++ b/kdevdesigner/designer/newformimpl.cpp @@ -368,7 +368,7 @@ NewForm::NewForm( TQWidget *parent, const TQStringList& projects, const TQString& currentProject, const TQString &templatePath ) : NewFormBase( parent, 0, TRUE ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); projectCombo->insertStringList( projects ); projectCombo->setCurrentText( currentProject ); diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp index 8dcf7ba5..84087f01 100644 --- a/kdevdesigner/designer/outputwindow.cpp +++ b/kdevdesigner/designer/outputwindow.cpp @@ -71,10 +71,10 @@ void OutputWindow::setupError() { errorView = new TQListView( this, "OutputWindow::errorView" ); errorView->setSorting( -1 ); - connect( errorView, TQT_SIGNAL( currentChanged( TQListViewItem* ) ), - this, TQT_SLOT( currentErrorChanged( TQListViewItem* ) ) ); - connect( errorView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( currentErrorChanged( TQListViewItem* ) ) ); + connect( errorView, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), + this, TQ_SLOT( currentErrorChanged( TQListViewItem* ) ) ); + connect( errorView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( currentErrorChanged( TQListViewItem* ) ) ); if ( MetaDataBase::languages().count() > 1 ) addTab( errorView, i18n( "Warnings/Errors" ) ); diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp index 903c1a4f..e27d3a21 100644 --- a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp +++ b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp @@ -69,7 +69,7 @@ PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); buttonPixmap->setEditor( StyledButton::PixmapEditor ); diff --git a/kdevdesigner/designer/paletteeditorimpl.cpp b/kdevdesigner/designer/paletteeditorimpl.cpp index ae0cf7fd..fca7fe90 100644 --- a/kdevdesigner/designer/paletteeditorimpl.cpp +++ b/kdevdesigner/designer/paletteeditorimpl.cpp @@ -39,7 +39,7 @@ PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp index 851b519b..bf521b48 100644 --- a/kdevdesigner/designer/pixmapchooser.cpp +++ b/kdevdesigner/designer/pixmapchooser.cpp @@ -189,7 +189,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T } } else { PixmapFunction dia( parent, 0, TRUE ); - TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + TQObject::connect( dia.helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) ); dia.editArguments->setFocus(); diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui.h b/kdevdesigner/designer/pixmapcollectioneditor.ui.h index 82bd7929..c32fc135 100644 --- a/kdevdesigner/designer/pixmapcollectioneditor.ui.h +++ b/kdevdesigner/designer/pixmapcollectioneditor.ui.h @@ -110,8 +110,8 @@ void PixmapCollectionEditor::setChooserMode( bool c ) buttonCancel->show(); buttonOk->setEnabled( FALSE ); buttonOk->setDefault( TRUE ); - connect( viewPixmaps, TQT_SIGNAL( doubleClicked( TQIconViewItem * ) ), buttonOk, TQT_SIGNAL( clicked() ) ); - connect( viewPixmaps, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ), buttonOk, TQT_SIGNAL( clicked() ) ); + connect( viewPixmaps, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ), buttonOk, TQ_SIGNAL( clicked() ) ); + connect( viewPixmaps, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ), buttonOk, TQ_SIGNAL( clicked() ) ); setCaption( i18n( "Choose Image" ) ); } else { buttonClose->show(); diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp index 12530f1a..bf60b215 100644 --- a/kdevdesigner/designer/popupmenueditor.cpp +++ b/kdevdesigner/designer/popupmenueditor.cpp @@ -105,7 +105,7 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * par { init(); a = new TQAction( this ); - TQObject::connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( selfDestruct() ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( selfDestruct() ) ); } @@ -147,7 +147,7 @@ PopupMenuEditorItem::~PopupMenuEditorItem() void PopupMenuEditorItem::init() { if ( a ) { - TQObject::connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( selfDestruct() ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( selfDestruct() ) ); if ( m && !isSeparator() ) { s = new PopupMenuEditor( m->formWindow(), m ); TQString n = "PopupMenuEditor"; @@ -847,7 +847,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) // Hide the sub menu of the current item, but do it later if ( currentIndex < (int)itemList.count() ) { PopupMenuEditor *s = itemList.at( currentIndex )->s; - TQTimer::singleShot( 0, s, TQT_SLOT( hide() ) ); + TQTimer::singleShot( 0, s, TQ_SLOT( hide() ) ); } draggedItem = 0; @@ -884,11 +884,11 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) if ( i ) { dropInPlace( i, e->pos().y() ); - TQTimer::singleShot( 0, this, TQT_SLOT( resizeToContents() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( resizeToContents() ) ); } - TQTimer::singleShot( 0, this, TQT_SLOT( showSubMenu() ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( setFocus() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( showSubMenu() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( setFocus() ) ); dropLine->hide(); e->accept(); } diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp index f8535a25..8dcf8b28 100644 --- a/kdevdesigner/designer/project.cpp +++ b/kdevdesigner/designer/project.cpp @@ -1311,9 +1311,9 @@ void Project::addObject( TQObject *o ) if ( MainWindow::self ) { TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(), TQEvent::ChildInserted ); connect( fw, - TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), MainWindow::self, - TQT_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) + TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); } if ( fw->parentWidget() ) { @@ -1487,9 +1487,9 @@ void Project::designerCreated() if ( !fw || fw->mainWindow() ) continue; fw->setMainWindow( MainWindow::self ); - connect( fw, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, + connect( fw, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - MainWindow::self, TQT_SLOT( updateUndoRedo( bool, bool, + MainWindow::self, TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); fw->reparent( MainWindow::self->qWorkspace(), TQPoint( 0, 0 ), FALSE ); TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(), diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp index 99bb800d..77ac4f25 100644 --- a/kdevdesigner/designer/projectsettingsimpl.cpp +++ b/kdevdesigner/designer/projectsettingsimpl.cpp @@ -57,7 +57,7 @@ ProjectSettings::ProjectSettings( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) : ProjectSettingsBase( parent, name, modal, fl ), project( pro ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editProjectFile->setFocus(); diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index 8f7b1071..af1d26d7 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -417,8 +417,8 @@ void PropertyItem::createResetButton() hbox->layout()->setAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); - TQObject::connect( resetButton, TQT_SIGNAL( clicked() ), - listview, TQT_SLOT( resetProperty() ) ); + TQObject::connect( resetButton, TQ_SIGNAL( clicked() ), + listview, TQ_SLOT( resetProperty() ) ); TQToolTip::add( resetButton, i18n( "Reset the property to its default value" ) ); TQWhatsThis::add( resetButton, i18n( "Click this button to reset the property to its default value" ) ); updateResetButtonState(); @@ -614,18 +614,18 @@ TQLineEdit *PropertyTextItem::lined() button = new TQPushButton( "...", box ); setupStyle( button ); button->setFixedWidth( 20 ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getText() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getText() ) ); lin->setFrame( FALSE ); } - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); if ( PropertyItem::name() == "name" || PropertyItem::name() == "itemName" ) - connect( lin, TQT_SIGNAL( returnPressed() ), + connect( lin, TQ_SIGNAL( returnPressed() ), listview->propertyEditor()->formWindow()->commandHistory(), - TQT_SLOT( checkCompressedCommand() ) ); + TQ_SLOT( checkCompressedCommand() ) ); lin->installEventFilter( listview ); return lin; } @@ -783,10 +783,10 @@ TQLineEdit *PropertyDoubleItem::lined() lin = new TQLineEdit( listview->viewport() ); lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) ); - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); lin->installEventFilter( listview ); return lin; } @@ -865,8 +865,8 @@ TQDateEdit *PropertyDateItem::lined() for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; - connect( lin, TQT_SIGNAL( valueChanged( const TQDate & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDate & ) ), + this, TQ_SLOT( setValue() ) ); return lin; } @@ -936,8 +936,8 @@ TQTimeEdit *PropertyTimeItem::lined() if ( lin ) return lin; lin = new TQTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -1011,8 +1011,8 @@ TQDateTimeEdit *PropertyDateTimeItem::lined() if ( lin ) return lin; lin = new TQDateTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDateTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -1089,8 +1089,8 @@ TQComboBox *PropertyBoolItem::combo() comb->hide(); comb->insertItem( i18n( "False" ) ); comb->insertItem( i18n( "True" ) ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -1186,8 +1186,8 @@ TQSpinBox *PropertyIntItem::spinBox() if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1282,8 +1282,8 @@ TQSpinBox* PropertyLayoutItem::spinBox() if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1347,8 +1347,8 @@ TQComboBox *PropertyListItem::combo() return comb; comb = new TQComboBox( editable, listview->viewport() ); comb->hide(); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); if ( editable ) { TQObjectList *ol = comb->queryList( "TQLineEdit" ); @@ -1644,8 +1644,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr box->setLineWidth( 2 ); pixPrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPixmap() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPixmap() ) ); } PropertyPixmapItem::~PropertyPixmapItem() @@ -1747,8 +1747,8 @@ PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, Prop pal.setDisabled( cg ); colorPrev->setPalette( pal ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getColor() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getColor() ) ); } void PropertyColorItem::createChildren() @@ -1869,8 +1869,8 @@ PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, Proper box->installEventFilter( listview ); lined->installEventFilter( listview ); button->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getFont() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getFont() ) ); } void PropertyFontItem::createChildren() @@ -2269,8 +2269,8 @@ PropertyPaletteItem::PropertyPaletteItem( PropertyList *l, PropertyItem *after, box->setLineWidth( 2 ); palettePrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPalette() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPalette() ) ); } PropertyPaletteItem::~PropertyPaletteItem() { @@ -2391,8 +2391,8 @@ TQComboBox *PropertyCursorItem::combo() comb->insertItem( HandPix, i18n("Pointing Hand"), TQObject::PointingHandCursor ); comb->insertItem( NoPix, i18n("Forbidden"), TQObject::ForbiddenCursor ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -2459,8 +2459,8 @@ PropertyKeysequenceItem::PropertyKeysequenceItem( PropertyList *l, box = new TQHBox( listview->viewport() ); box->hide(); sequence = new TQLineEdit( box ); - connect( sequence, TQT_SIGNAL(textChanged( const TQString & )), - this, TQT_SLOT(setValue()) ); + connect( sequence, TQ_SIGNAL(textChanged( const TQString & )), + this, TQ_SLOT(setValue()) ); sequence->installEventFilter( this ); } @@ -2654,8 +2654,8 @@ EnumBox::EnumBox( TQWidget *parent, const char *name ) : TQComboBox( parent, name ) { pop = new EnumPopup( this, "popup", TQObject::WType_Popup ); - connect( pop, TQT_SIGNAL( hidden() ), this, TQT_SLOT( popupHidden() ) ); - connect( pop, TQT_SIGNAL( closed() ), this, TQT_SLOT( popupClosed() ) ); + connect( pop, TQ_SIGNAL( hidden() ), this, TQ_SLOT( popupHidden() ) ); + connect( pop, TQ_SIGNAL( closed() ), this, TQ_SLOT( popupClosed() ) ); popupShown = FALSE; arrowDown = FALSE; } @@ -2750,14 +2750,14 @@ void EnumBox::mousePressEvent( TQMouseEvent *e ) } popup(); - TQTimer::singleShot( 100, this, TQT_SLOT( restoreArrow() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( restoreArrow() ) ); } void EnumBox::keyPressEvent( TQKeyEvent *e ) { if ( e->key() == Key_Space ) { popup(); - TQTimer::singleShot( 100, this, TQT_SLOT( restoreArrow() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( restoreArrow() ) ); } else if ( e->key() == Key_Enter || e->key() == Key_Return ) { popup(); } @@ -2786,8 +2786,8 @@ PropertyEnumItem::PropertyEnumItem( PropertyList *l, box = new EnumBox( listview->viewport() ); box->hide(); box->installEventFilter( listview ); - connect( box, TQT_SIGNAL( aboutToShowPopup() ), this, TQT_SLOT( insertEnums() ) ); - connect( box, TQT_SIGNAL( valueChanged() ), this, TQT_SLOT( setValue() ) ); + connect( box, TQ_SIGNAL( aboutToShowPopup() ), this, TQ_SLOT( insertEnums() ) ); + connect( box, TQ_SIGNAL( valueChanged() ), this, TQ_SLOT( setValue() ) ); } PropertyEnumItem::~PropertyEnumItem() @@ -2917,16 +2917,16 @@ PropertyList::PropertyList( PropertyEditor *e ) viewport()->installEventFilter( this ); addColumn( i18n( "Property" ) ); addColumn( i18n( "Value" ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( updateEditorSize() ) ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); - connect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( toggleSort() ) ); - connect( this, TQT_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( toggleOpen( TQListViewItem * ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( updateEditorSize() ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); + connect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( toggleSort() ) ); + connect( this, TQ_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( toggleOpen( TQListViewItem * ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); @@ -3566,7 +3566,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) return TRUE; } } else if ( e->type() == TQEvent::FocusOut && ::tqt_cast<TQLineEdit*>(o) && editor->formWindow() ) { - TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) ); + TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQ_SLOT( checkCompressedCommand() ) ); } else if ( o == viewport() ) { TQMouseEvent *me; PropertyListItem* i; @@ -3918,8 +3918,8 @@ EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) header()->hide(); removeColumn( 1 ); setRootIsDecorated( TRUE ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, TQT_SLOT( renamed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); } TQString clean_arguments( const TQString &s ) diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp index 4c773351..87a40ecf 100644 --- a/kdevdesigner/designer/qcompletionedit.cpp +++ b/kdevdesigner/designer/qcompletionedit.cpp @@ -45,8 +45,8 @@ QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name ) listbox->setHScrollBarMode( TQScrollView::AlwaysOn ); listbox->setVScrollBarMode( TQScrollView::AlwaysOn ); listbox->setCornerWidget( new TQSizeGrip( listbox, "completion sizegrip" ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( textDidChange( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( textDidChange( const TQString & ) ) ); popup->setFocusProxy( listbox ); installEventFilter( this ); } diff --git a/kdevdesigner/designer/sourceeditor.cpp b/kdevdesigner/designer/sourceeditor.cpp index bcdca52e..82ebc991 100644 --- a/kdevdesigner/designer/sourceeditor.cpp +++ b/kdevdesigner/designer/sourceeditor.cpp @@ -47,7 +47,7 @@ SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageIn lIface->addRef(); editor = iFace->editor( MainWindow::self->areEditorsReadOnly(), this, MainWindow::self->designerInterface() ); - iFace->onBreakPointChange( MainWindow::self, TQT_SLOT( breakPointsChanged() ) ); + iFace->onBreakPointChange( MainWindow::self, TQ_SLOT( breakPointsChanged() ) ); resize( 600, 400 ); setIcon( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) ); } diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp index 1b21432f..d5d10d84 100644 --- a/kdevdesigner/designer/startdialogimpl.cpp +++ b/kdevdesigner/designer/startdialogimpl.cpp @@ -45,13 +45,13 @@ StartDialog::StartDialog( TQWidget *parent, const TQString &templatePath ) initFileOpen(); showInFuture = TRUE; - connect( buttonHelp, TQT_SIGNAL( clicked() ), - MainWindow::self, TQT_SLOT( showDialogHelp() ) ); - connect( recentView, TQT_SIGNAL( doubleClicked(TQIconViewItem*) ), - this, TQT_SLOT( accept() ) ); - connect( recentView, TQT_SIGNAL( returnPressed(TQIconViewItem*) ), - this, TQT_SLOT( accept() ) ); - connect( fd, TQT_SIGNAL( fileSelected() ), this, TQT_SLOT( accept() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), + MainWindow::self, TQ_SLOT( showDialogHelp() ) ); + connect( recentView, TQ_SIGNAL( doubleClicked(TQIconViewItem*) ), + this, TQ_SLOT( accept() ) ); + connect( recentView, TQ_SIGNAL( returnPressed(TQIconViewItem*) ), + this, TQ_SLOT( accept() ) ); + connect( fd, TQ_SIGNAL( fileSelected() ), this, TQ_SLOT( accept() ) ); } void StartDialog::accept() diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp index 798e0a09..8ea02a98 100644 --- a/kdevdesigner/designer/styledbutton.cpp +++ b/kdevdesigner/designer/styledbutton.cpp @@ -44,7 +44,7 @@ StyledButton::StyledButton(TQWidget* parent, const char* name) setMinimumSize( minimumSizeHint() ); setAcceptDrops( TRUE ); - connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor())); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(onEditor())); setEditor( ColorEditor ); } diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp index 3d0fa9e3..19fe6e48 100644 --- a/kdevdesigner/designer/tableeditorimpl.cpp +++ b/kdevdesigner/designer/tableeditorimpl.cpp @@ -53,7 +53,7 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f #endif formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); #ifndef TQT_NO_TABLE labelColumnPixmap->setText( "" ); labelRowPixmap->setText( "" ); diff --git a/kdevdesigner/designer/timestamp.cpp b/kdevdesigner/designer/timestamp.cpp index 553d9e3f..79a51e67 100644 --- a/kdevdesigner/designer/timestamp.cpp +++ b/kdevdesigner/designer/timestamp.cpp @@ -34,7 +34,7 @@ TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) : TQObject( parent ), filename( f ), autoCheck( FALSE ) { timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoCheckTimeStamp() ) ); update(); } diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp index 8d800061..7db821df 100644 --- a/kdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -301,8 +301,8 @@ QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *parent, const char *name ) next->setAutoRaise( TRUE ); next->setAutoRepeat( TRUE ); next->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); - connect( prev, TQT_SIGNAL( clicked() ), this, TQT_SLOT( prevPage() ) ); - connect( next, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPage() ) ); + connect( prev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( prevPage() ) ); + connect( next, TQ_SIGNAL( clicked() ), this, TQ_SLOT( nextPage() ) ); updateButtons(); } @@ -864,7 +864,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" ); MetaDataBase::addEntry( dw ); wiz->addPage( dw, i18n( "Page" ) ); - TQTimer::singleShot( 0, wiz, TQT_SLOT( next() ) ); + TQTimer::singleShot( 0, wiz, TQ_SLOT( next() ) ); } return wiz; } else if ( className == "Spacer" ) { diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp index c4c4f83d..1342c3ac 100644 --- a/kdevdesigner/designer/wizardeditorimpl.cpp +++ b/kdevdesigner/designer/wizardeditorimpl.cpp @@ -41,19 +41,19 @@ WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); fillListBox(); // Add drag and drop ListBoxDnd *listBoxDnd = new ListBoxDnd( listBox ); listBoxDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( listBoxDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), - listBoxDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + listBoxDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); - TQObject::connect( listBoxDnd, TQT_SIGNAL( dragged( TQListBoxItem * ) ), - this, TQT_SLOT( itemDragged( TQListBoxItem * ) ) ); - TQObject::connect( listBoxDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), - this, TQT_SLOT( itemDropped( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dragged( TQListBoxItem * ) ), + this, TQ_SLOT( itemDragged( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + this, TQ_SLOT( itemDropped( TQListBoxItem * ) ) ); // Add in-place rename new ListBoxRename( listBox ); diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp index 17bc3153..4cd0c26f 100644 --- a/kdevdesigner/designer/workspace.cpp +++ b/kdevdesigner/designer/workspace.cpp @@ -80,8 +80,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ) project = p; t = ObjectType; setPixmap( 0, SmallIcon( "designer_object.png" , KDevDesignerPartFactory::instance()) ); - TQObject::connect( p->fakeFormFileFor( o ), TQT_SIGNAL( somethingChanged(FormFile*) ), - listView(), TQT_SLOT( update() ) ); + TQObject::connect( p->fakeFormFileFor( o ), TQ_SIGNAL( somethingChanged(FormFile*) ), + listView(), TQ_SLOT( update() ) ); } WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) @@ -92,7 +92,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()) ); - TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); if ( formFile->supportsCodeFile() ) { (void) new WorkspaceItem( this, formFile, FormSourceType ); } @@ -292,12 +292,12 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw ) #endif addColumn( i18n( "Files" ) ); setAllColumnsShowFocus( TRUE ); - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); viewport()->setAcceptDrops( TRUE ); @@ -319,23 +319,23 @@ void Workspace::setCurrentProject( Project *pro ) if ( project == pro ) return; if ( project ) { - disconnect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( objectAdded(TQObject*) ), this, TQT_SLOT( objectAdded(TQObject*) ) ); - disconnect( project, TQT_SIGNAL( objectRemoved(TQObject*) ), this, TQT_SLOT( objectRemoved(TQObject*) ) ); - disconnect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + disconnect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( objectAdded(TQObject*) ), this, TQ_SLOT( objectAdded(TQObject*) ) ); + disconnect( project, TQ_SIGNAL( objectRemoved(TQObject*) ), this, TQ_SLOT( objectRemoved(TQObject*) ) ); + disconnect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); } project = pro; - connect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - connect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - connect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - connect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - connect( project, TQT_SIGNAL( destroyed(TQObject*) ), this, TQT_SLOT( projectDestroyed(TQObject*) ) ); - connect( project, TQT_SIGNAL( objectAdded(TQObject*) ), this, TQT_SLOT( objectAdded(TQObject*) ) ); - connect( project, TQT_SIGNAL( objectRemoved(TQObject*) ), this, TQT_SLOT( objectRemoved(TQObject*) ) ); - connect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + connect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + connect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + connect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + connect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + connect( project, TQ_SIGNAL( destroyed(TQObject*) ), this, TQ_SLOT( projectDestroyed(TQObject*) ) ); + connect( project, TQ_SIGNAL( objectAdded(TQObject*) ), this, TQ_SLOT( objectAdded(TQObject*) ) ); + connect( project, TQ_SIGNAL( objectRemoved(TQObject*) ), this, TQ_SLOT( objectRemoved(TQObject*) ) ); + connect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); clear(); if ( bufferEdit ) @@ -656,8 +656,8 @@ bool Workspace::eventFilter( TQObject *o, TQEvent * e ) void Workspace::setBufferEdit( QCompletionEdit *edit ) { bufferEdit = edit; - connect( bufferEdit, TQT_SIGNAL( chosen( const TQString & ) ), - this, TQT_SLOT( bufferChosen( const TQString & ) ) ); + connect( bufferEdit, TQ_SIGNAL( chosen( const TQString & ) ), + this, TQ_SLOT( bufferChosen( const TQString & ) ) ); bufferEdit->installEventFilter( this ); } diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp index bc83e670..6ff96718 100644 --- a/kdevdesigner/src/kdevdesigner.cpp +++ b/kdevdesigner/src/kdevdesigner.cpp @@ -99,16 +99,16 @@ void KDevDesigner::load(const KURL& url) void KDevDesigner::setupActions() { -/* KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());*/ +/* KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());*/ - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void KDevDesigner::saveProperties(TDEConfig* /*config*/) @@ -174,8 +174,8 @@ void KDevDesigner::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index 1ca3abfd..ab1eac5e 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 ())); } diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index 12090860..66966f33 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -92,19 +92,19 @@ ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* parent, const 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 ); @@ -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..25ef4197 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -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())); } @@ -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/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/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index 774efe8e..d801904f 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -49,10 +49,10 @@ setupGUI(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -88,19 +88,19 @@ void %{APPNAME}::load(const KURL& url) void %{APPNAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0, - this, TQT_SLOT(optionsPreferences()), + this, TQ_SLOT(optionsPreferences()), actionCollection(), "custom_action"); } diff --git a/languages/cpp/app_templates/kapp/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..351fca4e 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -55,7 +55,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("Insert Hello World"), 0, this, - TQT_SLOT( slotInsertHello() ), view->actionCollection(), + TQ_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); view->setInstance (new TDEInstance("kate")); diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 8845fae3..19b31c71 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -59,7 +59,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("Insert Hello World"), 0, this, - TQT_SLOT( slotInsertHello() ), view->actionCollection(), + TQ_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); view->setInstance (new TDEInstance("kate")); @@ -94,7 +94,7 @@ Kate::PluginConfigPage* KatePlugin%{APPNAME}::configPage (uint, TQWidget *w, con { %{APPNAME}ConfigPage* p = new %{APPNAME}ConfigPage(this, w); initConfigPage( p ); - connect( p, TQT_SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, TQT_SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) ); + connect( p, TQ_SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, TQ_SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) ); return (Kate::PluginConfigPage*)p; } @@ -124,7 +124,7 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p ) lo->addWidget(lab); - // TODO: add connection to emit TQT_SLOT( changed() ) + // TODO: add connection to emit TQ_SLOT( changed() ) } %{APPNAME}ConfigPage::~%{APPNAME}ConfigPage() diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 69dcd7d8..c96ffbf1 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -28,17 +28,17 @@ static const KDevPluginInfo data("kdev%{APPNAMELC}"); setXMLFile("kdevlang_%{APPNAMELC}.rc"); - m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQ_SLOT(slotRun()),actionCollection(), "build_execute" ); kdDebug() << "Creating %{APPNAMELC} Part" << endl; - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) ); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), this, TQ_SLOT(savedFile(const KURL&)) ); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part *))); } @@ -74,14 +74,14 @@ void %{APPNAME}Part::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(parse())); + TQTimer::singleShot(0, this, TQ_SLOT(parse())); } void %{APPNAME}Part::projectClosed() { diff --git a/languages/cpp/app_templates/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/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index 601413ef..2cf5ff06 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -18,9 +18,9 @@ { setInstance( %{APPNAME}Factory::global() ); setXMLFile( "%{APPNAMELC}.rc" ); - KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" ); + KStdAction::cut(this, TQ_SLOT( cut() ), actionCollection(), "cut" ); // Note: Prefer KStdAction::* to any custom action if possible. - //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQT_SLOT( cut() ), + //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQ_SLOT( cut() ), // actionCollection(), "cut"); } diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 759cbf5a..f963714e 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -76,16 +76,16 @@ void %{APPNAME}::load(const KURL& url) void %{APPNAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void %{APPNAME}::saveProperties(TDEConfig* /*config*/) @@ -159,8 +159,8 @@ void %{APPNAME}::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index adf210b3..f4f866b1 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -26,9 +26,9 @@ setWidget(m_widget); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("%{APPNAMELC}_part.rc"); @@ -49,12 +49,12 @@ void %{APPNAME}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + connect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); else { - disconnect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + disconnect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index c395d983..ecda7fb0 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -14,7 +14,7 @@ Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. (void) new TDEAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0, - this, TQT_SLOT(slotAction()), + this, TQ_SLOT(slotAction()), actionCollection(), "plugin_action" ); } diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index 00e1adea..44a90d53 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -48,10 +48,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); showTipOnStart(); } @@ -62,22 +62,22 @@ void %{APPNAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() + KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, - m_view, TQT_SLOT(switchColors()), + m_view, TQ_SLOT(switchColors()), actionCollection(), "switch_action"); createGUI(); @@ -140,7 +140,7 @@ void %{APPNAME}::optionsPreferences() // to the names of the variables in the .kcfg file TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp index cde31592..daa8b078 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp @@ -31,9 +31,9 @@ K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); setWidget(m_widget); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("%{APPNAMELC}_part.rc"); @@ -63,12 +63,12 @@ void %{APPNAMELC}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + connect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); else { - disconnect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + disconnect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); diff --git a/languages/cpp/app_templates/kscons_tdemdi/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..e9edb6d5 100644 --- a/languages/cpp/app_templates/kxt/app.cpp +++ b/languages/cpp/app_templates/kxt/app.cpp @@ -47,10 +47,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -60,19 +60,19 @@ void %{APPNAMELC}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAMELC}View TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, - m_view, TQT_SLOT(switchColors()), + m_view, TQ_SLOT(switchColors()), actionCollection(), "switch_action"); createGUI(); @@ -135,7 +135,7 @@ void %{APPNAMELC}::optionsPreferences() // to the names of the variables in the .kcfg file TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/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..8ce81310 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp @@ -37,17 +37,17 @@ openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen = new TQToolButton( openIcon, tr("Open File"), TQString(), - this, TQT_SLOT(choose()), fileTools, "open file" ); + this, TQ_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave = new TQToolButton( saveIcon, tr("Save File"), TQString(), - this, TQT_SLOT(save()), fileTools, "save file" ); + this, TQ_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint = new TQToolButton( printIcon, tr("Print File"), TQString(), - this, TQT_SLOT(print()), fileTools, "print file" ); + this, TQ_SLOT(print()), fileTools, "print file" ); (void)TQWhatsThis::whatsThisButton( fileTools ); @@ -79,41 +79,41 @@ menuBar()->insertItem( tr("&File"), file ); - file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( tr("&New"), this, TQ_SLOT(newDoc()), CTRL+Key_N ); int id; id = file->insertItem( openIcon, tr("&Open..."), - this, TQT_SLOT(choose()), CTRL+Key_O ); + this, TQ_SLOT(choose()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, tr("&Save"), - this, TQT_SLOT(save()), CTRL+Key_S ); + this, TQ_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) ); + id = file->insertItem( tr("Save &As..."), this, TQ_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); file->insertSeparator(); id = file->insertItem( printIcon, tr("&Print..."), - this, TQT_SLOT(print()), CTRL+Key_P ); + this, TQ_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); file->insertSeparator(); - file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); + file->insertItem( tr("&Close"), this, TQ_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( tr("&Help"), help ); - help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); - help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) ); + help->insertItem( tr("&About"), this, TQ_SLOT(about()), Key_F1 ); + help->insertItem( tr("About &TQt"), this, TQ_SLOT(aboutTQt()) ); help->insertSeparator(); - help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); + help->insertItem( tr("What's &This"), this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 ); e = new TQTextEdit( this, "editor" ); e->setFocus(); diff --git a/languages/cpp/app_templates/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..ce638d20 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.cpp +++ b/languages/cpp/app_templates/tdeconfig35/app.cpp @@ -34,10 +34,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -47,14 +47,14 @@ void %{APPNAMELC}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, - m_view, TQT_SLOT(switchColors()), + m_view, TQ_SLOT(switchColors()), actionCollection(), "switch_action"); setupGUI(); @@ -75,7 +75,7 @@ void %{APPNAMELC}::optionsPreferences() // to the names of the variables in the .kcfg file TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp index 0d2bf1ff..168cd8c4 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp @@ -38,10 +38,10 @@ extern "C" { /// @todo //Connect your signals and slots here to configure the screen saver. - connect( OkayPushButton, TQT_SIGNAL( released() ), - TQT_SLOT( slotOkPressed() ) ); - connect( CancelPushButton, TQT_SIGNAL( released() ), - TQT_SLOT( slotCancelPressed() ) ); + connect( OkayPushButton, TQ_SIGNAL( released() ), + TQ_SLOT( slotOkPressed() ) ); + connect( CancelPushButton, TQ_SIGNAL( released() ), + TQ_SLOT( slotCancelPressed() ) ); } diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 9067d1e9..abd282f4 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -64,15 +64,15 @@ CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const ch : CCConfigWidgetBase( parent, name ) { m_pPart = part; - connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogRegistered( Catalog* ) ), - this, TQT_SLOT( catalogRegistered( Catalog* ) ) ); - connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogUnregistered( Catalog* ) ), - this, TQT_SLOT( catalogUnregistered( Catalog* ) ) ); + connect( m_pPart->codeRepository(), TQ_SIGNAL( catalogRegistered( Catalog* ) ), + this, TQ_SLOT( catalogRegistered( Catalog* ) ) ); + connect( m_pPart->codeRepository(), TQ_SIGNAL( catalogUnregistered( Catalog* ) ), + this, TQ_SLOT( catalogUnregistered( Catalog* ) ) ); - connect( m_qtDir, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SLOT(isValidTQtDir(const TQString &))); - connect( m_qtDir, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(isValidTQtDir(const TQString &))); + connect( m_qtDir, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SLOT(isValidTQtDir(const TQString &))); + connect( m_qtDir, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(isValidTQtDir(const TQString &))); initGeneralTab( ); initTQtTab(); @@ -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/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index a62087ac..7f97ba1e 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -358,7 +358,7 @@ struct PopupFillerHelpStruct { memType = "enum"; TQString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQ_SLOT( popupAction( int ) ) ); receiver->m_popupActions.insert( id, d.decl ); } @@ -448,12 +448,12 @@ struct PopupFillerHelpStruct { } } - int id = parent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt1, receiver, TQ_SLOT( popupAction( int ) ) ); if ( d.resolved() ) receiver->m_popupActions.insert( id, d.resolved() ->getDeclarationInfo() ); if ( !txt2.isEmpty() ) { - int id2 = parent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) ); + int id2 = parent->insertItem( txt2, receiver, TQ_SLOT( popupDefinitionAction( int ) ) ); if ( d.resolved() ) receiver->m_popupDefinitionActions.insert( id2, d.resolved() ->getDeclarationInfo() ); } @@ -538,7 +538,7 @@ struct PopupClassViewFillerHelpStruct { memType = "enum"; TQString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQ_SLOT( popupClassViewAction( int ) ) ); receiver->m_popupClassViewActions.insert( id, dom ); } @@ -597,7 +597,7 @@ struct PopupClassViewFillerHelpStruct { } } - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQ_SLOT( popupClassViewAction( int ) ) ); if ( dom ) receiver->m_popupClassViewActions.insert( id, dom ); @@ -645,7 +645,7 @@ class PopupFiller { //kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl; } - int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQ_SLOT( popupAction( int ) ) ); DeclarationInfo fakeDec; fakeDec.name = decl.name; fakeDec.file = includeFile; @@ -671,7 +671,7 @@ class PopupFiller { f.type = d.desc(); f.memberType = SimpleTypeImpl::MemberInfo::Variable; - /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); + /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQ_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable );*/ struk.insertItem( parent, f, prefix ); @@ -683,7 +683,7 @@ class PopupFiller { parent->insertItem( i18n( "Comment on %1" ).arg( sourceVariable.name ), m ); TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } parent->insertSeparator(); } @@ -764,7 +764,7 @@ class PopupFiller { mo->insertItem( i18n( "Comment" ), m ); TQStringList ls = prepareTextForMenu( ( *it ).first.decl.comment, 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } } @@ -796,7 +796,7 @@ class PopupFiller { parent->insertItem( i18n( "Comment on %1" ).arg( cleanForMenu( d->name() ) ), m ); TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } } } @@ -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 ); }*/ @@ -2500,8 +2500,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; @@ -2705,8 +2705,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; 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/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index bd35d649..01b34a43 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -201,10 +201,10 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri m_pCompletionConfig = new CppCodeCompletionConfig( this, projectDom() ); m_pSplitHeaderSourceConfig = new CppSplitHeaderSourceConfig( this, projectDom() ); - m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this ); connect( m_pSplitHeaderSourceConfig, TQT_SIGNAL( stored() ), - this, TQT_SLOT( splitHeaderSourceConfigStored() ) ); - connect( m_pCompletionConfig, TQT_SIGNAL( stored() ), - this, TQT_SLOT( codeCompletionConfigStored() ) ); + m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this ); connect( m_pSplitHeaderSourceConfig, TQ_SIGNAL( stored() ), + this, TQ_SLOT( splitHeaderSourceConfigStored() ) ); + connect( m_pCompletionConfig, TQ_SIGNAL( stored() ), + this, TQ_SLOT( codeCompletionConfigStored() ) ); m_qtBuildConfig = new QtBuildConfig( this, projectDom() ); m_qtBuildConfig->store(); @@ -215,44 +215,44 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri m_problemReporter = 0; m_textChangedTimer = new TQTimer( this ); - connect( m_textChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseCurrentFile()) ); + connect( m_textChangedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseCurrentFile()) ); m_cursorMovedTimer = new TQTimer( this ); - connect( m_cursorMovedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCursorPositionChanged()) ); + connect( m_cursorMovedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCursorPositionChanged()) ); // m_deleteParserStoreTimer = new TQTimer( this ); m_saveMemoryTimer = new TQTimer( this ); m_buildSafeFileSetTimer = new TQTimer( this ); // m_functionHintTimer = new TQTimer( this ); - connect( m_buildSafeFileSetTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(buildSafeFileSet()) ); - connect( m_saveMemoryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveMemory()) ); -// connect( m_deleteParserStoreTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDeleteParserStore()) ); + connect( m_buildSafeFileSetTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(buildSafeFileSet()) ); + connect( m_saveMemoryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSaveMemory()) ); +// connect( m_deleteParserStoreTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDeleteParserStore()) ); resetParserStoreTimer(); m_saveMemoryTimer->start( 240000, false ); //Free some memory every 4 minutes - // connect( m_functionHintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFunctionHint()) ); + // connect( m_functionHintTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFunctionHint()) ); setXMLFile( "kdevcppsupport.rc" ); m_catalogList.setAutoDelete( true ); - connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( projectOpened() ) ); - connect( core(), TQT_SIGNAL( projectClosed() ), this, TQT_SLOT( projectClosed() ) ); - connect( core(), TQT_SIGNAL( languageChanged() ), this, TQT_SLOT( projectOpened() ) ); - connect( partController(), TQT_SIGNAL( savedFile( const KURL& ) ), - this, TQT_SLOT( savedFile( const KURL& ) ) ); - connect( core(), TQT_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), - this, TQT_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); - connect( partController(), TQT_SIGNAL( activePartChanged( KParts::Part* ) ), - this, TQT_SLOT( activePartChanged( KParts::Part* ) ) ); - connect( partController(), TQT_SIGNAL( partRemoved( KParts::Part* ) ), - this, TQT_SLOT( partRemoved( KParts::Part* ) ) ); - - connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), - this, TQT_SLOT( configWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( projectOpened() ) ); + connect( core(), TQ_SIGNAL( projectClosed() ), this, TQ_SLOT( projectClosed() ) ); + connect( core(), TQ_SIGNAL( languageChanged() ), this, TQ_SLOT( projectOpened() ) ); + connect( partController(), TQ_SIGNAL( savedFile( const KURL& ) ), + this, TQ_SLOT( savedFile( const KURL& ) ) ); + connect( core(), TQ_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), + this, TQ_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); + connect( partController(), TQ_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQ_SLOT( activePartChanged( KParts::Part* ) ) ); + connect( partController(), TQ_SIGNAL( partRemoved( KParts::Part* ) ), + this, TQ_SLOT( partRemoved( KParts::Part* ) ) ); + + connect( core(), TQ_SIGNAL( configWidget( KDialogBase* ) ), + this, TQ_SLOT( configWidget( KDialogBase* ) ) ); m_switchHeaderSourceAction = new TDEAction( i18n( "Switch Header/Implementation" ), SHIFT + Key_F12, - this, TQT_SLOT( slotSwitchHeader() ), + this, TQ_SLOT( slotSwitchHeader() ), actionCollection(), "edit_switchheader" ); m_switchHeaderSourceAction->setToolTip( i18n( "Switch between header and implementation files" ) ); m_switchHeaderSourceAction->setWhatsThis( i18n( "<b>Switch Header/Implementation</b><p>" @@ -265,7 +265,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri TDEAction *action; action = new TDEAction( i18n( "Complete Text" ), CTRL + Key_Space, - this, TQT_SLOT( slotCompleteText() ), + this, TQ_SLOT( slotCompleteText() ), actionCollection(), "edit_complete_text" ); action->setToolTip( i18n( "Complete current expression" ) ); action->setWhatsThis( i18n( "<b>Complete Text</p><p>Completes current expression using " @@ -274,11 +274,11 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action->setEnabled( false ); m_createGetterSetterAction = new TDEAction( i18n( "Create Accessor Methods" ), 0, - this, TQT_SLOT( slotCreateAccessMethods() ), actionCollection(), + this, TQ_SLOT( slotCreateAccessMethods() ), actionCollection(), "edit_create_getter_setter" ); action = new TDEAction( i18n( "Make Member" ), 0, Key_F2, - this, TQT_SLOT( slotMakeMember() ), + this, TQ_SLOT( slotMakeMember() ), actionCollection(), "edit_make_member" ); action->setToolTip( i18n( "Make member" ) ); action->setWhatsThis( i18n( "<b>Make member</b><p>Creates a class member function in implementation file " @@ -286,7 +286,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action->plug( &m_DummyActionWidget ); action = new TDEAction( i18n( "Navigation Menu" ), 0, CTRL + ALT + Key_Space, - this, TQT_SLOT( slotNavigate() ), + this, TQ_SLOT( slotNavigate() ), actionCollection(), "edit_navigate" ); action->setToolTip( i18n( "Show the navigation-menu" ) ); action->setWhatsThis( i18n( "<b>Navigate</b><p>Shows a navigation-menu based on the type-evaluation of the item under the cursor." ) ); @@ -294,7 +294,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action = new TDEAction( i18n( "New Class..." ), "classnew", 0, - this, TQT_SLOT( slotNewClass() ), + this, TQ_SLOT( slotNewClass() ), actionCollection(), "project_newclass" ); action->setToolTip( i18n( "Generate a new class" ) ); action->setWhatsThis( i18n( "<b>New Class</b><p>Calls the <b>New Class</b> wizard." ) ); @@ -306,8 +306,8 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri withcpp = true; // daniel - connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); new KDevCppSupportIface( this ); //(void) dcopClient(); @@ -438,7 +438,7 @@ void CppSupportPart::projectConfigWidget( KDialogBase* dlg ) vbox = dlg->addVBoxPage( i18n( "C++ Support" ), i18n( "C++ Support" ), BarIcon( info() ->icon(), TDEIcon::SizeMedium ) ); CCConfigWidget* w = new CCConfigWidget( this, vbox ); - connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) ); + connect( dlg, TQ_SIGNAL( okClicked( ) ), w, TQ_SLOT( accept( ) ) ); } void CppSupportPart::configWidget( KDialogBase *dlg ) @@ -446,13 +446,13 @@ void CppSupportPart::configWidget( KDialogBase *dlg ) TQVBox * vbox = dlg->addVBoxPage( i18n( "C++ Class Generator" ), i18n( "C++ Class Generator" ), BarIcon( info() ->icon(), TDEIcon::SizeMedium ) ); ClassGeneratorConfig *w = new ClassGeneratorConfig( vbox, "classgenerator config widget" ); - connect( dlg, TQT_SIGNAL( okClicked() ), w, TQT_SLOT( storeConfig() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w, TQ_SLOT( storeConfig() ) ); vbox = dlg->addVBoxPage(i18n("C++ Parsing"), i18n("C++ Parsing"), BarIcon( "text-x-c++src", TDEIcon::SizeMedium) ); ConfigureProblemReporter* ww = new ConfigureProblemReporter( vbox ); ww->setPart( this ); - connect(dlg, TQT_SIGNAL(okClicked()), ww, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), ww, TQ_SLOT(accept())); } void CppSupportPart::activePartChanged( KParts::Part *part ) @@ -465,11 +465,11 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( m_activeView ) { - disconnect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, 0 ); + disconnect( m_activeView, TQ_SIGNAL( cursorPositionChanged() ), this, 0 ); } if ( m_activeDocument ) { - disconnect( m_activeDocument, TQT_SIGNAL(textChanged()), this, 0 ); + disconnect( m_activeDocument, TQ_SIGNAL(textChanged()), this, 0 ); } m_isTyping = false; @@ -500,14 +500,14 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( m_activeDocument ) { - connect( m_activeDocument, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_activeDocument, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_textChangedTimer->start( 250, true ); // kick the parse timer, we might want to parse the current file } if ( m_activeViewCursor ) { - connect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, TQT_SLOT(slotCursorMoved()) ); -// this, TQT_SLOT( slotCursorPositionChanged() ) ); + connect( m_activeView, TQ_SIGNAL( cursorPositionChanged() ), this, TQ_SLOT(slotCursorMoved()) ); +// this, TQ_SLOT( slotCursorPositionChanged() ) ); } @@ -516,8 +516,8 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( !textHintIface ) return ; - connect( view, TQT_SIGNAL( needTextHint( int, int, TQString& ) ), - this, TQT_SLOT( slotNeedTextHint( int, int, TQString& ) ) ); + connect( view, TQ_SIGNAL( needTextHint( int, int, TQString& ) ), + this, TQ_SLOT( slotNeedTextHint( int, int, TQString& ) ) ); textHintIface->enableTextHints( 1000 ); #endif @@ -551,17 +551,17 @@ void CppSupportPart::projectOpened( ) embedProblemReporter(); - connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), - m_problemReporter, TQT_SLOT( configWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL( configWidget( KDialogBase* ) ), + m_problemReporter, TQ_SLOT( configWidget( KDialogBase* ) ) ); - connect( project( ), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), - this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), - this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), - this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); - connect( project(), TQT_SIGNAL( projectCompiled() ), - this, TQT_SLOT( slotProjectCompiled() ) ); + connect( project( ), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQ_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQ_SLOT( removedFilesFromProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQ_SLOT( changedFilesInProject( const TQStringList & ) ) ); + connect( project(), TQ_SIGNAL( projectCompiled() ), + this, TQ_SLOT( slotProjectCompiled() ) ); m_timestamp.clear(); m_parseEmitWaiting.clear(); @@ -573,7 +573,7 @@ void CppSupportPart::projectOpened( ) m_buildSafeFileSetTimer->start( 500, true ); updateParserConfiguration(); //Necessary to respect custom include-paths and such - TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( initialParse( ) ) ); } void CppSupportPart::embedProblemReporter( bool force ) @@ -687,7 +687,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) MakeMemberHelper( text, atline, atcol ); if ( !text.isEmpty() ) { - id = popup->insertItem( i18n( "Make Member" ), this, TQT_SLOT( slotMakeMember() ) ); + id = popup->insertItem( i18n( "Make Member" ), this, TQ_SLOT( slotMakeMember() ) ); popup->setWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file " "based on the member declaration at the current line." ) ); } @@ -754,7 +754,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) } text += formatModelItem( *it, true ); text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); - int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) ); + int id = m2->insertItem( text, this, TQ_SLOT( gotoDeclarationLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); m2->setItemParameter( id, line ); @@ -795,7 +795,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) } text += formatModelItem( *it, true ); text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); - int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) ); + int id = m->insertItem( text, this, TQ_SLOT( gotoLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); m->setItemParameter( id, line ); @@ -821,7 +821,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) if ( mcontext->item() ->isClass() ) { m_activeClass = ( ClassModel* ) mcontext->item(); - int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQT_SLOT( slotExtractInterface() ) ); + int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQ_SLOT( slotExtractInterface() ) ); popup->setWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. " "No implementation code is extracted and no implementation code is created." ) ); } @@ -839,7 +839,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) if ( url.fileName().endsWith( ".ui" ) ) { m_contextFileName = url.path(); - int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) ); + int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQ_SLOT( slotCreateSubclass() ) ); popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) ); } } @@ -1526,7 +1526,7 @@ bool CppSupportPart::parseProject( bool force ) _jd->backgroundCount = 0; _jd->cycle = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); m_saveMemoryTimer->stop(); //Do not regularly remove cached files that may still be needed while parsing(the cache anyway be full for the whole parsing-process) return true; @@ -1583,7 +1583,7 @@ void CppSupportPart::slotParseFiles() } ++( _jd->it ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); if( _jd->it == _jd->files.end()) { if( _jd->reparseList.isEmpty() ) { @@ -1639,11 +1639,11 @@ void CppSupportPart::slotParseFiles() _jd->progressBar->setTotalSteps( _jd->backgroundCount ); if( _jd->lastParse.msecsTo( TQTime::currentTime()) > 60000 && !m_backgroundParser->filesInQueue()) { _jd->backgroundCount = _jd->backgroundState; ///Stop waiting if there is no progress and no file in the background-parser - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); } else { int timeStep = 0; if( alwaysParseInBackground ) { - TQTimer::singleShot( 10, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( slotParseFiles() ) ); } else { if( _jd->it == _jd->reparseList.end() ) { /*_jd->it = _jd->files.end(); @@ -1659,7 +1659,7 @@ void CppSupportPart::slotParseFiles() timeStep = 1; }*/ } - TQTimer::singleShot( timeStep, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( timeStep, this, TQ_SLOT( slotParseFiles() ) ); } } } @@ -3165,7 +3165,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/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index 39103db9..a87ed5b6 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -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/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index 63f6229b..f6791209 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -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 13d01768..f9143fc0 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -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; } @@ -272,7 +272,7 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, { 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..e2efd7b0 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -166,12 +166,12 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi mainWindow()->setViewAvailable(gdbOutputWidget, false); // gdbBreakpointWidget -> this - connect( gdbBreakpointWidget, TQT_SIGNAL(refreshBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( gdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( gdbBreakpointWidget, TQT_SIGNAL(gotoSourcePosition(const TQString&, int)), - this, TQT_SLOT(slotGotoSource(const TQString&, int)) ); + connect( gdbBreakpointWidget, TQ_SIGNAL(refreshBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( gdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( gdbBreakpointWidget, TQ_SIGNAL(gotoSourcePosition(const TQString&, int)), + this, TQ_SLOT(slotGotoSource(const TQString&, int)) ); viewerWidget = new ViewerWidget( controller, 0, "viewerWidget"); @@ -179,15 +179,15 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi i18n("Debug views"), i18n("Special debugger views")); mainWindow()->setViewAvailable(viewerWidget, false); - connect(viewerWidget, TQT_SIGNAL(setViewShown(bool)), - this, TQT_SLOT(slotShowView(bool))); + connect(viewerWidget, TQ_SIGNAL(setViewShown(bool)), + this, TQ_SLOT(slotShowView(bool))); // Now setup the actions TDEAction *action; // action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, action = new TDEAction(i18n("&Start"), "dbgrun", Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); action->setWhatsThis( i18n("<b>Start in debugger</b><p>" @@ -198,7 +198,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "about variables, frame stack, and so on.") ); action = new TDEAction(i18n("&Restart"), "dbgrestart", 0, - this, TQT_SLOT(slotRestart()), + this, TQ_SLOT(slotRestart()), actionCollection(), "debug_restart"); action->setToolTip( i18n("Restart program") ); action->setWhatsThis( i18n("<b>Restarts application</b><p>" @@ -208,33 +208,33 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Sto&p"), "process-stop", 0, - this, TQT_SLOT(slotStop()), + this, TQ_SLOT(slotStop()), actionCollection(), "debug_stop"); action->setToolTip( i18n("Stop debugger") ); action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger.")); action = new TDEAction(i18n("Interrupt"), "media-playback-pause", 0, - this, TQT_SLOT(slotPause()), + this, TQ_SLOT(slotPause()), actionCollection(), "debug_pause"); action->setToolTip( i18n("Interrupt application") ); action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current GDB command.")); action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0, - this, TQT_SLOT(slotRunToCursor()), + this, TQ_SLOT(slotRunToCursor()), actionCollection(), "debug_runtocursor"); action->setToolTip( i18n("Run to cursor") ); action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached.")); action = new TDEAction(i18n("Set E&xecution Position to Cursor"), "dbgjumpto", 0, - this, TQT_SLOT(slotJumpToCursor()), + this, TQ_SLOT(slotJumpToCursor()), actionCollection(), "debug_jumptocursor"); action->setToolTip( i18n("Jump to cursor") ); action->setWhatsThis(i18n("<b>Set Execution Position </b><p>Set the execution pointer to the current cursor position.")); action = new TDEAction(i18n("Step &Over"), "dbgnext", Key_F10, - this, TQT_SLOT(slotStepOver()), + this, TQ_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); action->setWhatsThis( i18n("<b>Step over</b><p>" @@ -245,14 +245,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Step over Ins&truction"), "dbgnextinst", 0, - this, TQT_SLOT(slotStepOverInstruction()), + this, TQ_SLOT(slotStepOverInstruction()), actionCollection(), "debug_stepoverinst"); action->setToolTip( i18n("Step over instruction") ); action->setWhatsThis(i18n("<b>Step over instruction</b><p>Steps over the next assembly instruction.")); action = new TDEAction(i18n("Step &Into"), "dbgstep", Key_F11, - this, TQT_SLOT(slotStepInto()), + this, TQ_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); action->setWhatsThis( i18n("<b>Step into</b><p>" @@ -262,14 +262,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Step into I&nstruction"), "dbgstepinst", 0, - this, TQT_SLOT(slotStepIntoInstruction()), + this, TQ_SLOT(slotStepIntoInstruction()), actionCollection(), "debug_stepintoinst"); action->setToolTip( i18n("Step into instruction") ); action->setWhatsThis(i18n("<b>Step into instruction</b><p>Steps into the next assembly instruction.")); action = new TDEAction(i18n("Step O&ut"), "dbgstepout", Key_F12, - this, TQT_SLOT(slotStepOut()), + this, TQ_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current function") ); action->setWhatsThis( i18n("<b>Step out</b><p>" @@ -281,7 +281,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Viewers"), "dbgmemview", 0, - this, TQT_SLOT(slotMemoryView()), + this, TQ_SLOT(slotMemoryView()), actionCollection(), "debug_memview"); action->setToolTip( i18n("Debugger viewers") ); action->setWhatsThis(i18n("<b>Debugger viewers</b><p>Various information about application being executed. There are 4 views available:<br>" @@ -292,7 +292,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Examine Core File..."), "application-x-core", 0, - this, TQT_SLOT(slotExamineCore()), + this, TQ_SLOT(slotExamineCore()), actionCollection(), "debug_core"); action->setToolTip( i18n("Examine core file") ); action->setWhatsThis( i18n("<b>Examine core file</b><p>" @@ -304,72 +304,72 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Attach to Process"), "connect_creating", 0, - this, TQT_SLOT(slotAttachProcess()), + this, TQ_SLOT(slotAttachProcess()), actionCollection(), "debug_attach"); action->setToolTip( i18n("Attach to process") ); action->setWhatsThis(i18n("<b>Attach to process</b><p>Attaches the debugger to a running process.")); action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0, - this, TQT_SLOT(toggleBreakpoint()), + this, TQ_SLOT(toggleBreakpoint()), actionCollection(), "debug_toggle_breakpoint"); action->setToolTip(i18n("Toggle breakpoint")); action->setWhatsThis(i18n("<b>Toggle breakpoint</b><p>Toggles the breakpoint at the current line in editor.")); - connect( mainWindow()->main()->guiFactory(), TQT_SIGNAL(clientAdded(KXMLGUIClient*)), - this, TQT_SLOT(guiClientAdded(KXMLGUIClient*)) ); + connect( mainWindow()->main()->guiFactory(), TQ_SIGNAL(clientAdded(KXMLGUIClient*)), + this, TQ_SLOT(guiClientAdded(KXMLGUIClient*)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( partController(), TQT_SIGNAL(loadedFile(const KURL &)), - gdbBreakpointWidget, TQT_SLOT(slotRefreshBP(const KURL &)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpoint(const TQString &, int)), - gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(editedBreakpoint(const TQString &, int)), - gdbBreakpointWidget, TQT_SLOT(slotEditBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), - gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); + connect( partController(), TQ_SIGNAL(loadedFile(const KURL &)), + gdbBreakpointWidget, TQ_SLOT(slotRefreshBP(const KURL &)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpoint(const TQString &, int)), + gdbBreakpointWidget, TQ_SLOT(slotToggleBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(editedBreakpoint(const TQString &, int)), + gdbBreakpointWidget, TQ_SLOT(slotEditBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + gdbBreakpointWidget, TQ_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStop(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectClosed()), - this, TQT_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStop(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectClosed()), + this, TQ_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); procLineMaker = new ProcessLineMaker(); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStdoutLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStderrLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStderrLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStdoutLine(const TQCString&))); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStderrLine(const TQCString&))); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStdoutLine(const TQCString&))); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStderrLine(const TQCString&))); // The output from tracepoints goes to "application" window, because // we don't have any better alternative, and using yet another window // is undesirable. Besides, this makes tracepoint look even more similar // to printf debugging. - connect( gdbBreakpointWidget, TQT_SIGNAL(tracingOutput(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); + connect( gdbBreakpointWidget, TQ_SIGNAL(tracingOutput(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStdout(const char*))); - connect(partController(), TQT_SIGNAL(savedFile(const KURL &)), - this, TQT_SLOT(slotFileSaved())); + connect(partController(), TQ_SIGNAL(savedFile(const KURL &)), + this, TQ_SLOT(slotFileSaved())); if (project()) - connect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotProjectCompiled())); + connect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotProjectCompiled())); setupController(); - TQTimer::singleShot(0, this, TQT_SLOT(setupDcop())); + TQTimer::singleShot(0, this, TQ_SLOT(setupDcop())); } void DebuggerPart::setupDcop() @@ -379,7 +379,7 @@ void DebuggerPart::setupDcop() if ((*it).find("drkonqi-") == 0) slotDCOPApplicationRegistered(*it); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), TQT_SLOT(slotDCOPApplicationRegistered(const TQCString&))); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), TQ_SLOT(slotDCOPApplicationRegistered(const TQCString&))); kapp->dcopClient()->setNotifications(true); } @@ -415,7 +415,7 @@ ASYNC DebuggerPart::slotDebugExternalProcess() if (attachProcess(pid) && m_drkonqi.isEmpty()) { m_drkonqi = kapp->dcopClient()->senderId(); - TQTimer::singleShot(15000, this, TQT_SLOT(slotCloseDrKonqi())); + TQTimer::singleShot(15000, this, TQ_SLOT(slotCloseDrKonqi())); mainWindow()->raiseView(framestackWidget); } @@ -497,7 +497,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) if (act) { int id = popup->insertItem( act->iconSet(), i18n("Run to &Cursor"), - this, TQT_SLOT(slotRunToCursor()), + this, TQ_SLOT(slotRunToCursor()), 0, -1, index); popup->setWhatsThis(id, act->whatsThis()); @@ -507,7 +507,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) if (econtext->url().isLocalFile()) { int id = popup->insertItem( i18n("Toggle Breakpoint"), - this, TQT_SLOT(toggleBreakpoint()), + this, TQ_SLOT(toggleBreakpoint()), 0, -1, index); index += running; popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); @@ -516,12 +516,12 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) { TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); int id = popup->insertItem( i18n("Evaluate: %1").arg(squeezed), - this, TQT_SLOT(contextEvaluate()), + this, TQ_SLOT(contextEvaluate()), 0, -1, index); index += running; popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor.")); int id2 = popup->insertItem( i18n("Watch: %1").arg(squeezed), - this, TQT_SLOT(contextWatch()), + this, TQ_SLOT(contextWatch()), 0, -1, index); index += running; popup->setWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list.")); @@ -562,8 +562,8 @@ void DebuggerPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Debugger"), i18n("Debugger"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); DebuggerConfigWidget *w = new DebuggerConfigWidget(this, vbox, "debugger config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(finished()), controller, TQT_SLOT(configure()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(finished()), controller, TQ_SLOT(configure()) ); } @@ -572,57 +572,57 @@ void DebuggerPart::setupController() VariableTree *variableTree = variableWidget->varTree(); // variableTree -> gdbBreakpointWidget - connect( variableTree, TQT_SIGNAL(toggleWatchpoint(const TQString &)), - gdbBreakpointWidget, TQT_SLOT(slotToggleWatchpoint(const TQString &))); + connect( variableTree, TQ_SIGNAL(toggleWatchpoint(const TQString &)), + gdbBreakpointWidget, TQ_SLOT(slotToggleWatchpoint(const TQString &))); // gdbOutputWidget -> controller - connect( gdbOutputWidget, TQT_SIGNAL(userGDBCmd(const TQString &)), - controller, TQT_SLOT(slotUserGDBCmd(const TQString&))); - connect( gdbOutputWidget, TQT_SIGNAL(breakInto()), - controller, TQT_SLOT(slotBreakInto())); + connect( gdbOutputWidget, TQ_SIGNAL(userGDBCmd(const TQString &)), + controller, TQ_SLOT(slotUserGDBCmd(const TQString&))); + connect( gdbOutputWidget, TQ_SIGNAL(breakInto()), + controller, TQ_SLOT(slotBreakInto())); - connect( controller, TQT_SIGNAL(breakpointHit(int)), - gdbBreakpointWidget, TQT_SLOT(slotBreakpointHit(int))); + connect( controller, TQ_SIGNAL(breakpointHit(int)), + gdbBreakpointWidget, TQ_SLOT(slotBreakpointHit(int))); // controller -> disassembleWidget - connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), - disassembleWidget, TQT_SLOT(slotShowStepInSource(const TQString&, int, const TQString&))); + connect( controller, TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + disassembleWidget, TQ_SLOT(slotShowStepInSource(const TQString&, int, const TQString&))); // controller -> this - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - this, TQT_SLOT(slotStatus(const TQString&, int))); - connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), - this, TQT_SLOT(slotShowStep(const TQString&, int))); - connect( controller, TQT_SIGNAL(debuggerAbnormalExit()), - this, TQT_SLOT(slotDebuggerAbnormalExit())); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + this, TQ_SLOT(slotStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + this, TQ_SLOT(slotShowStep(const TQString&, int))); + connect( controller, TQ_SIGNAL(debuggerAbnormalExit()), + this, TQ_SLOT(slotDebuggerAbnormalExit())); - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - this, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + this, TQ_SLOT(slotEvent(GDBController::event_t))); // controller -> procLineMaker - connect( controller, TQT_SIGNAL(ttyStdout(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); - connect( controller, TQT_SIGNAL(ttyStderr(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStderr(const char*))); + connect( controller, TQ_SIGNAL(ttyStdout(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStdout(const char*))); + connect( controller, TQ_SIGNAL(ttyStderr(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStderr(const char*))); // controller -> gdbOutputWidget - connect( controller, TQT_SIGNAL(gdbInternalCommandStdout(const char*)), - gdbOutputWidget, TQT_SLOT(slotInternalCommandStdout(const char*)) ); - connect( controller, TQT_SIGNAL(gdbUserCommandStdout(const char*)), - gdbOutputWidget, TQT_SLOT(slotUserCommandStdout(const char*)) ); + connect( controller, TQ_SIGNAL(gdbInternalCommandStdout(const char*)), + gdbOutputWidget, TQ_SLOT(slotInternalCommandStdout(const char*)) ); + connect( controller, TQ_SIGNAL(gdbUserCommandStdout(const char*)), + gdbOutputWidget, TQ_SLOT(slotUserCommandStdout(const char*)) ); - connect( controller, TQT_SIGNAL(gdbStderr(const char*)), - gdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - gdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(gdbStderr(const char*)), + gdbOutputWidget, TQ_SLOT(slotReceivedStderr(const char*)) ); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + gdbOutputWidget, TQ_SLOT(slotDbgStatus(const TQString&, int))); // controller -> viewerWidget - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - viewerWidget, TQT_SLOT(slotDebuggerState(const TQString&, int))); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + viewerWidget, TQ_SLOT(slotDebuggerState(const TQString&, int))); - connect(statusBarIndicator, TQT_SIGNAL(doubleClicked()), - controller, TQT_SLOT(explainDebuggerStatus())); + connect(statusBarIndicator, TQ_SIGNAL(doubleClicked()), + controller, TQ_SLOT(explainDebuggerStatus())); } @@ -857,18 +857,18 @@ void DebuggerPart::slotRun() if (rebuild) { - disconnect(TQT_SIGNAL(buildProject())); + disconnect(TQ_SIGNAL(buildProject())); // The KDevProject has no method to build the project, // so try connecting to a slot has is present to all // existing project managers. // Note: this assumes that 'slotBuild' will save // modified files. - if (connect(this, TQT_SIGNAL(buildProject()), - project(), TQT_SLOT(slotBuild()))) + if (connect(this, TQ_SIGNAL(buildProject()), + project(), TQ_SLOT(slotBuild()))) { - connect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotRun_part2())); + connect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotRun_part2())); emit buildProject(); rebuild = true; @@ -894,8 +894,8 @@ void DebuggerPart::slotRun_part2() { needRebuild_ = false; - disconnect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotRun_part2())); + disconnect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotRun_part2())); if (controller->stateIsOn( s_dbgNotStarted )) { diff --git a/languages/cpp/debugger/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/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..c89eb46b 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -798,17 +798,17 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en dbgProcess_ = new TDEProcess; - connect( dbgProcess_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotDbgWroteStdin(TDEProcess *)) ); + connect( dbgProcess_, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotDbgWroteStdin(TDEProcess *)) ); - connect( dbgProcess_, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotDbgProcessExited(TDEProcess*)) ); + connect( dbgProcess_, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotDbgProcessExited(TDEProcess*)) ); application_ = application; @@ -1101,8 +1101,8 @@ void GDBController::slotRun() tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); if (!config_dbgTerminal_) { - connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) ); - connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) ); + connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) ); + connect( tty_, TQ_SIGNAL(ErrOutput(const char*)), TQ_SIGNAL(ttyStderr(const char*)) ); } TQString tty(tty_->getSlave()); 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/stty.cpp b/languages/cpp/debugger/stty.cpp index 6960ad6d..9d95ad0d 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -132,7 +132,7 @@ STTY::STTY(bool ext, const TQString &termAppName) if (fout >= 0) { ttySlave = TQString(tty_slave); out = new TQSocketNotifier(fout, TQSocketNotifier::Read, this); - connect( out, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OutReceived(int)) ); + connect( out, TQ_SIGNAL(activated(int)), this, TQ_SLOT(OutReceived(int)) ); } } } diff --git a/languages/cpp/debugger/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/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/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/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp index 631d50d0..0c2ea291 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp @@ -53,7 +53,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) kdeUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index 49cb66f7..34a7fd9e 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -96,7 +96,7 @@ m_markIface( 0 ) "<tt>//FIXME fix this</tt>")); m_initCurrentTimer = new TQTimer( this ); - connect( m_initCurrentTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initCurrentList()) ); + connect( m_initCurrentTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(initCurrentList()) ); m_gridLayout = new TQGridLayout(this,2,3); m_errorList = new TDEListView(this); @@ -145,16 +145,16 @@ m_markIface( 0 ) m_gridLayout->addWidget(m_filterLabel,0,1,TQt::AlignRight); m_gridLayout->addWidget(m_filterEdit,0,2,TQt::AlignLeft); - connect( m_filterEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotFilter()) ); - connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )), - this, TQT_SLOT(slotFilter()) ); - connect( m_tabBar, TQT_SIGNAL(selected(int)), - this, TQT_SLOT(slotTabSelected(int)) ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); + connect( m_filterEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotFilter()) ); + connect( m_filterEdit, TQ_SIGNAL(textChanged( const TQString & )), + this, TQ_SLOT(slotFilter()) ); + connect( m_tabBar, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(slotTabSelected(int)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); // any editors that were open when we loaded the project needs to have their markType07 icon set too.. TQPtrListIterator<KParts::Part> it( *m_cppSupport->partController()->parts() ); @@ -225,11 +225,11 @@ void ProblemReporter::InitListView(TDEListView* listview) listview->addColumn( i18n("Problem") ); listview->setAllColumnsShowFocus( TRUE ); - connect( listview, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( listview, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); - connect( listview, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem* )) ); + connect( listview, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem* )) ); } diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index 8ecb44eb..a2684118 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -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())); } diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index 170ff230..c9e44ff4 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -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())); } diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java index 40bc6b93..50f3bff1 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)")); } @@ -77,19 +77,19 @@ 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()); + KStdAction.openNew(this, TQ_SLOT("fileNew()"), actionCollection()); + KStdAction.open(this, TQ_SLOT("fileOpen()"), actionCollection()); + KStdAction.save(this, TQ_SLOT("fileSave()"), actionCollection()); + KStdAction.saveAs(this, TQ_SLOT("fileSaveAs()"), actionCollection()); + KStdAction.print(this, TQ_SLOT("filePrint()"), actionCollection()); + KStdAction.quit(kapp, TQ_SLOT("quit()"), actionCollection()); - KStdAction.preferences(this, 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/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/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 80203576..36f9dadc 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -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( ) ) ); } diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index e1fc4174..e5a158b6 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -97,17 +97,17 @@ ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const 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() ) @@ -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..ca7e7690 100644 --- a/languages/kjssupport/jscodecompletion.cpp +++ b/languages/kjssupport/jscodecompletion.cpp @@ -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..306fdb4a 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() { @@ -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/lib/debugger/Mainpage.dox b/languages/lib/debugger/Mainpage.dox index 3e0641a9..9a804a36 100644 --- a/languages/lib/debugger/Mainpage.dox +++ b/languages/lib/debugger/Mainpage.dox @@ -16,12 +16,12 @@ an instance of @ref Debugger class and connect its Q_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/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/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp index 90532c22..76758693 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() diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index d0aaf01a..d88599e0 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -86,19 +86,19 @@ ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* parent, con 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 ); @@ -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/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index 1bcbb96b..a3ec40db 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -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())); } diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index af301000..3ed864bc 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -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(){ diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp index 6cddabdf..ac9a8531 100644 --- a/languages/php/phpconfigwidget.cpp +++ b/languages/php/phpconfigwidget.cpp @@ -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/phperrorview.cpp b/languages/php/phperrorview.cpp index 2ee5bbf3..85cbf4e7 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() ); } @@ -186,11 +186,11 @@ void PHPErrorView::InitListView(TDEListView* listview) listview->addColumn( i18n("Problem") ); listview->setAllColumnsShowFocus( TRUE ); - connect( listview, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( listview, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); - connect( listview, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem* )) ); + connect( listview, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem* )) ); } diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index 92d2fc4c..a9861678 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -44,9 +44,9 @@ PHPFile::PHPFile(PHPSupportPart *phpSupport, const TQString& fileName) /* 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*))); */ } diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 061bb956..f7836514 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -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/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 252b2167..cf498060 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -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( ) @@ -442,7 +442,7 @@ bool PHPSupportPart::parseProject() _jd->it = _jd->files.begin(); _jd->dir.setPath( project()->projectDirectory() ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); return TRUE; } @@ -470,7 +470,7 @@ void PHPSupportPart::slotParseFiles() ++( _jd->it ); } - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); } else // finished or interrupted { 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/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index 68baf71e..11e3d44f 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())); } diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/kapp/app.rb index af807fe9..8d135b19 100644 --- a/languages/ruby/app_templates/kapp/app.rb +++ b/languages/ruby/app_templates/kapp/app.rb @@ -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($kapp, 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..b81155b0 100644 --- a/languages/ruby/app_templates/kapp/appview.rb +++ b/languages/ruby/app_templates/kapp/appview.rb @@ -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.rb b/languages/ruby/app_templates/kxt/app.rb index 59a7c266..f7a18399 100644 --- a/languages/ruby/app_templates/kxt/app.rb +++ b/languages/ruby/app_templates/kxt/app.rb @@ -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($kapp, 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/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..1f399323 100644 --- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb +++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb @@ -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/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index b012f0be..f17c3ce0 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -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 938ee0c0..83b12d8d 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -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; } @@ -271,7 +271,7 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, { 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..b5210bdb 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -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,48 +224,48 @@ 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() @@ -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..94204089 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -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); @@ -696,8 +696,8 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); if (!config_dbgTerminal_) { - connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) ); - connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) ); + connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) ); + connect( tty_, TQ_SIGNAL(ErrOutput(const char*)), TQ_SIGNAL(ttyStderr(const char*)) ); } TQString tty(tty_->getSlave()); @@ -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; @@ -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/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..bacb21d9 100644 --- a/languages/ruby/debugger/stty.cpp +++ b/languages/ruby/debugger/stty.cpp @@ -131,7 +131,7 @@ STTY::STTY(bool ext, const TQString &termAppName) if (fout >= 0) { ttySlave = TQString(tty_slave); out = new TQSocketNotifier(fout, TQSocketNotifier::Read, this); - connect( out, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OutReceived(int)) ); + connect( out, TQ_SIGNAL(activated(int)), this, TQ_SLOT(OutReceived(int)) ); } } } diff --git a/languages/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..79cbac07 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -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) @@ -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.")); } } 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/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/lib/interfaces/KDevCoreIface.cpp b/lib/interfaces/KDevCoreIface.cpp index aa70e01b..c86e3562 100644 --- a/lib/interfaces/KDevCoreIface.cpp +++ b/lib/interfaces/KDevCoreIface.cpp @@ -29,8 +29,8 @@ KDevCoreIface::KDevCoreIface(KDevCore *core) : TQObject(core), DCOPObject("KDevCore"), m_core(core) { - connect( m_core, TQT_SIGNAL(projectOpened()), this, TQT_SLOT(forwardProjectOpened()) ); - connect( m_core, TQT_SIGNAL(projectClosed()), this, TQT_SLOT(forwardProjectClosed()) ); + connect( m_core, TQ_SIGNAL(projectOpened()), this, TQ_SLOT(forwardProjectOpened()) ); + connect( m_core, TQ_SIGNAL(projectClosed()), this, TQ_SLOT(forwardProjectClosed()) ); } diff --git a/lib/interfaces/KDevPartControllerIface.cpp b/lib/interfaces/KDevPartControllerIface.cpp index 1b184453..60c9ef97 100644 --- a/lib/interfaces/KDevPartControllerIface.cpp +++ b/lib/interfaces/KDevPartControllerIface.cpp @@ -28,9 +28,9 @@ KDevPartControllerIface::KDevPartControllerIface(KDevPartController *pc) : TQObject(pc), DCOPObject("KDevPartController"), m_controller(pc) { - connect(pc, TQT_SIGNAL(loadedFile(const KURL &)), this, TQT_SLOT(forwardLoadedFile(const KURL &))); - connect(pc, TQT_SIGNAL(savedFile(const KURL &)), this, TQT_SLOT(forwardSavedFile(const KURL &))); - connect(pc, TQT_SIGNAL(closedFile(const KURL &)), this, TQT_SLOT(forwardClosedFile(const KURL &))); + connect(pc, TQ_SIGNAL(loadedFile(const KURL &)), this, TQ_SLOT(forwardLoadedFile(const KURL &))); + connect(pc, TQ_SIGNAL(savedFile(const KURL &)), this, TQ_SLOT(forwardSavedFile(const KURL &))); + connect(pc, TQ_SIGNAL(closedFile(const KURL &)), this, TQ_SLOT(forwardClosedFile(const KURL &))); } diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h index 282906db..e496576f 100644 --- a/lib/interfaces/kdevcore.h +++ b/lib/interfaces/kdevcore.h @@ -78,15 +78,15 @@ to if you reimplement TQWidget::contextMenuEvent method. -# Connect KDevCore::contextMenu(TQPopupMenu *, const Context *) signal to that slot in the constructor of your plugin:\n @code -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 *))); @endcode -# Fill the menu in the slot you created, for example:\n @code if (context->hasType(Context::EditorContext)) { const EditorContext *econtext = static_cast<const EditorContext*>(context); - int id = popup->insertItem(i18n("My Menu Item 1"), this, TQT_SLOT(myMenuAction1())); + int id = popup->insertItem(i18n("My Menu Item 1"), this, TQ_SLOT(myMenuAction1())); popup->setWhatsThis(id, i18n("What's this for my menu item 1")); } else if context->hasType(MyContext)) diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp index e8616df1..3a49a8c6 100644 --- a/lib/interfaces/kdevproject.cpp +++ b/lib/interfaces/kdevproject.cpp @@ -40,14 +40,14 @@ struct KDevProject::Private { KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name) : KDevPlugin(info, parent, name), d(new KDevProject::Private()) { - connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); - connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); + connect( this, TQ_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQ_SLOT(buildFileMap()) ); + connect( this, TQ_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQ_SLOT(buildFileMap()) ); - connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(slotAddFilesToFileMap(const TQStringList& )) ); - connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(slotRemoveFilesFromFileMap(const TQStringList& )) ); + connect( this, TQ_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQ_SLOT(slotAddFilesToFileMap(const TQStringList& )) ); + connect( this, TQ_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQ_SLOT(slotRemoveFilesFromFileMap(const TQStringList& )) ); d->m_timer = new TQTimer(this); - connect(d->m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBuildFileMap())); + connect(d->m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotBuildFileMap())); d->m_iface = new KDevProjectIface(this); } diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp index a937c744..0c2b0650 100644 --- a/lib/util/blockingkprocess.cpp +++ b/lib/util/blockingkprocess.cpp @@ -22,12 +22,12 @@ BlockingTDEProcess::BlockingTDEProcess(TQObject *parent, const char *name) m_timeoutValue = 60; m_timer = 0L; - connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); - connect(this, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); - connect(this, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); + connect(this, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); + connect(this, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); } BlockingTDEProcess::BlockingTDEProcess() @@ -37,12 +37,12 @@ BlockingTDEProcess::BlockingTDEProcess() m_stdErr = ""; m_timeoutValue = 60; m_timer = 0L; - connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); - connect(this, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); - connect(this, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); + connect(this, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); + connect(this, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); } @@ -55,7 +55,7 @@ bool BlockingTDEProcess::start(RunMode runmode, Communication comm) { m_timeout = false; m_timer = new TQTimer(); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeOut())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeOut())); m_timer->start(m_timeoutValue*1000, true); enter_loop(); delete m_timer; diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp index 3335ce9f..16f578f0 100644 --- a/lib/util/configwidgetproxy.cpp +++ b/lib/util/configwidgetproxy.cpp @@ -34,8 +34,8 @@ ConfigWidgetProxy::ConfigWidgetProxy( KDevCore * core ) { - connect( core, TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget( KDialogBase*)) ); - connect( core, TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(slotProjectConfigWidget( KDialogBase*)) ); + connect( core, TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(slotConfigWidget( KDialogBase*)) ); + connect( core, TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(slotProjectConfigWidget( KDialogBase*)) ); } ConfigWidgetProxy::~ConfigWidgetProxy() @@ -66,8 +66,8 @@ void ConfigWidgetProxy::slotConfigWidget( KDialogBase * dlg ) ++it; } - connect( dlg, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT( slotAboutToShowPage(TQWidget*)) ); - connect( dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotConfigWidgetDestroyed()) ); + connect( dlg, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT( slotAboutToShowPage(TQWidget*)) ); + connect( dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotConfigWidgetDestroyed()) ); } void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg ) @@ -79,8 +79,8 @@ void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg ) ++it; } - connect( dlg, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT( slotAboutToShowPage(TQWidget*)) ); - connect( dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotConfigWidgetDestroyed()) ); + connect( dlg, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT( slotAboutToShowPage(TQWidget*)) ); + connect( dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotConfigWidgetDestroyed()) ); } void ConfigWidgetProxy::slotConfigWidgetDestroyed( ) diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h index 34cadce9..ee9a3fb0 100644 --- a/lib/util/configwidgetproxy.h +++ b/lib/util/configwidgetproxy.h @@ -47,8 +47,8 @@ A typical case looks like this: _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createGlobalConfigPage( i18n("My Part"), GLOBALDOC_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("My Part"), PROJECTDOC_OPTIONS, info()->icon() ); -connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )) ); +connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )) ); ... ... @@ -57,10 +57,10 @@ void MyPart::insertConfigWidget( TQObject const * dlg, TQWidget * page, unsigned { if ( pagenumber == PROJECTDOC_OPTIONS ) { MyPartGlobalSettings * w = new MyPartGlobalSettings( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } else if ( pagenumber == PROJECTDOC_OPTIONS ) { MyPartProjectSettings * w = new MyPartProjectSettings( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } } @endcode diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index 0e617762..6fb0f40c 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -39,12 +39,12 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, *proc << executable; *proc << args; - connect( proc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processExited()) ); - connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedStdout(TDEProcess*,char*,int)) ); - connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedStderr(TDEProcess*,char*,int)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processExited()) ); + connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedStdout(TDEProcess*,char*,int)) ); + connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedStderr(TDEProcess*,char*,int)) ); bool ok = proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); @@ -58,8 +58,8 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, } else { progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."), i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false ); - connect( progressDlg, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(cancelClicked()) ); + connect( progressDlg, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(cancelClicked()) ); } } diff --git a/lib/util/kdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp index b0b78250..db095e55 100644 --- a/lib/util/kdevjobtimer.cpp +++ b/lib/util/kdevjobtimer.cpp @@ -15,7 +15,7 @@ KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name) : TQTimer(parent, name) { m_payload = payload; - connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) ); + connect( this, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()) ); } KDevJobTimer::~KDevJobTimer() @@ -26,7 +26,7 @@ void KDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member { KDevJobTimer * p = new KDevJobTimer( payload ); p->start( msec, true ); - connect( p, TQT_SIGNAL(timeout(void*)), receiver, member ); + connect( p, TQ_SIGNAL(timeout(void*)), receiver, member ); } void KDevJobTimer::slotTimeout() diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp index 14982373..1db1b7e1 100644 --- a/lib/util/kdevshellwidget.cpp +++ b/lib/util/kdevshellwidget.cpp @@ -44,9 +44,9 @@ void KDevShellWidget::activate( ) m_konsolePart = (KParts::ReadOnlyPart *) factory->create( this, "libkonsolepart", "KParts::ReadOnlyPart" ); if ( !m_konsolePart ) return; - connect( m_konsolePart, TQT_SIGNAL( processExited(TDEProcess *) ), this, TQT_SLOT( processExited(TDEProcess *) ) ); - connect( m_konsolePart, TQT_SIGNAL( receivedData( const TQString& ) ), this, TQT_SIGNAL( receivedData( const TQString& ) ) ); - connect( m_konsolePart, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed()) ); + connect( m_konsolePart, TQ_SIGNAL( processExited(TDEProcess *) ), this, TQ_SLOT( processExited(TDEProcess *) ) ); + connect( m_konsolePart, TQ_SIGNAL( receivedData( const TQString& ) ), this, TQ_SIGNAL( receivedData( const TQString& ) ) ); + connect( m_konsolePart, TQ_SIGNAL(destroyed()), this, TQ_SLOT(partDestroyed()) ); m_konsolePart->widget()->setFocusPolicy( TQWidget::WheelFocus ); setFocusProxy( m_konsolePart->widget() ); @@ -109,7 +109,7 @@ void KDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate ) // reactivating with a non-working setting (the partDestroyed() // slot will have ran before m_doAutoActivate is set) if ( doAutoActivate ) - TQTimer::singleShot( 3000, this, TQT_SLOT(setAutoReactivateOnCloseDelayed()) ); + TQTimer::singleShot( 3000, this, TQ_SLOT(setAutoReactivateOnCloseDelayed()) ); else m_doAutoActivate = false; } diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp index c4b44894..de10a9e0 100644 --- a/lib/util/tdescriptactionmanager.cpp +++ b/lib/util/tdescriptactionmanager.cpp @@ -52,7 +52,7 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter TDETrader::OfferList offers = TDETrader::self()->query( "KScriptRunner/KScriptRunner", scriptTypeQuery ); if ( !offers.isEmpty() ) { - m_action = new TDEAction(m_scriptName, TDEShortcut(), this, TQT_SLOT(activate()), ac, "script"); + m_action = new TDEAction(m_scriptName, TDEShortcut(), this, TQ_SLOT(activate()), ac, "script"); m_isValid = true; m_timeout = new TQTimer(this); TQString icon = desktop.readIcon(); @@ -60,7 +60,7 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter if( !icon.isEmpty() ) m_action->setIcon(icon); m_action->setShortcutConfigurable(true); - connect( m_timeout, TQT_SIGNAL(timeout()), TQT_SLOT(cleanup()) ); + connect( m_timeout, TQ_SIGNAL(timeout()), TQ_SLOT(cleanup()) ); } } } @@ -91,7 +91,7 @@ void KScriptAction::activate( ) m_interface->setScript(m_scriptFile); else m_interface->setScript(m_scriptFile, m_scriptMethod); - connect(this, TQT_SIGNAL(done(KScriptClientInterface::Result, const TQVariant &)), this, TQT_SLOT(scriptFinished())); + connect(this, TQ_SIGNAL(done(KScriptClientInterface::Result, const TQVariant &)), this, TQ_SLOT(scriptFinished())); } else { @@ -152,16 +152,16 @@ TQPtrList< TDEAction > KScriptActionManager::scripts( TQObject * interface , con { actions.append(script->action()); m_actions.append(script); - connect(script, TQT_SIGNAL(error( const TQString&)), this, - TQT_SIGNAL(scriptError( const TQString&))); - connect(script, TQT_SIGNAL(warning( const TQString&)), this, - TQT_SIGNAL(scriptWarning( const TQString&))); - connect(script, TQT_SIGNAL(output( const TQString&)), this, - TQT_SIGNAL(scriptOutput( const TQString&))); - connect(script, TQT_SIGNAL(progress( int )), this, - TQT_SIGNAL(scriptProgress(int))); - connect(script, TQT_SIGNAL(done( KScriptClientInterface::Result, const TQVariant &)),this, - TQT_SIGNAL(scriptDone( KScriptClientInterface::Result, const TQVariant &))); + connect(script, TQ_SIGNAL(error( const TQString&)), this, + TQ_SIGNAL(scriptError( const TQString&))); + connect(script, TQ_SIGNAL(warning( const TQString&)), this, + TQ_SIGNAL(scriptWarning( const TQString&))); + connect(script, TQ_SIGNAL(output( const TQString&)), this, + TQ_SIGNAL(scriptOutput( const TQString&))); + connect(script, TQ_SIGNAL(progress( int )), this, + TQ_SIGNAL(scriptProgress(int))); + connect(script, TQ_SIGNAL(done( KScriptClientInterface::Result, const TQVariant &)),this, + TQ_SIGNAL(scriptDone( KScriptClientInterface::Result, const TQVariant &))); } else delete script; diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp index 7e643d66..87db2425 100644 --- a/lib/widgets/flagboxes.cpp +++ b/lib/widgets/flagboxes.cpp @@ -320,7 +320,7 @@ FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter, layout->addWidget(edit); details = new TQPushButton("...", this); details->setMaximumWidth(30); - connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPathDetails())); + connect(details, TQ_SIGNAL(clicked()), this, TQ_SLOT(showPathDetails())); layout->addWidget(details); } @@ -540,7 +540,7 @@ FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditC { details = new TQPushButton("...", this); details->setMaximumWidth(30); - connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showListDetails())); + connect(details, TQ_SIGNAL(clicked()), this, TQ_SLOT(showListDetails())); layout->addWidget(details); } diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index a8520e30..8fdec94e 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -24,54 +24,54 @@ KDevHTMLPart::KDevHTMLPart() { setXMLFile(locate("data", "tdevelop/kdevhtml_partui.rc"), true); - connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)), - this, TQT_SLOT(openURLRequest(const KURL &)) ); + connect(browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)), + this, TQ_SLOT(openURLRequest(const KURL &)) ); - connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* ))); - connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); - connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &))); + connect(this, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(slotStarted(TDEIO::Job* ))); + connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted())); + connect(this, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotCancelled(const TQString &))); TDEActionCollection * actions = actionCollection();// new TDEActionCollection( this ); reloadAction = new TDEAction( i18n( "Reload" ), "reload", 0, - this, TQT_SLOT( slotReload() ), actions, "doc_reload" ); + this, TQ_SLOT( slotReload() ), actions, "doc_reload" ); reloadAction->setWhatsThis(i18n("<b>Reload</b><p>Reloads the current document.")); stopAction = new TDEAction( i18n( "Stop" ), "process-stop", 0, - this, TQT_SLOT( slotStop() ), actions, "doc_stop" ); + this, TQ_SLOT( slotStop() ), actions, "doc_stop" ); stopAction->setWhatsThis(i18n("<b>Stop</b><p>Stops the loading of current document.")); duplicateAction = new TDEAction( i18n( "Duplicate Tab" ), "window-new", 0, - this, TQT_SLOT( slotDuplicate() ), actions, "doc_dup" ); + this, TQ_SLOT( slotDuplicate() ), actions, "doc_dup" ); duplicateAction->setWhatsThis(i18n("<b>Duplicate window</b><p>Opens current document in a new window.")); - printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actions, "print_doc"); - copyAction = KStdAction::copy(this, TQT_SLOT(slotCopy()), actions, "copy_doc_selection"); + printAction = KStdAction::print(this, TQ_SLOT(slotPrint()), actions, "print_doc"); + copyAction = KStdAction::copy(this, TQ_SLOT(slotCopy()), actions, "copy_doc_selection"); - connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(popup(const TQString &, const TQPoint &))); - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect( this, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(popup(const TQString &, const TQPoint &))); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); //BEGIN documentation history stuff m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, - this, TQT_SLOT(slotBack()), + this, TQ_SLOT(slotBack()), actions, "browser_back"); m_backAction->setEnabled( false ); m_backAction->setToolTip(i18n("Back")); m_backAction->setWhatsThis(i18n("<b>Back</b><p>Moves backwards one step in the <b>documentation</b> browsing history.")); - connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotBackAboutToShow())); - connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPopupActivated(int))); + connect(m_backAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotBackAboutToShow())); + connect(m_backAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, - this, TQT_SLOT(slotForward()), + this, TQ_SLOT(slotForward()), actions, "browser_forward"); m_forwardAction->setEnabled( false ); m_forwardAction->setToolTip(i18n("Forward")); m_forwardAction->setWhatsThis(i18n("<b>Forward</b><p>Moves forward one step in the <b>documentation</b> browsing history.")); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotForwardAboutToShow())); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPopupActivated(int))); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotForwardAboutToShow())); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); m_restoring = false; m_Current = m_history.end(); @@ -479,9 +479,9 @@ void KDevHTMLPart::slotCopy( ) TQString text = selectedText(); text.replace( TQChar( 0xa0 ), ' ' ); TQClipboard *cb = TQApplication::clipboard(); - disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); + disconnect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) ); cb->setText(text); - connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); + connect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) ); } void KDevHTMLPart::slotSelectionChanged( ) diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp index 75682116..7a9ed47b 100644 --- a/lib/widgets/kdevtabwidget.cpp +++ b/lib/widgets/kdevtabwidget.cpp @@ -22,8 +22,8 @@ KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(p { m_pTabBar = new KTabBar(this, "tabbar"); setTabBar(m_pTabBar); - connect(m_pTabBar, TQT_SIGNAL(closeWindow(const TQWidget*)), this, TQT_SIGNAL(closeWindow(const TQWidget*))); - connect(m_pTabBar, TQT_SIGNAL(closeOthers(TQWidget*)), this, TQT_SIGNAL(closeOthers(TQWidget*))); + connect(m_pTabBar, TQ_SIGNAL(closeWindow(const TQWidget*)), this, TQ_SIGNAL(closeWindow(const TQWidget*))); + connect(m_pTabBar, TQ_SIGNAL(closeOthers(TQWidget*)), this, TQ_SIGNAL(closeOthers(TQWidget*))); } KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name) @@ -34,8 +34,8 @@ KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name) if (closePixmap.isNull()) closePixmap = SmallIcon("window-close"); - m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, TQT_SLOT(closeWindowSlot())); - m_pPopupMenu->insertItem(i18n("Close &Others"), this, TQT_SLOT(closeOthersSlot())); + m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, TQ_SLOT(closeWindowSlot())); + m_pPopupMenu->insertItem(i18n("Close &Others"), this, TQ_SLOT(closeOthersSlot())); } void KTabBar::closeWindowSlot() diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp index 9690e8a4..a98ce92a 100644 --- a/lib/widgets/ksavealldialog.cpp +++ b/lib/widgets/ksavealldialog.cpp @@ -79,9 +79,9 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co ++it; } - connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) ); - connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(save()) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(saveNone()) ); + connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) ); + connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(save()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(saveNone()) ); } KSaveSelectDialog::~KSaveSelectDialog() {} @@ -159,9 +159,9 @@ KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent setButtonTip( User1, i18n("Lose all modifications") ); setButtonTip( Close, i18n("Cancels the action") ); - connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) ); - connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveAll()) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(revert()) ); + connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) ); + connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(saveAll()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(revert()) ); } KSaveAllDialog::~KSaveAllDialog() diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp index 113b206b..be881aa3 100644 --- a/lib/widgets/processlinemaker.cpp +++ b/lib/widgets/processlinemaker.cpp @@ -28,11 +28,11 @@ ProcessLineMaker::ProcessLineMaker() ProcessLineMaker::ProcessLineMaker( const TDEProcess* proc ) { - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); } void ProcessLineMaker::slotReceivedStdout( const char *buffer ) diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index f3088c88..7d8a4d3b 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -117,17 +117,17 @@ ProcessWidget::ProcessWidget(TQWidget *parent, const char *name) procLineMaker = new ProcessLineMaker( childproc ); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - this, TQT_SLOT(insertStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - this, TQT_SLOT(insertStderrLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - this, TQT_SLOT(addPartialStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - this, TQT_SLOT(addPartialStderrLine(const TQCString&) )); - - connect(childproc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*) )) ; + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + this, TQ_SLOT(insertStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + this, TQ_SLOT(insertStderrLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + this, TQ_SLOT(addPartialStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + this, TQ_SLOT(addPartialStderrLine(const TQCString&) )); + + connect(childproc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*) )) ; } diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp index 6e9c06b7..951fad34 100644 --- a/lib/widgets/propeditor/pcheckbox.cpp +++ b/lib/widgets/propeditor/pcheckbox.cpp @@ -39,7 +39,7 @@ PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); } TQVariant PCheckBox::value() const @@ -49,9 +49,9 @@ TQVariant PCheckBox::value() const void PCheckBox::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + disconnect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); m_edit->setChecked(value.toBool()); - connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp index 4b6ae5c4..9c42f4a6 100644 --- a/lib/widgets/propeditor/pcolorbutton.cpp +++ b/lib/widgets/propeditor/pcolorbutton.cpp @@ -39,10 +39,10 @@ PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT m_edit = new KColorButton(this); - connect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&))); + connect(m_edit, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updateProperty(const TQColor&))); #else m_edit = new TQPushButton(this); - connect(m_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeColor())); + connect(m_edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeColor())); #endif m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); @@ -78,9 +78,9 @@ void PColorButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect void PColorButton::setValue(const TQVariant& value, bool emitChange) { #ifndef PURE_QT - disconnect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&))); + disconnect(m_edit, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updateProperty(const TQColor&))); m_edit->setColor(value.toColor()); - connect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&))); + connect(m_edit, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updateProperty(const TQColor&))); #else m_color = value.toColor(); m_edit->setText(m_color.name()); diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp index 23c61f46..78fd9dc3 100644 --- a/lib/widgets/propeditor/pcolorcombo.cpp +++ b/lib/widgets/propeditor/pcolorcombo.cpp @@ -34,7 +34,7 @@ PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char * m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); } TQVariant PColorCombo::value() const @@ -44,9 +44,9 @@ TQVariant PColorCombo::value() const void PColorCombo::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setColor(value.toColor()); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp index a0749744..ca42cda6 100644 --- a/lib/widgets/propeditor/pcombobox.cpp +++ b/lib/widgets/propeditor/pcombobox.cpp @@ -45,7 +45,7 @@ void PComboBox::init(bool rw) fillBox(); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); } void PComboBox::fillBox() @@ -68,9 +68,9 @@ void PComboBox::setValue(const TQVariant &value, bool emitChange) { if (!value.isNull()) { - disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setCurrentText(findDescription(value)); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp index 113ec325..563552c3 100644 --- a/lib/widgets/propeditor/pdateedit.cpp +++ b/lib/widgets/propeditor/pdateedit.cpp @@ -33,7 +33,7 @@ PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(updateProperty(const TQDate&))); } TQVariant PDateEdit::value() const @@ -51,9 +51,9 @@ void PDateEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r void PDateEdit::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(updateProperty(const TQDate&))); m_edit->setDate(value.toDate()); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(updateProperty(const TQDate&))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp index 55a0bdcc..8f4c03d3 100644 --- a/lib/widgets/propeditor/pdatetimeedit.cpp +++ b/lib/widgets/propeditor/pdatetimeedit.cpp @@ -32,7 +32,7 @@ PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const ch m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(updateProperty(const TQDateTime&))); } TQVariant PDateTimeEdit::value() const @@ -50,9 +50,9 @@ void PDateTimeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRec void PDateTimeEdit::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(updateProperty(const TQDateTime&))); m_edit->setDateTime(value.toDateTime()); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(updateProperty(const TQDateTime&))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp index 99b0151e..b244935f 100644 --- a/lib/widgets/propeditor/pdoublenuminput.cpp +++ b/lib/widgets/propeditor/pdoublenuminput.cpp @@ -38,10 +38,10 @@ PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, cons #ifndef PURE_QT m_edit = new KDoubleNumInput(-999999.0, 999999.0, 0.0, 0.01, 2, this); m_edit->setLabel(TQString()); - connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); + connect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(updateProperty(double))); #else m_edit = new TQFloatInput(-999999, 999999, 0.01, 2, this ); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); #endif m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); /* m_edit->setMinValue(-999999999); @@ -59,13 +59,13 @@ TQVariant PDoubleNumInput::value() const void PDoubleNumInput::setValue(const TQVariant &value, bool emitChange) { #ifndef PURE_QT - disconnect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(updateProperty(double))); m_edit->setValue(value.toDouble()); - connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); + connect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(updateProperty(double))); #else - disconnect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setValue(int(value.toDouble()*pow(m_edit->digits(),10))); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); #endif if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp index 8932c4ae..7044e6c1 100644 --- a/lib/widgets/propeditor/pfontbutton.cpp +++ b/lib/widgets/propeditor/pfontbutton.cpp @@ -44,7 +44,7 @@ PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char* #endif l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(updateProperty(const TQFont& ))); + connect(m_edit, TQ_SIGNAL(fontSelected(const TQFont& )), this, TQ_SLOT(updateProperty(const TQFont& ))); } TQVariant PFontButton::value() const @@ -66,9 +66,9 @@ void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& void PFontButton::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(fontSelected(const TQFont&)), this, TQT_SLOT(updateProperty(const TQFont&))); + disconnect(m_edit, TQ_SIGNAL(fontSelected(const TQFont&)), this, TQ_SLOT(updateProperty(const TQFont&))); m_edit->setFont(value.toFont()); - connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(updateProperty(const TQFont& ))); + connect(m_edit, TQ_SIGNAL(fontSelected(const TQFont& )), this, TQ_SLOT(updateProperty(const TQFont& ))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp index cb8a80b2..224e4bd0 100644 --- a/lib/widgets/propeditor/pfontcombo.cpp +++ b/lib/widgets/propeditor/pfontcombo.cpp @@ -46,9 +46,9 @@ PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *na #ifdef PURE_QT TQFontDatabase fonts; m_edit->insertStringList(fonts.families()); - connect(m_edit, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(updateProperty(const TQString&))); #else - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); #endif } @@ -63,13 +63,13 @@ TQVariant PFontCombo::value() const void PFontCombo::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); #ifndef PURE_QT m_edit->setCurrentFont(value.toString()); #else m_edit->setCurrentText(value.toString()); #endif - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp index f5e1ecb0..c27a6b74 100644 --- a/lib/widgets/propeditor/plineedit.cpp +++ b/lib/widgets/propeditor/plineedit.cpp @@ -32,7 +32,7 @@ PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); } TQVariant PLineEdit::value() const @@ -42,9 +42,9 @@ TQVariant PLineEdit::value() const void PLineEdit::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); m_edit->setText(value.toString()); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp index 996b1d0e..baa6224b 100644 --- a/lib/widgets/propeditor/plinestyleedit.cpp +++ b/lib/widgets/propeditor/plinestyleedit.cpp @@ -140,7 +140,7 @@ PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const m_edit->insertItem(TQPixmap(dashdot)); m_edit->insertItem(TQPixmap(dashdotdot)); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); } TQVariant PLineStyleEdit::value() const @@ -186,9 +186,9 @@ void PLineStyleEdit::setValue(const TQVariant& value, bool emitChange) return; if ((value.toInt() > 5) || (value.toInt() < 0)) return; - disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setCurrentItem(value.toInt()); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp index 3241f892..0026ec31 100644 --- a/lib/widgets/propeditor/ppixmapedit.cpp +++ b/lib/widgets/propeditor/ppixmapedit.cpp @@ -61,7 +61,7 @@ PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* m_popup->hide(); - connect(m_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateProperty())); + connect(m_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateProperty())); } TQVariant PPixmapEdit::value() const diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp index 987bb31b..0185b2e4 100644 --- a/lib/widgets/propeditor/propertyeditor.cpp +++ b/lib/widgets/propeditor/propertyeditor.cpp @@ -177,10 +177,10 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) header()->setClickEnabled(false); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(updateEditorSize())); - connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(slotClicked(TQListViewItem*))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(updateEditorSize())); + connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(slotClicked(TQListViewItem*))); m_currentEditItem = 0; m_doubleClickForEdit = true; @@ -199,7 +199,7 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) m_undoButton->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); m_undoButton->resize(m_undoButton->height(), m_undoButton->height()); m_undoButton->hide(); - connect(m_undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo())); + connect(m_undoButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(undo())); m_currentEditLayout = new TQGridLayout(m_currentEditArea, 1, 2, 0, 0); // m_currentEditLayout->addWidget(m_undoButton, 0, 1); } @@ -214,7 +214,7 @@ void PropertyEditor::populateProperties(PropertyList *list) if (list == 0) return; m_list = list; - connect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*))); + connect(m_list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(propertyValueChanged(Property*))); const TQValueList<TQPair<TQString, TQValueList<TQString> > >& groups = m_list->propertiesOfGroup(); for (TQValueList<TQPair<TQString, TQValueList<TQString> > >::const_iterator it = groups.begin(); it != groups.end(); ++it) @@ -288,7 +288,7 @@ void PropertyEditor::clearProperties() hideEditor(); - disconnect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*))); + disconnect(m_list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(propertyValueChanged(Property*))); clear(); delete m_list; m_list = 0; @@ -445,8 +445,8 @@ Machine *PropertyEditor::machine(MultiProperty *property) if (m_registeredForType[name] == 0) { m_registeredForType[name] = PropertyMachineFactory::getInstance()->machineForProperty(property); - connect(m_registeredForType[name]->propertyEditor, TQT_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)), - this, TQT_SLOT(propertyChanged(MultiProperty*, const TQVariant&))); + connect(m_registeredForType[name]->propertyEditor, TQ_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)), + this, TQ_SLOT(propertyChanged(MultiProperty*, const TQVariant&))); m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->childrenRect().topLeft()); m_registeredForType[name]->propertyEditor->hide(); } diff --git a/lib/widgets/propeditor/propertylist.cpp b/lib/widgets/propeditor/propertylist.cpp index a5b43a3f..6ef367c2 100644 --- a/lib/widgets/propeditor/propertylist.cpp +++ b/lib/widgets/propeditor/propertylist.cpp @@ -327,7 +327,7 @@ void PropertyBuffer::intersect(const PropertyList *list) // tqWarning("intersect:: removing %s from intersection", it.key().ascii()); removeProperty(it.key()); } - connect(list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(intersectedValueChanged(Property*))); + connect(list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(intersectedValueChanged(Property*))); } void PropertyBuffer::intersectedValueChanged(Property *property) @@ -359,7 +359,7 @@ PropertyBuffer::PropertyBuffer(PropertyList *list) addToGroup(list->m_groupOfProperty[it.data()], mp); m_list[it.key()] = mp; } - connect(list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(intersectedValueChanged(Property*))); + connect(list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(intersectedValueChanged(Property*))); } } diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp index 755041c1..cb15bebb 100644 --- a/lib/widgets/propeditor/pspinbox.cpp +++ b/lib/widgets/propeditor/pspinbox.cpp @@ -34,7 +34,7 @@ PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name) m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); } PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *parent, const char *name) @@ -44,7 +44,7 @@ PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step m_edit = new TQSpinBox(minValue, maxValue, step, this); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); } TQVariant PSpinBox::value() const @@ -54,9 +54,9 @@ TQVariant PSpinBox::value() const void PSpinBox::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setValue(value.toInt()); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp index b6f4b74e..9f2e1364 100644 --- a/lib/widgets/propeditor/pstringlistedit.cpp +++ b/lib/widgets/propeditor/pstringlistedit.cpp @@ -49,7 +49,7 @@ PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, cons pbSelect->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); l->addWidget(pbSelect); - connect(pbSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor())); + connect(pbSelect, TQ_SIGNAL(clicked()), this, TQ_SLOT(showEditor())); } TQVariant PStringListEdit::value() const @@ -87,8 +87,8 @@ void PStringListEdit::showEditor() #endif TQSpacerItem *si = new TQSpacerItem(30, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding); - connect(pbOk, TQT_SIGNAL(clicked()), dia, TQT_SLOT(accept())); - connect(pbCancel, TQT_SIGNAL(clicked()), dia, TQT_SLOT(reject())); + connect(pbOk, TQ_SIGNAL(clicked()), dia, TQ_SLOT(accept())); + connect(pbCancel, TQ_SIGNAL(clicked()), dia, TQ_SLOT(reject())); dh->addItem(si); dh->addWidget(pbOk); diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp index ee91ea48..7b7afec1 100644 --- a/lib/widgets/propeditor/psymbolcombo.cpp +++ b/lib/widgets/propeditor/psymbolcombo.cpp @@ -51,8 +51,8 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char m_select->hide(); #endif - connect(m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectChar())); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_select, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectChar())); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); } TQVariant PSymbolCombo::value() const @@ -67,9 +67,9 @@ void PSymbolCombo::setValue(const TQVariant &value, bool emitChange) { if (!(value.isNull())) { - disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); m_edit->setText(TQChar(value.toInt())); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); if (emitChange) emit propertyChanged(m_property, value); } @@ -89,8 +89,8 @@ void PSymbolCombo::selectChar() KPushButton *pbCancel = new KPushButton(KStdGuiItem::cancel(), dia); TQSpacerItem *si = new TQSpacerItem(30, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding); - connect(pbOk, TQT_SIGNAL(clicked()), dia, TQT_SLOT(accept())); - connect(pbCancel, TQT_SIGNAL(clicked()), dia, TQT_SLOT(reject())); + connect(pbOk, TQ_SIGNAL(clicked()), dia, TQ_SLOT(accept())); + connect(pbCancel, TQ_SIGNAL(clicked()), dia, TQ_SLOT(reject())); dh->addItem(si); dh->addWidget(pbOk); diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp index 047c9997..d2df31e0 100644 --- a/lib/widgets/propeditor/purledit.cpp +++ b/lib/widgets/propeditor/purledit.cpp @@ -38,14 +38,14 @@ PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const c m_edit = new KURLRequester(this); l->addWidget(m_edit); m_edit->setMode((KFile::Mode)mode); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); #else m_edit = new KLineEdit(this); m_select = new TQPushButton("...",this); l->addWidget(m_edit); l->addWidget(m_select); m_mode = mode; - connect( m_select, TQT_SIGNAL(clicked()),this,TQT_SLOT(select())); + connect( m_select, TQ_SIGNAL(clicked()),this,TQ_SLOT(select())); #endif m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } @@ -62,9 +62,9 @@ TQVariant PUrlEdit::value() const void PUrlEdit::setValue(const TQVariant& value, bool emitChange) { #ifndef PURE_QT - disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); m_edit->setURL(value.toString()); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); #else m_edit->setText(value.toString()); #endif diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp index dae82868..2d4bfb57 100644 --- a/lib/widgets/propeditor/pyesnobutton.cpp +++ b/lib/widgets/propeditor/pyesnobutton.cpp @@ -40,7 +40,7 @@ PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); } TQVariant PYesNoButton::value() const @@ -55,10 +55,10 @@ void PYesNoButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect void PYesNoButton::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + disconnect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); m_edit->setDown(value.toBool()); value.toBool() ? m_edit->setText(i18n("Yes")) : m_edit->setText(i18n("No")); - connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp index 683a0931..862de024 100644 --- a/lib/widgets/propeditor/qeditlistbox.cpp +++ b/lib/widgets/propeditor/qeditlistbox.cpp @@ -120,7 +120,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons, if ( buttons & Add ) { servNewButton = new TQPushButton(i18n("&Add"), gb); servNewButton->setEnabled(false); - connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); + connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addItem())); grid->addWidget(servNewButton, row++, 1); } @@ -128,7 +128,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons, if ( buttons & Remove ) { servRemoveButton = new TQPushButton(i18n("&Remove"), gb); servRemoveButton->setEnabled(false); - connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); + connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem())); grid->addWidget(servRemoveButton, row++, 1); } @@ -136,20 +136,20 @@ void QEditListBox::init( bool checkAtEntering, int buttons, if ( buttons & UpDown ) { servUpButton = new TQPushButton(i18n("Move &Up"), gb); servUpButton->setEnabled(false); - connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemUp())); + connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemUp())); servDownButton = new TQPushButton(i18n("Move &Down"), gb); servDownButton->setEnabled(false); - connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemDown())); + connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemDown())); grid->addWidget(servUpButton, row++, 1); grid->addWidget(servDownButton, row++, 1); } - connect(m_lineEdit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(typedSomething(const TQString&))); + connect(m_lineEdit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(typedSomething(const TQString&))); - connect(m_lineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addItem())); - connect(m_listBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int))); + connect(m_lineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addItem())); + connect(m_listBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int))); // maybe supplied lineedit has some text already typedSomething( m_lineEdit->text() ); diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index c54f425c..625e4d25 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -491,7 +491,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e ) d->arrowDown = TRUE; repaint( FALSE ); } - TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout())); + TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout())); d->shortClick = TRUE; } } @@ -1241,16 +1241,16 @@ void QComboView::setListView( TQListView * newListView ) d->listView()->resize( 100, 10 ); */ - connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(internalActivate(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(internalActivate(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(checkState(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(internalHighlight(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(checkState(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(internalHighlight(TQListViewItem*))); } @@ -1386,16 +1386,16 @@ void QComboView::setUpListView() d->listView()->header()->hide(); - connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(internalActivate(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(internalActivate(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(checkState(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(internalHighlight(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(checkState(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(internalHighlight(TQListViewItem*))); } @@ -1435,9 +1435,9 @@ void QComboView::setLineEdit( TQLineEdit *edit ) edit->setFont( font() ); } - connect (edit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SIGNAL( textChanged( const TQString& ) ) ); - connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); + connect (edit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SIGNAL( textChanged( const TQString& ) ) ); + connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); edit->setFrame( FALSE ); d->updateLinedGeometry(); diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index 80d26599..4e695114 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -71,20 +71,20 @@ AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &) setInstance(AbbrevFactory::instance()); setXMLFile("kdevabbrev.rc"); - 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*)) ); - connect(core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(configWidget(KDialogBase*))); + connect(core(), TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(configWidget(KDialogBase*))); TDEAction *action; action = new TDEAction( i18n("Expand Text"), CTRL + Key_J, - this, TQT_SLOT(slotExpandText()), + this, TQ_SLOT(slotExpandText()), actionCollection(), "edit_expandtext" ); action->setToolTip( i18n("Expand current word") ); action->setWhatsThis( i18n("<b>Expand current word</b><p>Current word can be completed using the list of similar words in source files.") ); action = new TDEAction( i18n("Expand Abbreviation"), CTRL + Key_L, - this, TQT_SLOT(slotExpandAbbrev()), + this, TQ_SLOT(slotExpandAbbrev()), actionCollection(), "edit_expandabbrev" ); action->setToolTip( i18n("Expand abbreviation") ); action->setWhatsThis( i18n("<b>Expand abbreviation</b><p>Enable and configure abbreviations in <b>TDevelop Settings</b>, <b>Abbreviations</b> tab.") ); @@ -140,14 +140,14 @@ void AbbrevPart::setAutoWordCompletionEnabled( bool enabled ) disconnect( docIface->widget(), 0, this, 0 ); if( m_autoWordCompletionEnabled ){ - connect( docIface->widget(), TQT_SIGNAL(completionAborted()), - this, TQT_SLOT(slotCompletionAborted()) ); - connect( docIface->widget(), TQT_SIGNAL(completionDone()), - this, TQT_SLOT(slotCompletionDone()) ); - connect( docIface->widget(), TQT_SIGNAL(aboutToShowCompletionBox()), - this, TQT_SLOT(slotAboutToShowCompletionBox()) ); - - connect( docIface, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( docIface->widget(), TQ_SIGNAL(completionAborted()), + this, TQ_SLOT(slotCompletionAborted()) ); + connect( docIface->widget(), TQ_SIGNAL(completionDone()), + this, TQ_SLOT(slotCompletionDone()) ); + connect( docIface->widget(), TQ_SIGNAL(aboutToShowCompletionBox()), + this, TQ_SLOT(slotAboutToShowCompletionBox()) ); + + connect( docIface, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); } } void AbbrevPart::load() @@ -243,7 +243,7 @@ void AbbrevPart::configWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Abbreviations"), i18n("Abbreviations"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); AbbrevConfigWidget *w = new AbbrevConfigWidget(this, vbox, "abbrev config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); } @@ -502,14 +502,14 @@ void AbbrevPart::slotActivePartChanged( KParts::Part* part ) disconnect( part->widget(), 0, this, 0 ); disconnect( doc, 0, this, 0 ); - connect( part->widget(), TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*, TQString*)), - this, TQT_SLOT(slotFilterInsertString(KTextEditor::CompletionEntry*, TQString*)) ); + connect( part->widget(), TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*, TQString*)), + this, TQ_SLOT(slotFilterInsertString(KTextEditor::CompletionEntry*, TQString*)) ); if( autoWordCompletionEnabled() ){ - connect( part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(slotCompletionAborted()) ); - connect( part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(slotCompletionDone()) ); - connect( part->widget(), TQT_SIGNAL(aboutToShowCompletionBox()), this, TQT_SLOT(slotAboutToShowCompletionBox()) ); - connect( doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(slotCompletionAborted()) ); + connect( part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(slotCompletionDone()) ); + connect( part->widget(), TQ_SIGNAL(aboutToShowCompletionBox()), this, TQ_SLOT(slotAboutToShowCompletionBox()) ); + connect( doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); } m_prevLine = -1; diff --git a/parts/abbrev/addtemplatedlg.cpp b/parts/abbrev/addtemplatedlg.cpp index a837c08a..b2c9a090 100644 --- a/parts/abbrev/addtemplatedlg.cpp +++ b/parts/abbrev/addtemplatedlg.cpp @@ -27,8 +27,8 @@ AddTemplateDialog::AddTemplateDialog( TQStringList suffixesList, TQWidget *paren { setFocusProxy( editTemplate ); comboSuffixes->insertStringList(suffixesList); - connect( editTemplate, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT( textChanged())); - connect( editDescription, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT( textChanged())); + connect( editTemplate, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT( textChanged())); + connect( editDescription, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT( textChanged())); buttonOk->setEnabled(false); } diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 2c8b36c8..76e33693 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -98,17 +98,17 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch m_customOptions = 0L; loadLicenses(); - connect( this, TQT_SIGNAL( selected( const TQString & ) ), this, TQT_SLOT( pageChanged() ) ); + connect( this, TQ_SIGNAL( selected( const TQString & ) ), this, TQ_SLOT( pageChanged() ) ); helpButton()->hide(); templates_listview->header()->hide(); templates_listview->setColumnWidthMode(0, TQListView::Maximum); //to provide horiz scrollbar. m_templatesMenu = new TDEPopupMenu(templates_listview); - m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, TQT_SLOT(addTemplateToFavourites())); + m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, TQ_SLOT(addTemplateToFavourites())); m_favouritesMenu = new TDEPopupMenu(favourites_iconview); - m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, TQT_SLOT(removeFavourite())); + m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, TQ_SLOT(removeFavourite())); m_pathIsValid=false; m_part = part; @@ -319,7 +319,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch license_combo->setCurrentItem( idx - 1 ); } - connect( license_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(licenseChanged()) ); + connect( license_combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(licenseChanged()) ); m_custom_options_layout = new TQHBoxLayout( custom_options ); m_custom_options_layout->setAutoAdd(true); diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp index e1a9dbad..dfdfc14a 100644 --- a/parts/appwizard/appwizardpart.cpp +++ b/parts/appwizard/appwizardpart.cpp @@ -43,7 +43,7 @@ AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringL TDEAction *action; action = new TDEAction( i18n("&New Project..."), "window-new", 0, - this, TQT_SLOT(slotNewProject()), + this, TQ_SLOT(slotNewProject()), actionCollection(), "project_new" ); action->setToolTip( i18n("Generate a new project from a template") ); action->setWhatsThis( i18n("<b>New project</b><p>" @@ -52,7 +52,7 @@ AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringL "application from a set of templates.") ); action = new TDEAction( i18n("&Import Existing Project..."),"wizard", 0, - this, TQT_SLOT(slotImportProject()), + this, TQ_SLOT(slotImportProject()), actionCollection(), "project_import" ); action->setToolTip( i18n("Import existing project") ); action->setWhatsThis( i18n("<b>Import existing project</b><p>Creates a project file for a given directory.") ); @@ -82,7 +82,7 @@ void AppWizardPart::slotImportProject() void AppWizardPart::openFilesAfterGeneration(const KURL::List urlsToOpen) { m_urlsToOpen = urlsToOpen; - connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( openFilesAfterGeneration() ) ); + connect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( openFilesAfterGeneration() ) ); } void AppWizardPart::openFilesAfterGeneration() @@ -90,7 +90,7 @@ void AppWizardPart::openFilesAfterGeneration() for (KURL::List::const_iterator it = m_urlsToOpen.begin(); it != m_urlsToOpen.end(); ++it) partController()->editDocument(*it); m_urlsToOpen.clear(); - disconnect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( openFilesAfterGeneration() ) ); + disconnect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( openFilesAfterGeneration() ) ); } #include "appwizardpart.moc" diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index 975b9e1f..3a2c7c11 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -86,12 +86,12 @@ ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *na infrastructureBox->setEnabled(false); setProjectType("c"); - connect( name_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotProjectNameChanged( const TQString & ) ) ); + connect( name_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotProjectNameChanged( const TQString & ) ) ); // scanAvailableVCS(); - connect( fetchModuleButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFetchModulesFromRepository()) ); - connect(urlinput_edit, TQT_SIGNAL(urlSelected(const TQString& )), this, TQT_SLOT(dirChanged())); - connect(urlinput_edit, TQT_SIGNAL(returnPressed(const TQString& )), this, TQT_SLOT(dirChanged())); + connect( fetchModuleButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFetchModulesFromRepository()) ); + connect(urlinput_edit, TQ_SIGNAL(urlSelected(const TQString& )), this, TQ_SLOT(dirChanged())); + connect(urlinput_edit, TQ_SIGNAL(returnPressed(const TQString& )), this, TQ_SLOT(dirChanged())); slotProjectNameChanged( name_edit->text() ); } @@ -531,8 +531,8 @@ void ImportDialog::slotFetchModulesFromRepository() setCursor( KCursor::waitCursor() ); // setEnabled( false ); - connect( vcs, TQT_SIGNAL(finishedFetching(TQString)), - this, TQT_SLOT(slotFinishedCheckout(TQString)) ); + connect( vcs, TQ_SIGNAL(finishedFetching(TQString)), + this, TQ_SLOT(slotFinishedCheckout(TQString)) ); //restore cursor if we can't fetch repository if ( !vcs->fetchFromRepository() ) diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 6f9198b0..af16f84f 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -50,13 +50,13 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) setXMLFile("kdevpart_astyle.rc"); - formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle"); + formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQ_SLOT(beautifySource()), actionCollection(), "edit_astyle"); formatTextAction->setEnabled(false); formatTextAction->setToolTip(i18n("Reformat source")); formatTextAction->setWhatsThis(i18n("<b>Reformat source</b><p>Source reformatting functionality using <b>astyle</b> library. " "Also available in <b>New Class</b> and <b>Subclassing</b> wizards.")); - formatFileAction = new TDEAction(i18n("Format files"), 0, this, TQT_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle"); + formatFileAction = new TDEAction(i18n("Format files"), 0, this, TQ_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle"); formatFileAction->setEnabled(false); formatFileAction->setToolTip(i18n("Format files")); formatFileAction->setWhatsThis(i18n("<b>Fomat files</b><p>Formatting functionality using <b>astyle</b> library. " @@ -68,11 +68,11 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) m_configProxy->createProjectConfigPage(i18n("Formatting"), 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(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(activePartChanged(KParts::Part*))); - 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 *)) ); loadGlobal(); //use the globals first, project level will override later.. @@ -249,13 +249,13 @@ void AStylePart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsi case GLOBALDOC_OPTIONS: { AStyleWidget *w = new AStyleWidget(this, true, page, "astyle config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { AStyleWidget *w = new AStyleWidget(this, false, page, "astyle config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -399,7 +399,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context) if (context->hasType( Context::EditorContext )) { popup->insertSeparator(); - int id = popup->insertItem( i18n("Format selection"), this, TQT_SLOT(beautifySource()) ); + int id = popup->insertItem( i18n("Format selection"), this, TQ_SLOT(beautifySource()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Format</b><p>Formats the current selection, if possible")); } else if ( context->hasType( Context::FileContext )){ @@ -407,7 +407,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context) m_urls = ctx->urls(); popup->insertSeparator(); - int id = popup->insertItem( i18n("Format files"), this, TQT_SLOT(formatFiles()) ); + int id = popup->insertItem( i18n("Format files"), this, TQ_SLOT(formatFiles()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Format files</b><p>Formats selected files if possible")); } diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp index 6959fe7b..67cf8d5c 100644 --- a/parts/astyle/astyle_widget.cpp +++ b/parts/astyle/astyle_widget.cpp @@ -17,40 +17,40 @@ AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, con : AStyleConfig(parent, name), m_part(part), isGlobalWidget(global) { // which style changed - disable the other pages. - connect(StyleGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); - connect(ConfigTabs, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(styleChanged()) ); - - connect(FillingGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); - connect(Fill_ForceTabs, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Fill_TabCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - connect(Fill_SpaceCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - - connect(BracketGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); - connect(Brackets_CloseHeaders, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Indent_Switches, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Cases, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Classes, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Brackets, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Namespaces, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Labels, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Preprocessors, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Continue_MaxStatement, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - connect(Continue_MinConditional, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - - connect(Block_Break, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Block_BreakAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Block_IfElse, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Pad_ParenthesesIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_ParenthesesOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_ParenthesesUn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_Operators, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Keep_Statements, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Keep_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(StyleGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged())); + connect(ConfigTabs, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(styleChanged()) ); + + connect(FillingGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged())); + connect(Fill_ForceTabs, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Fill_TabCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + connect(Fill_SpaceCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + + connect(BracketGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged())); + connect(Brackets_CloseHeaders, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Indent_Switches, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Cases, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Classes, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Brackets, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Namespaces, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Labels, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Blocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Preprocessors, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Continue_MaxStatement, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + connect(Continue_MinConditional, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + + connect(Block_Break, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Block_BreakAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Block_IfElse, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Pad_ParenthesesIn, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Pad_ParenthesesOut, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Pad_ParenthesesUn, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Pad_Operators, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Keep_Statements, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Keep_Blocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); TQStringVariantMap option; diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index e4dc74a2..a22756df 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -64,19 +64,19 @@ BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringL _editorMap.setAutoDelete( true ); _settingMarks = false; - connect( partController(), TQT_SIGNAL( partAdded( KParts::Part * ) ), this, TQT_SLOT( partAdded( KParts::Part * ) ) ); + connect( partController(), TQ_SIGNAL( partAdded( KParts::Part * ) ), this, TQ_SLOT( partAdded( KParts::Part * ) ) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("Bookmarks"), BOOKMARKSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - connect( _widget, TQT_SIGNAL( removeAllBookmarksForURL( const KURL & ) ), - this, TQT_SLOT( removeAllBookmarksForURL( const KURL & ) ) ); - connect( _widget, TQT_SIGNAL( removeBookmarkForURL( const KURL &, int ) ), - this, TQT_SLOT( removeBookmarkForURL( const KURL &, int ) ) ); + connect( _widget, TQ_SIGNAL( removeAllBookmarksForURL( const KURL & ) ), + this, TQ_SLOT( removeAllBookmarksForURL( const KURL & ) ) ); + connect( _widget, TQ_SIGNAL( removeBookmarkForURL( const KURL &, int ) ), + this, TQ_SLOT( removeBookmarkForURL( const KURL &, int ) ) ); - connect( _marksChangeTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( marksChanged() ) ); + connect( _marksChangeTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( marksChanged() ) ); _config = new BookmarksConfig; _config->readConfig(); @@ -112,10 +112,10 @@ void BookmarksPart::partAdded( KParts::Part * part ) // connect to this editor KTextEditor::Document * doc = static_cast<KTextEditor::Document*>( ro_part ); - connect( doc, TQT_SIGNAL( marksChanged() ), this, TQT_SLOT( marksEvent() ) ); + connect( doc, TQ_SIGNAL( marksChanged() ), this, TQ_SLOT( marksEvent() ) ); // workaround for a katepart oddity where it drops all bookmarks on 'reload' - connect( doc, TQT_SIGNAL( completed() ), this, TQT_SLOT( reload() ) ); + connect( doc, TQ_SIGNAL( completed() ), this, TQ_SLOT( reload() ) ); } } } @@ -490,7 +490,7 @@ void BookmarksPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page if ( pagenumber == BOOKMARKSETTINGSPAGE ) { BookmarkSettings * w = new BookmarkSettings( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } } diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index ac14328b..33354269 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -150,10 +150,10 @@ BookmarksWidget::BookmarksWidget(BookmarksPart *part) setAllColumnsShowFocus( true ); // setSortColumn( -1 ); - connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); } @@ -270,18 +270,18 @@ void BookmarksWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int ) popup.insertTitle( _selectedItem->url().fileName() + i18n(", line ") + TQString::number( _selectedItem->line() +1 ) ); - popup.insertItem( i18n("Remove This Bookmark"), this, TQT_SLOT( doEmitRemoveBookMark() ) ); + popup.insertItem( i18n("Remove This Bookmark"), this, TQ_SLOT( doEmitRemoveBookMark() ) ); } else { popup.insertTitle( _selectedItem->url().fileName() + i18n( ", All" ) ); - popup.insertItem( i18n("Remove These Bookmarks"), this, TQT_SLOT( doEmitRemoveBookMark() ) ); + popup.insertItem( i18n("Remove These Bookmarks"), this, TQ_SLOT( doEmitRemoveBookMark() ) ); } popup.insertSeparator(); - popup.insertItem( i18n( "Collapse All" ), this, TQT_SLOT(collapseAll()) ); - popup.insertItem( i18n( "Expand All" ), this, TQT_SLOT(expandAll()) ); + popup.insertItem( i18n( "Collapse All" ), this, TQ_SLOT(collapseAll()) ); + popup.insertItem( i18n( "Expand All" ), this, TQ_SLOT(expandAll()) ); popup.exec(p); } diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp index c0cc21a2..853eb417 100644 --- a/parts/classview/classtooldlg.cpp +++ b/parts/classview/classtooldlg.cpp @@ -106,21 +106,21 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) layout->addWidget(class_tree, 10); - connect( class_combo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotClassComboChoice(const TQString&)) ); - connect( close_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClose()) ); - connect( access_combo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotAccessComboChoice(const TQString&)) ); - connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents())); - connect( children_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren())); - connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients())); - connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers())); - connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods())); - connect( attributes_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewAttributes())); - - connect( part, TQT_SIGNAL(setLanguageSupport(KDevLanguageSupport*)), - this, TQT_SLOT(setLanguageSupport(KDevLanguageSupport*)) ); + connect( class_combo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotClassComboChoice(const TQString&)) ); + connect( close_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClose()) ); + connect( access_combo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotAccessComboChoice(const TQString&)) ); + connect( parents_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewParents())); + connect( children_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewChildren())); + connect( clients_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewClients())); + connect( suppliers_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewSuppliers())); + connect( methods_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewMethods())); + connect( attributes_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewAttributes())); + + connect( part, TQ_SIGNAL(setLanguageSupport(KDevLanguageSupport*)), + this, TQ_SLOT(setLanguageSupport(KDevLanguageSupport*)) ); m_part->registerClassToolDialog(this); } @@ -136,7 +136,7 @@ void ClassToolDialog::setLanguageSupport(KDevLanguageSupport *ls) { if (ls) { disconnect(ls, 0, this, 0); - connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh())); + connect(ls, TQ_SIGNAL(updatedSourceInfo()), this, TQ_SLOT(refresh())); } else refresh(); @@ -240,7 +240,7 @@ void ClassToolDialog::slotAccessComboChoice(const TQString &str) void ClassToolDialog::slotClose() { delete this; - // TQTimer::singleShot(0, this, TQT_SLOT(delayedClose())); + // TQTimer::singleShot(0, this, TQ_SLOT(delayedClose())); } diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp index 9e052418..aeb7f11a 100644 --- a/parts/classview/classtreebase.cpp +++ b/parts/classview/classtreebase.cpp @@ -40,9 +40,9 @@ TDEPopupMenu *ClassTreeItem::createPopup() TDEPopupMenu *popup = new TDEPopupMenu(); if (features & KDevLanguageSupport::Declarations) - popup->insertItem( i18n("Go to Declaration"), classTree(), TQT_SLOT(slotGotoDeclaration()) ); + popup->insertItem( i18n("Go to Declaration"), classTree(), TQ_SLOT(slotGotoDeclaration()) ); if (m_item->itemType() == PIT_METHOD) - popup->insertItem( i18n("Go to Definition"), classTree(), TQT_SLOT(slotGotoImplementation()) ); + popup->insertItem( i18n("Go to Definition"), classTree(), TQ_SLOT(slotGotoImplementation()) ); TQString title; switch(m_item->itemType()) { @@ -52,13 +52,13 @@ TDEPopupMenu *ClassTreeItem::createPopup() bool hasAddMethod = features & KDevLanguageSupport::AddMethod; bool hasAddAttribute = features & KDevLanguageSupport::AddAttribute; if (hasAddMethod) - popup->insertItem( i18n("Add Method..."), classTree(), TQT_SLOT(slotAddMethod())); + popup->insertItem( i18n("Add Method..."), classTree(), TQ_SLOT(slotAddMethod())); if (hasAddAttribute) - popup->insertItem( i18n("Add Attribute..."), classTree(), TQT_SLOT(slotAddAttribute())); + popup->insertItem( i18n("Add Attribute..."), classTree(), TQ_SLOT(slotAddAttribute())); popup->insertSeparator(); - popup->insertItem( i18n("Parent Classes..."), classTree(), TQT_SLOT(slotClassBaseClasses())); - popup->insertItem( i18n("Child Classes..."), classTree(), TQT_SLOT(slotClassDerivedClasses())); - popup->insertItem( i18n("Class Tool..."), classTree(), TQT_SLOT(slotClassTool())); + popup->insertItem( i18n("Parent Classes..."), classTree(), TQ_SLOT(slotClassBaseClasses())); + popup->insertItem( i18n("Child Classes..."), classTree(), TQ_SLOT(slotClassDerivedClasses())); + popup->insertItem( i18n("Class Tool..."), classTree(), TQ_SLOT(slotClassTool())); } break; case PIT_STRUCT: @@ -459,14 +459,14 @@ ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char * (void) new ClassToolTip(this); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotItemPressed(int, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed( TQListViewItem*)), - TQT_SLOT( slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotItemPressed(int, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed( TQListViewItem*)), + TQ_SLOT( slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); m_part = part; } diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index d068adaa..93110a54 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -161,11 +161,11 @@ ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringL TQWhatsThis::add(m_widget, i18n("<b>Class browser</b><p>" "The class browser shows all namespaces, classes and namespace and class members in a project.")); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); - connect( core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotProjectOpened()) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(languageChanged()), this, TQ_SLOT(slotProjectOpened()) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); } bool ClassViewPart::jumpedToItem( ItemDom item ) { @@ -182,34 +182,34 @@ ClassViewPart::~ClassViewPart() void ClassViewPart::slotProjectOpened( ) { - connect( languageSupport(), TQT_SIGNAL(updatedSourceInfo()), navigator, TQT_SLOT(refresh()) ); - connect( languageSupport(), TQT_SIGNAL(addedSourceInfo(const TQString& )), navigator, TQT_SLOT(addFile(const TQString& ))); + connect( languageSupport(), TQ_SIGNAL(updatedSourceInfo()), navigator, TQ_SLOT(refresh()) ); + connect( languageSupport(), TQ_SIGNAL(addedSourceInfo(const TQString& )), navigator, TQ_SLOT(addFile(const TQString& ))); navigator->refresh(); } void ClassViewPart::slotProjectClosed( ) { // navigator->refresh(); -// disconnect( languageSupport(), TQT_SIGNAL(updatedSourceInfo()), navigator, TQT_SLOT(refresh()) ); +// disconnect( languageSupport(), TQ_SIGNAL(updatedSourceInfo()), navigator, TQ_SLOT(refresh()) ); } void ClassViewPart::setupActions( ) { m_functionsnav = new TDEListViewAction( new KComboView(true, 150, 0, "m_functionsnav_combo", new FunctionCompletion() ), i18n("Functions Navigation"), 0, 0, 0, actionCollection(), "functionsnav_combo", true ); - connect(m_functionsnav->view(), TQT_SIGNAL(activated(TQListViewItem*)), navigator, TQT_SLOT(selectFunctionNav(TQListViewItem*))); + connect(m_functionsnav->view(), TQ_SIGNAL(activated(TQListViewItem*)), navigator, TQ_SLOT(selectFunctionNav(TQListViewItem*))); // m_functionsnav->view()->setEditable(false); - connect(m_functionsnav->view(), TQT_SIGNAL(focusGranted()), navigator, TQT_SLOT(functionNavFocused())); - connect(m_functionsnav->view(), TQT_SIGNAL(focusLost()), navigator, TQT_SLOT(functionNavUnFocused())); + connect(m_functionsnav->view(), TQ_SIGNAL(focusGranted()), navigator, TQ_SLOT(functionNavFocused())); + connect(m_functionsnav->view(), TQ_SIGNAL(focusLost()), navigator, TQ_SLOT(functionNavUnFocused())); m_functionsnav->setToolTip(i18n("Functions in file")); m_functionsnav->setWhatsThis(i18n("<b>Function navigator</b><p>Navigates over functions contained in the file.")); // m_functionsnav->view()->setCurrentText(NAV_NODEFINITION); m_functionsnav->view()->setDefaultText(NAV_NODEFINITION); - new TDEAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" ); + new TDEAction( i18n("Focus Navigator"), 0, this, TQ_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" ); if (langHasFeature(KDevLanguageSupport::Classes)) { - TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia"); + TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQ_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia"); ac->setToolTip(i18n("Class inheritance diagram")); ac->setWhatsThis(i18n("<b>Class inheritance diagram</b><p>Displays inheritance relationship between classes in project. " "Note, it does not display classes outside inheritance hierarchy.")); @@ -242,8 +242,8 @@ void ClassViewPart::activePartChanged( KParts::Part * part) navigator->stopTimer(); if (m_activeView) { - disconnect(m_activeView, TQT_SIGNAL(cursorPositionChanged()), - navigator, TQT_SLOT(slotCursorPositionChanged())); + disconnect(m_activeView, TQ_SIGNAL(cursorPositionChanged()), + navigator, TQ_SLOT(slotCursorPositionChanged())); } kdDebug() << "ClassViewPart::activePartChanged()" << endl; @@ -267,8 +267,8 @@ void ClassViewPart::activePartChanged( KParts::Part * part) } if( m_activeViewCursor ) { - connect(m_activeView, TQT_SIGNAL(cursorPositionChanged()), - navigator, TQT_SLOT(slotCursorPositionChanged()) ); + connect(m_activeView, TQ_SIGNAL(cursorPositionChanged()), + navigator, TQ_SLOT(slotCursorPositionChanged()) ); } } void ClassViewPart::slotFocusNavbar() diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 726c71a6..18a5d686 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -59,11 +59,11 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part ) m_projectItem = 0; - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( m_part->core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( m_part->core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); - connect( m_part->core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotProjectOpened()) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) ); + connect( m_part->core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( m_part->core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); + connect( m_part->core(), TQ_SIGNAL(languageChanged()), this, TQ_SLOT(slotProjectOpened()) ); TQStringList lst; lst << i18n( "Group by Directories" ) << i18n( "Plain List" ) << i18n( "Java Like Mode" ); @@ -71,28 +71,28 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part ) m_actionViewMode->setItems( lst ); m_actionViewMode->setWhatsThis(i18n("<b>View mode</b><p>Class browser items can be grouped by directories, listed in a plain or java like view.")); - m_actionNewClass = new TDEAction( i18n("New Class..."), TDEShortcut(), this, TQT_SLOT(slotNewClass()), + m_actionNewClass = new TDEAction( i18n("New Class..."), TDEShortcut(), this, TQ_SLOT(slotNewClass()), m_part->actionCollection(), "classview_new_class" ); m_actionNewClass->setWhatsThis(i18n("<b>New class</b><p>Calls the <b>New Class</b> wizard.")); - m_actionCreateAccessMethods = new TDEAction( i18n("Create get/set Methods"), TDEShortcut(), this, TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); + m_actionCreateAccessMethods = new TDEAction( i18n("Create get/set Methods"), TDEShortcut(), this, TQ_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); - m_actionAddMethod = new TDEAction( i18n("Add Method..."), TDEShortcut(), this, TQT_SLOT(slotAddMethod()), + m_actionAddMethod = new TDEAction( i18n("Add Method..."), TDEShortcut(), this, TQ_SLOT(slotAddMethod()), m_part->actionCollection(), "classview_add_method" ); m_actionAddMethod->setWhatsThis(i18n("<b>Add method</b><p>Calls the <b>New Method</b> wizard.")); - m_actionAddAttribute = new TDEAction( i18n("Add Attribute..."), TDEShortcut(), this, TQT_SLOT(slotAddAttribute()), + m_actionAddAttribute = new TDEAction( i18n("Add Attribute..."), TDEShortcut(), this, TQ_SLOT(slotAddAttribute()), m_part->actionCollection(), "classview_add_attribute" ); m_actionAddAttribute->setWhatsThis(i18n("<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard.")); - m_actionOpenDeclaration = new TDEAction( i18n("Open Declaration"), TDEShortcut(), this, TQT_SLOT(slotOpenDeclaration()), + m_actionOpenDeclaration = new TDEAction( i18n("Open Declaration"), TDEShortcut(), this, TQ_SLOT(slotOpenDeclaration()), m_part->actionCollection(), "classview_open_declaration" ); m_actionOpenDeclaration->setWhatsThis(i18n("<b>Open declaration</b><p>Opens a file where the selected item is declared and jumps to the declaration line.")); - m_actionOpenImplementation = new TDEAction( i18n("Open Implementation"), TDEShortcut(), this, TQT_SLOT(slotOpenImplementation()), + m_actionOpenImplementation = new TDEAction( i18n("Open Implementation"), TDEShortcut(), this, TQ_SLOT(slotOpenImplementation()), m_part->actionCollection(), "classview_open_implementation" ); m_actionOpenImplementation->setWhatsThis(i18n("<b>Open implementation</b><p>Opens a file where the selected item is defined (implemented) and jumps to the definition line.")); - m_actionFollowEditor = new TDEToggleAction( i18n("Follow Editor"), TDEShortcut(), this, TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); + m_actionFollowEditor = new TDEToggleAction( i18n("Follow Editor"), TDEShortcut(), this, TQ_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); TDEConfig* config = m_part->instance()->config(); config->setGroup( "General" ); @@ -218,12 +218,12 @@ void ClassViewWidget::slotProjectOpened( ) m_projectDirectoryLength = m_projectDirectory.length() + 1; - connect( m_part->languageSupport(), TQT_SIGNAL(updatedSourceInfo()), - this, TQT_SLOT(refresh()) ); - connect( m_part->languageSupport(), TQT_SIGNAL(aboutToRemoveSourceInfo(const TQString&)), - this, TQT_SLOT(removeFile(const TQString&)) ); - connect( m_part->languageSupport(), TQT_SIGNAL(addedSourceInfo(const TQString&)), - this, TQT_SLOT(insertFile(const TQString&)) ); + connect( m_part->languageSupport(), TQ_SIGNAL(updatedSourceInfo()), + this, TQ_SLOT(refresh()) ); + connect( m_part->languageSupport(), TQ_SIGNAL(aboutToRemoveSourceInfo(const TQString&)), + this, TQ_SLOT(removeFile(const TQString&)) ); + connect( m_part->languageSupport(), TQ_SIGNAL(addedSourceInfo(const TQString&)), + this, TQ_SLOT(insertFile(const TQString&)) ); } void ClassViewWidget::slotProjectClosed( ) diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp index 32d05059..3059f00e 100644 --- a/parts/classview/hierarchydlg.cpp +++ b/parts/classview/hierarchydlg.cpp @@ -66,22 +66,22 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part ) combo_layout->addWidget(close_button); layout->addWidget(splitter); - connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)), - this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) ); - connect( class_combo, TQT_SIGNAL(activated(TQListViewItem*)), - this, TQT_SLOT(slotClassComboChoice(TQListViewItem*)) ); - connect( namespace_combo, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotNamespaceComboChoice(const TQString&)) ); - connect( class_combo, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotClassComboChoice(const TQString&)) ); - connect( close_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(hide()) ); - connect( save_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(save()) ); - connect( refresh_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(refresh()) ); - connect( digraph, TQT_SIGNAL(selected(const TQString&)), - this, TQT_SLOT(classSelected(const TQString&)) ); + connect( namespace_combo, TQ_SIGNAL(activated(TQListViewItem*)), + this, TQ_SLOT(slotNamespaceComboChoice(TQListViewItem*)) ); + connect( class_combo, TQ_SIGNAL(activated(TQListViewItem*)), + this, TQ_SLOT(slotClassComboChoice(TQListViewItem*)) ); + connect( namespace_combo, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotNamespaceComboChoice(const TQString&)) ); + connect( class_combo, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotClassComboChoice(const TQString&)) ); + connect( close_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(hide()) ); + connect( save_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(save()) ); + connect( refresh_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(refresh()) ); + connect( digraph, TQ_SIGNAL(selected(const TQString&)), + this, TQ_SLOT(classSelected(const TQString&)) ); m_part = part; // m_part->registerHierarchyDialog(this); @@ -157,7 +157,7 @@ void HierarchyDialog::refresh() void HierarchyDialog::setLanguageSupport(KDevLanguageSupport *ls) { if (ls) - connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh())); + connect(ls, TQ_SIGNAL(updatedSourceInfo()), this, TQ_SLOT(refresh())); else refresh(); } diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index 694aa0d4..f42bd8db 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -111,18 +111,18 @@ Navigator::Navigator(ClassViewPart *parent, const char *name) m_navNoDefinition = true; m_actionSyncWithEditor = new TDEAction( i18n("Sync ClassView"), "view_tree", TDEShortcut(), this, - TQT_SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" ); + TQ_SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" ); TDEAction * action = new TDEAction( i18n("Jump to next function"), CTRL+ALT+Key_PageDown, this, - TQT_SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" ); + TQ_SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" ); action->plug( &m_dummyActionWidget ); action = new TDEAction( i18n("Jump to previous function"), CTRL+ALT+Key_PageUp, this, - TQT_SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" ); + TQ_SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" ); action->plug( &m_dummyActionWidget ); m_syncTimer = new TQTimer(this); - connect(m_syncTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(syncFunctionNav())); + connect(m_syncTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(syncFunctionNav())); } Navigator::~Navigator() diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 1333ac54..3e53b66c 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -81,18 +81,18 @@ CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) m_widget->setCaption(i18n("CTags Lookup")); mainWindow()->embedOutputView( m_widget, i18n( "CTags" ), i18n( "CTags lookup results" ) ); - 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 *)) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("CTags"), CTAGSSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - - new TDEAction( i18n("Lookup Current Text"), 0, CTRL+Key_Underscore, this, TQT_SLOT(slotLookup()), actionCollection(), "ctags_lookup_shortcut"); - new TDEAction( i18n("Lookup Current Text as Declaration"), 0, CTRL+Key_Semicolon, this, TQT_SLOT(slotLookupDeclaration()), actionCollection(), "ctags_declaration_shortcut"); - new TDEAction( i18n("Lookup Current Text as Definition"), 0, CTRL+Key_Colon, this, TQT_SLOT(slotLookupDefinition()), actionCollection(), "ctags_definition_shortcut"); - new TDEAction( i18n("Jump to Next Match"), 0, 0, this, TQT_SLOT(slotGoToNext()), actionCollection(), "ctags_jump_to_next"); - new TDEAction( i18n("Open Lookup Dialog"), 0, 0, this, TQT_SLOT(slotOpenLookup()), actionCollection(), "ctags_input_shortcut"); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + + new TDEAction( i18n("Lookup Current Text"), 0, CTRL+Key_Underscore, this, TQ_SLOT(slotLookup()), actionCollection(), "ctags_lookup_shortcut"); + new TDEAction( i18n("Lookup Current Text as Declaration"), 0, CTRL+Key_Semicolon, this, TQ_SLOT(slotLookupDeclaration()), actionCollection(), "ctags_declaration_shortcut"); + new TDEAction( i18n("Lookup Current Text as Definition"), 0, CTRL+Key_Colon, this, TQ_SLOT(slotLookupDefinition()), actionCollection(), "ctags_definition_shortcut"); + new TDEAction( i18n("Jump to Next Match"), 0, 0, this, TQ_SLOT(slotGoToNext()), actionCollection(), "ctags_jump_to_next"); + new TDEAction( i18n("Open Lookup Dialog"), 0, 0, this, TQ_SLOT(slotOpenLookup()), actionCollection(), "ctags_input_shortcut"); } @@ -111,8 +111,8 @@ void CTags2Part::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, u if ( pagenumber == CTAGSSETTINGSPAGE ) { CTags2SettingsWidget * w = new CTags2SettingsWidget( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); - connect( w, TQT_SIGNAL(newTagsfileName(const TQString& )), this, TQT_SLOT(updateTagsfileName(const TQString& )) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); + connect( w, TQ_SIGNAL(newTagsfileName(const TQString& )), this, TQ_SLOT(updateTagsfileName(const TQString& )) ); } } @@ -194,13 +194,13 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); if ( showDeclaration ) - popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) ); + popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQ_SLOT(slotGotoDeclaration()) ); if ( showDefinition ) - popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQT_SLOT(slotGotoDefinition()) ); + popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQ_SLOT(slotGotoDefinition()) ); if ( showLookup ) - popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQT_SLOT(slotGotoTag()) ); + popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQ_SLOT(slotGotoTag()) ); } } diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp index 4225e83a..7db053d0 100644 --- a/parts/ctags2/ctags2_widget.cpp +++ b/parts/ctags2/ctags2_widget.cpp @@ -52,10 +52,10 @@ CTags2Widget::CTags2Widget( CTags2Part * part, const char* name, WFlags fl) output_view->setColumnWidthMode(2,TQListView::Maximum); _typeTimeout = new TQTimer( this ); - connect( _typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(line_edit_changed()) ); + connect( _typeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(line_edit_changed()) ); - connect( output_view, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(itemExecuted(TQListViewItem*)) ); - connect( output_view, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(itemExecuted(TQListViewItem*)) ); + connect( output_view, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(itemExecuted(TQListViewItem*)) ); + connect( output_view, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(itemExecuted(TQListViewItem*)) ); updateDBDateLabel(); } diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index eb2063c4..62fd20b2 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -58,13 +58,13 @@ DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &) mainWindow()->setViewAvailable( diffWidget, false ); TDEAction *action = new TDEAction( i18n("Difference Viewer..."), 0, - this, TQT_SLOT(slotExecDiff()), + this, TQ_SLOT(slotExecDiff()), actionCollection(), "tools_diff" ); action->setToolTip(i18n("Difference viewer")); action->setWhatsThis(i18n("<b>Difference viewer</b><p>Shows the contents of a patch file.")); - 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 *)) ); } static bool urlIsEqual(const KURL &a, const KURL &b) @@ -121,7 +121,7 @@ void DiffPart::contextMenu( TQPopupMenu* popup, const Context* context ) if ( partController()->documentState( rw_part->url() ) != Clean ) { int id = popup->insertItem( i18n( "Difference to Disk File" ), - this, TQT_SLOT(localDiff()) ); + this, TQ_SLOT(localDiff()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Difference to disk file</b><p>Shows the difference between " "the file contents in this editor and the file contents on disk.")); } @@ -155,14 +155,14 @@ void DiffPart::localDiff() *proc << "-u" << popupFile.path() << "-"; proc->setWorkingDirectory( popupFile.directory() ); - connect( proc, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(processExited( TDEProcess* )) ); - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) ); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) ); - connect( proc, TQT_SIGNAL(wroteStdin( TDEProcess* )), - this, TQT_SLOT(wroteStdin( TDEProcess* )) ); + connect( proc, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(processExited( TDEProcess* )) ); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStdout( TDEProcess*, char*, int )) ); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStderr( TDEProcess*, char*, int )) ); + connect( proc, TQ_SIGNAL(wroteStdin( TDEProcess* )), + this, TQ_SLOT(wroteStdin( TDEProcess* )) ); if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { KMessageBox::error( 0, i18n( "Could not invoke the \"diff\" command." ) ); diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index 997da11a..59dcf3de 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -78,19 +78,19 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) } if ( !extPartsTranslated.isEmpty() ) popup->insertSeparator( i ); - connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) ); + connect( popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupActivated(int)) ); - popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); + popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQ_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); popup->setItemEnabled( POPUP_BASE - 2, length() > 0 ); popup->insertSeparator( 1 ); - popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); + popup->insertItem( i18n( "Highlight Syntax" ), this, TQ_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); popup->setItemChecked( POPUP_BASE - 1, _highlight ); popup->insertSeparator( 3 ); popup->insertSeparator(); - popup->insertItem( i18n("Hide view"), parent(), TQT_SLOT(hideView()) ); + popup->insertItem( i18n("Hide view"), parent(), TQ_SLOT(hideView()) ); return popup; } @@ -190,7 +190,7 @@ DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFl te->setReadOnly( true ); te->setTextFormat( TQTextEdit::PlainText ); // te->setMinimumSize( 300, 200 ); - connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); + connect( te, TQ_SIGNAL(externalPartRequested(const TQString&)), this, TQ_SLOT(loadExtPart(const TQString&)) ); TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->addWidget( te ); @@ -309,10 +309,10 @@ void DiffWidget::openURL( const KURL& url ) if ( !job ) return; - connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), - this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotFinished()) ); + connect( job, TQ_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), + this, TQ_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotFinished()) ); } void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) @@ -321,9 +321,9 @@ void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) if ( !te->isVisible() ) { - popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) ); + popup->insertItem( i18n("Display &Raw Output"), this, TQ_SLOT(showTextEdit()) ); popup->insertSeparator(); - popup->insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) ); + popup->insertItem( i18n("Hide view"), this, TQ_SLOT(hideView()) ); } popup->exec( TQCursor::pos() ); diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp index fd235a0a..e0f3cccf 100644 --- a/parts/distpart/distpart_part.cpp +++ b/parts/distpart/distpart_part.cpp @@ -46,7 +46,7 @@ DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringLis setXMLFile("kdevpart_distpart.rc"); m_action = new TDEAction( i18n("Distribution && Publishing"), "package", 0, - this, TQT_SLOT(show()), + this, TQ_SLOT(show()), actionCollection(), "make_dist" ); m_action->setToolTip(i18n("Make source and binary distribution")); @@ -58,8 +58,8 @@ DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringLis m_dialog = new DistpartDialog(this, m_dlg ); m_dlg->setMainWidget(m_dialog); - connect( m_dlg, TQT_SIGNAL(okClicked()), m_dialog, TQT_SLOT(slotokayPushButtonPressed())); - connect( m_dlg, TQT_SIGNAL(cancelClicked()), m_dialog, TQT_SLOT(slotcancelPushButtonPressed())); + connect( m_dlg, TQ_SIGNAL(okClicked()), m_dialog, TQ_SLOT(slotokayPushButtonPressed())); + connect( m_dlg, TQ_SIGNAL(cancelClicked()), m_dialog, TQ_SLOT(slotcancelPushButtonPressed())); // Package types //RpmPackage = new SpecSupport(this); //LsmPackage = new LsmSupport(this); diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index c628fe26..48f90f31 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -55,39 +55,39 @@ DistpartDialog::DistpartDialog(DistpartPart *part, TQWidget *parent) :distpart_ui(parent, "dist_widget"), m_part(part) { m_spec = new SpecSupport(m_part); - connect( customProjectCheckBox, TQT_SIGNAL(toggled(bool) ), - this, TQT_SLOT(slotcustomProjectCheckBoxChanged())); - connect( uploadCustomCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotuploadCustomCheckBoxChanged())); - -// connect( okayPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotokayPushButtonPressed())); -// connect( cancelPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotcancelPushButtonPressed())); -/* connect(help_PushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slothelp_PushButtonPressed()));*/ - connect( createSrcArchPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotcreateSrcArchPushButtonPressed())); - connect( resetSrcPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotresetSrcPushButtonPressed())); - - connect( genHTMLPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotgenHTMLPushButtonPressed())); - connect( resetHTMLPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotresetHTMLPushButtonPressed())); - connect( uploadSubmitPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotuploadSubmitPushButtonPressed())); - connect( uploadResetPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotuploadResetPushButtonPressed())); - connect( uploadAddFileToolButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotuploadAddFileToolButtonPressed())); - connect( uploadRemoveToolButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotuploadRemoveToolButtonPressed())); - connect ( srcDistFileListBox, TQT_SIGNAL(clicked(TQListBoxItem*)), this, TQT_SLOT(slotRemoveFile(TQListBoxItem*))); -// connect( buildAllPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotbuildAllPushButtonPressed() )); -// connect( exportSPECPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotexportSPECPushButtonPressed( ) ) ); -// connect( srcPackagePushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotsrcPackagePushButtonPressed() ) ); -// connect( importSPECPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotimportSPECPushButtonPressed() ) ); + connect( customProjectCheckBox, TQ_SIGNAL(toggled(bool) ), + this, TQ_SLOT(slotcustomProjectCheckBoxChanged())); + connect( uploadCustomCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotuploadCustomCheckBoxChanged())); + +// connect( okayPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotokayPushButtonPressed())); +// connect( cancelPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotcancelPushButtonPressed())); +/* connect(help_PushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slothelp_PushButtonPressed()));*/ + connect( createSrcArchPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotcreateSrcArchPushButtonPressed())); + connect( resetSrcPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotresetSrcPushButtonPressed())); + + connect( genHTMLPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotgenHTMLPushButtonPressed())); + connect( resetHTMLPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotresetHTMLPushButtonPressed())); + connect( uploadSubmitPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotuploadSubmitPushButtonPressed())); + connect( uploadResetPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotuploadResetPushButtonPressed())); + connect( uploadAddFileToolButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotuploadAddFileToolButtonPressed())); + connect( uploadRemoveToolButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotuploadRemoveToolButtonPressed())); + connect ( srcDistFileListBox, TQ_SIGNAL(clicked(TQListBoxItem*)), this, TQ_SLOT(slotRemoveFile(TQListBoxItem*))); +// connect( buildAllPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotbuildAllPushButtonPressed() )); +// connect( exportSPECPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotexportSPECPushButtonPressed( ) ) ); +// connect( srcPackagePushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotsrcPackagePushButtonPressed() ) ); +// connect( importSPECPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotimportSPECPushButtonPressed() ) ); loadSettings(); diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp index 06a0bb67..1698b68b 100644 --- a/parts/distpart/specsupport.cpp +++ b/parts/distpart/specsupport.cpp @@ -53,14 +53,14 @@ SpecSupport::SpecSupport(DistpartPart *part) : packageBase(), m_part(part) { // // // -// connect(buildAllPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotbuildAllPushButtonPressed())); -// connect(exportSPECPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotexportSPECPushButtonPressed())); -// connect(importSPECPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotimportSPECPushButtonPressed())); -// connect(srcPackagePushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotsrcPackagePushButtonPressed())); +// connect(buildAllPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotbuildAllPushButtonPressed())); +// connect(exportSPECPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotexportSPECPushButtonPressed())); +// connect(importSPECPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotimportSPECPushButtonPressed())); +// connect(srcPackagePushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotsrcPackagePushButtonPressed())); parseDotRpmmacros(); } diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index 4ec63094..6312006b 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -133,16 +133,16 @@ BookmarkView::BookmarkView(DocumentationWidget *parent, const char *name) showBookmarks(); - connect(m_view, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); - connect(m_addButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(addBookmark())); - connect(m_editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editBookmark())); - connect(m_removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeBookmark())); - - connect(m_widget->part(), TQT_SIGNAL(bookmarkLocation(const TQString&, const KURL& )), - this, TQT_SLOT(addBookmark(const TQString&, const KURL& ))); - connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); + connect(m_view, TQ_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); + connect(m_addButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(addBookmark())); + connect(m_editButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editBookmark())); + connect(m_removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeBookmark())); + + connect(m_widget->part(), TQ_SIGNAL(bookmarkLocation(const TQString&, const KURL& )), + this, TQ_SLOT(addBookmark(const TQString&, const KURL& ))); + connect(m_view, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } BookmarkView::~BookmarkView() diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index 3c07369c..d77126b1 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -47,10 +47,10 @@ ContentsView::ContentsView(DocumentationWidget *parent, const char *name) m_view->setSorting(-1); m_view->setAllColumnsShowFocus( true ); - connect(m_view, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); - connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); + connect(m_view, TQ_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); + connect(m_view, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } ContentsView::~ContentsView() diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp index 55b108ec..47b0c0f0 100644 --- a/parts/documentation/docconfiglistview.cpp +++ b/parts/documentation/docconfiglistview.cpp @@ -40,10 +40,10 @@ DocConfigListView::DocConfigListView(TQWidget *parent, const char *name) setResizeMode( TQListView::LastColumn ); setSorting(3); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(itemClicked(TQListViewItem*, const TQPoint&, int ))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(itemDoubleClicked(TQListViewItem*, const TQPoint&, int ))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(itemClicked(TQListViewItem*, const TQPoint&, int ))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(itemDoubleClicked(TQListViewItem*, const TQPoint&, int ))); } DocConfigListView::~DocConfigListView() diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 8dd6c0b8..8cfacada 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -64,7 +64,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, { (*it)->loadCatalogConfiguration( m_View ); } - connect( m_View, TQT_SIGNAL(itemActivated()), this, TQT_SLOT(editCollectionButtonClicked()) ); + connect( m_View, TQ_SIGNAL(itemActivated()), this, TQ_SLOT(editCollectionButtonClicked()) ); TDEConfig *config = m_part->config(); diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 1d284a64..09aaa042 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -87,11 +87,11 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("Documentation"), GLOBALDOC_OPTIONS, info()->icon() ); m_configProxy->createProjectConfigPage(i18n("Project Documentation"), 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(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(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + 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())); m_widget = new DocumentationWidget(this); m_widget->setIcon(SmallIcon(info()->icon())); @@ -109,7 +109,7 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T setupActions(); checkLastVersion(); - TQTimer::singleShot(5, this, TQT_SLOT(init())); + TQTimer::singleShot(5, this, TQ_SLOT(init())); new KDevDocumentationIface(this); } @@ -147,7 +147,7 @@ void DocumentationPart::loadDocumentationPlugins() { kdDebug() << " success" << endl; docPlugin->init(m_widget->contents()); - connect(this, TQT_SIGNAL(indexSelected(IndexBox* )), docPlugin, TQT_SLOT(createIndex(IndexBox* ))); + connect(this, TQ_SIGNAL(indexSelected(IndexBox* )), docPlugin, TQ_SLOT(createIndex(IndexBox* ))); m_plugins.append(docPlugin); } } @@ -172,13 +172,13 @@ void DocumentationPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *pag case GLOBALDOC_OPTIONS: { DocGlobalConfigWidget *w1 = new DocGlobalConfigWidget(this, m_widget, page, "doc config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w1, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { DocProjectConfigWidget *w1 = new DocProjectConfigWidget(this, page, "doc project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w1, TQ_SLOT(accept())); break; } } @@ -199,7 +199,7 @@ bool DocumentationPart::configure(int page) DocGlobalConfigWidget *w1 = new DocGlobalConfigWidget(this, m_widget, dlg.plainPage()); l->addWidget(w1); w1->docTab->setCurrentPage(page); - connect(&dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + connect(&dlg, TQ_SIGNAL(okClicked()), w1, TQ_SLOT(accept())); return (dlg.exec() == TQDialog::Accepted); } @@ -211,7 +211,7 @@ void DocumentationPart::setupActions() TDEAction *action; action = new TDEAction(i18n("&Search in Documentation..."), CTRL+ALT+Key_S, - this, TQT_SLOT(searchInDocumentation()), + this, TQ_SLOT(searchInDocumentation()), actionCollection(), "help_search_in_doc" ); action->setToolTip(i18n("Full text search in the documentation")); action->setWhatsThis(i18n("<b>Search in documentation</b><p>" @@ -222,7 +222,7 @@ void DocumentationPart::setupActions() "configuration dialog of the documentation plugin.")); action = new TDEAction(i18n("&Look in Documentation Index..."), CTRL+ALT+Key_I, - this, TQT_SLOT(lookInDocumentationIndex()), + this, TQ_SLOT(lookInDocumentationIndex()), actionCollection(), "help_look_in_index" ); action->setToolTip(i18n("Look in the documentation index")); action->setWhatsThis(i18n("<b>Look in documentation index</b><p>" @@ -231,19 +231,19 @@ void DocumentationPart::setupActions() "the documentation index.")); action = new TDEAction(i18n("Man Page..."), 0, - this, TQT_SLOT(manPage()), + this, TQ_SLOT(manPage()), actionCollection(), "help_manpage" ); action->setToolTip(i18n("Show a manpage")); action->setWhatsThis(i18n("<b>Show a manpage</b><p>Opens a man page using embedded viewer.")); action = new TDEAction(i18n("Info Page..."), 0, - this, TQT_SLOT(infoPage()), + this, TQ_SLOT(infoPage()), actionCollection(), "help_infopage"); action->setToolTip(i18n("Show an infopage")); action->setWhatsThis(i18n("<b>Show an infopage</b><p>Opens an info page using embedded viewer.")); action = new TDEAction(i18n("Find Documentation..."), 0, - this, TQT_SLOT(findInDocumentation()), + this, TQ_SLOT(findInDocumentation()), actionCollection(), "help_find_documentation"); action->setToolTip(i18n("Find Documentation")); action->setWhatsThis(i18n("<b>Find documentation</b><p>" @@ -467,7 +467,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) int id = -1; if (hasContextFeature(Finder)) { id = popup->insertItem(i18n("Find Documentation: %1").arg(squeezed), - this, TQT_SLOT(contextFindDocumentation())); + this, TQ_SLOT(contextFindDocumentation())); popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>" "Opens the documentation finder tab and searches " "all possible sources of documentation like " @@ -476,7 +476,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) } if (hasContextFeature(IndexLookup)) { id = popup->insertItem(i18n("Look in Documentation Index: %1").arg(squeezed), - this, TQT_SLOT(contextLookInDocumentationIndex())); + this, TQ_SLOT(contextLookInDocumentationIndex())); popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>" "Opens the documentation index tab. It allows " "a term to be entered which will be looked for in " @@ -484,7 +484,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) } if (hasContextFeature(FullTextSearch)) { id = popup->insertItem(i18n("Search in Documentation: %1").arg(squeezed), - this, TQT_SLOT(contextSearchInDocumentation())); + this, TQ_SLOT(contextSearchInDocumentation())); popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches " "for a term under the cursor in " "the documentation. For this to work, " @@ -493,12 +493,12 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) } if (hasContextFeature(GotoMan)) { id = popup->insertItem(i18n("Goto Manpage: %1").arg(squeezed), - this, TQT_SLOT(contextManPage())); + this, TQ_SLOT(contextManPage())); popup->setWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor.")); } if (hasContextFeature(GotoInfo)) { id = popup->insertItem( i18n("Goto Infopage: %1").arg(squeezed), - this, TQT_SLOT(contextInfoPage()) ); + this, TQ_SLOT(contextInfoPage()) ); popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor.")); } if (id != -1) diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index b1ab69ca..7d533753 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -64,7 +64,7 @@ DocumentationWidget::DocumentationWidget(DocumentationPart *part) m_bookmarks = new BookmarkView(this); m_tab->addItem(m_bookmarks, i18n("Bookmarks")); - connect(m_tab, TQT_SIGNAL(currentChanged(int)), this, TQT_SLOT(tabChanged(int))); + connect(m_tab, TQ_SIGNAL(currentChanged(int)), this, TQ_SLOT(tabChanged(int))); } DocumentationWidget::~DocumentationWidget() diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index ee6c639a..46027878 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -51,15 +51,15 @@ FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* na proc_man = new TDEProcess( this ); proc_info = new TDEProcess( this ); - connect( proc_man, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(procManExited( TDEProcess* )) ); - connect( proc_man, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)), - this, TQT_SLOT(procManReadStdout( TDEProcess*, char*, int)) ); - - connect( proc_info, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(procInfoExited( TDEProcess* )) ); - connect( proc_info, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)), - this, TQT_SLOT(procInfoReadStdout( TDEProcess*, char*, int)) ); + connect( proc_man, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(procManExited( TDEProcess* )) ); + connect( proc_man, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int)), + this, TQ_SLOT(procManReadStdout( TDEProcess*, char*, int)) ); + + connect( proc_info, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(procInfoExited( TDEProcess* )) ); + connect( proc_info, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int)), + this, TQ_SLOT(procInfoReadStdout( TDEProcess*, char*, int)) ); result_list->header()->hide(); result_list->setSorting(-1); diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp index f414e288..6024bdac 100644 --- a/parts/documentation/indexview.cpp +++ b/parts/documentation/indexview.cpp @@ -52,11 +52,11 @@ IndexView::IndexView(DocumentationWidget *parent, const char *name) m_index = new IndexBox(this); l->addWidget(m_index); - connect(m_index, TQT_SIGNAL(executed(TQListBoxItem* )), this, TQT_SLOT(searchInIndex(TQListBoxItem* ))); - connect(m_index, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem*, const TQPoint& )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListBoxItem*, const TQPoint& ))); - connect(m_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(searchInIndex())); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(showIndex(const TQString&))); + connect(m_index, TQ_SIGNAL(executed(TQListBoxItem* )), this, TQ_SLOT(searchInIndex(TQListBoxItem* ))); + connect(m_index, TQ_SIGNAL(mouseButtonPressed(int, TQListBoxItem*, const TQPoint& )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListBoxItem*, const TQPoint& ))); + connect(m_edit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(searchInIndex())); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(showIndex(const TQString&))); m_edit->installEventFilter(this); } diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 7eedf73a..43822380 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -685,7 +685,7 @@ ProjectDocumentationPlugin::ProjectDocumentationPlugin(DocumentationPlugin *docP kdDebug() << "ProjectDocumentationPlugin::ProjectDocumentationPlugin for type " << type << endl; m_watch = new KDirWatch(this); - connect(m_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(reinit())); + connect(m_watch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(reinit())); m_watch->startScan(); } diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index 952228c4..4ee167f0 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -101,8 +101,8 @@ bool KChmPart::openFile() m_htmlData.truncate(0); m_job = TDEIO::get( TQString("chm:")+m_file+"/", true, false ); - connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( jobDone( TDEIO::Job * ) ) ); + connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQ_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( jobDone( TDEIO::Job * ) ) ); return true; } diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 080254ae..49e9d425 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -102,13 +102,13 @@ SearchView::SearchView(DocumentationPart *part, TQWidget *parent, const char *na m_view->setAllColumnsShowFocus(true); m_view->setResizeMode( TQListView::LastColumn ); - connect(m_configButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateConfig())); - connect(m_indexButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateIndex())); - connect(m_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(search())); - connect(m_goSearchButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(search())); - connect(m_view, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(executed(TQListViewItem*))); - connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); + connect(m_configButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateConfig())); + connect(m_indexButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateIndex())); + connect(m_edit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(search())); + connect(m_goSearchButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(search())); + connect(m_view, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(executed(TQListViewItem*))); + connect(m_view, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } SearchView::~SearchView() @@ -195,10 +195,10 @@ void SearchView::search() proc->setEnvironment("PICDIR", picdir); *proc << exe << "-c" << (indexdir + "/htdig.conf") << query; - connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)), - this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int)) ); - connect( proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htsearchExited(TDEProcess *)) ); + connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)), + this, TQ_SLOT(htsearchStdout(TDEProcess *,char*,int)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htsearchExited(TDEProcess *)) ); searchResult = ""; diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index c99c4a2c..109b36e8 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -88,9 +88,9 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) setState(0); setMinimumWidth(300); - connect(this, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked())); - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedStart())); + connect(this, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelClicked())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(okClicked())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedStart())); } ProgressDialog::~ProgressDialog() @@ -268,8 +268,8 @@ void ProgressDialog::startHtdigProcess(bool initial) if (initial) { *proc << "-i"; } - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htdigExited(TDEProcess *))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htdigExited(TDEProcess *))); htdigRunning = true; @@ -387,8 +387,8 @@ void ProgressDialog::startHtmergeProcess() kdDebug(9002) << "Running htmerge" << endl; - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htmergeExited(TDEProcess *))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htmergeExited(TDEProcess *))); htmergeRunning = true; diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp index b880b6f2..1f2a36c4 100644 --- a/parts/doxygen/doxygenconfigwidget.cpp +++ b/parts/doxygen/doxygenconfigwidget.cpp @@ -68,7 +68,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par sm // type ); TQWhatsThis::add(inputString, option->docs().simplifyWhiteSpace()); - connect(inputString, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputString, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(), inputString); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -86,7 +86,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par for (sli.toFirst(); sli.current(); ++sli) inputString->addValue(sli.current()); TQWhatsThis::add(inputString, option->docs().simplifyWhiteSpace()); - connect(inputString, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputString, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(),inputString); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -109,7 +109,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par lm // type ); TQWhatsThis::add(inputStrList, option->docs().simplifyWhiteSpace()); - connect(inputStrList, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputStrList, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(),inputStrList); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -124,7 +124,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par *((ConfigBool *)option)->valueRef() // variable ); TQWhatsThis::add(inputBool, option->docs().simplifyWhiteSpace()); - connect(inputBool, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputBool, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(), inputBool); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -140,7 +140,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par ((ConfigInt *)option)->maxVal() // max value ); TQWhatsThis::add(inputInt, option->docs().simplifyWhiteSpace()); - connect(inputInt, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputInt, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(), inputInt); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -153,7 +153,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par TQDictIterator<TQObject> di(*m_switches); for (; di.current(); ++di) { TQObject *obj = di.current(); - connect(obj, TQT_SIGNAL(toggle(const TQString&, bool)), this, TQT_SLOT(toggle(const TQString&, bool))); + connect(obj, TQ_SIGNAL(toggle(const TQString&, bool)), this, TQ_SLOT(toggle(const TQString&, bool))); // UGLY HACK: assumes each item depends on a boolean without checking! emit toggle(di.currentKey(), ((InputBool *)obj)->getState()); } @@ -226,7 +226,7 @@ void DoxygenConfigWidget::init() TQDictIterator<TQObject> dio(*m_switches); for (; dio.current(); ++dio) { TQObject *obj = dio.current(); - connect(obj, TQT_SIGNAL(toggle(const TQString&, bool)), this, TQT_SLOT(toggle(const TQString&, bool))); + connect(obj, TQ_SIGNAL(toggle(const TQString&, bool)), this, TQ_SLOT(toggle(const TQString&, bool))); // UGLY HACK: assumes each item depends on a boolean without checking! emit toggle(dio.currentKey(), ((InputBool *)obj)->getState()); } diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index 36d41e8d..14912757 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -59,32 +59,32 @@ DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList TDEAction *action; action = new TDEAction( i18n("Build API Documentation"), 0, - this, TQT_SLOT(slotDoxygen()), + this, TQ_SLOT(slotDoxygen()), actionCollection(), "build_doxygen" ); action->setToolTip(i18n("Build API documentation")); action->setWhatsThis(i18n("<b>Build API documentation</b><p>Runs doxygen on a project Doxyfile to generate API documentation. " "If the search engine is enabled in Doxyfile, this also runs doxytag to create it.")); action = new TDEAction( i18n("Clean API Documentation"), 0, - this, TQT_SLOT(slotDoxClean()), + this, TQ_SLOT(slotDoxClean()), actionCollection(), "clean_doxygen" ); action->setToolTip(i18n("Clean API documentation")); action->setWhatsThis(i18n("<b>Clean API documentation</b><p>Removes all generated by doxygen files.")); -// connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); +// connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("Doxygen"), PROJECTOPTIONS, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - m_actionDocumentFunction = new TDEAction(i18n("Document Current Function"), 0, CTRL+SHIFT+Key_S, this, TQT_SLOT(slotDocumentFunction()), actionCollection(), "edit_document_function"); + m_actionDocumentFunction = new TDEAction(i18n("Document Current Function"), 0, CTRL+SHIFT+Key_S, this, TQ_SLOT(slotDocumentFunction()), actionCollection(), "edit_document_function"); m_actionDocumentFunction->setToolTip( i18n("Create a documentation template above a function")); m_actionDocumentFunction->setWhatsThis(i18n("<b>Document Current Function</b><p>Creates a documentation template according to a function's signature above a function definition/declaration.")); m_tmpDir.setAutoDelete(true); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part* ))); - m_actionPreview = new TDEAction(i18n("Preview Doxygen Output"), 0, CTRL+ALT+Key_P, this, TQT_SLOT(slotRunPreview()), actionCollection(), "show_preview_doxygen_output"); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part* ))); + m_actionPreview = new TDEAction(i18n("Preview Doxygen Output"), 0, CTRL+ALT+Key_P, this, TQ_SLOT(slotRunPreview()), actionCollection(), "show_preview_doxygen_output"); m_actionPreview->setToolTip( i18n("Show a preview of the Doxygen output of this file") ); m_actionPreview->setWhatsThis( i18n("<b>Preview Doxygen output</b><p>Runs Doxygen over the current file and shows the created index.html.") ); @@ -116,7 +116,7 @@ void DoxygenPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, adjustDoxyfile(); DoxygenConfigWidget *w = new DoxygenConfigWidget(project()->projectDirectory() + "/Doxyfile", page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } } @@ -474,7 +474,7 @@ void DoxygenPart::slotRunPreview( ) if (pStyle != 0 && !stylesheet.isNull()) *pStyle->valueRef() = stylesheet; - connect(appFrontend, TQT_SIGNAL(processExited()), this, TQT_SLOT(slotPreviewProcessExited())); + connect(appFrontend, TQ_SIGNAL(processExited()), this, TQ_SLOT(slotPreviewProcessExited())); appFrontend->startAppCommand("", "doxygen \"" + file.name() + "\"", false); } diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp index 1194d0bc..703525f3 100644 --- a/parts/doxygen/input.cpp +++ b/parts/doxygen/input.cpp @@ -121,7 +121,7 @@ InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent layout->addWidget(cb); layout->addStretch(1); - connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool))); + connect( cb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(valueChanged(bool))); } @@ -165,7 +165,7 @@ InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal layout->addWidget(sp); layout->addStretch(1); - connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); + connect(sp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int))); } @@ -226,13 +226,13 @@ InputString::InputString(const TQString & label, } if (le) - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(textChanged(const TQString&)) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(textChanged(const TQString&)) ); if (br) - connect( br, TQT_SIGNAL(clicked()), this, TQT_SLOT(browse()) ); + connect( br, TQ_SIGNAL(clicked()), this, TQ_SLOT(browse()) ); if (com) - connect( com, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(textChanged(const TQString &)) ); + connect( com, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(textChanged(const TQString &)) ); } InputString::~InputString() @@ -376,22 +376,22 @@ InputStrList::InputStrList(const TQString & label, layout->addWidget(dw, 0, 1); layout->addWidget(lb, 1, 1); - connect( le, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(addString()) ); - connect( add, TQT_SIGNAL(clicked()), - this, TQT_SLOT(addString()) ); - connect( del, TQT_SIGNAL(clicked()), - this, TQT_SLOT(delString()) ); - connect( upd, TQT_SIGNAL(clicked()), - this, TQT_SLOT(updateString()) ); + connect( le, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(addString()) ); + connect( add, TQ_SIGNAL(clicked()), + this, TQ_SLOT(addString()) ); + connect( del, TQ_SIGNAL(clicked()), + this, TQ_SLOT(delString()) ); + connect( upd, TQ_SIGNAL(clicked()), + this, TQ_SLOT(updateString()) ); if (brFile) - connect( brFile, TQT_SIGNAL(clicked()), - this, TQT_SLOT(browseFiles()) ); + connect( brFile, TQ_SIGNAL(clicked()), + this, TQ_SLOT(browseFiles()) ); if (brDir) - connect( brDir, TQT_SIGNAL(clicked()), - this, TQT_SLOT(browseDir()) ); - connect( lb, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT(selectText(const TQString &)) ); + connect( brDir, TQ_SIGNAL(clicked()), + this, TQ_SLOT(browseDir()) ); + connect( lb, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT(selectText(const TQString &)) ); strList = sl; } diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp index c8c1676b..c9287efc 100644 --- a/parts/filecreate/addglobaldlg.cpp +++ b/parts/filecreate/addglobaldlg.cpp @@ -71,8 +71,8 @@ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFla resize( TQSize(511, 282).expandedTo(minimumSizeHint()) ); // signals and slots connections - connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); } /* diff --git a/parts/filecreate/fctemplateedit.cpp b/parts/filecreate/fctemplateedit.cpp index b019ddb9..878d7c7a 100644 --- a/parts/filecreate/fctemplateedit.cpp +++ b/parts/filecreate/fctemplateedit.cpp @@ -14,8 +14,8 @@ FCTemplateEdit::FCTemplateEdit(TQWidget *parent, const char *name): FCTemplateEditBase(parent, name) { - connect( templatename_edit, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT( slotTemplateNameChanged( ))); + connect( templatename_edit, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT( slotTemplateNameChanged( ))); slotTemplateNameChanged(); } diff --git a/parts/filecreate/fctypeedit.cpp b/parts/filecreate/fctypeedit.cpp index 5ee4eb0d..63d73248 100644 --- a/parts/filecreate/fctypeedit.cpp +++ b/parts/filecreate/fctypeedit.cpp @@ -16,8 +16,8 @@ FCTypeEdit::FCTypeEdit(TQWidget *parent, char *name) : FCTypeEditBase(parent, name) { - connect( typeext_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged())); - connect( typename_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged( ))); + connect( typeext_edit, TQ_SIGNAL( textChanged ( const TQString & )),this, TQ_SLOT( slotTypeEditTextChanged())); + connect( typename_edit, TQ_SIGNAL( textChanged ( const TQString & )),this, TQ_SLOT( slotTypeEditTextChanged( ))); slotTypeEditTextChanged( ); } diff --git a/parts/filecreate/filecreate_filedialog.cpp b/parts/filecreate/filecreate_filedialog.cpp index 3aa86c96..0a500dd5 100644 --- a/parts/filecreate/filecreate_filedialog.cpp +++ b/parts/filecreate/filecreate_filedialog.cpp @@ -30,8 +30,8 @@ namespace FileCreate { m_extraWidget = extraWidget; m_typeChooser = dynamic_cast<TypeChooser*>(extraWidget); - connect(this, TQT_SIGNAL(filterChanged(const TQString &)), this, TQT_SLOT(slotActionFilterChanged(const TQString &)) ); - connect(locationEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotActionTextChanged(const TQString &)) ); + connect(this, TQ_SIGNAL(filterChanged(const TQString &)), this, TQ_SLOT(slotActionFilterChanged(const TQString &)) ); + connect(locationEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotActionTextChanged(const TQString &)) ); } diff --git a/parts/filecreate/filecreate_newfile.cpp b/parts/filecreate/filecreate_newfile.cpp index f1a69059..52c01b42 100644 --- a/parts/filecreate/filecreate_newfile.cpp +++ b/parts/filecreate/filecreate_newfile.cpp @@ -62,7 +62,7 @@ namespace FileCreate { m_addToProject->setChecked( true ); m_urlreq->setMode((int) KFile::Directory); - connect( m_filename, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotFileNameChanged(const TQString & ) ) ); + connect( m_filename, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotFileNameChanged(const TQString & ) ) ); slotFileNameChanged( m_filename->text() ); } diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index a1529097..75dfe5de 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -68,23 +68,23 @@ FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStrin setInstance(FileCreateFactory::instance()); setXMLFile("kdevpart_filecreate.rc"); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Templates"), PROJECTSETTINGSPAGE, info()->icon() ); _configProxy->createGlobalConfigPage( i18n("File Templates"), GLOBALSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - TDEToolBarPopupAction * newAction = new TDEToolBarPopupAction( i18n("&New"), "document-new", CTRL+TQt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new"); + TDEToolBarPopupAction * newAction = new TDEToolBarPopupAction( i18n("&New"), "document-new", CTRL+TQt::Key_N, this, TQ_SLOT(slotNewFile()), actionCollection(), "file_new"); newAction->setWhatsThis( i18n("<b>New file</b><p>Creates a new file. Also adds it the project if the <b>Add to project</b> checkbox is turned on.") ); newAction->setToolTip( i18n("Create a new file") ); m_newPopupMenu = newAction->popupMenu(); - connect(m_newPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowNewPopupMenu())); + connect(m_newPopupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShowNewPopupMenu())); - TQTimer::singleShot( 0, this, TQT_SLOT(slotGlobalInitialize()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotGlobalInitialize()) ); } @@ -105,14 +105,14 @@ void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, TQWidget * pag case PROJECTSETTINGSPAGE: { FCConfigWidget* w = new FCConfigWidget( this, false, page, "filecreate config widget" ); - connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) ); + connect( dlg, TQ_SIGNAL( okClicked( ) ), w, TQ_SLOT( accept( ) ) ); } break; case GLOBALSETTINGSPAGE: { FCConfigWidget *w = new FCConfigWidget( this, true, page, "filecreate config widget" ); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); } break; } @@ -136,7 +136,7 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() filetype->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall, TDEIcon::DefaultState, NULL, true); m_newPopupMenu->insertItem(iconPix, filetype->name(), this, - TQT_SLOT(slotNewFilePopup(int)), 0, ++id ); + TQ_SLOT(slotNewFilePopup(int)), 0, ++id ); m_newPopupMenu->setItemParameter( id, filetype->id() ); } else { @@ -151,7 +151,7 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() subtype->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall, TDEIcon::DefaultState, NULL, true); subMenu->insertItem(iconPix, subtype->name(), this, - TQT_SLOT(slotNewFilePopup(int)), 0, ++id ); + TQ_SLOT(slotNewFilePopup(int)), 0, ++id ); subMenu->setItemParameter( id, subtype->id() ); } } @@ -187,7 +187,7 @@ void FileCreatePart::slotNewFile() { } void FileCreatePart::slotProjectOpened() { - TQTimer::singleShot( 0, this, TQT_SLOT(slotInitialize()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotInitialize()) ); } void FileCreatePart::addFileType(const TQString & filename) { @@ -207,7 +207,7 @@ void FileCreatePart::addFileType(const TQString & filename) { void FileCreatePart::slotProjectClosed() { m_filetypes.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotGlobalInitialize()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotGlobalInitialize()) ); } void FileCreatePart::slotFiletypeSelected(const FileType * filetype) { diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp index 4638725c..118e3606 100644 --- a/parts/filecreate/filecreate_widget2.cpp +++ b/parts/filecreate/filecreate_widget2.cpp @@ -88,7 +88,7 @@ namespace FileCreate { void FriendlyWidget::refresh() { - disconnect( this, TQT_SIGNAL(currentChanged(int,int)), this, TQT_SLOT(slotCellSelected(int,int)) ); + disconnect( this, TQ_SIGNAL(currentChanged(int,int)), this, TQ_SLOT(slotCellSelected(int,int)) ); empty(); @@ -117,7 +117,7 @@ namespace FileCreate { resizeCells(); if (currentSelection()>-1) removeSelection(currentSelection()); - connect( this, TQT_SIGNAL(currentChanged(int,int)), this, TQT_SLOT(slotCellSelected(int,int)) ); + connect( this, TQ_SIGNAL(currentChanged(int,int)), this, TQ_SLOT(slotCellSelected(int,int)) ); } @@ -165,7 +165,7 @@ namespace FileCreate { } m_selected = typeForRow.contains(row) ? typeForRow[row] : NULL; - TQTimer::singleShot(0, this, TQT_SLOT(slotDoSelection()) ); + TQTimer::singleShot(0, this, TQ_SLOT(slotDoSelection()) ); } diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp index caf1ac74..a86d3155 100644 --- a/parts/filecreate/filecreate_widget3.cpp +++ b/parts/filecreate/filecreate_widget3.cpp @@ -46,7 +46,7 @@ namespace FileCreate { "Globally available file types are listed and can be configured in TDevelop settings dialog, <b>New File Wizard</b> tab.")); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotTypeSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotTypeSelected(TQListViewItem*)) ); } diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp index 49141dc0..d8af5988 100644 --- a/parts/filelist/filelist_widget.cpp +++ b/parts/filelist/filelist_widget.cpp @@ -45,26 +45,26 @@ FileListWidget::FileListWidget(ProjectviewPart *part, TQWidget *parent) setSelectionMode( TQListView::Extended ); -// connect( _part->partController(), TQT_SIGNAL( partAdded(KParts::Part*) ), this, TQT_SLOT(partAdded(KParts::Part*)) ); -// connect( _part->partController(), TQT_SIGNAL( partRemoved(KParts::Part*) ), this, TQT_SLOT(partRemoved()) ); - connect( _part->partController(), TQT_SIGNAL( partAdded(KParts::Part*) ), this, TQT_SLOT(startRefreshTimer()) ); - connect( _part->partController(), TQT_SIGNAL( partRemoved(KParts::Part*) ), this, TQT_SLOT(startRefreshTimer()) ); - connect( _part->partController(), TQT_SIGNAL( activePartChanged(KParts::Part*) ), this, TQT_SLOT( activePartChanged(KParts::Part* )) ); +// connect( _part->partController(), TQ_SIGNAL( partAdded(KParts::Part*) ), this, TQ_SLOT(partAdded(KParts::Part*)) ); +// connect( _part->partController(), TQ_SIGNAL( partRemoved(KParts::Part*) ), this, TQ_SLOT(partRemoved()) ); + connect( _part->partController(), TQ_SIGNAL( partAdded(KParts::Part*) ), this, TQ_SLOT(startRefreshTimer()) ); + connect( _part->partController(), TQ_SIGNAL( partRemoved(KParts::Part*) ), this, TQ_SLOT(startRefreshTimer()) ); + connect( _part->partController(), TQ_SIGNAL( activePartChanged(KParts::Part*) ), this, TQ_SLOT( activePartChanged(KParts::Part* )) ); - connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); - connect( _part->partController(), TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)), - this, TQT_SLOT(documentChangedState(const KURL&, DocumentState )) ); + connect( _part->partController(), TQ_SIGNAL(documentChangedState(const KURL &, DocumentState)), + this, TQ_SLOT(documentChangedState(const KURL&, DocumentState )) ); - connect( _part->partController(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart * )), this, TQT_SLOT(refreshFileList()) ); + connect( _part->partController(), TQ_SIGNAL(partURLChanged(KParts::ReadOnlyPart * )), this, TQ_SLOT(refreshFileList()) ); setItemMargin(10); - connect( &m_refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(refreshFileList()) ); + connect( &m_refreshTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(refreshFileList()) ); startRefreshTimer(); } @@ -226,9 +226,9 @@ void FileListWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int ) { TDEPopupMenu popup; popup.insertTitle( i18n("File List") ); - popup.insertItem( i18n("Close Selected"), this, TQT_SLOT(closeSelectedFiles()) ); - popup.insertItem( i18n("Save Selected"), this, TQT_SLOT(saveSelectedFiles()) ); - popup.insertItem( i18n("Reload Selected"), this, TQT_SLOT(reloadSelectedFiles()) ); + popup.insertItem( i18n("Close Selected"), this, TQ_SLOT(closeSelectedFiles()) ); + popup.insertItem( i18n("Save Selected"), this, TQ_SLOT(saveSelectedFiles()) ); + popup.insertItem( i18n("Reload Selected"), this, TQ_SLOT(reloadSelectedFiles()) ); FileContext context( getSelectedURLs() ); _part->core()->fillContextMenu( &popup, &context ); diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 8db2a727..99b45623 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -79,14 +79,14 @@ ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStr m_configProxy->createGlobalConfigPage(i18n("File List"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("File List"), 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(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_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(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); TDEConfig * config = kapp->config(); config->setGroup("File List Plugin"); @@ -98,7 +98,7 @@ ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStr setClientBuilder(m_guibuilder); } m_restored = false; - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } ProjectviewPart::~ProjectviewPart() @@ -277,21 +277,21 @@ void ProjectviewPart::setupActions() { m_openPrjViewAction = new TDESelectAction(i18n("Open Session..."), 0, actionCollection(), "viewsession_open"); - connect(m_openPrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotOpenProjectView(const TQString &))); + connect(m_openPrjViewAction, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotOpenProjectView(const TQString &))); m_openPrjViewAction->setToolTip(i18n("Open Session")); - m_savePrjViewAction = new TDEAction(i18n("Save Session"), "document-save", 0, this, TQT_SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save"); + m_savePrjViewAction = new TDEAction(i18n("Save Session"), "document-save", 0, this, TQ_SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save"); - m_newPrjViewAction = new TDEAction(i18n("New Session..."), "document-new", 0, this, TQT_SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new"); + m_newPrjViewAction = new TDEAction(i18n("New Session..."), "document-new", 0, this, TQ_SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new"); m_deletePrjViewAction = new TDESelectAction(i18n("Delete Session"), "edit-delete", 0, actionCollection(), "viewsession_delete"); - connect(m_deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotDeleteProjectView(const TQString &))); + connect(m_deletePrjViewAction, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotDeleteProjectView(const TQString &))); m_deletePrjViewAction->setToolTip(i18n("Delete Session")); - m_deleteCurrentPrjViewAction = new TDEAction(i18n("Delete Session"), "edit-delete", 0, this, TQT_SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent"); + m_deleteCurrentPrjViewAction = new TDEAction(i18n("Delete Session"), "edit-delete", 0, this, TQ_SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent"); m_deleteCurrentPrjViewAction->setToolTip(i18n("Delete Session")); @@ -306,13 +306,13 @@ void ProjectviewPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, case PROJECTDOC_OPTIONS: { ProjectviewProjectConfig *w = new ProjectviewProjectConfig(this, page, "project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case GLOBALDOC_OPTIONS: { ProjectviewConfig *w = new ProjectviewConfig(page, "global config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -332,7 +332,7 @@ void ProjectviewPart::contextMenu(TQPopupMenu */*popup*/, const Context */*conte // // 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/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index de9b5fef..a417931e 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -41,11 +41,11 @@ FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQS m_filetree = new KDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" ); - connect( m_filetree->dirOperator(), TQT_SIGNAL(fileSelected(const KFileItem*)), - this, TQT_SLOT(fileSelected(const KFileItem*))); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( m_filetree->dirOperator(), TQ_SIGNAL(fileSelected(const KFileItem*)), + this, TQ_SLOT(fileSelected(const KFileItem*))); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(slotConfigWidget(KDialogBase*)) ); m_filetree->setCaption( i18n("File Selector") ); m_filetree->setIcon( SmallIcon( info()->icon() ) ); @@ -54,7 +54,7 @@ FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQS m_filetree->readConfig( instance()->config(), "fileselector" ); - m_newFileAction = new TDEAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQT_SLOT(newFile()), this, "new_file"); + m_newFileAction = new TDEAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQ_SLOT(newFile()), this, "new_file"); } FileSelectorPart::~FileSelectorPart() @@ -84,7 +84,7 @@ void FileSelectorPart::slotConfigWidget( KDialogBase * dlg ) { TQVBox* vbox = dlg->addVBoxPage( i18n("File Selector"), i18n("File Selector"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); KFSConfigPage* page = new KFSConfigPage( vbox, 0, m_filetree ); - connect( dlg, TQT_SIGNAL( okClicked( ) ), page, TQT_SLOT( apply( ) ) ); + connect( dlg, TQ_SIGNAL( okClicked( ) ), page, TQ_SLOT( apply( ) ) ); // ### implement reload } diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 84fe2bb9..83ff0fb6 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -173,41 +173,41 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main filter = new KHistoryCombo( true, filterBox, "filter"); filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); - connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); + connect( btnFilter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( btnFilterClick() ) ); lo->addWidget(filterBox); - connect( filter, TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT( slotFilterChange(const TQString&) ) ); - connect( filter, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotFilterChange(const TQString&) ) ); - connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ), - filter, TQT_SLOT( addToHistory(const TQString&) ) ); + connect( filter, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQ_SIGNAL( returnPressed(const TQString&) ), + filter, TQ_SLOT( addToHistory(const TQString&) ) ); // tdeaction for the dir sync method acSyncDir = new TDEAction( i18n("Current Document Directory"), "dirsynch", 0, - this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); + this, TQ_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); toolbar->setIconText( TDEToolBar::IconOnly ); toolbar->setIconSize( 16 ); toolbar->setEnableContextMenu( false ); - connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( cmbPathActivated( const KURL& ) )); - connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )), - this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) )); - connect(dir, TQT_SIGNAL(urlEntered(const KURL&)), - this, TQT_SLOT(dirUrlEntered(const KURL&)) ); + connect( cmbPath, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( cmbPathActivated( const KURL& ) )); + connect( cmbPath, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect(dir, TQ_SIGNAL(urlEntered(const KURL&)), + this, TQ_SLOT(dirUrlEntered(const KURL&)) ); - connect(dir, TQT_SIGNAL(finishedLoading()), - this, TQT_SLOT(dirFinishedLoading()) ); + connect(dir, TQ_SIGNAL(finishedLoading()), + this, TQ_SLOT(dirFinishedLoading()) ); // enable dir sync button if current doc has a valid URL - connect ( partController, TQT_SIGNAL(activePartChanged(KParts::Part*) ), - this, TQT_SLOT(viewChanged() ) ); + connect ( partController, TQ_SIGNAL(activePartChanged(KParts::Part*) ), + this, TQ_SLOT(viewChanged() ) ); // Connect the bookmark handler - connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), - this, TQT_SLOT( setDir( const TQString& ) ) ); + connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )), + this, TQ_SLOT( setDir( const TQString& ) ) ); waitingUrl = TQString(); @@ -256,7 +256,7 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) if ( ! loc.isEmpty() ) { waitingDir = loc; - TQTimer::singleShot(0, this, TQT_SLOT(initialDirChangeHack())); + TQTimer::singleShot(0, this, TQ_SLOT(initialDirChangeHack())); } } @@ -275,11 +275,11 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) // connect events as needed /// @todo - solve startup problem: no need to set location for each doc opened! if ( autoSyncEvents & DocumentChanged ) - connect( partController, TQT_SIGNAL( viewChanged() ), this, TQT_SLOT( autoSync() ) ); + connect( partController, TQ_SIGNAL( viewChanged() ), this, TQ_SLOT( autoSync() ) ); if ( autoSyncEvents & DocumentOpened ) - connect( partController, TQT_SIGNAL( partAdded(KParts::Part*) ), - this, TQT_SLOT( autoSync(KParts::Part*) ) ); + connect( partController, TQ_SIGNAL( partAdded(KParts::Part*) ), + this, TQ_SLOT( autoSync(KParts::Part*) ) ); } @@ -590,10 +590,10 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect acSel->setAvailableLabel( i18n("A&vailable actions:") ); acSel->setSelectedLabel( i18n("S&elected actions:") ); lo->addWidget( gbToolbar ); - connect( acSel, TQT_SIGNAL( added( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); - connect( acSel, TQT_SIGNAL( removed( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); - connect( acSel, TQT_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); - connect( acSel, TQT_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); + connect( acSel, TQ_SIGNAL( added( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) ); + connect( acSel, TQ_SIGNAL( removed( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) ); + connect( acSel, TQ_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) ); + connect( acSel, TQ_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) ); // Sync TQGroupBox *gbSync = new TQGroupBox( 1, TQt::Horizontal, i18n("Auto Synchronization"), this ); @@ -601,9 +601,9 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect cbSyncOpen = new TQCheckBox( i18n("When a document is o&pened"), gbSync ); cbSyncShow = new TQCheckBox( i18n("When the file selector becomes visible"), gbSync ); lo->addWidget( gbSync ); - connect( cbSyncActive, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); - connect( cbSyncOpen, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); - connect( cbSyncShow, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cbSyncActive, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); + connect( cbSyncOpen, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); + connect( cbSyncShow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); // Histories TQHBox *hbPathHist = new TQHBox ( this ); @@ -611,22 +611,22 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect sbPathHistLength = new TQSpinBox( hbPathHist ); lbPathHist->setBuddy( sbPathHistLength ); lo->addWidget( hbPathHist ); - connect( sbPathHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( sbPathHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); TQHBox *hbFilterHist = new TQHBox ( this ); TQLabel *lbFilterHist = new TQLabel( i18n("Remember &filters:"), hbFilterHist ); sbFilterHistLength = new TQSpinBox( hbFilterHist ); lbFilterHist->setBuddy( sbFilterHistLength ); lo->addWidget( hbFilterHist ); - connect( sbFilterHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( sbFilterHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); // Session TQGroupBox *gbSession = new TQGroupBox( 1, TQt::Horizontal, i18n("Session"), this ); cbSesLocation = new TQCheckBox( i18n("Restore loca&tion"), gbSession ); cbSesFilter = new TQCheckBox( i18n("Restore last f&ilter"), gbSession ); lo->addWidget( gbSession ); - connect( cbSesLocation, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); - connect( cbSesFilter, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cbSesLocation, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); + connect( cbSesFilter, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); // make it look nice lo->addStretch( 1 ); @@ -713,16 +713,16 @@ void KFSConfigPage::apply() s |= KDevFileSelector::GotVisible; fileSelector->autoSyncEvents = s; // reset connections - disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync() ) ); + disconnect( fileSelector->partController, 0, fileSelector, TQ_SLOT( autoSync() ) ); disconnect( fileSelector->partController, 0, - fileSelector, TQT_SLOT( autoSync( KParts::Part *) ) ); + fileSelector, TQ_SLOT( autoSync( KParts::Part *) ) ); if ( s & KDevFileSelector::DocumentChanged ) - connect( fileSelector->partController, TQT_SIGNAL( viewChanged() ), - fileSelector, TQT_SLOT( autoSync() ) ); + connect( fileSelector->partController, TQ_SIGNAL( viewChanged() ), + fileSelector, TQ_SLOT( autoSync() ) ); if ( s & KDevFileSelector::DocumentOpened ) connect( fileSelector->partController, - TQT_SIGNAL( partAdded(KParts::Part *) ), - fileSelector, TQT_SLOT( autoSync(KParts::Part *) ) ); + TQ_SIGNAL( partAdded(KParts::Part *) ), + fileSelector, TQ_SLOT( autoSync(KParts::Part *) ) ); // histories fileSelector->cmbPath->setMaxItems( sbPathHistLength->value() ); diff --git a/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp index 283731c2..488897e5 100644 --- a/parts/fileselector/tdeactionselector.cpp +++ b/parts/fileselector/tdeactionselector.cpp @@ -98,18 +98,18 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) loadIcons(); - connect( d->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonAddClicked()) ); - connect( d->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonRemoveClicked()) ); - connect( d->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonUpClicked()) ); - connect( d->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonDownClicked()) ); - connect( d->availableListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->selectedListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->availableListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); - connect( d->selectedListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonAddClicked()) ); + connect( d->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonRemoveClicked()) ); + connect( d->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonUpClicked()) ); + connect( d->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonDownClicked()) ); + connect( d->availableListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->selectedListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->availableListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->selectedListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); d->availableListBox->installEventFilter( this ); d->selectedListBox->installEventFilter( this ); diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp index c11c9c81..97947ea4 100644 --- a/parts/fileview/addfilegroupdlg.cpp +++ b/parts/fileview/addfilegroupdlg.cpp @@ -27,14 +27,14 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString title_edit = new KLineEdit(old_title, this); title_edit->setFocus(); title_label->setBuddy(title_edit); - connect( title_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + connect( title_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged() ) ); TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this); pattern_edit = new KLineEdit(old_pattern, this); pattern_label->setBuddy(pattern_edit); TQFontMetrics fm(pattern_edit->fontMetrics()); pattern_edit->setMinimumWidth(fm.width('X')*35); - connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + connect( pattern_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged() ) ); TQVBoxLayout *layout = new TQVBoxLayout(this, 10); TQGridLayout *grid = new TQGridLayout(2, 2); @@ -54,8 +54,8 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( m_pOk, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotTextChanged(); diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp index 91b1a0bc..3b3ffa21 100644 --- a/parts/fileview/filegroupspart.cpp +++ b/parts/fileview/filegroupspart.cpp @@ -52,19 +52,19 @@ FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStrin _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Groups"), FILEGROUPS_OPTIONS, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); // File groups - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), - m_filegroups, TQT_SLOT(addFiles(const TQStringList&)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), - m_filegroups, TQT_SLOT(removeFiles(const TQStringList&)) ); -/* connect( project(), TQT_SIGNAL(addedFileToProject(const TQString&)), - m_filegroups, TQT_SLOT(addFile(const TQString&)) ); - connect( project(), TQT_SIGNAL(removedFileFromProject(const TQString&)), - m_filegroups, TQT_SLOT(removeFile(const TQString&)) );*/ + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), + m_filegroups, TQ_SLOT(addFiles(const TQStringList&)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), + m_filegroups, TQ_SLOT(removeFiles(const TQStringList&)) ); +/* connect( project(), TQ_SIGNAL(addedFileToProject(const TQString&)), + m_filegroups, TQ_SLOT(addFile(const TQString&)) ); + connect( project(), TQ_SIGNAL(removedFileFromProject(const TQString&)), + m_filegroups, TQ_SLOT(removeFile(const TQString&)) );*/ m_filegroups->refresh(); } @@ -84,7 +84,7 @@ void FileGroupsPart::refresh() // This method may be called from m_filetree's slot, // so we make sure not to modify the list view during // the execution of the slot - TQTimer::singleShot(0, m_filegroups, TQT_SLOT(refresh())); + TQTimer::singleShot(0, m_filegroups, TQ_SLOT(refresh())); } void FileGroupsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ) @@ -92,6 +92,6 @@ void FileGroupsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * pag if ( pagenumber == FILEGROUPS_OPTIONS ) { FileGroupsConfigWidget *w = new FileGroupsConfigWidget(this, page, "file groups config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } } diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index 7b82f256..9a45dc66 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -171,20 +171,20 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) // addColumn(i18n("Location")); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); m_actionToggleShowNonProjectFiles = new TDEToggleAction( i18n("Show Non Project Files"), TDEShortcut(), - this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); + this, TQ_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files")); m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("<b>Show non project files</b><p>Shows files that do not belong to a project in a file tree.")); m_actionToggleDisplayLocation = new TDEToggleAction( i18n("Display Location Column"), TDEShortcut(), - this, TQT_SLOT(slotToggleDisplayLocation()), this, "actiontoggleshowlocation" ); + this, TQ_SLOT(slotToggleDisplayLocation()), this, "actiontoggleshowlocation" ); m_actionToggleDisplayLocation->setWhatsThis(i18n("<b>Display the Location Column</b><p>Displays a column with the location of the files.")); m_part = part; @@ -261,7 +261,7 @@ void FileGroupsWidget::slotContextMenu(TDEListView *, TQListViewItem *item, cons "customization dialog"); TQVBox *vbox = dlg.addVBoxPage(i18n("File Groups")); FileGroupsConfigWidget *w = new FileGroupsConfigWidget(m_part, vbox, "file groups config widget"); - connect(&dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(&dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); dlg.exec(); } } diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp index 66e74e4d..1af5fe51 100644 --- a/parts/fileview/filetreeviewwidgetimpl.cpp +++ b/parts/fileview/filetreeviewwidgetimpl.cpp @@ -38,7 +38,7 @@ FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const ch // Actions m_actionToggleShowNonProjectFiles = new TDEToggleAction( i18n("Show Non Project Files"), TDEShortcut(), - this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); + this, TQ_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files")); m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("<b>Show non project files</b><p>Shows files that do not belong to a project in a file tree.")); @@ -96,7 +96,7 @@ void FileTreeViewWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewIt // kill the call-back's from working) if (item == fileTree()->firstChild() && canReloadTree()) { - int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQT_SLOT( slotReloadTree() ) ); + int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQ_SLOT( slotReloadTree() ) ); popupMenu->setWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") ); } diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index f89bf71d..d4bfedaf 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -70,19 +70,19 @@ FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFil setDragEnabled( false ); // Slot connections - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); // Intercepts KDevelop core signals and VCS notifications (if available) - connect( m_part->project(), TQT_SIGNAL( activeDirectoryChanged( const TQString&, const TQString& ) ), - this, TQT_SLOT( changeActiveDirectory( const TQString&, const TQString& ) ) ); - connect( m_part->project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), - this, TQT_SLOT( addProjectFiles( const TQStringList & ) ) ); - connect( m_part->project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), - this, TQT_SLOT( removeProjectFiles( const TQStringList & ) ) ); + connect( m_part->project(), TQ_SIGNAL( activeDirectoryChanged( const TQString&, const TQString& ) ), + this, TQ_SLOT( changeActiveDirectory( const TQString&, const TQString& ) ) ); + connect( m_part->project(), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQ_SLOT( addProjectFiles( const TQStringList & ) ) ); + connect( m_part->project(), TQ_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQ_SLOT( removeProjectFiles( const TQStringList & ) ) ); // Safeguard against VCS plug-in unloading at run-time - connect( m_impl, TQT_SIGNAL(implementationInvalidated()), this, TQT_SLOT(slotImplementationInvalidated()) ); + connect( m_impl, TQ_SIGNAL(implementationInvalidated()), this, TQ_SLOT(slotImplementationInvalidated()) ); // Hide pattern for files TQDomDocument &dom = *m_part->projectDom(); @@ -112,7 +112,7 @@ void FileTreeWidget::openDirectory( const TQString& dirName ) // if we're reloading if (m_rootBranch) { - disconnect( m_rootBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQT_SLOT(finishPopulate(KFileTreeViewItem*)) ); + disconnect( m_rootBranch, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQ_SLOT(finishPopulate(KFileTreeViewItem*)) ); removeBranch( m_rootBranch ); m_projectFiles.clear(); } @@ -128,7 +128,7 @@ void FileTreeWidget::openDirectory( const TQString& dirName ) b->setChildRecurse( false ); m_rootBranch = addBranch( b ); m_rootBranch->setOpen( true ); - connect( m_rootBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQT_SLOT(finishPopulate(KFileTreeViewItem*)) ); + connect( m_rootBranch, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQ_SLOT(finishPopulate(KFileTreeViewItem*)) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp index 25aa8f62..a9b7b3a5 100644 --- a/parts/fileview/fileviewpart.cpp +++ b/parts/fileview/fileviewpart.cpp @@ -66,10 +66,10 @@ FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringLis _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Tree"), FILETREE_OPTIONS, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - TQTimer::singleShot( 1000, this, TQT_SLOT(init()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(init()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -149,7 +149,7 @@ void FileViewPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * page, if ( pagenumber == FILETREE_OPTIONS ) { VCSColorsConfigWidget *w = new VCSColorsConfigWidget( this, vcsColors, page, "vcscolorsconfigwidget" ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } } diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp index bf68de83..4387b26c 100644 --- a/parts/fileview/partwidget.cpp +++ b/parts/fileview/partwidget.cpp @@ -60,10 +60,10 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent ) m_filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(m_filter, 2); - connect( m_btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBtnFilterClick() ) ); - connect( m_filter, TQT_SIGNAL( activated(const TQString&) ), this, TQT_SLOT( slotFilterChange(const TQString&) ) ); - connect( m_filter, TQT_SIGNAL( returnPressed(const TQString&) ), - m_filter, TQT_SLOT( addToHistory(const TQString&) ) ); + connect( m_btnFilter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBtnFilterClick() ) ); + connect( m_filter, TQ_SIGNAL( activated(const TQString&) ), this, TQ_SLOT( slotFilterChange(const TQString&) ) ); + connect( m_filter, TQ_SIGNAL( returnPressed(const TQString&) ), + m_filter, TQ_SLOT( addToHistory(const TQString&) ) ); TQWhatsThis::add ( m_filter, diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp index 450a6a58..21086959 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.cpp +++ b/parts/fileview/vcsfiletreewidgetimpl.cpp @@ -198,27 +198,27 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil parent->addColumn( "Work" ); parent->addColumn( "Repo" ); - connect( m_vcsInfoProvider, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void *)), - this, TQT_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) ); + connect( m_vcsInfoProvider, TQ_SIGNAL(statusReady(const VCSFileInfoMap&, void *)), + this, TQ_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) ); // Harakiri itself if the infoProvider object is destroyed since we cannot work anymore :-( - connect( m_vcsInfoProvider, TQT_SIGNAL(destroyed()), TQT_SIGNAL(implementationInvalidated()) ); + connect( m_vcsInfoProvider, TQ_SIGNAL(destroyed()), TQ_SIGNAL(implementationInvalidated()) ); m_actionToggleShowVCSFields = new TDEToggleAction( i18n("Show VCS Fields"), TDEShortcut(), this, "actiontoggleshowvcsfieldstoggleaction" ); m_actionToggleShowVCSFields->setCheckedState(i18n("Hide VCS Fields")); TQString aboutAction = i18n("<b>Show VCS fields</b><p>Shows <b>Revision</b> and <b>Timestamp</b> for each file contained in VCS repository."); m_actionToggleShowVCSFields->setWhatsThis( aboutAction ); - connect( m_actionToggleShowVCSFields, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleShowVCSFields(bool)) ); + connect( m_actionToggleShowVCSFields, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleShowVCSFields(bool)) ); m_actionSyncWithRepository = new TDEAction( i18n( "Sync with Repository"), TDEShortcut(), - this, TQT_SLOT(slotSyncWithRepository()), this, "actionsyncwithrepository" ); + this, TQ_SLOT(slotSyncWithRepository()), this, "actionsyncwithrepository" ); aboutAction = i18n("<b>Sync with repository</b><p>Synchronize file status with remote repository."); m_actionSyncWithRepository->setWhatsThis( aboutAction ); TQDomDocument &dom = projectDom(); m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") ); slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings - connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*))); + connect( parent, TQ_SIGNAL(expanded(TQListViewItem*)), this, TQ_SLOT(slotDirectoryExpanded(TQListViewItem*))); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp index 3a1351ad..a68f1ec5 100644 --- a/parts/filter/filterpart.cpp +++ b/parts/filter/filterpart.cpp @@ -38,13 +38,13 @@ FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) TDEAction *action; action = new TDEAction( i18n("Execute Command..."), 0, - this, TQT_SLOT(slotShellInsert()), + this, TQ_SLOT(slotShellInsert()), actionCollection(), "tools_insertshell" ); action->setToolTip(i18n("Execute shell command")); action->setWhatsThis(i18n("<b>Execute shell command</b><p>Executes a shell command and outputs its result into the current document.")); action = new TDEAction( i18n("Filter Selection Through Command..."), 0, - this, TQT_SLOT(slotShellFilter()), + this, TQ_SLOT(slotShellFilter()), actionCollection(), "tools_filtershell" ); action->setToolTip(i18n("Filter selection through a shell command")); action->setWhatsThis(i18n("<b>Filter selection through shell command</b><p>Filters selection through a shell command and outputs its result into the current document.")); diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp index a5100d5b..967f09a4 100644 --- a/parts/filter/shellfilterdlg.cpp +++ b/parts/filter/shellfilterdlg.cpp @@ -44,10 +44,10 @@ ShellFilterDialog::ShellFilterDialog() buttonbox->layout(); layout->addWidget(buttonbox); - connect( start_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotStartClicked()) ); - connect( cancel_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject()) ); + connect( start_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotStartClicked()) ); + connect( cancel_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); m_proc = 0; @@ -81,12 +81,12 @@ void ShellFilterDialog::slotStartClicked() delete m_proc; m_proc = new KShellProcess("/bin/sh"); (*m_proc) << combo->currentText(); - connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char *, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); - connect( m_proc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess*)) ); - connect( m_proc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char *, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); + connect( m_proc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess*)) ); + connect( m_proc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::All); m_proc->writeStdin(m_instr, m_instr.length()); } diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp index 057e8121..a379ec53 100644 --- a/parts/filter/shellinsertdlg.cpp +++ b/parts/filter/shellinsertdlg.cpp @@ -45,11 +45,11 @@ ShellInsertDialog::ShellInsertDialog() buttonbox->layout(); layout->addWidget(buttonbox); - connect( start_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotStartClicked()) ); - connect( cancel_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject()) ); - connect( combo->lineEdit(), TQT_SIGNAL(textChanged( const TQString &)), this, TQT_SLOT(executeTextChanged( const TQString &))); + connect( start_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotStartClicked()) ); + connect( cancel_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); + connect( combo->lineEdit(), TQ_SIGNAL(textChanged( const TQString &)), this, TQ_SLOT(executeTextChanged( const TQString &))); m_proc = 0; TDEConfig *config = FilterFactory::instance()->config(); @@ -97,10 +97,10 @@ void ShellInsertDialog::slotStartClicked() delete m_proc; m_proc = new KShellProcess("/bin/sh"); (*m_proc) << combo->currentText(); - connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char *, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); - connect( m_proc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char *, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); + connect( m_proc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp index 98581a9c..1d31f618 100644 --- a/parts/fullscreen/fullscreen_part.cpp +++ b/parts/fullscreen/fullscreen_part.cpp @@ -40,7 +40,7 @@ FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStrin m_bFullScreen = false; - m_pFullScreen = KStdAction::fullScreen(this, TQT_SLOT(slotToggleFullScreen()), actionCollection(), mainWindow()->main()); + m_pFullScreen = KStdAction::fullScreen(this, TQ_SLOT(slotToggleFullScreen()), actionCollection(), mainWindow()->main()); } FullScreenPart::~FullScreenPart() diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp index fc083382..70f301a0 100644 --- a/parts/grepview/grepdlg.cpp +++ b/parts/grepview/grepdlg.cpp @@ -249,15 +249,15 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name "by the pattern input field, resulting in the regular expression " "to search for.")); - connect( template_combo, TQT_SIGNAL(activated(int)), - TQT_SLOT(templateActivated(int)) ); - connect( search_button, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSearchClicked()) ); - connect( done_button, TQT_SIGNAL(clicked()), - TQT_SLOT(hide()) ); - connect( pattern_combo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), - TQT_SLOT( slotPatternChanged( const TQString & ) ) ); - connect( synch_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSynchDirectory()) ); + connect( template_combo, TQ_SIGNAL(activated(int)), + TQ_SLOT(templateActivated(int)) ); + connect( search_button, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSearchClicked()) ); + connect( done_button, TQ_SIGNAL(clicked()), + TQ_SLOT(hide()) ); + connect( pattern_combo->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), + TQ_SLOT( slotPatternChanged( const TQString & ) ) ); + connect( synch_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSynchDirectory()) ); slotPatternChanged( pattern_combo->currentText() ); } diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp index 92f4ebb6..2d67bdb2 100644 --- a/parts/grepview/grepviewpart.cpp +++ b/parts/grepview/grepviewpart.cpp @@ -41,12 +41,12 @@ GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringLi setXMLFile("kdevgrepview.rc"); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(stopButtonClicked(KDevPlugin*)) ); - 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( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(stopButtonClicked(KDevPlugin*)) ); + 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 *)) ); m_widget = new GrepViewWidget(this); m_widget->setIcon(SmallIcon("grep")); @@ -63,7 +63,7 @@ GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringLi TDEAction *action; action = new TDEAction(i18n("Find in Fi&les..."), "grep", CTRL+ALT+Key_F, - this, TQT_SLOT(slotGrep()), + this, TQ_SLOT(slotGrep()), actionCollection(), "edit_grep"); action->setToolTip( i18n("Search for expressions over several files") ); action->setWhatsThis( i18n("<b>Find in files</b><p>" @@ -117,7 +117,7 @@ void GrepViewPart::contextMenu(TQPopupMenu *popup, const Context *context) m_popupstr = ident; TQString squeezed = KStringHandler::csqueeze(ident, 30); int id = popup->insertItem( i18n("Grep: %1").arg(squeezed), - this, TQT_SLOT(slotContextGrep()) ); + this, TQ_SLOT(slotContextGrep()) ); popup->setWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog " "and sets the pattern to the text under the cursor.")); popup->insertSeparator(); diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp index 1d709dff..d6c67cc0 100644 --- a/parts/grepview/grepviewwidget.cpp +++ b/parts/grepview/grepviewwidget.cpp @@ -137,25 +137,25 @@ GrepViewWidget::GrepViewWidget(GrepViewPart *part) : TQWidget(0, "grepview widg m_tabWidget->addTab(m_curOutput, i18n("Search Results")); grepdlg = new GrepDialog( part, this, "grep widget"); - connect( grepdlg, TQT_SIGNAL(searchClicked()), this, TQT_SLOT(searchActivated()) ); - connect( m_curOutput, TQT_SIGNAL(processExited(TDEProcess* )), this, TQT_SLOT(slotSearchProcessExited()) ); + connect( grepdlg, TQ_SIGNAL(searchClicked()), this, TQ_SLOT(searchActivated()) ); + connect( m_curOutput, TQ_SIGNAL(processExited(TDEProcess* )), this, TQ_SLOT(slotSearchProcessExited()) ); - connect( m_tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotOutputTabChanged()) ); + connect( m_tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotOutputTabChanged()) ); - connect( m_curOutput, TQT_SIGNAL(clicked(TQListBoxItem*)), - this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, TQT_SIGNAL(returnPressed(TQListBoxItem*)), - this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQ_SIGNAL(clicked(TQListBoxItem*)), + this, TQ_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQ_SIGNAL(returnPressed(TQListBoxItem*)), + this, TQ_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, TQT_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); + connect( m_curOutput, TQ_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQ_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); m_part = part; m_closeButton = new TQToolButton(m_tabWidget);//@todo change text/icon m_closeButton->setIconSet(SmallIconSet("tab_remove")); m_closeButton->setEnabled(false); - connect (m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseCurrentOutput())); + connect (m_closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCloseCurrentOutput())); m_tabWidget->setCornerWidget(m_closeButton); } @@ -459,10 +459,10 @@ void GrepViewWidget::slotKeepOutput( ) m_curOutput = new GrepViewProcessWidget(m_tabWidget); m_tabWidget->insertTab(m_curOutput, i18n("Search Results"), 0); - connect( m_curOutput, TQT_SIGNAL(clicked(TQListBoxItem*)), this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, TQT_SIGNAL(returnPressed(TQListBoxItem*)), this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, TQT_SIGNAL(processExited(TDEProcess* )), this, TQT_SLOT(slotSearchProcessExited()) ); - connect( m_curOutput, TQT_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); + connect( m_curOutput, TQ_SIGNAL(clicked(TQListBoxItem*)), this, TQ_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQ_SIGNAL(returnPressed(TQListBoxItem*)), this, TQ_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQ_SIGNAL(processExited(TDEProcess* )), this, TQ_SLOT(slotSearchProcessExited()) ); + connect( m_curOutput, TQ_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQ_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); } void GrepViewWidget::slotCloseCurrentOutput( ) diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp index 873ab790..118cb756 100644 --- a/parts/konsole/konsoleviewpart.cpp +++ b/parts/konsole/konsoleviewpart.cpp @@ -48,7 +48,7 @@ KonsoleViewPart::KonsoleViewPart(TQObject *parent, const char *name, const TQStr mainWindow()->embedOutputView(m_widget, i18n("Konsole"), i18n("Embedded console window")); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); } diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index e58dde5b..5a62b7a6 100644 --- a/parts/konsole/konsoleviewwidget.cpp +++ b/parts/konsole/konsoleviewwidget.cpp @@ -30,7 +30,7 @@ KonsoleViewWidget::KonsoleViewWidget(KonsoleViewPart *part) : TQWidget(0, "konsole widget"), part(0), owner( part ) { - connect(part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect(part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(activePartChanged(KParts::Part*))); vbox = new TQVBoxLayout(this); } @@ -70,7 +70,7 @@ void KonsoleViewWidget::activate() // this->activePartChanged( owner->partController()->activePart() ); part->widget()->show(); - connect(part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed())); + connect(part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(partDestroyed())); } diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp index 665f725c..feca079c 100644 --- a/parts/openwith/openwithpart.cpp +++ b/parts/openwith/openwithpart.cpp @@ -26,8 +26,8 @@ OpenWithPart::OpenWithPart(TQObject *parent, const char *name, const TQStringLis { setInstance( OpenWithFactory::instance() ); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu*,const Context *)), - this, TQT_SLOT(fillContextMenu(TQPopupMenu*,const Context *))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu*,const Context *)), + this, TQ_SLOT(fillContextMenu(TQPopupMenu*,const Context *))); } @@ -45,7 +45,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); - popup->insertItem( i18n("Open as UTF-8"), this, TQT_SLOT(openAsUtf8()) ); + popup->insertItem( i18n("Open as UTF-8"), this, TQ_SLOT(openAsUtf8()) ); TDEPopupMenu * openAsPopup = new TDEPopupMenu( popup ); @@ -58,7 +58,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) TQStringList::const_iterator it = encodings.constBegin(); while ( it != encodings.constEnd() ) { - openAsPopup->insertItem( *it, this, TQT_SLOT(openAsEncoding(int)), 0, i ); + openAsPopup->insertItem( *it, this, TQ_SLOT(openAsEncoding(int)), 0, i ); ++it; i++; } @@ -74,7 +74,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) for (it = offers.begin(); it != offers.end(); ++it) { TDEAction *action = new TDEAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName( (*it)->desktopEntryPath() ).data()); - connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(openWithService())); + connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(openWithService())); action->plug( openWithPopup ); } } @@ -85,7 +85,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) openWithPopup->insertSeparator(); // make sure the generic "Open with ..." entry gets appended to the submenu - id = openWithPopup->insertItem(i18n("Open With..."), this, TQT_SLOT(openWithDialog())); + id = openWithPopup->insertItem(i18n("Open With..."), this, TQ_SLOT(openWithDialog())); openWithPopup->setWhatsThis(id, i18n("<b>Open With...</b><p>Provides a dialog to choose the application to open the selected file.")); } diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 3d8b47bf..5a961419 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -51,10 +51,10 @@ AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const T mainWindow()->embedOutputView(m_widget, i18n("Application"), i18n("Output of the executed user program")); hideView(); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited())); - connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SIGNAL(processExited())); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect(m_widget, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited())); + connect(m_widget, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SIGNAL(processExited())); } diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index 50060339..a8931f86 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -40,9 +40,9 @@ AppOutputWidget::AppOutputWidget(AppOutputViewPart* part) : ProcessWidget(0, "app output widget"), m_part(part) { - connect(this, TQT_SIGNAL(executed(TQListBoxItem*)), TQT_SLOT(slotRowSelected(TQListBoxItem*))); - connect(this, TQT_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), - TQT_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & ))); + connect(this, TQ_SIGNAL(executed(TQListBoxItem*)), TQ_SLOT(slotRowSelected(TQListBoxItem*))); + connect(this, TQ_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), + TQ_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & ))); TDEConfig *config = kapp->config(); config->setGroup("General Options"); setFont(config->readFontEntry("OutputViewFont")); @@ -251,24 +251,24 @@ void AppOutputWidget::slotContextMenu( TQListBoxItem *, const TQPoint &p ) { TDEPopupMenu popup(this, "filter output"); - int id = popup.insertItem( i18n("Clear output"), this, TQT_SLOT(clearViewAndContents()) ); + int id = popup.insertItem( i18n("Clear output"), this, TQ_SLOT(clearViewAndContents()) ); popup.setItemEnabled( id, m_contentList.size() > 0 ); - popup.insertItem( i18n("Copy selected lines"), this, TQT_SLOT(copySelected()) ); + popup.insertItem( i18n("Copy selected lines"), this, TQ_SLOT(copySelected()) ); popup.insertSeparator(); - popup.insertItem( i18n("Save unfiltered"), this, TQT_SLOT(saveAll()) ); - id = popup.insertItem( i18n("Save filtered output"), this, TQT_SLOT(saveFiltered()) ); + popup.insertItem( i18n("Save unfiltered"), this, TQ_SLOT(saveAll()) ); + id = popup.insertItem( i18n("Save filtered output"), this, TQ_SLOT(saveFiltered()) ); popup.setItemEnabled( id, m_filter.m_isActive ); popup.insertSeparator(); - id = popup.insertItem( i18n("Clear filter"), this, TQT_SLOT(clearFilter()) ); + id = popup.insertItem( i18n("Clear filter"), this, TQ_SLOT(clearFilter()) ); popup.setItemEnabled( id, m_filter.m_isActive ); - popup.insertItem( i18n("Edit filter"), this, TQT_SLOT(editFilter() ) ); + popup.insertItem( i18n("Edit filter"), this, TQ_SLOT(editFilter() ) ); popup.insertSeparator(); - popup.insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) ); + popup.insertItem( i18n("Hide view"), this, TQ_SLOT(hideView()) ); popup.exec(p); } diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index b27f893d..d1b1df76 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -52,17 +52,17 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis mainWindow()->embedOutputView(m_widget, i18n("Messages"), i18n("Compiler output messages")); TDEAction *action; - action = new TDEAction( i18n("&Next Error"), Key_F4, m_widget, TQT_SLOT(nextError()), + action = new TDEAction( i18n("&Next Error"), Key_F4, m_widget, TQ_SLOT(nextError()), actionCollection(), "view_next_error"); action->setToolTip( i18n("Go to the next error") ); action->setWhatsThis(i18n("<b>Next error</b><p>Switches to the file and line where the next error was reported from.")); - action = new TDEAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, TQT_SLOT(prevError()), + action = new TDEAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, TQ_SLOT(prevError()), actionCollection(), "view_previous_error"); action->setToolTip( i18n("Go to the previous error") ); action->setWhatsThis(i18n("<b>Previous error</b><p>Switches to the file and line where the previous error was reported from.")); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); } diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index eee8adab..e05295f1 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -181,41 +181,41 @@ MakeWidget::MakeWidget(MakeViewPart *part) childproc = new TDEProcess(this); procLineMaker = new ProcessLineMaker( childproc ); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - this, TQT_SLOT(insertStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - this, TQT_SLOT(insertStderrLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - this, TQT_SLOT(storePartialStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - this, TQT_SLOT(storePartialStderrLine(const TQCString&) )); - - connect( childproc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*) )) ; - - connect( &m_directoryStatusFilter, TQT_SIGNAL(item(EnteringDirectoryItem*)), - this, TQT_SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) ); - connect( &m_directoryStatusFilter, TQT_SIGNAL(item(ExitingDirectoryItem*)), - this, TQT_SLOT(slotExitedDirectory(ExitingDirectoryItem*)) ); - connect( &m_errorFilter, TQT_SIGNAL(item(MakeItem*)), - this, TQT_SLOT(insertItem(MakeItem*)) ); - connect( &m_actionFilter, TQT_SIGNAL(item(MakeItem*)), - this, TQT_SLOT(insertItem(MakeItem*)) ); - connect( &m_otherFilter, TQT_SIGNAL(item(MakeItem*)), - this, TQT_SLOT(insertItem(MakeItem*)) ); - - connect( verticalScrollBar(), TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(verticScrollingOn()) ); - connect( verticalScrollBar(), TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(verticScrollingOff()) ); - connect( horizontalScrollBar(), TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(horizScrollingOn()) ); - connect( horizontalScrollBar(), TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(horizScrollingOff()) ); + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + this, TQ_SLOT(insertStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + this, TQ_SLOT(insertStderrLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + this, TQ_SLOT(storePartialStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + this, TQ_SLOT(storePartialStderrLine(const TQCString&) )); + + connect( childproc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*) )) ; + + connect( &m_directoryStatusFilter, TQ_SIGNAL(item(EnteringDirectoryItem*)), + this, TQ_SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) ); + connect( &m_directoryStatusFilter, TQ_SIGNAL(item(ExitingDirectoryItem*)), + this, TQ_SLOT(slotExitedDirectory(ExitingDirectoryItem*)) ); + connect( &m_errorFilter, TQ_SIGNAL(item(MakeItem*)), + this, TQ_SLOT(insertItem(MakeItem*)) ); + connect( &m_actionFilter, TQ_SIGNAL(item(MakeItem*)), + this, TQ_SLOT(insertItem(MakeItem*)) ); + connect( &m_otherFilter, TQ_SIGNAL(item(MakeItem*)), + this, TQ_SLOT(insertItem(MakeItem*)) ); + + connect( verticalScrollBar(), TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(verticScrollingOn()) ); + connect( verticalScrollBar(), TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(verticScrollingOff()) ); + connect( horizontalScrollBar(), TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(horizScrollingOn()) ); + connect( horizontalScrollBar(), TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(horizScrollingOff()) ); // this slot doesn't exist anymore -// connect( m_part->partController(), TQT_SIGNAL(loadedFile(const KURL&)), -// this, TQT_SLOT(slotDocumentOpened(const KURL&)) ); +// connect( m_part->partController(), TQ_SIGNAL(loadedFile(const KURL&)), +// this, TQ_SLOT(slotDocumentOpened(const KURL&)) ); } MakeWidget::~MakeWidget() @@ -588,7 +588,7 @@ void MakeWidget::slotProcessExited(TDEProcess *) // and its TDEProcess object can be reused. if (childproc->normalExit() && !childproc->exitStatus()) { - TQTimer::singleShot(0, this, TQT_SLOT(startNextJob())); + TQTimer::singleShot(0, this, TQ_SLOT(startNextJob())); // if (commandList.isEmpty()) // The last command on the list was successful so restore the // output view to what it had before the compilation process started @@ -698,23 +698,23 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos ) pMenu->setCheckable(true); pMenu->insertSeparator(); - int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_SLOT(toggleLineWrapping()) ); + int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQ_SLOT(toggleLineWrapping()) ); pMenu->setItemChecked(id, m_bLineWrapping); pMenu->setWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed.")); pMenu->insertSeparator(); - id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQT_SLOT(slotVeryShortCompilerOutput()) ); + id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQ_SLOT(slotVeryShortCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eVeryShort); - id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQT_SLOT(slotShortCompilerOutput()) ); + id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQ_SLOT(slotShortCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eShort); - id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQT_SLOT(slotFullCompilerOutput()) ); + id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQ_SLOT(slotFullCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eFull); pMenu->insertSeparator(); - id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQT_SLOT(toggleShowDirNavigMessages())); + id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQ_SLOT(toggleShowDirNavigMessages())); pMenu->setWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building.")); pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages()); diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp index 57b1cd58..9741c6aa 100644 --- a/parts/partexplorer/partexplorer_plugin.cpp +++ b/parts/partexplorer/partexplorer_plugin.cpp @@ -40,7 +40,7 @@ PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, con m_widget = new PartExplorerForm( mainWindow()->main() ); // mainWindow()->embedSelectView( m_widget, i18n("PartExplorer"), i18n("Query system services")); - TDEAction *action = new TDEAction( i18n("&Part Explorer"), 0, this, TQT_SLOT(slotShowForm()), + TDEAction *action = new TDEAction( i18n("&Part Explorer"), 0, this, TQ_SLOT(slotShowForm()), actionCollection(), "show_partexplorerform" ); action->setToolTip(i18n("TDETrader query execution")); action->setWhatsThis(i18n("<b>Part explorer</b><p>Shows a dialog for TDETrader query execution. Search your TDE documentation for more information about TDE services and TDETrader.")); diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp index baf05bb2..14a926f5 100644 --- a/parts/partexplorer/partexplorerform.cpp +++ b/parts/partexplorer/partexplorerform.cpp @@ -131,11 +131,11 @@ PartExplorerForm::PartExplorerForm( TQWidget *parent ) // Resize dialog resize( 480, 512 ); -// connect( m_base->typeCombo->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchRequested()) ); -// connect( m_base->constraintsText, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchRequested()) ); +// connect( m_base->typeCombo->lineEdit(), TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotSearchRequested()) ); +// connect( m_base->constraintsText, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotSearchRequested()) ); - connect( actionButton(User1), TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearchRequested()) ); -// connect( m_base->typeCombo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotServicetypeChanged( const TQString& ) ) ); + connect( actionButton(User1), TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchRequested()) ); +// connect( m_base->typeCombo->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotServicetypeChanged( const TQString& ) ) ); // slotServicetypeChanged( m_base->typeCombo->lineEdit()->text() ); // populating with all known servicetypes diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index 78c97eb6..0d127a9c 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -56,26 +56,26 @@ QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringL setXMLFile("kdevpart_quickopen.rc"); m_actionQuickOpen = new TDEAction( i18n("Quick Open File..."), CTRL + ALT + Key_O, - this, TQT_SLOT(slotQuickFileOpen()), + this, TQ_SLOT(slotQuickFileOpen()), actionCollection(), "quick_open" ); m_actionQuickOpen->setToolTip(i18n("Quick open file in project")); m_actionQuickOpen->setWhatsThis(i18n("<b>Quick open</b><p>Provides a file name input form with completion listbox to quickly open file in a project.")); m_actionQuickOpenClass = new TDEAction( i18n("Quick Open Class..."), CTRL + ALT + Key_C, - this, TQT_SLOT(slotQuickOpenClass()), + this, TQ_SLOT(slotQuickOpenClass()), actionCollection(), "quick_open_class" ); m_actionQuickOpenClass->setToolTip(i18n("Find class in project")); m_actionQuickOpenClass->setWhatsThis(i18n("<b>Find class</b><p>Provides a class name input form with completion listbox to quickly open a file where the class is defined.")); - m_actionFunctionOpen = new TDEAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, TQT_SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" ); + m_actionFunctionOpen = new TDEAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, TQ_SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" ); m_actionFunctionOpen->setToolTip(i18n("Quick open function in project")); - m_switchToAction = new TDEAction(i18n("Switch To..."), TDEShortcut("CTRL+/"), this, TQT_SLOT(slotSwitchTo()), actionCollection(), "file_switchto"); + m_switchToAction = new TDEAction(i18n("Switch To..."), TDEShortcut("CTRL+/"), this, TQ_SLOT(slotSwitchTo()), actionCollection(), "file_switchto"); m_switchToAction->setToolTip(i18n("Switch to")); m_switchToAction->setWhatsThis(i18n("<b>Switch to</b><p>Prompts to enter the name of previously opened file to switch to.")); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); } diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp index 5929dfa1..dd07f2eb 100644 --- a/parts/quickopen/quickopendialog.cpp +++ b/parts/quickopen/quickopendialog.cpp @@ -32,7 +32,7 @@ QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, TQWidget* parent, const ch : QuickOpenDialogBase( parent, name, modal, fl ), m_part( part ) { nameEdit->installEventFilter(this); - connect( &m_typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTextChangedDelayed()) ); + connect( &m_typeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTextChangedDelayed()) ); } QuickOpenDialog::~QuickOpenDialog() diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp index 1e16d144..2fec05f6 100644 --- a/parts/regexptest/regexptestpart.cpp +++ b/parts/regexptest/regexptestpart.cpp @@ -33,7 +33,7 @@ RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStrin TDEAction *action; action = new TDEAction( i18n("Debug Regular Expression..."), 0, - this, TQT_SLOT(slotRegexpTest()), + this, TQ_SLOT(slotRegexpTest()), actionCollection(), "tools_regexptest" ); action->setToolTip(i18n("Debug regular expression")); action->setWhatsThis(i18n("<b>Debug regular expression</b><p>Allows to enter a regular expression " diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp index 447548ef..d5329308 100644 --- a/parts/replace/replace_part.cpp +++ b/parts/replace/replace_part.cpp @@ -53,7 +53,7 @@ ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& mainWindow()->setViewAvailable( m_widget, false ); action = new TDEAction(i18n("Find-Select-Replace..."), 0, - CTRL+SHIFT+Key_R, this, TQT_SLOT(slotReplace()), actionCollection(), "edit_replace_across"); + CTRL+SHIFT+Key_R, this, TQ_SLOT(slotReplace()), actionCollection(), "edit_replace_across"); action->setToolTip( i18n("Project wide string replacement") ); action->setWhatsThis( i18n("<b>Find-Select-Replace</b><p>" "Opens the project wide string replacement dialog. There you " @@ -62,9 +62,9 @@ ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& "you specify. Matches will be displayed in the <b>Replace</b> window, you " "can replace them with the specified string, exclude them from replace operation or cancel the whole replace.") ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(enableAction())); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(disableAction())); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(enableAction())); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(disableAction())); } void ReplacePart::enableAction() @@ -100,7 +100,7 @@ void ReplacePart::contextMenu(TQPopupMenu *popup, const Context *context) m_popupstr = ident; TQString squeezed = KStringHandler::csqueeze(ident, 30); int id = popup->insertItem( i18n("Replace Project Wide: %1").arg(squeezed), - this, TQT_SLOT(slotReplace()) ); + this, TQ_SLOT(slotReplace()) ); popup->setWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog " "and sets the pattern to the text under the cursor.")); popup->insertSeparator(); diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index 6b1bcbda..22a256ae 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -81,13 +81,13 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part) layout->addWidget( _listview ); // setup signals - connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) ); + connect( m_dialog->find_button, TQ_SIGNAL( clicked() ), TQ_SLOT( find() ) ); - connect( _replace, TQT_SIGNAL( clicked() ), TQT_SLOT( replace() ) ); - connect( _cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( clear() ) ); - connect( _listview, TQT_SIGNAL( editDocument( const TQString &, int ) ), TQT_SLOT( editDocument( const TQString &, int ) ) ); + connect( _replace, TQ_SIGNAL( clicked() ), TQ_SLOT( replace() ) ); + connect( _cancel, TQ_SIGNAL( clicked() ), TQ_SLOT( clear() ) ); + connect( _listview, TQ_SIGNAL( editDocument( const TQString &, int ) ), TQ_SLOT( editDocument( const TQString &, int ) ) ); - connect( m_part->core(), TQT_SIGNAL( stopButtonClicked( KDevPlugin * ) ), TQT_SLOT( stopButtonClicked( KDevPlugin * ) ) ); + connect( m_part->core(), TQ_SIGNAL( stopButtonClicked( KDevPlugin * ) ), TQ_SLOT( stopButtonClicked( KDevPlugin * ) ) ); } //BEGIN Slots diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp index 3fcdd761..412f0545 100644 --- a/parts/replace/replacedlgimpl.cpp +++ b/parts/replace/replacedlgimpl.cpp @@ -41,13 +41,13 @@ ReplaceDlgImpl::ReplaceDlgImpl(TQWidget* parent, const char* name, bool modal, W : ReplaceDlg(parent,name, modal,fl), _regexp_dialog( 0 ) { - connect( find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( saveComboHistories() ) ); - connect( regexp_button, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpEditor() ) ); - connect( find_combo, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( validateFind( const TQString & ) ) ); - connect( regexp_combo, TQT_SIGNAL( textChanged ( const TQString & ) ), - TQT_SLOT( validateExpression( const TQString & ) ) ); - connect( strings_regexp_radio, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleExpression( bool ) ) ); + connect( find_button, TQ_SIGNAL( clicked() ), TQ_SLOT( saveComboHistories() ) ); + connect( regexp_button, TQ_SIGNAL( clicked() ), TQ_SLOT( showRegExpEditor() ) ); + connect( find_combo, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( validateFind( const TQString & ) ) ); + connect( regexp_combo, TQ_SIGNAL( textChanged ( const TQString & ) ), + TQ_SLOT( validateExpression( const TQString & ) ) ); + connect( strings_regexp_radio, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( toggleExpression( bool ) ) ); // disable the editor button if the regexp editor isn't installed if ( TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index 7a797414..2304a31b 100644 --- a/parts/replace/replaceview.cpp +++ b/parts/replace/replaceview.cpp @@ -40,9 +40,9 @@ ReplaceView::ReplaceView( TQWidget * parent ) : TDEListView( parent ), _latestfi pal.setActive( cg ); setPalette( pal ); - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), TQT_SLOT( slotClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int) ), - TQT_SLOT( slotMousePressed(int, TQListViewItem *, const TQPoint &, int) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), TQ_SLOT( slotClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int) ), + TQ_SLOT( slotMousePressed(int, TQListViewItem *, const TQPoint &, int) ) ); } void ReplaceView::makeReplacementsForFile( TQTextStream & istream, TQTextStream & ostream, ReplaceItem const * fileitem ) diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index d0558b79..eba3d6cb 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -55,12 +55,12 @@ scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringL m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("Scripting"), GLOBALDOC_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))); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } scriptingPart::~scriptingPart() @@ -98,7 +98,7 @@ void scriptingPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, u case GLOBALDOC_OPTIONS: { scriptingGlobalConfig *w = new scriptingGlobalConfig(this, page, "global config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index 1c650ce2..75815de5 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -51,12 +51,12 @@ SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& mainWindow()->embedSelectViewRight( m_widget, i18n("Code Snippets"), i18n("Insert a code snippet") ); - connect( core(), TQT_SIGNAL( configWidget( KDialogBase * ) ), this, TQT_SLOT( slotConfigWidget( KDialogBase * ) ) ); + connect( core(), TQ_SIGNAL( configWidget( KDialogBase * ) ), this, TQ_SLOT( slotConfigWidget( KDialogBase * ) ) ); /*The next two connects are used to check if certain SnippetGroups need to be opened according to the languages supported by this project*/ - connect( core(), TQT_SIGNAL( projectOpened() ), m_widget, TQT_SLOT( languageChanged() ) ); - connect( core(), TQT_SIGNAL( languageChanged() ), m_widget, TQT_SLOT( languageChanged() ) ); + connect( core(), TQ_SIGNAL( projectOpened() ), m_widget, TQ_SLOT( languageChanged() ) ); + connect( core(), TQ_SIGNAL( languageChanged() ), m_widget, TQ_SLOT( languageChanged() ) ); setupActions(); } @@ -73,7 +73,7 @@ SnippetPart::~SnippetPart() void SnippetPart::setupActions() { - new TDEAction( i18n("Show Snippet Tree"), CTRL+ALT+SHIFT+Key_S, this, TQT_SLOT(slotShowView()), actionCollection(), "snippet_showview"); + new TDEAction( i18n("Show Snippet Tree"), CTRL+ALT+SHIFT+Key_S, this, TQ_SLOT(slotShowView()), actionCollection(), "snippet_showview"); } /*! @@ -105,7 +105,7 @@ void SnippetPart::slotConfigWidget( KDialogBase *dlg ) w->leDelimiter->setText(m_widget->getSnippetConfig()->getDelimiter()); w->cbToolTip->setChecked(m_widget->getSnippetConfig()->useToolTips()); w->btnGroupAutoOpen->setButton(m_widget->getSnippetConfig()->getAutoOpenGroups()); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotOKClicked()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotOKClicked()) ); } diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 9cd4ae4b..67ba0371 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -64,20 +64,20 @@ SnippetWidget::SnippetWidget(SnippetPart *part) setRootIsDecorated(true); //connect the signals - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); - connect( this, TQT_SIGNAL( executed (TQListViewItem *) ), - this, TQT_SLOT( slotExecuted( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( returnPressed (TQListViewItem *) ), - this, TQT_SLOT( slotExecuted( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( executed (TQListViewItem *) ), + this, TQ_SLOT( slotExecuted( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed (TQListViewItem *) ), + this, TQ_SLOT( slotExecuted( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), - this, TQT_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), + this, TQ_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); _cfg = 0; - TQTimer::singleShot(0, this, TQT_SLOT(initConfig())); + TQTimer::singleShot(0, this, TQ_SLOT(initConfig())); } SnippetWidget::~SnippetWidget() @@ -551,19 +551,19 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int if ( item ) { popup.insertTitle( selectedItem->getName() ); - popup.insertItem( i18n("Add Item..."), this, TQT_SLOT( slotAdd() ) ); - popup.insertItem( i18n("Add Group..."), this, TQT_SLOT( slotAddGroup() ) ); + popup.insertItem( i18n("Add Item..."), this, TQ_SLOT( slotAdd() ) ); + popup.insertItem( i18n("Add Group..."), this, TQ_SLOT( slotAddGroup() ) ); if (dynamic_cast<SnippetGroup*>(item)) { - popup.insertItem( i18n("Edit..."), this, TQT_SLOT( slotEditGroup() ) ); + popup.insertItem( i18n("Edit..."), this, TQ_SLOT( slotEditGroup() ) ); } else { - popup.insertItem( i18n("Edit..."), this, TQT_SLOT( slotEdit() ) ); + popup.insertItem( i18n("Edit..."), this, TQ_SLOT( slotEdit() ) ); } - popup.insertItem( i18n("Remove"), this, TQT_SLOT( slotRemove() ) ); + popup.insertItem( i18n("Remove"), this, TQ_SLOT( slotRemove() ) ); } else { popup.insertTitle(i18n("Code Snippets")); - popup.insertItem( i18n("Add Group..."), this, TQT_SLOT( slotAddGroup() ) ); + popup.insertItem( i18n("Add Group..."), this, TQ_SLOT( slotAddGroup() ) ); } popup.exec(p); @@ -735,8 +735,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots - connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); - connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); + connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) ); + connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) ); //prepare to execute the dialog bool bReturn = false; @@ -848,8 +848,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots - connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); - connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); + connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) ); + connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) ); //execute the dialog TQString strReturn = ""; diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp index 7e38f061..26cb14de 100644 --- a/parts/texttools/texttoolspart.cpp +++ b/parts/texttools/texttoolspart.cpp @@ -36,8 +36,8 @@ TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringL m_widget = 0; - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*)) ); } diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index c6df3310..f1e31ca1 100644 --- a/parts/texttools/texttoolswidget.cpp +++ b/parts/texttools/texttoolswidget.cpp @@ -68,14 +68,14 @@ TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *parent, const ch m_part = part; m_timer = new TQTimer(this); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotItemPressed(int,TQListViewItem*)) ); - // connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - // this, TQT_SLOT(slotItemPressed(int,TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotReturnPressed(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotItemPressed(int,TQListViewItem*)) ); + // connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + // this, TQ_SLOT(slotItemPressed(int,TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotReturnPressed(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } @@ -171,8 +171,8 @@ void TextToolsWidget::stop() void TextToolsWidget::setMode(Mode mode, KParts::Part *part) { - connect( part, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(startTimer()) ); + connect( part, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(startTimer()) ); m_editIface = dynamic_cast<KTextEditor::EditInterface*>(part); switch (mode) { @@ -181,18 +181,18 @@ void TextToolsWidget::setMode(Mode mode, KParts::Part *part) << "table" << "tr"; m_emptyTags << "br" << "hr" << "img" << "input" << "p" << "meta"; - connect( m_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(parseXML()) ); + connect( m_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(parseXML()) ); break; case Docbook: m_relevantTags << "chapter" << "sect1" << "sect2" << "para" << "formalpara"; - connect( m_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(parseXML()) ); + connect( m_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(parseXML()) ); break; case LaTeX: - connect( m_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(parseLaTeX()) ); + connect( m_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(parseLaTeX()) ); break; default: ; } diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index 9172d44b..6d276e88 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -34,13 +34,13 @@ TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringLis TDEAction *action; action = new TDEAction(i18n("&Tip of the Day"), "idea", 0, - this, TQT_SLOT(showTip()), actionCollection(), "help_tipofday"); + this, TQ_SLOT(showTip()), actionCollection(), "help_tipofday"); action->setToolTip(i18n("A tip how to use TDevelop")); action->setWhatsThis(i18n("<b>Tip of the day</b><p>" "Will display another good tip \n" "contributed by KDevelop users.")); - connect(core(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(showOnStart())); + connect(core(), TQ_SIGNAL(coreInitialized()), this, TQ_SLOT(showOnStart())); } diff --git a/parts/tools/addtooldlg.ui.h b/parts/tools/addtooldlg.ui.h index fea69766..61b52809 100644 --- a/parts/tools/addtooldlg.ui.h +++ b/parts/tools/addtooldlg.ui.h @@ -12,7 +12,7 @@ void AddToolDialog::init() { - connect( tree, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(treeSelectionChanged(TQListViewItem*)) ); + connect( tree, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(treeSelectionChanged(TQListViewItem*)) ); tree->header()->hide(); } diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index 8c13a4ea..e8372597 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -139,8 +139,8 @@ KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name ) addDesktopGroup( TQString() ); - connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ), TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) ); - connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( currentChanged(TQListViewItem*) ), TQ_SLOT( slotItemHighlighted(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( selectionChanged(TQListViewItem*) ), TQ_SLOT( slotSelectionChanged(TQListViewItem*) ) ); } // ---------------------------------------------------------------------- diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index 5487bc77..94c3d2fa 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -49,17 +49,17 @@ ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &) m_configProxy = new ConfigWidgetProxy( core() ); m_configProxy->createGlobalConfigPage( i18n("Tools Menu"), TOOLSSETTINGS, info()->icon() ); m_configProxy->createGlobalConfigPage( i18n("External Tools"), EXTRATOOLSSETTINGS, 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(coreInitialized()), this, TQT_SLOT(updateMenu())); + connect(core(), TQ_SIGNAL(coreInitialized()), this, TQ_SLOT(updateMenu())); - 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 *)) ); // Apparently action lists can only be plugged after the // xmlgui client has been registered - TQTimer::singleShot(0, this, TQT_SLOT(updateToolsMenu())); + TQTimer::singleShot(0, this, TQ_SLOT(updateToolsMenu())); } @@ -73,14 +73,14 @@ void ToolsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, un if ( pagenumber == TOOLSSETTINGS ) { ToolsConfig *w = new ToolsConfig( page, "tools config widget" ); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateMenu())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(updateMenu())); } else if ( pagenumber == EXTRATOOLSSETTINGS ) { ToolsConfigWidget *w2 = new ToolsConfigWidget( page, "tools config widget" ); - connect(dlg, TQT_SIGNAL(okClicked()), w2, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateToolsMenu())); + connect(dlg, TQ_SIGNAL(okClicked()), w2, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(updateToolsMenu())); } } @@ -103,7 +103,7 @@ void ToolsPart::updateMenu() continue; TDEAction *action = new TDEAction(df.readName(), df.readIcon(), 0, - this, TQT_SLOT(slotToolActivated()), (TQObject*)0, name.latin1()); + this, TQ_SLOT(slotToolActivated()), (TQObject*)0, name.latin1()); actions.append(action); } @@ -180,7 +180,7 @@ void ToolsPart::updateToolsMenu() config->setGroup("Tool Menu " + menutext); bool isdesktopfile = config->readBoolEntry("DesktopFile"); TDEAction *action = new TDEAction(*it, 0, - this, TQT_SLOT(toolsMenuActivated()), + this, TQ_SLOT(toolsMenuActivated()), (TQObject*) 0, menutext.utf8()); if (isdesktopfile) { KDesktopFile df(config->readPathEntry("CommandLine")); @@ -212,12 +212,12 @@ void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context) TQStringList l = config->readListEntry("Dir Context"); TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) - externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(dirContextActivated(int)) ), (*it) ); + externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQ_SLOT(dirContextActivated(int)) ), (*it) ); } else { TQStringList l = config->readListEntry("File Context"); TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) - externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(fileContextActivated(int)) ), (*it) ); + externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQ_SLOT(fileContextActivated(int)) ), (*it) ); } } diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp index f21713e9..adb2ab2f 100644 --- a/parts/tools/toolsconfig.cpp +++ b/parts/tools/toolsconfig.cpp @@ -50,13 +50,13 @@ void ToolsConfig::showEvent(TQShowEvent *e) _toList->show(); vbox->addWidget(_toList); - connect(_toList, TQT_SIGNAL(clicked()), this, TQT_SLOT(toList())); + connect(_toList, TQ_SIGNAL(clicked()), this, TQ_SLOT(toList())); _toTree = new TQPushButton(TQApplication::reverseLayout() ? ">>" : "<<", this); _toTree->show(); vbox->addWidget(_toTree); - connect(_toTree, TQT_SIGNAL(clicked()), this, TQT_SLOT(toTree())); + connect(_toTree, TQ_SIGNAL(clicked()), this, TQ_SLOT(toTree())); vbox = new TQVBoxLayout(hbox); _list = new TQListBox(this); @@ -72,8 +72,8 @@ void ToolsConfig::showEvent(TQShowEvent *e) fill(); checkButtons(); - connect(_tree, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(checkButtons())); - connect(_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(checkButtons())); + connect(_tree, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(checkButtons())); + connect(_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(checkButtons())); } diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp index a547bdef..a8b40350 100644 --- a/parts/uimode/uichooser_part.cpp +++ b/parts/uimode/uichooser_part.cpp @@ -25,8 +25,8 @@ UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringL _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createGlobalConfigPage( i18n("User Interface"), UICHOOSERSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); } @@ -42,7 +42,7 @@ void UIChooserPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page if ( pagenumber == UICHOOSERSETTINGSPAGE ) { UIChooserWidget * w = new UIChooserWidget( this, page, "UIChooser widget" ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } } diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp index 23d45735..3770f5d6 100644 --- a/parts/valgrind/valgrind_dialog.cpp +++ b/parts/valgrind/valgrind_dialog.cpp @@ -25,10 +25,10 @@ ValgrindDialog::ValgrindDialog( Type type, TQWidget* parent ) w->executableEdit->setFocus(); w->stack->raiseWidget(m_type); setMainWidget( w ); - connect( w->executableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); - connect( w->valExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); - connect( w->ctExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); - connect( w->kcExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); + connect( w->executableEdit->lineEdit(), TQ_SIGNAL( textChanged( const TQString &)), this, TQ_SLOT( valgrindTextChanged())); + connect( w->valExecutableEdit->lineEdit(), TQ_SIGNAL( textChanged( const TQString &)), this, TQ_SLOT( valgrindTextChanged())); + connect( w->ctExecutableEdit->lineEdit(), TQ_SIGNAL( textChanged( const TQString &)), this, TQ_SLOT( valgrindTextChanged())); + connect( w->kcExecutableEdit->lineEdit(), TQ_SIGNAL( textChanged( const TQString &)), this, TQ_SLOT( valgrindTextChanged())); enableButtonOK( false ); } diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp index 5c78d952..0b984575 100644 --- a/parts/valgrind/valgrind_part.cpp +++ b/parts/valgrind/valgrind_part.cpp @@ -33,16 +33,16 @@ ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringLi setXMLFile( "kdevpart_valgrind.rc" ); proc = new KShellProcess(); - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) ); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) ); - connect( proc, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(processExited( TDEProcess* )) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), - this, TQT_SLOT(projectOpened()) ); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStdout( TDEProcess*, char*, int )) ); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStderr( TDEProcess*, char*, int )) ); + connect( proc, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(processExited( TDEProcess* )) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), + this, TQ_SLOT(projectOpened()) ); m_widget = new ValgrindWidget( this ); m_widget->setIcon( SmallIcon("fork") ); @@ -59,12 +59,12 @@ ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringLi "some abuses of the POSIX pthread API." ) ); TDEAction* action = new TDEAction( i18n("&Valgrind Memory Leak Check"), 0, this, - TQT_SLOT(slotExecValgrind()), actionCollection(), "tools_valgrind" ); + TQ_SLOT(slotExecValgrind()), actionCollection(), "tools_valgrind" ); action->setToolTip(i18n("Valgrind memory leak check")); action->setWhatsThis(i18n("<b>Valgrind memory leak check</b><p>Runs Valgrind - a tool to help you find memory-management problems in your programs.")); action = new TDEAction( i18n("P&rofile with KCachegrind"), 0, this, - TQT_SLOT(slotExecCalltree()), actionCollection(), "tools_calltree" ); + TQ_SLOT(slotExecCalltree()), actionCollection(), "tools_calltree" ); action->setToolTip(i18n("Profile with KCachegrind")); action->setWhatsThis(i18n("<b>Profile with KCachegrind</b><p>Runs your program in calltree and then displays profiler information in KCachegrind.")); diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp index 70484704..75f0c506 100644 --- a/parts/valgrind/valgrind_widget.cpp +++ b/parts/valgrind/valgrind_widget.cpp @@ -101,17 +101,17 @@ ValgrindWidget::ValgrindWidget( ValgrindPart *part ) vbl->addWidget( lv ); popup = new TQPopupMenu( lv, "valPopup" ); - popup->insertItem( i18n( "&Open Valgrind Output..." ), _part, TQT_SLOT(loadOutput()), 0, 0 ); + popup->insertItem( i18n( "&Open Valgrind Output..." ), _part, TQ_SLOT(loadOutput()), 0, 0 ); popup->insertSeparator(); - popup->insertItem( i18n( "Expand All Items" ), this, TQT_SLOT(expandAll()), 0, 2 ); - popup->insertItem( i18n( "Collapse All Items" ), this, TQT_SLOT(collapseAll()), 0, 3 ); - - connect( popup, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(aboutToShowPopup()) ); - connect( lv, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(executed(TQListViewItem*)) ); - connect( lv, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + popup->insertItem( i18n( "Expand All Items" ), this, TQ_SLOT(expandAll()), 0, 2 ); + popup->insertItem( i18n( "Collapse All Items" ), this, TQ_SLOT(collapseAll()), 0, 3 ); + + connect( popup, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(aboutToShowPopup()) ); + connect( lv, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(executed(TQListViewItem*)) ); + connect( lv, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp index e8606636..e1719371 100644 --- a/parts/vcsmanager/vcsmanagerpart.cpp +++ b/parts/vcsmanager/vcsmanagerpart.cpp @@ -58,10 +58,10 @@ VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStrin m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createProjectConfigPage(i18n("Version Control"), 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(projectOpened()), this, TQT_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); } VCSManagerPart::~VCSManagerPart() @@ -76,7 +76,7 @@ void VCSManagerPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, case PROJECTDOC_OPTIONS: { VCSManagerProjectConfig *w = new VCSManagerProjectConfig(this, page, "project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } diff --git a/src/Mainpage.dox b/src/Mainpage.dox index 67b3be1a..69e2e239 100644 --- a/src/Mainpage.dox +++ b/src/Mainpage.dox @@ -62,8 +62,8 @@ Example: app.processEvents(); - TQObject::connect(PluginController::getInstance(), SIGNAL(loadingPlugin(const TQString &)), - splash, SLOT(showMessage(const TQString &))); + TQObject::connect(PluginController::getInstance(), TQ_SIGNAL(loadingPlugin(const TQString &)), + splash, TQ_SLOT(showMessage(const TQString &))); splash->message( i18n( "Loading Settings" ) ); TopLevel::getInstance()->loadSettings(); diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index 73ff852b..75e0ba13 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -40,13 +40,13 @@ EditorProxy::EditorProxy() : TQObject() { m_delayedLineTimer = new TQTimer( this ); - connect( m_delayedLineTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(setLineNumberDelayed()) ); + connect( m_delayedLineTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(setLineNumberDelayed()) ); TDEConfig *config = kapp->config(); m_delayedViewCreationCompatibleUI = true; TDEAction *ac = new TDEAction( i18n("Show Context Menu"), 0, this, - TQT_SLOT(showPopup()), TopLevel::getInstance()->main()->actionCollection(), "show_popup" ); + TQ_SLOT(showPopup()), TopLevel::getInstance()->main()->actionCollection(), "show_popup" ); TDEShortcut cut ;/*= TDEStdAccel::shortcut(TDEStdAccel::PopupMenuContext);*/ cut.append(KKey(CTRL+Key_Return)); ac->setShortcut(cut); @@ -143,7 +143,7 @@ void EditorProxy::installPopup( KParts::Part * part ) iface->installPopup( popup ); - connect(popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(popupAboutToShow())); + connect(popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(popupAboutToShow())); // ugly hack: mark the "original" items m_popupIds.resize(popup->count()); diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp index 794ab8cd..9beeb3e9 100644 --- a/src/generalinfowidget.cpp +++ b/src/generalinfowidget.cpp @@ -32,10 +32,10 @@ TQString makeRelativePath(const TQString& fromPath, const TQString& toPath); GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name) : GeneralInfoWidgetBase(parent, name), m_projectDom(projectDom) { - connect(project_directory_edit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotProjectDirectoryChanged(const TQString&))); - connect(project_directory_combo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotProjectDirectoryComboChanged())); + connect(project_directory_edit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotProjectDirectoryChanged(const TQString&))); + connect(project_directory_combo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotProjectDirectoryComboChanged())); readConfig(); } diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index 52dd0053..f07f9b4d 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -94,7 +94,7 @@ void LanguageSelectWidget::init() layout->addWidget( groupBox2 ); - connect( _pluginList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) ); + connect( _pluginList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQ_SLOT( itemSelected( TQListViewItem * ) ) ); readProjectConfig(); } diff --git a/src/main.cpp b/src/main.cpp index 65177e53..7faf9b53 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -102,8 +102,8 @@ int main(int argc, char *argv[]) if (splash) splash->message( i18n( "Loading Settings" ) ); TopLevel::getInstance()->loadSettings(); - TQObject::connect(PluginController::getInstance(), TQT_SIGNAL(loadingPlugin(const TQString &)), - splash, TQT_SLOT(message(const TQString &))); + TQObject::connect(PluginController::getInstance(), TQ_SIGNAL(loadingPlugin(const TQString &)), + splash, TQ_SLOT(message(const TQString &))); if (splash) splash->show(); PluginController::getInstance()->loadInitialPlugins(); diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp index 10b5fd56..b548aa3b 100644 --- a/src/main_assistant.cpp +++ b/src/main_assistant.cpp @@ -94,8 +94,8 @@ int main(int argc, char *argv[]) app.processEvents(); - TQObject::connect(PluginController::getInstance(), TQT_SIGNAL(loadingPlugin(const TQString &)), - splash, TQT_SLOT(message(const TQString &))); + TQObject::connect(PluginController::getInstance(), TQ_SIGNAL(loadingPlugin(const TQString &)), + splash, TQ_SLOT(message(const TQString &))); if (splash) splash->message( i18n( "Loading Settings" ) ); TopLevel::getInstance()->loadSettings(); diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index c0c63e2e..38414c00 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -81,11 +81,11 @@ MainWindowShare::MainWindowShare(TQObject* pParent, const char* name) void MainWindowShare::init() { - connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(Core::getInstance(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect( m_pMainWnd->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( m_pMainWnd->actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); } void MainWindowShare::slotActionStatusText( const TQString &text ) @@ -105,83 +105,83 @@ void MainWindowShare::createActions() { ProjectManager::getInstance()->createActions( m_pMainWnd->actionCollection() ); - KStdAction::quit(this->parent(), TQT_SLOT(close()), m_pMainWnd->actionCollection()); + KStdAction::quit(this->parent(), TQ_SLOT(close()), m_pMainWnd->actionCollection()); TDEAction* action; m_stopProcesses = new TDEToolBarPopupAction( i18n( "&Stop" ), "process-stop", - Key_Escape, this, TQT_SLOT(slotStopButtonPressed()), + Key_Escape, this, TQ_SLOT(slotStopButtonPressed()), m_pMainWnd->actionCollection(), "stop_processes" ); m_stopProcesses->setToolTip(i18n("Stop")); m_stopProcesses->setWhatsThis(i18n("<b>Stop</b><p>Stops all running processes (like building process, grep command, etc.). When placed onto a toolbar provides a popup menu to choose a process to stop.")); m_stopProcesses->setEnabled( false ); - connect(m_stopProcesses->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotStopMenuAboutToShow())); - connect(m_stopProcesses->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotStopPopupActivated(int))); + connect(m_stopProcesses->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotStopMenuAboutToShow())); + connect(m_stopProcesses->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotStopPopupActivated(int))); - connect( Core::getInstance(), TQT_SIGNAL(activeProcessChanged(KDevPlugin*, bool)), - this, TQT_SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) ); + connect( Core::getInstance(), TQ_SIGNAL(activeProcessChanged(KDevPlugin*, bool)), + this, TQ_SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) ); action = KStdAction::showMenubar( - this, TQT_SLOT(slotShowMenuBar()), + this, TQ_SLOT(slotShowMenuBar()), m_pMainWnd->actionCollection(), "settings_show_menubar" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you switch the menubar on/off."))); action = KStdAction::keyBindings( - this, TQT_SLOT(slotKeyBindings()), + this, TQ_SLOT(slotKeyBindings()), m_pMainWnd->actionCollection(), "settings_configure_shortcuts" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure shortcut keys."))); action = KStdAction::configureToolbars( - this, TQT_SLOT(slotConfigureToolbars()), + this, TQ_SLOT(slotConfigureToolbars()), m_pMainWnd->actionCollection(), "settings_configure_toolbars" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure toolbars."))); action = KStdAction::configureNotifications( - this, TQT_SLOT(slotConfigureNotifications()), + this, TQ_SLOT(slotConfigureNotifications()), m_pMainWnd->actionCollection(), "settings_configure_notifications" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure system notifications."))); - action = KStdAction::preferences(this, TQT_SLOT(slotSettings()), + action = KStdAction::preferences(this, TQ_SLOT(slotSettings()), m_pMainWnd->actionCollection(), "settings_configure" ); action->setToolTip( i18n( "Configure TDevelop" ) ); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(i18n( "Configure TDevelop" )).arg(i18n("Lets you customize TDevelop."))); - m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); + m_toggleStatusbar = KStdAction::showToolbar(this, TQ_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); m_toggleStatusbar->setText(i18n("Show &Statusbar")); m_toggleStatusbar->setToolTip( i18n("Show statusbar") ); m_toggleStatusbar->setWhatsThis(i18n("<b>Show statusbar</b><p>Hides or shows the statusbar.")); - action = new TDEAction( i18n("&Next Window"), ALT+Key_Right, this, TQT_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window"); + action = new TDEAction( i18n("&Next Window"), ALT+Key_Right, this, TQ_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window"); action->setToolTip( i18n("Next window") ); action->setWhatsThis(i18n("<b>Next window</b><p>Switches to the next window.")); - action = new TDEAction( i18n("&Previous Window"), ALT+Key_Left, this, TQT_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window"); + action = new TDEAction( i18n("&Previous Window"), ALT+Key_Left, this, TQ_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window"); action->setToolTip( i18n("Previous window") ); action->setWhatsThis(i18n("<b>Previous window</b><p>Switches to the previous window.")); - action = new TDEAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQT_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window"); + action = new TDEAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQ_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window"); action->setToolTip( i18n("Last accessed window") ); action->setWhatsThis(i18n("<b>Last accessed window</b><p>Switches to the last viewed window (Hold the Alt key pressed and walk on by repeating the Up key).")); - action = new TDEAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQT_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window"); + action = new TDEAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQ_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window"); action->setToolTip( i18n("First accessed window") ); action->setWhatsThis(i18n("<b>First accessed window</b><p>Switches to the first accessed window (Hold the Alt key pressed and walk on by repeating the Down key).")); - action = new TDEAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQT_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" ); + action = new TDEAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQ_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" ); - m_configureEditorAction = new TDEAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQT_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors"); + m_configureEditorAction = new TDEAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQ_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors"); m_configureEditorAction->setToolTip( i18n("Configure editor settings") ); m_configureEditorAction->setWhatsThis(i18n("<b>Configure editor</b><p>Opens editor configuration dialog.")); m_configureEditorAction->setEnabled( false ); KDevPartController * partController = API::getInstance()->partController(); - 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* )) ); } void MainWindowShare::slotReportBug() @@ -367,15 +367,15 @@ void MainWindowShare::slotGUICreated( KParts::Part * part ) if ( TDEAction * action = part->action("file_save") ) { kdDebug(9000) << " *** found \"file_save\" action - disconnecting" << endl; - disconnect( action, TQT_SIGNAL(activated()), 0, 0 ); - connect( action, TQT_SIGNAL(activated()), PartController::getInstance(), TQT_SLOT(slotSave()) ); + disconnect( action, TQ_SIGNAL(activated()), 0, 0 ); + connect( action, TQ_SIGNAL(activated()), PartController::getInstance(), TQ_SLOT(slotSave()) ); } if ( TDEAction * action = part->action("file_reload") ) { kdDebug(9000) << " *** found \"file_reload\" action - disconnecting" << endl; - disconnect( action, TQT_SIGNAL(activated()), 0, 0 ); - connect( action, TQT_SIGNAL(activated()), PartController::getInstance(), TQT_SLOT(slotReload()) ); + disconnect( action, TQ_SIGNAL(activated()), 0, 0 ); + connect( action, TQ_SIGNAL(activated()), PartController::getInstance(), TQ_SLOT(slotReload()) ); } } @@ -429,7 +429,7 @@ void MainWindowShare::slotConfigureToolbars() { m_pMainWnd->saveMainWindowSettings( TDEGlobal::config(), "Mainwindow" ); KEditToolbar dlg( m_pMainWnd->factory() ); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -438,7 +438,7 @@ void MainWindowShare::contextMenu(TQPopupMenu* popup, const Context *) if ( m_pMainWnd->menuBar()->isVisible() ) return; - int id = popup->insertItem( i18n("Show &Menubar"), m_pMainWnd->menuBar(), TQT_SLOT(show()) ); + int id = popup->insertItem( i18n("Show &Menubar"), m_pMainWnd->menuBar(), TQ_SLOT(show()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Show menubar</b><p>Lets you switch the menubar on/off.")); } diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp index 5fbc1cc9..fe988c02 100644 --- a/src/multibuffer.cpp +++ b/src/multibuffer.cpp @@ -57,8 +57,8 @@ MultiBuffer::MultiBuffer( TQWidget *parent ) API::getInstance() ->languageSupport() ) { setOrientation( lang->splitOrientation() ); - connect( lang, TQT_SIGNAL( splitOrientationChanged( TQt::Orientation ) ), - this, TQT_SLOT( setOrientation( TQt::Orientation ) ) ); + connect( lang, TQ_SIGNAL( splitOrientationChanged( TQt::Orientation ) ), + this, TQ_SLOT( setOrientation( TQt::Orientation ) ) ); } else { @@ -221,8 +221,8 @@ void MultiBuffer::show() // We're managing the view deletion by being its parent, // don't let the part self-destruct - disconnect( view, TQT_SIGNAL( destroyed() ), - document, TQT_SLOT( slotWidgetDestroyed() ) ); + disconnect( view, TQ_SIGNAL( destroyed() ), + document, TQ_SLOT( slotWidgetDestroyed() ) ); document->insertChildClient( view ); PartController::getInstance() ->integrateTextEditorPart( document ); diff --git a/src/newui/button.cpp b/src/newui/button.cpp index 5e900260..fc8bf826 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -56,9 +56,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, TQToolTip::add(this, m_realText); m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0, - this, TQT_SLOT(assignAccel()), this); + this, TQ_SLOT(assignAccel()), this); m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0, - this, TQT_SLOT(clearAccel()), this); + this, TQ_SLOT(clearAccel()), this); TDEConfig *config = kapp->config(); config->setGroup("UI"); diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index eb217dcb..60292252 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) m_widgetStack = new TQWidgetStack(this); m_internalLayout->addWidget(m_widgetStack); - m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQT_SLOT(moveToDockLeft()), this ); - m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQT_SLOT(moveToDockRight()), this ); - m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQT_SLOT(moveToDockBottom()), this ); + m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQ_SLOT(moveToDockLeft()), this ); + m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQ_SLOT(moveToDockRight()), this ); + m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQ_SLOT(moveToDockBottom()), this ); setVisible(m_visible); @@ -192,8 +192,8 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc m_bar->addButton(button); m_widgetStack->addWidget(widget); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectWidget())); - connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), this, TQT_SLOT(contextMenu(TQPopupMenu*)) ); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectWidget())); + connect(button, TQ_SIGNAL(contextMenu(TQPopupMenu*)), this, TQ_SLOT(contextMenu(TQPopupMenu*)) ); if (!skipActivation) { diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index 62a81eca..d3c70d4e 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -208,10 +208,10 @@ DTabWidget *DMainWindow::createTab() DTabWidget *tab = new DTabWidget(m_central); m_tabs.append(tab); if (tab->closeButton()) - connect(tab->closeButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(closeTab())); - connect(tab, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*))); - connect(tab, TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), - this, TQT_SLOT(tabContext(TQWidget*,const TQPoint &))); + connect(tab->closeButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(closeTab())); + connect(tab, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*))); + connect(tab, TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), + this, TQ_SLOT(tabContext(TQWidget*,const TQPoint &))); return tab; } @@ -274,7 +274,7 @@ void DMainWindow::addDockWidget(DDockWindow::Position position, TQWidget *view, { toolWindow(position)->addWidget(title, view); m_docks[view] = position; - connect(view, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed())); + connect(view, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed())); } void DMainWindow::removeDockWidget(TQWidget *view) diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp index becfb12c..f96f3ca0 100644 --- a/src/newui/dtabwidget.cpp +++ b/src/newui/dtabwidget.cpp @@ -49,8 +49,8 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) setTabReorderingEnabled(true); } - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(setFocus(TQWidget*))); -// connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(updateHistory(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(setFocus(TQWidget*))); +// connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(updateHistory(TQWidget*))); } void DTabWidget::loadSettings() diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index b34eb4f9..086d641e 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -92,9 +92,9 @@ struct ModificationData PartController::PartController(TQWidget *parent) : KDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false) { - connect(this, TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part* )) ); - connect(this, TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part* )) ); - connect(this, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part*))); + connect(this, TQ_SIGNAL(partRemoved(KParts::Part*)), this, TQ_SLOT(slotPartRemoved(KParts::Part* )) ); + connect(this, TQ_SIGNAL(partAdded(KParts::Part*)), this, TQ_SLOT(slotPartAdded(KParts::Part* )) ); + connect(this, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part*))); setupActions(); @@ -126,56 +126,56 @@ void PartController::setupActions() { TDEActionCollection *ac = TopLevel::getInstance()->main()->actionCollection(); - TDEAction* newAction = KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac, "file_open"); + TDEAction* newAction = KStdAction::open(this, TQ_SLOT(slotOpenFile()), ac, "file_open"); newAction->setToolTip( i18n("Open file") ); newAction->setWhatsThis( i18n("<b>Open file</b><p>Opens an existing file without adding it to the project.</p>") ); - m_openRecentAction = KStdAction::openRecent( this, TQT_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); + m_openRecentAction = KStdAction::openRecent( this, TQ_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file."))); m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" ); - m_saveAllFilesAction = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all"); + m_saveAllFilesAction = new TDEAction(i18n("Save Al&l"), 0, this, TQ_SLOT(slotSaveAllFiles()), ac, "file_save_all"); m_saveAllFilesAction->setToolTip( i18n("Save all modified files") ); m_saveAllFilesAction->setWhatsThis(i18n("<b>Save all</b><p>Saves all modified files.")); m_saveAllFilesAction->setEnabled(false); - m_revertAllFilesAction = new TDEAction(i18n("Rever&t All"), 0, this, TQT_SLOT(slotRevertAllFiles()), ac, "file_revert_all"); + m_revertAllFilesAction = new TDEAction(i18n("Rever&t All"), 0, this, TQ_SLOT(slotRevertAllFiles()), ac, "file_revert_all"); m_revertAllFilesAction->setToolTip(i18n("Revert all changes")); m_revertAllFilesAction->setWhatsThis(i18n("<b>Revert all</b><p>Reverts all changes in opened files. Prompts to save changes so the reversion can be canceled for each modified file.")); m_revertAllFilesAction->setEnabled(false); - m_closeWindowAction = KStdAction::close(this, TQT_SLOT(slotCloseWindow()), ac, "file_close"); + m_closeWindowAction = KStdAction::close(this, TQ_SLOT(slotCloseWindow()), ac, "file_close"); m_closeWindowAction->setToolTip( i18n("Close current file") ); m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file."))); m_closeWindowAction->setEnabled(false); - m_closeAllWindowsAction = new TDEAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all"); + m_closeAllWindowsAction = new TDEAction(i18n("Close All"), 0, this, TQ_SLOT(slotCloseAllWindows()), ac, "file_close_all"); m_closeAllWindowsAction->setToolTip( i18n("Close all files") ); m_closeAllWindowsAction->setWhatsThis(i18n("<b>Close all</b><p>Close all opened files.")); m_closeAllWindowsAction->setEnabled(false); - m_closeOtherWindowsAction = new TDEAction(i18n("Close All Others"), 0, this, TQT_SLOT(slotCloseOtherWindows()), ac, "file_closeother"); + m_closeOtherWindowsAction = new TDEAction(i18n("Close All Others"), 0, this, TQ_SLOT(slotCloseOtherWindows()), ac, "file_closeother"); m_closeOtherWindowsAction->setToolTip( i18n("Close other files") ); m_closeOtherWindowsAction->setWhatsThis(i18n("<b>Close all others</b><p>Close all opened files except current.")); m_closeOtherWindowsAction->setEnabled(false); new TDEActionSeparator(ac, "dummy_separator"); - m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQT_SLOT(slotBack()), ac, "history_back"); + m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQ_SLOT(slotBack()), ac, "history_back"); m_backAction->setEnabled( false ); m_backAction->setToolTip(i18n("Back")); m_backAction->setWhatsThis(i18n("<b>Back</b><p>Moves backwards one step in the navigation history.")); - connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBackAboutToShow())); - connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotBackPopupActivated(int))); + connect(m_backAction->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotBackAboutToShow())); + connect(m_backAction->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotBackPopupActivated(int))); - m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQT_SLOT(slotForward()), ac, "history_forward"); + m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQ_SLOT(slotForward()), ac, "history_forward"); m_forwardAction->setEnabled( false ); m_forwardAction->setToolTip(i18n("Forward")); m_forwardAction->setWhatsThis(i18n("<b>Forward</b><p>Moves forward one step in the navigation history.")); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotForwardAboutToShow())); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotForwardPopupActivated(int))); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotForwardAboutToShow())); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotForwardPopupActivated(int))); - m_gotoLastEditPosAction = new TDEAction( i18n("Goto Last Edit Position"), "go-bottom", 0, this, TQT_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" ); + m_gotoLastEditPosAction = new TDEAction( i18n("Goto Last Edit Position"), "go-bottom", 0, this, TQ_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" ); m_gotoLastEditPosAction->setEnabled( false ); m_gotoLastEditPosAction->setToolTip( i18n("Goto Last Edit Position") ); m_gotoLastEditPosAction->setWhatsThis( i18n("<b>Goto Last Edit Position</b><p>Open the last edited file and position cursor at the point of edit") ); @@ -574,8 +574,8 @@ void PartController::showDocument(const KURL &url, bool newWin) { part = new HTMLDocumentationPart; integratePart(part,docUrl); - connect(part, TQT_SIGNAL(fileNameChanged(KParts::ReadOnlyPart* )), - this, TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart* ))); + connect(part, TQ_SIGNAL(fileNameChanged(KParts::ReadOnlyPart* )), + this, TQ_SIGNAL(partURLChanged(KParts::ReadOnlyPart* ))); } else { @@ -678,14 +678,14 @@ void PartController::integratePart(KParts::Part *part, const KURL &url, emit loadedFile( ro_part->url() ); - connect( part, TQT_SIGNAL(modifiedOnDisc(Kate::Document*, bool, unsigned char)), this, TQT_SLOT(slotDocumentDirty(Kate::Document*, bool, unsigned char)) ); + connect( part, TQ_SIGNAL(modifiedOnDisc(Kate::Document*, bool, unsigned char)), this, TQ_SLOT(slotDocumentDirty(Kate::Document*, bool, unsigned char)) ); // let's get notified when a document has been changed - connect(part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotUploadFinished())); + connect(part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotUploadFinished())); // yes, we're cheating again. this signal exists for katepart's // Document object and our HTMLDocumentationPart -// connect(part, TQT_SIGNAL(fileNameChanged()), this, TQT_SLOT(slotFileNameChanged())); +// connect(part, TQ_SIGNAL(fileNameChanged()), this, TQ_SLOT(slotFileNameChanged())); // Connect to the document's views newStatus() signal in order to keep track of the // modified-status of the document. @@ -697,22 +697,22 @@ void PartController::integratePart(KParts::Part *part, const KURL &url, if (designerPart && API::getInstance()->languageSupport()) { kdDebug() << "integrating designer part with language support" << endl; - connect(designerPart, TQT_SIGNAL(addedFunction(DesignerType, const TQString&, Function )), + connect(designerPart, TQ_SIGNAL(addedFunction(DesignerType, const TQString&, Function )), API::getInstance()->languageSupport(), - TQT_SLOT(addFunction(DesignerType, const TQString&, Function ))); - connect(designerPart, TQT_SIGNAL(editedFunction(DesignerType, const TQString&, Function, Function )), API::getInstance()->languageSupport(), - TQT_SLOT(editFunction(DesignerType, const TQString&, Function, Function ))); - connect(designerPart, TQT_SIGNAL(removedFunction(DesignerType, const TQString&, Function )), + TQ_SLOT(addFunction(DesignerType, const TQString&, Function ))); + connect(designerPart, TQ_SIGNAL(editedFunction(DesignerType, const TQString&, Function, Function )), API::getInstance()->languageSupport(), + TQ_SLOT(editFunction(DesignerType, const TQString&, Function, Function ))); + connect(designerPart, TQ_SIGNAL(removedFunction(DesignerType, const TQString&, Function )), API::getInstance()->languageSupport(), - TQT_SLOT(removeFunction(DesignerType, const TQString&, Function ))); - connect(designerPart, TQT_SIGNAL(editFunction(DesignerType, const TQString&, const TQString& )), + TQ_SLOT(removeFunction(DesignerType, const TQString&, Function ))); + connect(designerPart, TQ_SIGNAL(editFunction(DesignerType, const TQString&, const TQString& )), API::getInstance()->languageSupport(), - TQT_SLOT(openFunction(DesignerType, const TQString&, const TQString& ))); - connect(designerPart, TQT_SIGNAL(editSource(DesignerType, const TQString& )), + TQ_SLOT(openFunction(DesignerType, const TQString&, const TQString& ))); + connect(designerPart, TQ_SIGNAL(editSource(DesignerType, const TQString& )), API::getInstance()->languageSupport(), - TQT_SLOT(openSource(DesignerType, const TQString& ))); - connect(designerPart, TQT_SIGNAL(newStatus(const TQString &, int)), - this, TQT_SLOT(slotNewDesignerStatus(const TQString &, int))); + TQ_SLOT(openSource(DesignerType, const TQString& ))); + connect(designerPart, TQ_SIGNAL(newStatus(const TQString &, int)), + this, TQ_SLOT(slotNewDesignerStatus(const TQString &, int))); } } @@ -733,14 +733,14 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) if ( !doc ) return; - connect( doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(textChanged()) ); - connect( doc, TQT_SIGNAL(fileNameChanged()), - this, TQT_SLOT(slotDocumentUrlChanged())); + connect( doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(textChanged()) ); + connect( doc, TQ_SIGNAL(fileNameChanged()), + this, TQ_SLOT(slotDocumentUrlChanged())); if( doc->widget() ) { - connect( doc->widget(), TQT_SIGNAL(dropEventPass(TQDropEvent *)), - TopLevel::getInstance()->main(), TQT_SLOT(slotDropEvent(TQDropEvent *)) ); + connect( doc->widget(), TQ_SIGNAL(dropEventPass(TQDropEvent *)), + TopLevel::getInstance()->main(), TQ_SLOT(slotDropEvent(TQDropEvent *)) ); } if ( KTextEditor::View * view = dynamic_cast<KTextEditor::View*>( doc->widget() ) ) @@ -780,7 +780,7 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) TQPtrListIterator<KTextEditor::View> it( list ); while ( it.current() ) { - connect( it, TQT_SIGNAL( newStatus() ), this, TQT_SLOT( slotNewStatus() ) ); + connect( it, TQ_SIGNAL( newStatus() ), this, TQ_SLOT( slotNewStatus() ) ); ++it; } } @@ -1327,7 +1327,7 @@ void PartController::slotActivePartChanged( KParts::Part *part ) } updateMenuItems(); - TQTimer::singleShot( 100, this, TQT_SLOT(slotWaitForFactoryHack()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(slotWaitForFactoryHack()) ); } void PartController::showPart( KParts::Part* part, const TQString& name, const TQString& shortDescription ) @@ -1379,7 +1379,7 @@ void PartController::slotDocumentDirty( Kate::Document * d, bool isModified, uns p->doc = doc; p->isModified = isModified; p->reason = reason; - KDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p ); + KDevJobTimer::singleShot( 0, this, TQ_SLOT(slotDocumentDirtyStepTwo(void*)), p ); } } @@ -1754,7 +1754,7 @@ void PartController::slotWaitForFactoryHack( ) { if ( !activePart()->factory() ) { - TQTimer::singleShot( 100, this, TQT_SLOT(slotWaitForFactoryHack()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(slotWaitForFactoryHack()) ); return; } else diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 30aa9171..7166ab34 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -244,8 +244,8 @@ void PluginController::integratePart(KXMLGUIClient *part) Core::setupShourtcutTips(part); TopLevel::getInstance()->main()->guiFactory()->addClient(part); - connect( part->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ), - TopLevel::getInstance()->main()->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ) ); + connect( part->actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), + TopLevel::getInstance()->main()->actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ) ); } void PluginController::integrateAndRememberPart(const TQString &name, KDevPlugin *part) diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp index a626a0dd..f7e92089 100644 --- a/src/pluginselectdialog.cpp +++ b/src/pluginselectdialog.cpp @@ -51,8 +51,8 @@ PluginSelectDialog::PluginSelectDialog(TQWidget* parent, const char* name, bool plugin_list->addColumn(""); plugin_list->header()->hide(); - connect( plugin_list, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) ); - connect( urllabel, TQT_SIGNAL( leftClickedURL( const TQString & ) ), this, TQT_SLOT( openURL( const TQString & ) ) ); + connect( plugin_list, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQ_SLOT( itemSelected( TQListViewItem * ) ) ); + connect( urllabel, TQ_SIGNAL( leftClickedURL( const TQString & ) ), this, TQ_SLOT( openURL( const TQString & ) ) ); init(); } diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 19a88d78..adebaee4 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -94,14 +94,14 @@ void ProjectManager::createActions( TDEActionCollection* ac ) TDEAction *action; action = new TDEAction(i18n("&Open Project..."), "project_open", 0, - this, TQT_SLOT(slotOpenProject()), + this, TQ_SLOT(slotOpenProject()), ac, "project_open"); action->setToolTip( i18n("Open project")); action->setWhatsThis(i18n("<b>Open project</b><p>Opens a KDevelop3 or KDevelop2 project.")); m_openRecentProjectAction = new TDERecentFilesAction(i18n("Open &Recent Project"), 0, - this, TQT_SLOT(loadProject(const KURL &)), + this, TQ_SLOT(loadProject(const KURL &)), ac, "project_open_recent"); m_openRecentProjectAction->setToolTip(i18n("Open recent project")); m_openRecentProjectAction->setWhatsThis(i18n("<b>Open recent project</b><p>Opens recently opened project.")); @@ -109,14 +109,14 @@ void ProjectManager::createActions( TDEActionCollection* ac ) m_closeProjectAction = new TDEAction(i18n("C&lose Project"), "window-close",0, - this, TQT_SLOT(closeProject()), + this, TQ_SLOT(closeProject()), ac, "project_close"); m_closeProjectAction->setEnabled(false); m_closeProjectAction->setToolTip(i18n("Close project")); m_closeProjectAction->setWhatsThis(i18n("<b>Close project</b><p>Closes the current project.")); m_projectOptionsAction = new TDEAction(i18n("Project &Options"), "configure", 0, - this, TQT_SLOT(slotProjectOptions()), + this, TQ_SLOT(slotProjectOptions()), ac, "project_options" ); m_projectOptionsAction->setToolTip(i18n("Project options")); m_projectOptionsAction->setWhatsThis(i18n("<b>Project options</b><p>Lets you customize project options.")); @@ -151,7 +151,7 @@ void ProjectManager::slotProjectOptions() TQVBox *box = dlg.addVBoxPage( i18n("General"), i18n("General"), BarIcon( "tdevelop", TDEIcon::SizeMedium ) ); GeneralInfoWidget *g = new GeneralInfoWidget(*API::getInstance()->projectDom(), box, "general informations widget"); - connect (&dlg, TQT_SIGNAL(okClicked()), g, TQT_SLOT(accept())); + connect (&dlg, TQ_SIGNAL(okClicked()), g, TQ_SLOT(accept())); TDEConfig *config = kapp->config(); config->setGroup("Project Settings Dialog"); @@ -239,7 +239,7 @@ bool ProjectManager::loadProject(const KURL &projectURL) m_info = new ProjectInfo; m_info->m_projectURL = url; - TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadProject()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotLoadProject()) ); // no one cares about this value return true; diff --git a/src/projectsession.cpp b/src/projectsession.cpp index afdaf0b5..272258dd 100644 --- a/src/projectsession.cpp +++ b/src/projectsession.cpp @@ -118,7 +118,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ ++it; } - TQTimer::singleShot( 0, this, TQT_SLOT(loadDocument()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(loadDocument()) ); return true; } @@ -444,7 +444,7 @@ void ProjectSession::loadDocument( ) _docDataList.pop_front(); loadDocument(); - //TQTimer::singleShot( 0, this, TQT_SLOT(loadDocument()) ); + //TQTimer::singleShot( 0, this, TQ_SLOT(loadDocument()) ); } } diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 8a39730b..b18f4cb5 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -63,9 +63,9 @@ SimpleMainWindow::SimpleMainWindow(TQWidget* parent, const char *name) resize(800, 600); // starts tdevelop at 800x600 the first time m_mainWindowShare = new MainWindowShare(this); - connect(m_bottomDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor())); - connect(m_leftDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor())); - connect(m_rightDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor())); + connect(m_bottomDock, TQ_SIGNAL(hidden()), this, TQ_SLOT(raiseEditor())); + connect(m_leftDock, TQ_SIGNAL(hidden()), this, TQ_SLOT(raiseEditor())); + connect(m_rightDock, TQ_SIGNAL(hidden()), this, TQ_SLOT(raiseEditor())); } SimpleMainWindow::~ SimpleMainWindow( ) @@ -97,7 +97,7 @@ void SimpleMainWindow::init() if (help_menu) { help_menu->insertItem(SmallIconSet("contents"), i18n("TDevelop &Programming Handbook"), - this, TQT_SLOT(slotProgrammingHandbook()), 0, -1, 1); + this, TQ_SLOT(slotProgrammingHandbook()), 0, -1, 1); } menuBar()->setEnabled( false ); @@ -116,19 +116,19 @@ void SimpleMainWindow::init() i18n("Could Not Find Plugins") ); } - connect(Core::getInstance(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(slotCoreInitialized())); - connect(Core::getInstance(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(Core::getInstance(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); - connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(PartController::getInstance(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart *)), - this, TQT_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * ))); - connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect(Core::getInstance(), TQ_SIGNAL(coreInitialized()), this, TQ_SLOT(slotCoreInitialized())); + connect(Core::getInstance(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(Core::getInstance(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); + connect(Core::getInstance(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(PartController::getInstance(), TQ_SIGNAL(partURLChanged(KParts::ReadOnlyPart *)), + this, TQ_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * ))); + connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); connect(PartController::getInstance(), - TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)), - this, TQT_SLOT(documentChangedState(const KURL&, DocumentState))); + TQ_SIGNAL(documentChangedState(const KURL &, DocumentState)), + this, TQ_SLOT(documentChangedState(const KURL&, DocumentState))); loadSettings(); } @@ -413,65 +413,65 @@ void SimpleMainWindow::createFramework() { PartController::createInstance( this ); - connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(createGUI(KParts::Part*))); + connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(createGUI(KParts::Part*))); } void SimpleMainWindow::createActions() { m_raiseEditor = new TDEAction(i18n("Raise &Editor"), ALT+Key_C, - this, TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor"); + this, TQ_SLOT(raiseEditor()), actionCollection(), "raise_editor"); m_raiseEditor->setToolTip(i18n("Raise editor")); m_raiseEditor->setWhatsThis(i18n("<b>Raise editor</b><p>Focuses the editor.")); m_lowerAllDocks = new TDEAction(i18n("Lower All Docks"), CTRL+SHIFT+Key_C, - this, TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks"); + this, TQ_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks"); new TDEAction(i18n("Switch to next TabWidget"), 0, this, - TQT_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" ); + TQ_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" ); m_splitHor = new TDEAction(i18n("Split &Horizontal"), CTRL+SHIFT+Key_T, - this, TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h"); + this, TQ_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h"); m_splitHor->setIcon("view_top_bottom"); m_splitVer = new TDEAction(i18n("Split &Vertical"), CTRL+SHIFT+Key_L, - this, TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v"); + this, TQ_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v"); m_splitVer->setIcon("view_left_right"); m_splitHor1 = new TDEAction(i18n("Split &Horizontal"), 0, - this, TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1"); + this, TQ_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1"); m_splitHor1->setIcon("view_top_bottom"); m_splitVer1 = new TDEAction(i18n("Split &Vertical"), 0, - this, TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1"); + this, TQ_SLOT(slotSplitVertical()), actionCollection(), "split_v1"); m_splitVer1->setIcon("view_left_right"); m_splitHor2 = new TDEAction(i18n("Split &Horizontal and Open"), 0, - this, TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2"); + this, TQ_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2"); m_splitHor2->setIcon("view_top_bottom"); m_splitVer2 = new TDEAction(i18n("Split &Vertical and Open"), 0, - this, TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2"); + this, TQ_SLOT(slotSplitVertical()), actionCollection(), "split_v2"); m_splitVer2->setIcon("view_left_right"); m_raiseLeftDock = new TDEAction(i18n("Switch Left Dock"), CTRL+SHIFT+ALT+Key_L, - this, TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock"); + this, TQ_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock"); m_raiseRightDock = new TDEAction(i18n("Switch Right Dock"), CTRL+SHIFT+ALT+Key_R, - this, TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock"); + this, TQ_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock"); m_raiseBottomDock = new TDEAction(i18n("Switch Bottom Dock"), CTRL+SHIFT+ALT+Key_B, - this, TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock"); + this, TQ_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock"); - KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars()), + KStdAction::configureToolbars(this, TQ_SLOT(configureToolbars()), actionCollection(), "set_configure_toolbars"); m_mainWindowShare->createActions(); - connect(m_mainWindowShare, TQT_SIGNAL(gotoNextWindow()), this, TQT_SLOT(gotoNextWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoPreviousWindow()), this, TQT_SLOT(gotoPreviousWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoFirstWindow()), this, TQT_SLOT(gotoFirstWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoLastWindow()), this, TQT_SLOT(gotoLastWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoNextWindow()), this, TQ_SLOT(gotoNextWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoPreviousWindow()), this, TQ_SLOT(gotoPreviousWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoFirstWindow()), this, TQ_SLOT(gotoFirstWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoLastWindow()), this, TQ_SLOT(gotoLastWindow())); } void SimpleMainWindow::raiseEditor() @@ -644,7 +644,7 @@ void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p) ++it; } - connect(&tabMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(tabContextActivated(int))); + connect(&tabMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(tabContextActivated(int))); tabMenu.exec(p); } @@ -679,7 +679,7 @@ void SimpleMainWindow::configureToolbars() { saveMainWindowSettings(TDEGlobal::config(), "SimpleMainWindow"); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -718,8 +718,8 @@ void SimpleMainWindow::setupWindowMenu() actionCollection()->action("file_close_all")->plug(m_windowMenu); actionCollection()->action("file_closeother")->plug(m_windowMenu); - TQObject::connect(m_windowMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openURL(int))); - TQObject::connect(m_windowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillWindowMenu())); + TQObject::connect(m_windowMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(openURL(int))); + TQObject::connect(m_windowMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(fillWindowMenu())); } void SimpleMainWindow::openURL(int w) diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp index 205656bd..b2e0f13a 100644 --- a/src/splashscreen.cpp +++ b/src/splashscreen.cpp @@ -13,7 +13,7 @@ KDevSplashScreen::KDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f) { TQTimer *timer = new TQTimer( this ); - TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); + TQObject::connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(animate())); timer->start(150); state = 0; diff --git a/src/statusbar.cpp b/src/statusbar.cpp index b4e11769..44cb4b70 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -39,8 +39,8 @@ KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name) _status->setAlignment(TQWidget::AlignCenter); addWidget(_status, 0, true); - connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); } @@ -60,14 +60,14 @@ void KDevStatusBar::activePartChanged(KParts::Part *part) { if ((_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) { - connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), - this, TQT_SLOT( setStatus( const TQString & ) ) ); + connect( part->widget(), TQ_SIGNAL( viewStatusMsg( const TQString & ) ), + this, TQ_SLOT( setStatus( const TQString & ) ) ); _status->show(); } else if ((_cursorIface = dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()))) { - connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); + connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged())); _status->show(); cursorPositionChanged(); diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp index 1e18f8e1..dceb9b9e 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.cpp +++ b/vcs/clearcase/clearcasefileinfoprovider.cpp @@ -21,7 +21,7 @@ ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent) { vcsInfo_ = NULL; - connect(parent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); + connect(parent, TQ_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQ_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); kdevVCS_ = parent; } diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp index 8f05fbad..700de36b 100644 --- a/vcs/clearcase/clearcasepart.cpp +++ b/vcs/clearcase/clearcasepart.cpp @@ -60,8 +60,8 @@ ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQString fileInfoProvider_ = new ClearcaseFileinfoProvider(this); setInstance(ClearcaseFactory::instance()); - 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 *)) ); } ClearcasePart::~ClearcasePart() @@ -88,26 +88,26 @@ void ClearcasePart::contextMenu(TQPopupMenu *popup, const Context *context) TQString name = fi.fileName(); sub->insertTitle( i18n("Actions for %1").arg(name) ); sub->insertItem( i18n("Checkin"), - this, TQT_SLOT(slotCheckin()) ); + this, TQ_SLOT(slotCheckin()) ); sub->insertItem( i18n("Checkout"), - this, TQT_SLOT(slotCheckout()) ); + this, TQ_SLOT(slotCheckout()) ); sub->insertItem( i18n("Uncheckout"), - this, TQT_SLOT(slotUncheckout()) ); + this, TQ_SLOT(slotUncheckout()) ); sub->insertSeparator(); sub->insertItem( i18n("Create Element"), - this, TQT_SLOT(slotCreate()) ); + this, TQ_SLOT(slotCreate()) ); sub->insertItem( i18n("Remove Element"), - this, TQT_SLOT(slotRemove()) ); + this, TQ_SLOT(slotRemove()) ); sub->insertSeparator(); sub->insertItem( i18n("History"), - this, TQT_SLOT(slotListHistory()) ); + this, TQ_SLOT(slotListHistory()) ); sub->insertSeparator(); sub->insertItem( i18n("Diff"), - this, TQT_SLOT(slotDiff()) ); + this, TQ_SLOT(slotDiff()) ); sub->insertSeparator(); sub->insertItem( i18n("List Checkouts"), - this, TQT_SLOT(slotListCheckouts()) ); + this, TQ_SLOT(slotListCheckouts()) ); popup->insertItem(i18n("Clearcase"), sub); @@ -304,8 +304,8 @@ void ClearcasePart::slotDiff() args << name; ExecCommand* cmv = new ExecCommand( "cleartool", args, dir, env, this ); - connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )), - this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); + connect( cmv, TQ_SIGNAL(finished( const TQString&, const TQString& )), + this, TQ_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); } diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp index 2f93ab49..f940b77c 100644 --- a/vcs/clearcase/commentdlg.cpp +++ b/vcs/clearcase/commentdlg.cpp @@ -46,8 +46,8 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin) buttonbox->addStretch(); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); - 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()) ); ok->setDefault(true); buttonbox->layout(); layout2->addWidget(buttonbox, 0); diff --git a/vcs/cvsservice/annotatedialog.cpp b/vcs/cvsservice/annotatedialog.cpp index ac9f293d..b7cbb749 100644 --- a/vcs/cvsservice/annotatedialog.cpp +++ b/vcs/cvsservice/annotatedialog.cpp @@ -33,8 +33,8 @@ AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent, c TQVBox *vbox = addVBoxPage( i18n("Annotate") ); m_cvsAnnotatePage = new AnnotatePage( m_cvsService, vbox ); - connect( m_cvsAnnotatePage, TQT_SIGNAL(requestAnnotate(const TQString)), - this, TQT_SLOT(slotAnnotate(const TQString)) ); + connect( m_cvsAnnotatePage, TQ_SIGNAL(requestAnnotate(const TQString)), + this, TQ_SLOT(slotAnnotate(const TQString)) ); } AnnotateDialog::~AnnotateDialog() @@ -61,8 +61,8 @@ void AnnotateDialog::slotAnnotate(const TQString rev) AnnotatePage * page = new AnnotatePage( m_cvsService, vbox ); page->startAnnotate(m_pathName, rev); - connect( page, TQT_SIGNAL(requestAnnotate(const TQString)), - this, TQT_SLOT(slotAnnotate(const TQString)) ); + connect( page, TQ_SIGNAL(requestAnnotate(const TQString)), + this, TQ_SLOT(slotAnnotate(const TQString)) ); } #include "annotatedialog.moc" diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp index 1b23e973..9ecf8279 100644 --- a/vcs/cvsservice/annotatepage.cpp +++ b/vcs/cvsservice/annotatepage.cpp @@ -59,10 +59,10 @@ AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *parent, const dialogLayout->add( LayoutWidget ); - connect( m_btnAnnotate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewAnnotate()) ); - connect( m_leRevision, TQT_SIGNAL( returnPressed() ), - m_btnAnnotate, TQT_SLOT( setFocus() ) ); + connect( m_btnAnnotate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewAnnotate()) ); + connect( m_leRevision, TQ_SIGNAL( returnPressed() ), + m_btnAnnotate, TQ_SLOT( setFocus() ) ); //Nest create the AnnotateView; it will do the actual displaying m_annotateView = new AnnotateView(this, "annotateview"); diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp index 89aa7f01..55f9b8fd 100644 --- a/vcs/cvsservice/annotateview.cpp +++ b/vcs/cvsservice/annotateview.cpp @@ -157,8 +157,8 @@ AnnotateView::AnnotateView(AnnotatePage *parent, const char *name) setSorting(AnnotateViewItem::LineNumberColumn); setColumnAlignment(AnnotateViewItem::LineNumberColumn, TQt::AlignRight); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*)) ); } diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index e6bcbd05..c91f8309 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -77,10 +77,10 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService, m_base = new CheckoutDialogBase( this, "checkoutdialogbase" ); setMainWidget( m_base ); - connect( m_base->fetchModulesButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFetchModulesList()) ); - connect( m_base->modulesListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotModuleSelected(TQListViewItem*)) ); + connect( m_base->fetchModulesButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFetchModulesList()) ); + connect( m_base->modulesListView, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotModuleSelected(TQListViewItem*)) ); // Avoid displaying 'file:/' when displaying the file m_base->workURLRequester->setShowLocalProtocol( false ); diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp index f47516ed..206fe754 100644 --- a/vcs/cvsservice/commitdlg.cpp +++ b/vcs/cvsservice/commitdlg.cpp @@ -33,8 +33,8 @@ CommitDialog::CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent ) : CommitDialogBase( parent, "commitdialog", true ) { - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); setChangeLogFileName( changeLogfileNamePath ); } diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 8eb77b71..e71e8a28 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -35,7 +35,7 @@ CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stu : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ), m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 ) { - connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&))); + connect( this, TQ_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQ_SLOT(updateStatusFor(const CVSDir&))); } /////////////////////////////////////////////////////////////////////////////// @@ -146,7 +146,7 @@ void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir) * item conains any childs. Therefor we need to give FileTree some time * to update the directory item before we give the status infos. */ - TQTimer::singleShot( 1000, this, TQT_SLOT(propagateUpdate()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(propagateUpdate()) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp index 21169346..fb189234 100644 --- a/vcs/cvsservice/cvslogdialog.cpp +++ b/vcs/cvsservice/cvslogdialog.cpp @@ -42,8 +42,8 @@ CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent, const TQVBox *vbox = addVBoxPage( i18n("Log From CVS") ); m_cvsLogPage = new CVSLogPage( m_cvsService, vbox ); - connect( m_cvsLogPage, TQT_SIGNAL(diffRequested(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&, const TQString&)) ); + connect( m_cvsLogPage, TQ_SIGNAL(diffRequested(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(slotDiffRequested(const TQString&, const TQString&, const TQString&)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -66,8 +66,8 @@ void CVSLogDialog::startLog( const TQString &workDir, const TQString &pathName ) m_cvsLogPage = new CVSLogPage( m_cvsService, vbox ); this->resize( m_cvsLogPage->size() ); - connect( m_cvsLogPage, TQT_SIGNAL(linkClicked(const TQString&, const TQString&)), - this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&)) ); + connect( m_cvsLogPage, TQ_SIGNAL(linkClicked(const TQString&, const TQString&)), + this, TQ_SLOT(slotDiffRequested(const TQString&, const TQString&)) ); */ m_cvsLogPage->startLog( workDir, pathName ); } diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp index 4b2d7fb4..756d28d1 100644 --- a/vcs/cvsservice/cvslogpage.cpp +++ b/vcs/cvsservice/cvslogpage.cpp @@ -46,7 +46,7 @@ CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *parent, const cha m_textBrowser->setMinimumWidth(fontMetrics().width('X')*50); m_textBrowser->setMinimumHeight(fontMetrics().width('X')*43); - connect( m_textBrowser, TQT_SIGNAL(linkClicked( const TQString& )), this, TQT_SLOT(slotLinkClicked( const TQString& )) ); + connect( m_textBrowser, TQ_SIGNAL(linkClicked( const TQString& )), this, TQ_SLOT(slotLinkClicked( const TQString& )) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index 6ded6ecb..ca7c26ab 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -96,10 +96,10 @@ CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStri m_impl = new CvsServicePartImpl( this ); // Load / store project configuration every time project is opened/closed - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } /////////////////////////////////////////////////////////////////////////////// @@ -119,15 +119,15 @@ void CvsServicePart::init() setupActions(); // Re-route our implementation signal for when check-out finishes to the standard signal - connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) ); + connect( m_impl, TQ_SIGNAL(checkoutFinished(TQString)), TQ_SIGNAL(finishedFetching(TQString)) ); // Context menu - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) ); TQWhatsThis::add( m_impl->processWidget(), i18n("<b>CVS</b><p>Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") ); @@ -144,92 +144,92 @@ void CvsServicePart::setupActions() // context at runtime. See CvsServicePart::contextMenu(). actionCommit = new TDEAction( i18n("&Commit to Repository"), 0, this, - TQT_SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" ); + TQ_SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" ); actionCommit->setToolTip( i18n("Commit file(s)") ); actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") ); - actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), + actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "cvsservice_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); - actionLog = new TDEAction( i18n("Generate &Log"), 0, this, TQT_SLOT(slotActionLog()), + actionLog = new TDEAction( i18n("Generate &Log"), 0, this, TQ_SLOT(slotActionLog()), actionCollection(), "cvsservice_log" ); actionLog->setToolTip( i18n("Generate log") ); actionLog->setWhatsThis( i18n("<b>Generate log</b><p>Produces log for this file.") ); - actionAnnotate = new TDEAction( i18n("&Annotate"), 0, this, TQT_SLOT(slotActionAnnotate()), + actionAnnotate = new TDEAction( i18n("&Annotate"), 0, this, TQ_SLOT(slotActionAnnotate()), actionCollection(), "cvsservice_annotate" ); actionAnnotate->setToolTip( i18n("Generate annotations") ); actionAnnotate->setWhatsThis( i18n("<b>Annotate</b><p>Produces annotations for this file.") ); - actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), + actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "cvsservice_add" ); actionAdd->setToolTip( i18n("Add file to repository") ); actionAdd->setWhatsThis( i18n("<b>Add to repository</b><p>Adds file to repository.") ); - actionEdit = new TDEAction( i18n("&Edit Files"), 0, this, TQT_SLOT(slotActionEdit()), + actionEdit = new TDEAction( i18n("&Edit Files"), 0, this, TQ_SLOT(slotActionEdit()), actionCollection(), "cvsservice_edit" ); actionEdit->setToolTip( i18n("Mark as being edited") ); actionEdit->setWhatsThis( i18n("<b>Mark as being edited</b><p>Mark the files as being edited.") ); - actionUnEdit = new TDEAction( i18n("&Unedit Files"), 0, this, TQT_SLOT(slotActionUnEdit()), + actionUnEdit = new TDEAction( i18n("&Unedit Files"), 0, this, TQ_SLOT(slotActionUnEdit()), actionCollection(), "cvsservice_unedit" ); actionUnEdit->setToolTip( i18n("Remove editing mark from files") ); actionUnEdit->setWhatsThis( i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.") ); - actionEditors = new TDEAction( i18n("&Show Editors"), 0, this, TQT_SLOT(slotActionEditors()), + actionEditors = new TDEAction( i18n("&Show Editors"), 0, this, TQ_SLOT(slotActionEditors()), actionCollection(), "cvsservice_editors" ); actionEditors->setToolTip( i18n("Show editors") ); actionEditors->setWhatsThis( i18n("<b>Show editors</b><p>Shows the list of users who are editing files.") ); actionAddBinary = new TDEAction( i18n("Add to Repository as &Binary"), 0, this, - TQT_SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" ); + TQ_SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" ); actionAddBinary->setToolTip( i18n("Add file to repository as binary") ); actionAddBinary->setWhatsThis( i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).") ); actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, - TQT_SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" ); + TQ_SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" ); actionRemove->setToolTip( i18n("Remove from repository") ); actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") ); actionUpdate = new TDEAction( i18n("&Update/Revert to Another Release"), 0, this, - TQT_SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" ); + TQ_SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" ); actionUpdate->setToolTip( i18n("Update/revert") ); actionUpdate->setWhatsThis( i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.") ); actionRemoveSticky = new TDEAction( i18n("R&emove Sticky Flag"), 0, - this, TQT_SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" ); + this, TQ_SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" ); actionRemoveSticky->setToolTip( i18n("Remove sticky flag") ); actionRemoveSticky->setWhatsThis( i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).") ); actionTag = new TDEAction( i18n("Make &Tag/Branch"), 0, - this, TQT_SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" ); + this, TQ_SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" ); actionTag->setToolTip( i18n("Make tag/branch") ); actionTag->setWhatsThis( i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).") ); actionUnTag = new TDEAction( i18n("&Delete Tag"), 0, - this, TQT_SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" ); + this, TQ_SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" ); actionUnTag->setToolTip( i18n("Delete tag") ); actionUnTag->setWhatsThis( i18n("<b>Delete tag</b><p>Delete tag from selected file(s).") ); actionAddToIgnoreList = new TDEAction( i18n("&Ignore in CVS Operations"), 0, - this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" ); + this, TQ_SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" ); actionAddToIgnoreList->setToolTip( i18n("Ignore in CVS operations") ); actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.") ); actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in CVS Operations"), 0, - this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" ); + this, TQ_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" ); actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in CVS operations") ); actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.") ); actionLogin = new TDEAction( i18n("&Log to Server"), 0, this, - TQT_SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" ); + TQ_SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" ); actionLogin->setToolTip( i18n("Login to server") ); actionLogin->setWhatsThis( i18n("<b>Login to server</b><p>Logs in to the CVS server.") ); actionLogout = new TDEAction( i18n("L&ogout From Server"), 0, this, - TQT_SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" ); + TQ_SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" ); actionLogout->setToolTip( i18n("Logout from server") ); actionLogout->setWhatsThis( i18n("<b>Logout from server</b><p>Logs out from the CVS server.") ); } @@ -278,7 +278,7 @@ void CvsServicePart::projectConfigWidget( KDialogBase *dlg ) { TQVBox *vbox = dlg->addVBoxPage( i18n("CvsService"), i18n("CvsService"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); CvsOptionsWidget *w = new CvsOptionsWidget( (TQWidget *)vbox, "cvs config widget" ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -320,45 +320,45 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context ) if (context->hasType( Context::FileContext )) popup->insertSeparator(); - int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) ); + int id = subMenu->insertItem( actionCommit->text(), this, TQ_SLOT(slotCommit()) ); subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); // CvsService let to do log and diff operations only on one file (or directory) at time if (m_urls.count() == 1) { - id = subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); + id = subMenu->insertItem( actionDiff->text(), this, TQ_SLOT(slotDiff()) ); subMenu->setWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases.")); - id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + id = subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); subMenu->setWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file.")); - id = subMenu->insertItem( actionAnnotate->text(), this, TQT_SLOT(slotAnnotate()) ); + id = subMenu->insertItem( actionAnnotate->text(), this, TQ_SLOT(slotAnnotate()) ); subMenu->setWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file.")); } - id = subMenu->insertItem( actionEditors->text(), this, TQT_SLOT(slotEditors()) ); + id = subMenu->insertItem( actionEditors->text(), this, TQ_SLOT(slotEditors()) ); subMenu->setWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files.")); - id = subMenu->insertItem( actionEdit->text(), this, TQT_SLOT(slotEdit()) ); + id = subMenu->insertItem( actionEdit->text(), this, TQ_SLOT(slotEdit()) ); subMenu->setWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited.")); - id = subMenu->insertItem( actionUnEdit->text(), this, TQT_SLOT(slotUnEdit()) ); + id = subMenu->insertItem( actionUnEdit->text(), this, TQ_SLOT(slotUnEdit()) ); subMenu->setWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.")); - id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); + id = subMenu->insertItem( actionAdd->text(), this, TQ_SLOT(slotAdd()) ); subMenu->setWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository.")); - id = subMenu->insertItem( actionAddBinary->text(), this, TQT_SLOT(slotAddBinary()) ); + id = subMenu->insertItem( actionAddBinary->text(), this, TQ_SLOT(slotAddBinary()) ); subMenu->setWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).")); - id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotRemove()) ); + id = subMenu->insertItem( actionRemove->text(), this, TQ_SLOT(slotRemove()) ); subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionTag->text(), this, TQT_SLOT(slotTag()) ); + id = subMenu->insertItem( actionTag->text(), this, TQ_SLOT(slotTag()) ); subMenu->setWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).")); - id = subMenu->insertItem( actionUnTag->text(), this, TQT_SLOT(slotUnTag()) ); + id = subMenu->insertItem( actionUnTag->text(), this, TQ_SLOT(slotUnTag()) ); subMenu->setWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s).")); - id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); + id = subMenu->insertItem( actionUpdate->text(), this, TQ_SLOT(slotUpdate()) ); subMenu->setWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.")); - id = subMenu->insertItem( actionRemoveSticky->text(), this, TQT_SLOT(slotRemoveSticky()) ); + id = subMenu->insertItem( actionRemoveSticky->text(), this, TQ_SLOT(slotRemoveSticky()) ); subMenu->setWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); + id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQ_SLOT(slotAddToIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.")); - id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); + id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQ_SLOT(slotRemoveFromIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.")); // Now insert in parent menu @@ -750,8 +750,8 @@ void CvsServicePart::slotProjectOpened() options->load( project() ); // When files are added to project they may be added to/removed from repository too - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -772,8 +772,8 @@ void CvsServicePart::slotProjectClosed() delete options; // We don't have a project anymore ... - disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + disconnect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + disconnect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } #include "cvspart.moc" diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp index 01c85df3..28203e91 100644 --- a/vcs/cvsservice/cvspartimpl.cpp +++ b/vcs/cvsservice/cvspartimpl.cpp @@ -80,7 +80,7 @@ CvsServicePartImpl::CvsServicePartImpl( CvsServicePart *part, const char *name ) m_scheduler = new DirectScheduler( m_widget ); m_fileInfoProvider = new CVSFileInfoProvider( part, m_cvsService ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); } else { @@ -374,7 +374,7 @@ bool CvsServicePartImpl::checkout() modulePath = dlg.workDir() + dlg.module(); m_scheduler->schedule( job ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotCheckoutFinished(bool,int)) ); return true; } } @@ -406,7 +406,7 @@ void CvsServicePartImpl::commit( const KURL::List& urlList ) } m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); // 2. if requested to do so, add an entry to the Changelog too if (dlg.mustAddToChangeLog()) @@ -448,7 +448,7 @@ void CvsServicePartImpl::update( const KURL::List& urlList ) additionalOptions ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -465,7 +465,7 @@ void CvsServicePartImpl::add( const KURL::List& urlList, bool binary ) DCOPRef cvsJob = m_cvsService->add( fileList(), binary ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -531,7 +531,7 @@ void CvsServicePartImpl::unedit( const KURL::List& urlList) DCOPRef cvsJob = m_cvsService->unedit( fileList() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -548,7 +548,7 @@ void CvsServicePartImpl::edit( const KURL::List& urlList) DCOPRef cvsJob = m_cvsService->edit( fileList() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -582,8 +582,8 @@ void CvsServicePartImpl::remove( const KURL::List& urlList ) DCOPRef cvsJob = m_cvsService->remove( fileList(), true ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -606,8 +606,8 @@ void CvsServicePartImpl::removeStickyFlag( const KURL::List& urlList ) "-A" ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -656,8 +656,8 @@ void CvsServicePartImpl::diff( const KURL::List& urlList ) } m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotDiffFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotDiffFinished(bool,int)) ); doneOperation(); } @@ -680,8 +680,8 @@ void CvsServicePartImpl::tag( const KURL::List& urlList ) dlg.isBranch(), dlg.force() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -705,8 +705,8 @@ void CvsServicePartImpl::unTag( const KURL::List& urlList ) dlg.isBranch(), dlg.force() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -747,7 +747,7 @@ void CvsServicePartImpl::createNewProject( const TQString &dirName, DCOPRef cvsJob = m_cvsService->import( dirName, location, module, filesToIgnore, message, vendor, release, false ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotCheckoutFinished(bool,int)) ); */ TQString rsh_preamble; if ( !options->cvsRshEnvVar().isEmpty() ) diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index bb8fb459..87e917a5 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -140,7 +140,7 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob ) kdDebug(9006) << "Running: " << cmdLine << endl; // disconnect 3rd party slots from our signals - disconnect( TQT_SIGNAL(jobFinished(bool, int)) ); + disconnect( TQ_SIGNAL(jobFinished(bool, int)) ); showInfo( i18n("Started job: %1").arg( cmdLine ) ); diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 50020079..1119c6ff 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -75,14 +75,14 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) } if ( !extPartsTranslated.isEmpty() ) popup->insertSeparator( i ); - connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) ); + connect( popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupActivated(int)) ); - popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); + popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQ_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); popup->setItemEnabled( POPUP_BASE - 2, length() > 0 ); popup->insertSeparator( 1 ); - popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); + popup->insertItem( i18n( "Highlight Syntax" ), this, TQ_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); popup->setItemChecked( POPUP_BASE - 1, _highlight ); popup->insertSeparator( 3 ); @@ -184,7 +184,7 @@ DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ): te->setReadOnly( true ); te->setTextFormat( TQTextEdit::PlainText ); // te->setMinimumSize( 300, 200 ); - connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); + connect( te, TQ_SIGNAL(externalPartRequested(const TQString&)), this, TQ_SLOT(loadExtPart(const TQString&)) ); TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->addWidget( te ); @@ -301,10 +301,10 @@ void DiffWidget::openURL( const KURL& url ) if ( !job ) return; - connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), - this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotFinished()) ); + connect( job, TQ_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), + this, TQ_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotFinished()) ); } void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) @@ -312,7 +312,7 @@ void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) TQPopupMenu* popup = new TQPopupMenu( this ); if ( !te->isVisible() ) - popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) ); + popup->insertItem( i18n("Display &Raw Output"), this, TQ_SLOT(showTextEdit()) ); popup->exec( TQCursor::pos() ); delete popup; diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index 9a9da35e..f343d9a8 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -104,8 +104,8 @@ void CommitDialog::setDepotFiles( const TQStringList& lst ) } ExecCommand* cmd = new ExecCommand( "p4", args, TQString(), TQStringList(), this ); - connect( cmd, TQT_SIGNAL(finished( const TQString&, const TQString& )), - this, TQT_SLOT(getFilesFinished( const TQString&, const TQString& )) ); + connect( cmd, TQ_SIGNAL(finished( const TQString&, const TQString& )), + this, TQ_SLOT(getFilesFinished( const TQString&, const TQString& )) ); } void CommitDialog::getFilesFinished( const TQString& out, const TQString& /* err */ ) diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index 76a4456a..8d7975e8 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -44,8 +44,8 @@ PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringLi setInstance(PerforceFactory::instance()); setupActions(); - 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 *)) ); } @@ -54,31 +54,31 @@ PerforcePart::~PerforcePart() void PerforcePart::setupActions() { - actionEdit = new TDEAction( i18n("Edit"), 0, this, TQT_SLOT(slotActionEdit()), + actionEdit = new TDEAction( i18n("Edit"), 0, this, TQ_SLOT(slotActionEdit()), actionCollection(), "perforce_edit" ); actionEdit->setToolTip(i18n("Edit")); actionEdit->setWhatsThis(i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit.")); - actionRevert = new TDEAction( i18n("Revert"), 0, this, TQT_SLOT(slotActionRevert()), + actionRevert = new TDEAction( i18n("Revert"), 0, this, TQ_SLOT(slotActionRevert()), actionCollection(), "perforce_revert" ); actionRevert->setToolTip(i18n("Revert")); actionRevert->setWhatsThis(i18n("<b>Revert</b><p>Discards changes made to open files.")); - actionSubmit = new TDEAction( i18n("Submit"), 0, this, TQT_SLOT(slotActionCommit()), + actionSubmit = new TDEAction( i18n("Submit"), 0, this, TQ_SLOT(slotActionCommit()), actionCollection(), "perforce_submit" ); actionSubmit->setToolTip(i18n("Submit")); actionSubmit->setWhatsThis(i18n("<b>Submit</b><p>Sends changes made to open files to the depot.")); - actionSync = new TDEAction( i18n("Sync"), 0, this, TQT_SLOT(slotActionUpdate()), + actionSync = new TDEAction( i18n("Sync"), 0, this, TQ_SLOT(slotActionUpdate()), actionCollection(), "perforce_sync" ); actionSync->setToolTip(i18n("Sync")); actionSync->setWhatsThis(i18n("<b>Sync</b><p>Copies files from the depot into the workspace.")); - actionDiff = new TDEAction( i18n("Diff Against Repository"), 0, this, TQT_SLOT(slotActionDiff()), + actionDiff = new TDEAction( i18n("Diff Against Repository"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "perforce_diff" ); actionDiff->setToolTip(i18n("Diff against repository")); actionDiff->setWhatsThis(i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot.")); - actionAdd = new TDEAction( i18n("Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), + actionAdd = new TDEAction( i18n("Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "perforce_add" ); actionAdd->setToolTip(i18n("Add to repository")); actionAdd->setWhatsThis(i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot.")); - actionRemove = new TDEAction( i18n("Remove From Repository"), 0, this, TQT_SLOT(slotActionRemove()), + actionRemove = new TDEAction( i18n("Remove From Repository"), 0, this, TQ_SLOT(slotActionRemove()), actionCollection(), "perforce_remove" ); actionRemove->setToolTip(i18n("Remove from repository")); actionRemove->setWhatsThis(i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot.")); @@ -97,26 +97,26 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context) sub->insertTitle( i18n("Actions for %1").arg(name) ); int id = sub->insertItem( i18n("Edit"), - this, TQT_SLOT(slotEdit()) ); + this, TQ_SLOT(slotEdit()) ); sub->setWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit.")); id = sub->insertItem( i18n("Revert"), - this, TQT_SLOT(slotRevert()) ); + this, TQ_SLOT(slotRevert()) ); sub->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files.")); id = sub->insertItem( i18n("Submit"), - this, TQT_SLOT(slotCommit()) ); + this, TQ_SLOT(slotCommit()) ); sub->setWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot.")); id = sub->insertItem( i18n("Sync"), - this, TQT_SLOT(slotUpdate()) ); + this, TQ_SLOT(slotUpdate()) ); sub->setWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace.")); sub->insertSeparator(); id = sub->insertItem( i18n("Diff Against Repository"), - this, TQT_SLOT(slotDiff()) ); + this, TQ_SLOT(slotDiff()) ); sub->setWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot.")); id = sub->insertItem( i18n("Add to Repository"), - this, TQT_SLOT(slotAdd()) ); + this, TQ_SLOT(slotAdd()) ); sub->setWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot.")); id = sub->insertItem( i18n("Remove From Repository"), - this, TQT_SLOT(slotRemove()) ); + this, TQ_SLOT(slotRemove()) ); sub->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot.")); id = popup->insertItem(i18n("Perforce"), sub); } @@ -243,8 +243,8 @@ void PerforcePart::diff( const TQString& filename ) args << "-du"; args << name; ExecCommand* cmv = new ExecCommand( "p4", args, TQString(), TQStringList(), this ); - connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )), - this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); + connect( cmv, TQ_SIGNAL(finished( const TQString&, const TQString& )), + this, TQ_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); } void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err ) diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp index 0fd2c20b..9f3eb3f9 100644 --- a/vcs/subversion/kdevsvnd_widgets.cpp +++ b/vcs/subversion/kdevsvnd_widgets.cpp @@ -27,9 +27,9 @@ SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool m btnPermanent->setText(i18n("Accept Permanently")); btnTemporary->setText(i18n("Accept Temporarily")); btnReject->setText(i18n("Reject")); - connect( btnPermanent, TQT_SIGNAL(clicked()), this, TQT_SLOT(setPermanent()) ); - connect( btnTemporary, TQT_SIGNAL(clicked()), this, TQT_SLOT(setTemporary()) ); - connect( btnReject, TQT_SIGNAL(clicked()), this, TQT_SLOT(setRejected ()) ); + connect( btnPermanent, TQ_SIGNAL(clicked()), this, TQ_SLOT(setPermanent()) ); + connect( btnTemporary, TQ_SIGNAL(clicked()), this, TQ_SLOT(setTemporary()) ); + connect( btnReject, TQ_SIGNAL(clicked()), this, TQ_SLOT(setRejected ()) ); } SvnSSLTrustPrompt::~SvnSSLTrustPrompt() {} diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index e9c89ece..c0a97129 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -127,7 +127,7 @@ void subversionCore::resolve( const KURL::List& list ) { s << cmd << *it << recurse; SimpleJob * job = TDEIO::special(servURL, parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } } @@ -142,7 +142,7 @@ void subversionCore::update( const KURL::List& list ) { s << cmd << list << rev << TQString( "HEAD" ); SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") ); } @@ -160,7 +160,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){ TQString revkind2 = "WORKING"; s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); if ( diffresult.count() > 0 ) { //check kompare is available @@ -241,7 +241,7 @@ void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, s << cmd << pathOrUrl1 << pathOrUrl2 << rev1 << revKind1 << rev2 << revKind2 << recurse; s << pegdiff; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDiffResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotDiffResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() ); } @@ -261,7 +261,7 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock s << *it; } SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if( list.count() == 1 ) initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") ); else if( list.count() > 1 ) @@ -295,7 +295,7 @@ void subversionCore::svnLog( const KURL::List& list, s << *it; } SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotLogResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotLogResult( TDEIO::Job * ) ) ); // progress info. LogView is allowed and meaninful only for one url in KDev3.4 initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") ); } @@ -316,7 +316,7 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQStrin s << revstart << revKindStart << revend << revKindEnd ; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotBlameResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotBlameResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") ); } @@ -332,7 +332,7 @@ void subversionCore::add( const KURL::List& list ) { // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::del( const KURL::List& list ) { @@ -346,7 +346,7 @@ void subversionCore::del( const KURL::List& list ) { // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::revert( const KURL::List& list ) { @@ -359,7 +359,7 @@ void subversionCore::revert( const KURL::List& list ) { s << cmd << list; SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::checkout() { @@ -377,7 +377,7 @@ void subversionCore::checkout() { servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" SimpleJob * job = TDEIO::special(servURL,parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotEndCheckout( TDEIO::Job * ) ) ); } } @@ -393,7 +393,7 @@ void subversionCore::switchTree( const KURL &path, const KURL &repositUrl, s << recurse << revNum << revKind; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() ); } @@ -408,7 +408,7 @@ void subversionCore::switchRelocate( const KURL &path, s << cmd << path << currentUrl << newUrl << recurse; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); // this doesn't contact repository } @@ -423,7 +423,7 @@ void subversionCore::svnCopy( const KURL &src, int srcRev, const TQString &srcRe s << cmd << src << srcRev << srcRevKind << dest; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, src.prettyURL(), dest.prettyURL() ); } @@ -440,7 +440,7 @@ void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1, s << recurse << ignore_ancestry << force << dry_run; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() , wc_path.prettyURL() ); } @@ -722,10 +722,10 @@ void subversionCore::initProcessDlg( TDEIO::Job *job, const TQString &src, const progress->setSourceUrl( src ); progress->setDestUrl( dest ); progress->setJob( job ); - connect( job, TQT_SIGNAL( totalSize(TDEIO::Job*, TDEIO::filesize_t) ), - progress, TQT_SLOT( slotTotalSize (TDEIO::Job*, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( processedSize(TDEIO::Job*, TDEIO::filesize_t) ), - progress, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( totalSize(TDEIO::Job*, TDEIO::filesize_t) ), + progress, TQ_SLOT( slotTotalSize (TDEIO::Job*, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( processedSize(TDEIO::Job*, TDEIO::filesize_t) ), + progress, TQ_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t) ) ); } void subversionCore::createNewProject( const TQString& // dirName diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index 45d44d1e..f845c035 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -155,7 +155,7 @@ bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerDa s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << checkRepos << recursive; KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/"; job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if( checkRepos ) m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory Status") ); return true; diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index 98b44848..be5f2b24 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -74,14 +74,14 @@ subversionPart::subversionPart(TQObject *parent, const char *name, const TQStrin setupActions(); - connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) ); + connect( m_impl, TQ_SIGNAL(checkoutFinished(TQString)), TQ_SIGNAL(finishedFetching(TQString)) ); // Context menu - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); m_impl->processWidget()->setCaption(i18n( "Subversion Output" )); mainWindow()->embedOutputView( (TQWidget*)m_impl->processWidget(), i18n( "Subversion" ), i18n( "Subversion messages" ) ); @@ -98,65 +98,65 @@ subversionPart::~subversionPart() { } void subversionPart::setupActions() { - actionCommit = new TDEAction( i18n("&Commit to Repository..."), 0, this, TQT_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); + actionCommit = new TDEAction( i18n("&Commit to Repository..."), 0, this, TQ_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); actionCommit->setToolTip( i18n("Commit file(s)") ); actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") ); - /* actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), + /* actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "subversion_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); */ - actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); + actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); actionAdd->setToolTip( i18n("Add file to repository") ); actionAdd->setWhatsThis( i18n("<b>Add file to repository</b><p>Adds file to repository.") ); - actionLog = new TDEAction( i18n("Show logs..."), 0, this, TQT_SLOT(slotLog()), actionCollection(), "subversion_log" ); - actionBlame = new TDEAction( i18n("Blame..."), 0, this, TQT_SLOT(slotBlame()), actionCollection(), "subversion_blame"); + actionLog = new TDEAction( i18n("Show logs..."), 0, this, TQ_SLOT(slotLog()), actionCollection(), "subversion_log" ); + actionBlame = new TDEAction( i18n("Blame..."), 0, this, TQ_SLOT(slotBlame()), actionCollection(), "subversion_blame"); - actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQT_SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); + actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQ_SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); actionRemove->setToolTip( i18n("Remove from repository") ); actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") ); - actionUpdate = new TDEAction( i18n("&Update"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); + actionUpdate = new TDEAction( i18n("&Update"), 0, this, TQ_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); actionUpdate->setToolTip( i18n("Update") ); actionUpdate->setWhatsThis( i18n("<b>Update</b><p>Updates file(s) from repository.") ); - actionDiffLocal = new TDEAction( i18n("&Diff to BASE"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); + actionDiffLocal = new TDEAction( i18n("&Diff to BASE"), 0, this, TQ_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); actionDiffLocal->setToolTip( i18n("Diff to BASE") ); actionDiffLocal->setWhatsThis( i18n("<b>Diff to disk</b><p>Diff current file to the BASE checked out copy.") ); - actionDiffHead = new TDEAction( i18n("&Diff to HEAD"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); + actionDiffHead = new TDEAction( i18n("&Diff to HEAD"), 0, this, TQ_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); actionDiffHead->setToolTip( i18n("Diff to HEAD") ); actionDiffHead->setWhatsThis( i18n("<b>Diff HEAD</b><p>Diff the current file to HEAD in svn.") ); - actionRevert = new TDEAction( i18n("&Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); + actionRevert = new TDEAction( i18n("&Revert"), 0, this, TQ_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); actionRevert->setToolTip( i18n("Revert") ); actionRevert->setWhatsThis( i18n("<b>Revert</b><p>Undo local changes.") ); /* actionAddToIgnoreList = new TDEAction( i18n("&Ignore in Subversion Operations"), 0, - this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" ); + this, TQ_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" ); actionAddToIgnoreList->setToolTip( i18n("Ignore in Subversion operations") ); actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).") ); actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in Subversion Operations"), 0, - this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" ); + this, TQ_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" ); actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in Subversion operations") ); actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).") ); */ actionResolve = new TDEAction( i18n("Re&solve Conflicting State"), 0, - this, TQT_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" ); + this, TQ_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" ); actionResolve->setToolTip( i18n("Resolve the conflicting state of a file after a merge") ); actionResolve->setWhatsThis( i18n("<b>Resolve the conflicting state</b><p>Remove the conflict state that can be set on a file after a merge failed.") ); actionSwitch = new TDEAction( i18n("Switch this working copy to URL.."), 0, - this, TQT_SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); + this, TQ_SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); // warn slogCopy(), slotMerge only works on context menu. There is no main-menu action actionCopy = new TDEAction( i18n("Copy this working copy to URL.."), 0, - this, TQT_SLOT(slotCopy()), actionCollection(), "subversion_copy" ); + this, TQ_SLOT(slotCopy()), actionCollection(), "subversion_copy" ); actionMerge = new TDEAction( i18n("Merge difference to working copy"), 0, - this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); + this, TQ_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); } TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) { @@ -213,48 +213,48 @@ if(!project()) if (context->hasType( Context::FileContext )) popup->insertSeparator(); - int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) ); + int id = subMenu->insertItem( actionCommit->text(), this, TQ_SLOT(slotCommit()) ); // CvsService let to do log and diff operations only on one file (or directory) at time /* if (m_urls.count() == 1) { - subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); - subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + subMenu->insertItem( actionDiff->text(), this, TQ_SLOT(slotDiff()) ); + subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); }*/ subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); - id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); + id = subMenu->insertItem( actionAdd->text(), this, TQ_SLOT(slotAdd()) ); subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository.")); - id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) ); + id = subMenu->insertItem( actionRemove->text(), this, TQ_SLOT(slotDel()) ); subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); - id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + id = subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs")); - id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) ); + id = subMenu->insertItem( actionBlame->text(), this, TQ_SLOT(slotBlame()) ); subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) ); + id = subMenu->insertItem( actionDiffLocal->text(), this, TQ_SLOT(slotDiffLocal()) ); subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk.")); - id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) ); + id = subMenu->insertItem( actionDiffHead->text(), this, TQ_SLOT(slotDiffHead()) ); subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository.")); - id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); + id = subMenu->insertItem( actionUpdate->text(), this, TQ_SLOT(slotUpdate()) ); subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository.")); - id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) ); + id = subMenu->insertItem( actionRevert->text(), this, TQ_SLOT(slotRevert()) ); subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") ); - id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) ); + id = subMenu->insertItem( actionResolve->text(), this, TQ_SLOT(slotResolve()) ); subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") ); - id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) ); + id = subMenu->insertItem( actionSwitch->text(), this, TQ_SLOT(slotSwitch()) ); subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") ); - id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) ); + id = subMenu->insertItem( actionCopy->text(), this, TQ_SLOT(slotCopy()) ); subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") ); - id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) ); + id = subMenu->insertItem( actionMerge->text(), this, TQ_SLOT(slotMerge()) ); subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") ); /* subMenu->insertSeparator(); - id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); + id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQ_SLOT(slotAddToIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).")); - id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); + id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQ_SLOT(slotRemoveFromIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).")); */ // Now insert in parent menu @@ -529,16 +529,16 @@ void subversionPart::slotProjectOpened() { } */ //loadOptions(); /// \FIXME slots - //connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - //connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + //connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + //connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } void subversionPart::slotProjectClosed() { kdDebug(9036) << "subversion :projectClosed" << endl; //saveOptions(); /// \FIXME slots - //disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - //disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + //disconnect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + //disconnect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } void subversionPart::savePartialProjectSession(TQDomElement* dom) { diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index 95b31f6b..8cedf78f 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -39,7 +39,7 @@ subversionWidget::subversionWidget( subversionPart *part, TQWidget *parent, cons m_closeButton = new TQPushButton( tab() ); m_closeButton->setText( i18n("Close") ); tab()->setCornerWidget(m_closeButton); - connect( m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentTab()) ); + connect( m_closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeCurrentTab()) ); } subversionWidget::~subversionWidget() diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp index 87647525..78f09102 100644 --- a/vcs/subversion/svn_blamewidget.cpp +++ b/vcs/subversion/svn_blamewidget.cpp @@ -99,8 +99,8 @@ SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *parent ) m_layout->addWidget( m_okBtn, 1, 0 ); m_layout->addWidget( m_cancelBtn, 1, 1 ); - connect( m_okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( m_cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( m_okBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( m_cancelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); } SvnBlameFileSelectDlg::~SvnBlameFileSelectDlg() {} diff --git a/vcs/subversion/svn_copywidget.cpp b/vcs/subversion/svn_copywidget.cpp index 30b25fd7..094b9684 100644 --- a/vcs/subversion/svn_copywidget.cpp +++ b/vcs/subversion/svn_copywidget.cpp @@ -13,10 +13,10 @@ SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder { reqEdit->setText( reqPath ); - connect( urlRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsUrl()) ); - connect( pathRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsLocalPath()) ); - connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revnumInput, TQT_SLOT(setEnabled(bool)) ); - connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revkindCombo, TQT_SLOT(setDisabled(bool)) ); + connect( urlRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(setSourceAsUrl()) ); + connect( pathRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(setSourceAsLocalPath()) ); + connect( revnumRadio, TQ_SIGNAL(toggled(bool)), revnumInput, TQ_SLOT(setEnabled(bool)) ); + connect( revnumRadio, TQ_SIGNAL(toggled(bool)), revkindCombo, TQ_SLOT(setDisabled(bool)) ); // In many cases, users copy from reository to repository. This is for making tag/branche. // The case where copying from local path to repository may be lesser than the above one. diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index ebf5f438..ac9b982b 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -73,9 +73,9 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) resize( TQSize(692, 343).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); - connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) ); - connect( listView1, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)) ); + connect( listView1, TQ_SIGNAL(clicked( TQListViewItem *)), this, TQ_SLOT(slotClicked(TQListViewItem*)) ); + connect( listView1, TQ_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)) ); } SvnLogViewWidget::~SvnLogViewWidget() { @@ -128,8 +128,8 @@ void SvnLogViewWidget::contextMenuRequested( TQListViewItem *item, const TQPoint if( !m_ctxLogItem ) return; TQPopupMenu *menu = new TQPopupMenu(this); - menu->insertItem( i18n("Blame this revision"), this, TQT_SLOT(blameThis()) ); - menu->insertItem( i18n("Difference to previous revision"), this, TQT_SLOT(diffToPrevious()) ); + menu->insertItem( i18n("Blame this revision"), this, TQ_SLOT(blameThis()) ); + menu->insertItem( i18n("Difference to previous revision"), this, TQ_SLOT(diffToPrevious()) ); menu->exec( pos ); } void SvnLogViewWidget::blameThis() @@ -195,10 +195,10 @@ SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *parent, const char* name, bo radio4->setChecked(true); //start revistion by revision keyword radio5->setChecked(true); //end revision by revision number reinstallRevisionSpecifiers(); - connect( intInput1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartRevnumRadio()) ); - connect( comboBox1, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setStartRevkindRadio()) ); - connect( intInput2, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndRevnumRadio()) ); - connect( comboBox2, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setEndRevkindRadio()) ); + connect( intInput1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartRevnumRadio()) ); + connect( comboBox1, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(setStartRevkindRadio()) ); + connect( intInput2, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndRevnumRadio()) ); + connect( comboBox2, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(setEndRevkindRadio()) ); } SvnLogViewOptionDlg::~SvnLogViewOptionDlg() {} diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp index 50731690..5885e6b7 100644 --- a/vcs/subversion/svn_mergewidget.cpp +++ b/vcs/subversion/svn_mergewidget.cpp @@ -33,10 +33,10 @@ SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent ) { dest->setURL( wcTarget.prettyURL() ); - connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revnum1, TQT_SLOT(setEnabled(bool)) ); - connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revkind1, TQT_SLOT(setDisabled(bool)) ); - connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revnum2, TQT_SLOT(setEnabled(bool)) ); - connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revkind2, TQT_SLOT(setDisabled(bool)) ); + connect( revnumbtn1, TQ_SIGNAL(toggled(bool)), revnum1, TQ_SLOT(setEnabled(bool)) ); + connect( revnumbtn1, TQ_SIGNAL(toggled(bool)), revkind1, TQ_SLOT(setDisabled(bool)) ); + connect( revnumbtn2, TQ_SIGNAL(toggled(bool)), revnum2, TQ_SLOT(setEnabled(bool)) ); + connect( revnumbtn2, TQ_SIGNAL(toggled(bool)), revkind2, TQ_SLOT(setDisabled(bool)) ); revkind1->setDisabled(true); revnum2->setDisabled(true); } diff --git a/vcs/subversion/svn_switchwidget.cpp b/vcs/subversion/svn_switchwidget.cpp index 7149cce2..490d20b7 100644 --- a/vcs/subversion/svn_switchwidget.cpp +++ b/vcs/subversion/svn_switchwidget.cpp @@ -11,8 +11,8 @@ SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, : SvnSwitchDlgBase( parent ) , m_info( holder ) { - connect( switchOnlyRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); - connect( relocationRadio , TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( switchOnlyRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( relocationRadio , TQ_SIGNAL(clicked()), this, TQ_SLOT(resetCurrentRepositoryUrlEdit()) ); // set switch only switchOnlyRadio->setChecked( true ); wcUrlEdit->setText( wcPath ); |