diff options
Diffstat (limited to 'buildtools/autotools')
54 files changed, 187 insertions, 187 deletions
diff --git a/buildtools/autotools/addapplicationdlg.h b/buildtools/autotools/addapplicationdlg.h index 285a4d77..b36adafd 100644 --- a/buildtools/autotools/addapplicationdlg.h +++ b/buildtools/autotools/addapplicationdlg.h @@ -21,7 +21,7 @@ class TargetItem; class AddApplicationDialog : public AddApplicationDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui index e7495907..61e0d105 100644 --- a/buildtools/autotools/addapplicationdlgbase.ui +++ b/buildtools/autotools/addapplicationdlgbase.ui @@ -539,11 +539,11 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">addTypeClicked()</slot> <slot access="protected">iconClicked()</slot> <slot access="protected">removeTypeClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> 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/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h index 521ddd35..c68e8113 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.h +++ b/buildtools/autotools/addexistingdirectoriesdlg.h @@ -35,7 +35,7 @@ class KImportIconView; class AddExistingDirectoriesDialog : public AddExistingDlgBase { - Q_OBJECT + TQ_OBJECT public: 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/addexistingfilesdlg.h b/buildtools/autotools/addexistingfilesdlg.h index 467307f7..3d9fed36 100644 --- a/buildtools/autotools/addexistingfilesdlg.h +++ b/buildtools/autotools/addexistingfilesdlg.h @@ -38,7 +38,7 @@ class KFileItem; class AddExistingFilesDialog : public AddExistingDlgBase { - Q_OBJECT + TQ_OBJECT public: 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/addfiledlg.h b/buildtools/autotools/addfiledlg.h index d3e41b49..dbd87b4e 100644 --- a/buildtools/autotools/addfiledlg.h +++ b/buildtools/autotools/addfiledlg.h @@ -26,7 +26,7 @@ class TargetItem; class AddFileDialog : public AddFileDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addicondlg.h b/buildtools/autotools/addicondlg.h index 89507b68..b11925f0 100644 --- a/buildtools/autotools/addicondlg.h +++ b/buildtools/autotools/addicondlg.h @@ -22,7 +22,7 @@ class TargetItem; class AddIconDialog : public AddIconDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui index 354a8f88..7d65613d 100644 --- a/buildtools/autotools/addicondlgbase.ui +++ b/buildtools/autotools/addicondlgbase.ui @@ -260,9 +260,9 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>somethingChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> 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/addprefixdlg.h b/buildtools/autotools/addprefixdlg.h index 794241f6..c2e80532 100644 --- a/buildtools/autotools/addprefixdlg.h +++ b/buildtools/autotools/addprefixdlg.h @@ -18,7 +18,7 @@ class TQPushButton; class AddPrefixDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addservicedlg.h b/buildtools/autotools/addservicedlg.h index 70d004e4..203dedf9 100644 --- a/buildtools/autotools/addservicedlg.h +++ b/buildtools/autotools/addservicedlg.h @@ -21,7 +21,7 @@ class TargetItem; class AddServiceDialog : public AddServiceDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui index ad8e1b49..a921195e 100644 --- a/buildtools/autotools/addservicedlgbase.ui +++ b/buildtools/autotools/addservicedlgbase.ui @@ -530,12 +530,12 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">iconClicked()</slot> <slot access="protected">addTypeClicked()</slot> <slot access="protected">propertyExecuted(TQListViewItem*)</slot> <slot access="protected">removeTypeClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> 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/addsubprojectdlg.h b/buildtools/autotools/addsubprojectdlg.h index 897558ef..d2964561 100644 --- a/buildtools/autotools/addsubprojectdlg.h +++ b/buildtools/autotools/addsubprojectdlg.h @@ -24,7 +24,7 @@ class SubprojectItem; class AddSubprojectDialog : public AddSubprojectDlgBase { - Q_OBJECT + TQ_OBJECT public: 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/addtargetdlg.h b/buildtools/autotools/addtargetdlg.h index 0be9aa0a..0663a3e2 100644 --- a/buildtools/autotools/addtargetdlg.h +++ b/buildtools/autotools/addtargetdlg.h @@ -21,7 +21,7 @@ class SubprojectItem; class AddTargetDialog : public AddTargetDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui index 77bb8adc..b7b48d36 100644 --- a/buildtools/autotools/addtargetdlgbase.ui +++ b/buildtools/autotools/addtargetdlgbase.ui @@ -334,9 +334,9 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">primaryChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> 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/addtranslationdlg.h b/buildtools/autotools/addtranslationdlg.h index 2754a65b..e8932562 100644 --- a/buildtools/autotools/addtranslationdlg.h +++ b/buildtools/autotools/addtranslationdlg.h @@ -20,7 +20,7 @@ class AutoProjectPart; class AddTranslationDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 936f7eb1..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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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 " @@ -241,8 +241,8 @@ void AutoDetailsView::initActions() "command builds it.")); TQToolTip::add( m_button3, tr2i18n( "Remove")); - removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotRemoveDetail() ), actions, + removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "edit-delete", 0, this, + 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/autodetailsview.h b/buildtools/autotools/autodetailsview.h index 081842ee..5c2eab6f 100644 --- a/buildtools/autotools/autodetailsview.h +++ b/buildtools/autotools/autodetailsview.h @@ -31,7 +31,7 @@ class AutoDetailsView : protected AutoProjectViewBase { friend class RemoveFileDialog; friend class FileItem; - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 014e8e2f..8646fc8c 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -62,12 +62,12 @@ #define RUN_OPTIONS 2 #define MAKE_OPTIONS 3 -static const KDevPluginInfo data("kdevautoproject"); +static const KDevPluginInfo pluginData("kdevautoproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( pluginData ) ) AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args) - : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart") + : KDevBuildTool(&pluginData, parent, name ? name : "AutoProjectPart") , m_lastCompilationFailed(false) { setInstance(AutoProjectFactory::instance()); @@ -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/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h index c4a9949b..bee4f9ae 100644 --- a/buildtools/autotools/autoprojectpart.h +++ b/buildtools/autotools/autoprojectpart.h @@ -33,7 +33,7 @@ class ConfigWidgetProxy; class AutoProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index 2c98ed35..1b732dde 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -87,7 +87,7 @@ AutoProjectWidget::AutoProjectWidget( AutoProjectPart *part, bool kde ) m_choosenTarget = 0; m_makefileHandler = new MakefileHandler(); - TQSplitter *splitter = new TQSplitter(Qt::Vertical, this); + TQSplitter *splitter = new TQSplitter(TQt::Vertical, this); initOverview ( splitter ); initDetailview ( splitter ); @@ -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/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h index df392c59..2b0e546d 100644 --- a/buildtools/autotools/autoprojectwidget.h +++ b/buildtools/autotools/autoprojectwidget.h @@ -47,7 +47,7 @@ class MakefileHandler; class AutoProjectWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT friend class RemoveFileDialog; friend class TargetOptionsDialog; // to access projectDom() via m_part->projectDom() diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 6d6b6c01..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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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 " @@ -206,28 +206,28 @@ void AutoSubprojectView::initActions() addTargetAction->plug( m_button2 ); TQToolTip::add( m_button3, tr2i18n( "Add Service...")); - addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_tdevelop", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotAddService() ), actions, "add service" ); + addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_tdevelop", 0, this, + 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, TQT_TQOBJECT(this), - TQT_SLOT( slotAddApplication() ), actions, "add application" ); + addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window-new", 0, this, + 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, TQT_TQOBJECT(this), - TQT_SLOT( slotBuildSubproject() ), actions, "build subproject" ); + buildSubprojectAction = new AutoToolsAction( i18n( "Build" ), "launch", 0, this, + 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 " "dialog, <b>Make Options</b> tab.</qt>")); buildSubprojectAction->plug( m_button5 ); - forceReeditSubprojectAction = new TDEAction( i18n( "Force Reedit" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); + forceReeditSubprojectAction = new TDEAction( i18n( "Force Reedit" ), 0, 0, this, + 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 " @@ -238,21 +238,21 @@ void AutoSubprojectView::initActions() if (!m_part->isKDE()) forceReeditSubprojectAction->setEnabled(false); - cleanSubprojectAction = new TDEAction( i18n( "Clean" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT( slotCleanSubproject() ), actions, "clean subproject" ); + cleanSubprojectAction = new TDEAction( i18n( "Clean" ), 0, 0, this, + 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, TQT_TQOBJECT(this), - TQT_SLOT( slotInstallSubproject() ), actions, "install subproject" ); + installSubprojectAction = new TDEAction( i18n( "Install" ), 0, 0, this, + 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, - TQT_TQOBJECT(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 " @@ -260,19 +260,19 @@ void AutoSubprojectView::initActions() "can be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); - expandAction = new TDEAction( i18n( "Expand Subtree" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotExpandTree()), actions, "expandAction" ); - collapseAction = new TDEAction( i18n( "Collapse Subtree" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCollapseTree()), actions, "collapseAction" ); + expandAction = new TDEAction( i18n( "Expand Subtree" ), 0, 0, this, + TQ_SLOT(slotExpandTree()), actions, "expandAction" ); + collapseAction = new TDEAction( i18n( "Collapse Subtree" ), 0, 0, this, + TQ_SLOT(slotCollapseTree()), actions, "collapseAction" ); - otherAction = new TDEAction( i18n( "Manage Custom Commands..." ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT( slotManageBuildCommands() ), actions, "manage custom commands" ); + otherAction = new TDEAction( i18n( "Manage Custom Commands..." ), 0, 0, this, + 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/autosubprojectview.h b/buildtools/autotools/autosubprojectview.h index 5f6f10b3..27e0c55b 100644 --- a/buildtools/autotools/autosubprojectview.h +++ b/buildtools/autotools/autosubprojectview.h @@ -40,7 +40,7 @@ namespace AutoProjectPrivate //so in order to be able to compile this file I made the inheritance public again, Alex class AutoSubprojectView : public AutoProjectViewBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index 820c4bd9..fbaf91a8 100644 --- a/buildtools/autotools/autotoolsaction.cpp +++ b/buildtools/autotools/autotoolsaction.cpp @@ -107,10 +107,10 @@ int AutoToolsAction::plug( TQWidget* w, int index ) if (kapp && !kapp->authorizeTDEAction(name())) return -1; - if ( ::tqqt_cast<TQToolButton*>( w ) ) + 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() ) @@ -145,7 +145,7 @@ void AutoToolsAction::updateEnabled( int i ) { TQWidget* w = container( i ); - if ( ::tqqt_cast<TQToolButton*>( w ) ) + if ( ::tqt_cast<TQToolButton*>( w ) ) static_cast<TQToolButton*>( w )->setEnabled( isEnabled() ); else TDEAction::updateEnabled( i ) ; 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/choosetargetdialog.h b/buildtools/autotools/choosetargetdialog.h index bcc3ba64..ec9e2799 100644 --- a/buildtools/autotools/choosetargetdialog.h +++ b/buildtools/autotools/choosetargetdialog.h @@ -28,7 +28,7 @@ class TQWidget; class ChooseTargetDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: ChooseTargetDialog( AutoProjectWidget* widget, AutoProjectPart* part, diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui index 9bcddff0..9747faca 100644 --- a/buildtools/autotools/choosetargetdlgbase.ui +++ b/buildtools/autotools/choosetargetdlgbase.ui @@ -202,12 +202,12 @@ <tabstop>newFileList</tabstop> <tabstop>neverAskAgainCheckbox</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotActiveTargetToggled(bool)</slot> <slot access="protected">slotChooseTargetToggled(bool)</slot> <slot access="private">slotSubprojectChanged(const TQString&)</slot> <slot access="private">slotTargetChanged(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index cc39aa07..33c280f4 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -72,10 +72,10 @@ public: ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *parent, const char *name) : ConfigureOptionsWidgetBase(parent, name) { - config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); m_part = part; - env_groupBox->setColumnLayout( 1, Qt::Vertical ); + env_groupBox->setColumnLayout( 1, TQt::Vertical ); TQDomDocument &dom = *part->projectDom(); m_environmentVariablesWidget = new EnvironmentVariablesWidget(dom, "/kdevautoproject/general/envvars", env_groupBox); @@ -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())); } @@ -405,7 +405,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin if (prop.isValid()) args = TQStringList::split(" ", prop.toString()); - TQObject *obj = factory->create(TQT_TQOBJECT(this), service->name().latin1(), + TQObject *obj = factory->create(this, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h index dc4f7ffa..42f6d931 100644 --- a/buildtools/autotools/configureoptionswidget.h +++ b/buildtools/autotools/configureoptionswidget.h @@ -24,7 +24,7 @@ class EnvironmentVariablesWidget; class ConfigureOptionsWidget : public ConfigureOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui index a8821504..3392c6a5 100644 --- a/buildtools/autotools/configureoptionswidgetbase.ui +++ b/buildtools/autotools/configureoptionswidgetbase.ui @@ -1014,7 +1014,7 @@ headers in a nonstandard directory <include dir></string> <tabstop>f77flags_edit</tabstop> <tabstop>f77flags_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">builddirClicked()</slot> <slot access="protected">cflagsClicked()</slot> <slot access="protected">configAdded()</slot> @@ -1028,7 +1028,7 @@ headers in a nonstandard directory <include dir></string> <slot access="protected">f77serviceChanged()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">topsourcedirClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> 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/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h index 0de3f189..b4dbcf00 100644 --- a/buildtools/autotools/fileselectorwidget.h +++ b/buildtools/autotools/fileselectorwidget.h @@ -39,7 +39,7 @@ class KFile; class KDnDDirOperator : public KDirOperator { - Q_OBJECT + TQ_OBJECT public: @@ -51,7 +51,7 @@ protected: class FileSelectorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/kimporticonview.h b/buildtools/autotools/kimporticonview.h index 26ec4d96..cf8880e0 100644 --- a/buildtools/autotools/kimporticonview.h +++ b/buildtools/autotools/kimporticonview.h @@ -23,7 +23,7 @@ class KImportIconView : public KFileDnDIconView { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/managecustomcommand.h b/buildtools/autotools/managecustomcommand.h index ad3ea250..a9a30dae 100644 --- a/buildtools/autotools/managecustomcommand.h +++ b/buildtools/autotools/managecustomcommand.h @@ -23,7 +23,7 @@ class ManageCustomCommand: public ManageCustomBuildCommandsBase { - Q_OBJECT + TQ_OBJECT public: ManageCustomCommand( TQWidget *parent = 0, const char *name = 0 ); diff --git a/buildtools/autotools/managecustomcommandsbase.ui b/buildtools/autotools/managecustomcommandsbase.ui index eab430e9..9088ba07 100644 --- a/buildtools/autotools/managecustomcommandsbase.ui +++ b/buildtools/autotools/managecustomcommandsbase.ui @@ -117,9 +117,9 @@ <tabstop>addButton</tabstop> <tabstop>removeButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>addButton_clicked()</slot> <slot>removeButton_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index 6c4bac8c..a18fbf5d 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -72,7 +72,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ) { - KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) ); + KDevCompilerOptions * plugin = createCompilerOptions( compiler, parent ); if ( plugin ) { 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/removefiledlg.h b/buildtools/autotools/removefiledlg.h index 138f9ad5..bb3fd1cc 100644 --- a/buildtools/autotools/removefiledlg.h +++ b/buildtools/autotools/removefiledlg.h @@ -25,7 +25,7 @@ class TargetItem; class RemoveFileDialog : public RemoveFileDlgBase { - Q_OBJECT + TQ_OBJECT public: 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/subprojectoptionsdlg.h b/buildtools/autotools/subprojectoptionsdlg.h index d53b34c1..113db5ff 100644 --- a/buildtools/autotools/subprojectoptionsdlg.h +++ b/buildtools/autotools/subprojectoptionsdlg.h @@ -21,7 +21,7 @@ class SubprojectItem; class SubprojectOptionsDialog : public SubprojectOptionsDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui index d417e73b..90059f0a 100644 --- a/buildtools/autotools/subprojectoptionsdlgbase.ui +++ b/buildtools/autotools/subprojectoptionsdlgbase.ui @@ -964,7 +964,7 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">buildorderMoveDownClicked()</slot> <slot access="protected">cflagsClicked()</slot> <slot access="protected">cxxFlagsClicked()</slot> @@ -980,7 +980,7 @@ <slot access="protected">removePrefixClicked()</slot> <slot access="private">addPrefixClicked()</slot> <slot access="private">editPrefixClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/targetoptionsdlg.h b/buildtools/autotools/targetoptionsdlg.h index 205086c9..1e44d565 100644 --- a/buildtools/autotools/targetoptionsdlg.h +++ b/buildtools/autotools/targetoptionsdlg.h @@ -20,7 +20,7 @@ class TargetItem; class TargetOptionsDialog : public TargetOptionsDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui index 2fad9db1..ea5d4738 100644 --- a/buildtools/autotools/targetoptionsdlgbase.ui +++ b/buildtools/autotools/targetoptionsdlgbase.ui @@ -700,7 +700,7 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">insideMoveDownClicked()</slot> <slot access="protected">insideMoveUpClicked()</slot> <slot access="protected">outsideAddClicked()</slot> @@ -708,7 +708,7 @@ <slot access="protected">outsideMoveDownClicked()</slot> <slot access="protected">outsideMoveUpClicked()</slot> <slot access="protected">outsideRemoveClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> 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/tdefilednddetailview.h b/buildtools/autotools/tdefilednddetailview.h index bb65d40f..8af26cf0 100644 --- a/buildtools/autotools/tdefilednddetailview.h +++ b/buildtools/autotools/tdefilednddetailview.h @@ -39,7 +39,7 @@ class KFileDnDDetailView : public KFileDetailView { - Q_OBJECT + TQ_OBJECT public: /** */ 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/autotools/tdefiledndiconview.h b/buildtools/autotools/tdefiledndiconview.h index 8bd36d51..b18cf486 100644 --- a/buildtools/autotools/tdefiledndiconview.h +++ b/buildtools/autotools/tdefiledndiconview.h @@ -34,7 +34,7 @@ class KFileDnDIconView : public KFileIconView { - Q_OBJECT + TQ_OBJECT public: // Public methods |