diff options
Diffstat (limited to 'buildtools')
160 files changed, 484 insertions, 1078 deletions
diff --git a/buildtools/ada/adaglobaloptionsdlg.h b/buildtools/ada/adaglobaloptionsdlg.h index 39e2e354..1b3d75cf 100644 --- a/buildtools/ada/adaglobaloptionsdlg.h +++ b/buildtools/ada/adaglobaloptionsdlg.h @@ -19,7 +19,7 @@ class AdaProjectPart; class AdaGlobalOptionsDlg : public AdaProjectOptionsDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/ada/adaproject_optionsdlgbase.ui b/buildtools/ada/adaproject_optionsdlgbase.ui index b98bc1a3..35774d19 100644 --- a/buildtools/ada/adaproject_optionsdlgbase.ui +++ b/buildtools/ada/adaproject_optionsdlgbase.ui @@ -447,7 +447,7 @@ <tabstop>addconfig_button</tabstop> <tabstop>removeconfig_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">compiler_box_activated(const TQString&)</slot> <slot access="protected">addconfig_button_clicked()</slot> <slot access="protected">configRemoved()</slot> @@ -457,7 +457,7 @@ <slot access="protected">configAdded()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">setDefaultOptions()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index 5eacf5d0..4cd401a5 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -43,28 +43,28 @@ #include "adaglobaloptionsdlg.h" typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory; -static const KDevPluginInfo data("kdevadaproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) ) +static const KDevPluginInfo pluginData("kdevadaproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( pluginData ) ) AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" ) + :KDevBuildTool(&pluginData, parent, name ? name : "AdaProjectPart" ) { setInstance(AdaProjectFactory::instance()); setXMLFile("kdevadaproject.rc"); 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/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h index 5511da78..a1415344 100644 --- a/buildtools/ada/adaproject_part.h +++ b/buildtools/ada/adaproject_part.h @@ -19,7 +19,7 @@ class KDevCompilerOptions; class AdaProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: AdaProjectPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/buildtools/ada/adaproject_widget.h b/buildtools/ada/adaproject_widget.h index 6bbab369..f1bb5e2b 100644 --- a/buildtools/ada/adaproject_widget.h +++ b/buildtools/ada/adaproject_widget.h @@ -9,7 +9,7 @@ class AdaProjectPart; class AdaProjectWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp index 28549efc..3a0624cb 100644 --- a/buildtools/ada/adaprojectoptionsdlg.cpp +++ b/buildtools/ada/adaprojectoptionsdlg.cpp @@ -27,7 +27,7 @@ AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl) : AdaProjectOptionsDlgBase(parent,name, fl), m_part(part) { - config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'"); diff --git a/buildtools/ada/adaprojectoptionsdlg.h b/buildtools/ada/adaprojectoptionsdlg.h index 569f06c9..655b2310 100644 --- a/buildtools/ada/adaprojectoptionsdlg.h +++ b/buildtools/ada/adaprojectoptionsdlg.h @@ -18,7 +18,7 @@ class KDevCompilerOptions; class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index a9e5a2d4..3c71e490 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -35,8 +35,8 @@ typedef KDevGenericFactory<AntProjectPart> AntProjectFactory; -static const KDevPluginInfo data("kdevantproject"); -K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( data )) +static const KDevPluginInfo pluginData("kdevantproject"); +K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( pluginData )) AntOptions::AntOptions() @@ -46,14 +46,14 @@ AntOptions::AntOptions() AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &) - : KDevBuildTool(&data, parent, name ? name : "AntProjectPart") + : KDevBuildTool(&pluginData, parent, name ? name : "AntProjectPart") { setInstance(AntProjectFactory::instance()); 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/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h index e3b325d2..aecd7838 100644 --- a/buildtools/ant/antprojectpart.h +++ b/buildtools/ant/antprojectpart.h @@ -42,7 +42,7 @@ public: class AntProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addapplicationdlg.h b/buildtools/autotools/addapplicationdlg.h index f2c0ecb4..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: @@ -42,5 +42,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - 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 6af3be99..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 ); @@ -384,5 +384,3 @@ void AddExistingDirectoriesDialog::slotDropped ( TQDropEvent* ev ) } #include "addexistingdirectoriesdlg.moc" - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/buildtools/autotools/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h index 7b1d9c8e..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: @@ -71,5 +71,3 @@ protected slots: }; #endif -// kate: indent-mode csands; tab-width 4; - 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 2b44bba1..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: @@ -75,4 +75,3 @@ protected slots: }; #endif // ADDEXISTINGFILESDLG_H -// kate: indent-mode csands; tab-width 4; 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 a9215cab..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) @@ -724,5 +724,3 @@ void AutoDetailsView::focusOutEvent(TQFocusEvent */*e*/) } #include "autodetailsview.moc" - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/buildtools/autotools/autodetailsview.h b/buildtools/autotools/autodetailsview.h index c2ad1afb..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: @@ -86,4 +86,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h index 9a82b025..277918a9 100644 --- a/buildtools/autotools/autolistviewitems.h +++ b/buildtools/autotools/autolistviewitems.h @@ -139,5 +139,3 @@ public: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 6640a353..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 @@ -1547,5 +1547,3 @@ TQString AutoProjectPart::getAutoConfFile(const TQString& dir){ } #include "autoprojectpart.moc" - -// kate: space-indent on; indent-width 4; diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h index 83066c3c..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: @@ -154,4 +154,3 @@ private: typedef KDevGenericFactory<AutoProjectPart> AutoProjectFactory; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index 12037bff..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 () @@ -744,5 +744,3 @@ MakefileHandler* AutoProjectWidget::makefileHandler() { return m_makefileHandler; } -//kate: indent-mode csands; tab-width 4; space-indent off; - diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h index b3f6eaef..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() @@ -227,4 +227,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 005ae123..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())); } @@ -1133,5 +1133,3 @@ void AutoSubprojectView::expandCollapse( TQListViewItem * item, bool expand ) } #include "autosubprojectview.moc" - -// kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/buildtools/autotools/autosubprojectview.h b/buildtools/autotools/autosubprojectview.h index fab7c546..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: @@ -127,5 +127,3 @@ private slots: }; #endif - -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index cf1e37d6..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,12 +145,8 @@ 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 ) ; } - - - -//kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autotoolsaction.h b/buildtools/autotools/autotoolsaction.h index dd9ddda5..758cbaef 100644 --- a/buildtools/autotools/autotoolsaction.h +++ b/buildtools/autotools/autotoolsaction.h @@ -66,5 +66,3 @@ public: }; #endif - -//kate: indent-mode csands; tab-width 4; auto-insert-doxygen on; diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index 8b59545f..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& ) ) ); } @@ -345,4 +345,3 @@ bool ChooseTargetDialog::alwaysUseActiveTarget() const #include "choosetargetdialog.moc" -//kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/choosetargetdialog.h b/buildtools/autotools/choosetargetdialog.h index b1e4f12d..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, @@ -55,4 +55,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; 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 e40874de..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: @@ -67,4 +67,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; 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 d7107e7a..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: @@ -94,5 +94,3 @@ signals: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/buildtools/autotools/kimporticonview.h b/buildtools/autotools/kimporticonview.h index d66c74ba..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: @@ -41,5 +41,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp index 27f4512e..f1de18c1 100644 --- a/buildtools/autotools/makefilehandler.cpp +++ b/buildtools/autotools/makefilehandler.cpp @@ -163,4 +163,3 @@ TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools:: return variable; } -//kate: space-indent on; indent-width 4; diff --git a/buildtools/autotools/makefilehandler.h b/buildtools/autotools/makefilehandler.h index 0311500b..70cbcd2e 100644 --- a/buildtools/autotools/makefilehandler.h +++ b/buildtools/autotools/makefilehandler.h @@ -71,6 +71,3 @@ private: }; #endif - -//kate: space-indent on; indent-width 4; - diff --git a/buildtools/autotools/managecustomcommand.h b/buildtools/autotools/managecustomcommand.h index 659959ca..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 ); @@ -35,4 +35,3 @@ public slots: }; #endif -// kate: indent-mode csands; tab-width 4; 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 ec58b54c..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 ) { @@ -995,5 +995,3 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m TQDir().rename(fileName + "#", fileName); } - -//kate: indent-mode csands; space-indent off; tab-width 4; diff --git a/buildtools/autotools/misc.h b/buildtools/autotools/misc.h index def8ce20..223022f1 100644 --- a/buildtools/autotools/misc.h +++ b/buildtools/autotools/misc.h @@ -61,5 +61,3 @@ public: }; #endif -// kate: indent-mode csands; tab-width 4; - 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 f3b86bff..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: @@ -49,4 +49,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; 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/removetargetdlg.h b/buildtools/autotools/removetargetdlg.h index a9981007..9a5c82f3 100644 --- a/buildtools/autotools/removetargetdlg.h +++ b/buildtools/autotools/removetargetdlg.h @@ -52,4 +52,3 @@ protected: }; #endif -// kate: indent-mode csands; tab-width 4; 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 659d89fb..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: @@ -60,5 +60,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - 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.cpp b/buildtools/autotools/targetoptionsdlg.cpp index 866661ae..ac2767a7 100644 --- a/buildtools/autotools/targetoptionsdlg.cpp +++ b/buildtools/autotools/targetoptionsdlg.cpp @@ -354,4 +354,3 @@ void TargetOptionsDialog::accept() } #include "targetoptionsdlg.moc" -// kate: indent-mode csands; space-indent on; indent-width 4; replace-tabs on; diff --git a/buildtools/autotools/targetoptionsdlg.h b/buildtools/autotools/targetoptionsdlg.h index 5238080f..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: @@ -46,5 +46,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - 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 43165a06..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: /** */ @@ -134,4 +134,3 @@ protected: // Private attributes }; #endif -// kate: indent-mode csands; tab-width 4; 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 6d699185..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 @@ -125,5 +125,3 @@ protected: bool m_dndEnabled; }; #endif -// kate: indent-mode csands; tab-width 4; auto-insert-doxygen on; - diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp index 20931698..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)) ); } @@ -95,5 +95,3 @@ void CustomBuildOptionsWidget::makeToggled(bool b) } #include "custombuildoptionswidget.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/custombuildoptionswidget.h b/buildtools/custommakefiles/custombuildoptionswidget.h index 91b4e5c4..3308aa47 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.h +++ b/buildtools/custommakefiles/custombuildoptionswidget.h @@ -20,7 +20,7 @@ class TQTabWidget; class CustomBuildOptionsWidget : public CustomBuildOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: @@ -43,5 +43,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui index bea1e872..0e1658ea 100644 --- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui +++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui @@ -56,9 +56,6 @@ <property name="text"> <string>Other</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>other custom build tool, e.g. script</string> </property> @@ -147,10 +144,10 @@ </spacer> </vbox> </widget> -<Q_SLOTS> +<slots> <slot access="protected">makeToggled(bool)</slot> <slot access="protected">otherToggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp index 6a12cdfb..10855e60 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.cpp +++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp @@ -43,10 +43,10 @@ CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQ defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/defaulttarget")); makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/makeoptions")); - envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), TQT_TQOBJECT(this))); + envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), this)); m_allEnvironments = m_part->allMakeEnvironments(); m_currentEnvironment = m_part->currentMakeEnvironment(); - env_var_group->setColumnLayout( 1, Qt::Vertical ); + env_var_group->setColumnLayout( 1, TQt::Vertical ); m_envWidget = new EnvironmentVariablesWidget(m_dom, m_configGroup + "/make/environments/" + m_currentEnvironment, env_var_group); envs_combo->insertStringList(m_allEnvironments); envs_combo->setEditText(m_currentEnvironment); diff --git a/buildtools/custommakefiles/custommakeconfigwidget.h b/buildtools/custommakefiles/custommakeconfigwidget.h index 9ace95e0..d3369b1d 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.h +++ b/buildtools/custommakefiles/custommakeconfigwidget.h @@ -23,7 +23,7 @@ class EnvironmentVariablesWidget; */ class CustomMakeConfigWidget : public CustomMakeConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui index cae0a6e0..47d23c9b 100644 --- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui +++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui @@ -375,13 +375,13 @@ <tabstop>copyenvs_button</tabstop> <tabstop>removeenvs_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">envNameChanged(const TQString &)</slot> <slot access="protected">envChanged(const TQString&)</slot> <slot access="protected">envAdded()</slot> <slot access="protected">envRemoved()</slot> <slot access="protected">envCopied()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp index 85f77d52..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) @@ -76,5 +76,3 @@ void CustomManagerWidget::accept() #include "custommanagerwidget.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/custommanagerwidget.h b/buildtools/custommakefiles/custommanagerwidget.h index 657bae9f..6ce029e2 100644 --- a/buildtools/custommakefiles/custommanagerwidget.h +++ b/buildtools/custommakefiles/custommanagerwidget.h @@ -22,7 +22,7 @@ class KEditListBox; class CustomManagerWidget : public CustomManagerWidgetBase { -Q_OBJECT +TQ_OBJECT public: @@ -38,5 +38,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp index 945d7c91..012dfd36 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.cpp +++ b/buildtools/custommakefiles/customotherconfigwidget.cpp @@ -38,10 +38,10 @@ CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/defaulttarget")); makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/otheroptions")); - envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); + envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); m_allEnvironments = m_part->allMakeEnvironments(); m_currentEnvironment = m_part->currentMakeEnvironment(); - env_var_group->setColumnLayout( 1, Qt::Vertical ); + env_var_group->setColumnLayout( 1, TQt::Vertical ); m_envWidget = new EnvironmentVariablesWidget(m_dom, m_configGroup + "/other/environments/" + m_currentEnvironment, env_var_group); envs_combo->insertStringList(m_allEnvironments); envs_combo->setEditText(m_currentEnvironment); @@ -121,5 +121,3 @@ void CustomOtherConfigWidget::accept() } #include "customotherconfigwidget.moc" -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/custommakefiles/customotherconfigwidget.h b/buildtools/custommakefiles/customotherconfigwidget.h index 64f3a5bd..ee9c31a7 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.h +++ b/buildtools/custommakefiles/customotherconfigwidget.h @@ -23,7 +23,7 @@ class EnvironmentVariablesWidget; */ class CustomOtherConfigWidget : public CustomOtherConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: @@ -53,6 +53,3 @@ protected: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/custommakefiles/customotherconfigwidgetbase.ui b/buildtools/custommakefiles/customotherconfigwidgetbase.ui index 3f7290af..60f4adbc 100644 --- a/buildtools/custommakefiles/customotherconfigwidgetbase.ui +++ b/buildtools/custommakefiles/customotherconfigwidgetbase.ui @@ -276,13 +276,13 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">envNameChanged(const TQString &)</slot> <slot access="protected">envChanged(const TQString&)</slot> <slot access="protected">envAdded()</slot> <slot access="protected">envRemoved()</slot> <slot access="protected">envCopied()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index f61782ae..746e9fe4 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -62,11 +62,11 @@ #include <kdevplugininfo.h> typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory; -static const KDevPluginInfo data( "kdevcustomproject" ); -K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) ) +static const KDevPluginInfo pluginData( "kdevcustomproject" ); +K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( pluginData ) ) CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ) - : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" ) + : KDevBuildTool( &pluginData, parent, name ? name : "CustomProjectPart" ) , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false ) { setInstance( CustomProjectFactory::instance() ); @@ -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/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h index 67223e92..b505847c 100644 --- a/buildtools/custommakefiles/customprojectpart.h +++ b/buildtools/custommakefiles/customprojectpart.h @@ -32,7 +32,7 @@ class TDESelectAction; class CustomProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: @@ -156,4 +156,3 @@ private: }; #endif -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp index a223c87a..2ccf9593 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.cpp +++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp @@ -127,5 +127,3 @@ TQStringList SelectNewFilesDialog::includedPaths() const } #include "selectnewfilesdialog.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/selectnewfilesdialog.h b/buildtools/custommakefiles/selectnewfilesdialog.h index 3c8d9c14..5c226f41 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.h +++ b/buildtools/custommakefiles/selectnewfilesdialog.h @@ -20,7 +20,7 @@ class SelectNewFilesDialogBase; class SelectNewFilesDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: @@ -50,5 +50,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am index 340d0e38..950d6571 100644 --- a/buildtools/lib/parsers/autotools/Makefile.am +++ b/buildtools/lib/parsers/autotools/Makefile.am @@ -13,7 +13,7 @@ libkdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotoo parser: cd $(srcdir) ; \ bison -d autotools.yy -o autotools_yacc.cpp ; \ - mv -f autotools_yacc.hpp autotools_yacc.h ; \ + mv -f autotools_yacc.h autotools_yacc.h ; \ flex -oautotools_lex.cpp autotools.ll EXTRA_DIST = autotools.yy autotools.ll diff --git a/buildtools/lib/parsers/autotools/autotools.yy b/buildtools/lib/parsers/autotools/autotools.yy index d76cc5fe..c40e9c5b 100644 --- a/buildtools/lib/parsers/autotools/autotools.yy +++ b/buildtools/lib/parsers/autotools/autotools.yy @@ -49,7 +49,7 @@ struct Result { Result(): node(0) {} /**Type of semantic value for simple grammar rules.*/ - QString value; + TQString value; /**Type of semantic value for grammar rules which are parts of AST.*/ AST *node; /**Type of semantic value for "multiline_values" grammar rule. diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp index ddcbddc3..4b70428b 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsast.cpp @@ -113,5 +113,3 @@ void CommentAST::writeBack(TQString &buffer) } } - -// kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h index 768e3e07..94047845 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.h +++ b/buildtools/lib/parsers/autotools/autotoolsast.h @@ -265,5 +265,3 @@ public: } #endif - -// kate: indent-mode csands; space-indent off; tab-width 4; auto-insert-doxygen on; diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp index 1c2efaea..cd013d29 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp @@ -65,6 +65,3 @@ int Driver::parseFile(KURL fileName, ProjectAST **ast) } } - -//kate: indent-mode csands; space-indent off; tab-width 4; - diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.h b/buildtools/lib/parsers/autotools/autotoolsdriver.h index 8e29bec6..ecf6fea7 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.h +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.h @@ -72,5 +72,3 @@ public: } #endif - -// kate: indent-mode csands; tab-width 4; space-indent off; auto-insert-doxygen on; diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h index ea300158..bb4a1a2a 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.h +++ b/buildtools/lib/parsers/autotools/tests/viewer.h @@ -29,7 +29,7 @@ namespace AutoTools { class ProjectAST; } class TQListViewItem; class Viewer: public ViewerBase { -Q_OBJECT +TQ_OBJECT public: Viewer(TQWidget *parent = 0, const char *name = 0); diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui index 3fb32462..139f1908 100644 --- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui +++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui @@ -210,11 +210,11 @@ <slot>tabWidget2_selected(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>addAll_clicked()</slot> <slot>choose_clicked()</slot> <slot>files_currentChanged(TQListBoxItem*)</slot> <slot>tabWidget2_selected(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/lib/parsers/qmake/FlexLexer.h b/buildtools/lib/parsers/qmake/FlexLexer.h index 1db844da..edea96ca 100644 --- a/buildtools/lib/parsers/qmake/FlexLexer.h +++ b/buildtools/lib/parsers/qmake/FlexLexer.h @@ -1,5 +1,3 @@ - -// -*-C++-*- // FlexLexer.h -- define interfaces for lexical analyzer classes generated // by flex diff --git a/buildtools/lib/parsers/qmake/location.hh b/buildtools/lib/parsers/qmake/location.h index d6247645..f97af783 100644 --- a/buildtools/lib/parsers/qmake/location.hh +++ b/buildtools/lib/parsers/qmake/location.h @@ -33,16 +33,16 @@ version 2.2 of Bison. */ /** - ** \file location.hh + ** \file location.h ** Define the TQMake::location class. */ -#ifndef BISON_LOCATION_HH -# define BISON_LOCATION_HH +#ifndef BISON_LOCATION_H +# define BISON_LOCATION_H # include <iostream> # include <string> -# include "position.hh" +# include "position.h" namespace TQMake { @@ -142,4 +142,4 @@ namespace TQMake } -#endif // not BISON_LOCATION_HH +#endif // not BISON_LOCATION_H diff --git a/buildtools/lib/parsers/qmake/position.hh b/buildtools/lib/parsers/qmake/position.h index 6e95eb95..9f5951f0 100644 --- a/buildtools/lib/parsers/qmake/position.hh +++ b/buildtools/lib/parsers/qmake/position.h @@ -33,12 +33,12 @@ version 2.2 of Bison. */ /** - ** \file position.hh + ** \file position.h ** Define the TQMake::position class. */ -#ifndef BISON_POSITION_HH -# define BISON_POSITION_HH +#ifndef BISON_POSITION_H +# define BISON_POSITION_H # include <iostream> # include <string> @@ -139,4 +139,4 @@ namespace TQMake } } -#endif // not BISON_POSITION_HH +#endif // not BISON_POSITION_H diff --git a/buildtools/lib/parsers/qmake/qmake.ll b/buildtools/lib/parsers/qmake/qmake.ll index a0289f6e..14d5e777 100644 --- a/buildtools/lib/parsers/qmake/qmake.ll +++ b/buildtools/lib/parsers/qmake/qmake.ll @@ -81,29 +81,29 @@ cont \\{ws}*{newline} <INITIAL>{ws} {} <vallist>{ws} { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::LIST_WS; } <vallist,INITIAL>{cont} { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::CONT; } <vallist,INITIAL>{comment_cont} { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::COMMENT_CONT; } {id_simple} { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return (Parser::token::token::ID_SIMPLE); } <funcargs>{id_args} { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); mylval->value = mylval->value.mid(0, mylval->value.length()-1); unput(')'); BEGIN(INITIAL); @@ -112,43 +112,43 @@ cont \\{ws}*{newline} <vallist>{var_value} { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::VARIABLE_VALUE; } <vallist>{quoted_var_value} { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::QUOTED_VARIABLE_VALUE; } "=" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::EQ; } "+=" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::PLUSEQ; } "-=" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::MINUSEQ; } "*=" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::STAREQ; } "~=" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::TILDEEQ; } @@ -175,28 +175,28 @@ cont \\{ws}*{newline} } ":" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::COLON; } <vallist>{ws}{newline} { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); setLineEndingFromString( mylval->value ); return Parser::token::token::NEWLINE; } <vallist,INITIAL>{newline} { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); setLineEndingFromString( mylval->value ); return Parser::token::token::NEWLINE; } <vallist,INITIAL>{comment} { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return (Parser::token::token::COMMENT); } @@ -214,7 +214,7 @@ namespace QMake return yylex(); } - void Lexer::setLineEndingFromString( const QString& str ) + void Lexer::setLineEndingFromString( const TQString& str ) { if( str.endsWith("\r\n") && m_lineEnding == None ) m_lineEnding = Windows; diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy index 3cc0b79d..83cb60c8 100644 --- a/buildtools/lib/parsers/qmake/qmake.yy +++ b/buildtools/lib/parsers/qmake/qmake.yy @@ -51,7 +51,7 @@ struct Result { Result(): node(0) {} /**Type of semantic value for simple grammar rules.*/ - QString value; + TQString value; /**Type of semantic value for grammar rules which are parts of AST.*/ AST *node; /**Type of semantic value for "multiline_values" grammar rule. @@ -71,7 +71,7 @@ struct Result { </pre> */ QStringList values; - QString indent; + TQString indent; }; #define YYSTYPE Result @@ -109,7 +109,7 @@ Don't forget to uncomment "yydebug = 1" line in qmakedriver.cpp. */ %} -%skeleton "lalr1.cc" +%skeleton "lalr1.cpp" %define "parser_class_name" "Parser" %name-prefix="QMake" %parse-param { QMake::Lexer* lexer } @@ -310,8 +310,8 @@ listws: LIST_WS } | { - $<value>$ = QString(); - $<indent>$ = QString(); + $<value>$ = TQString(); + $<indent>$ = TQString(); } ; operator : EQ diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h index fe133946..4bed35dd 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.h +++ b/buildtools/lib/parsers/qmake/qmake_lex.h @@ -20,7 +20,7 @@ #ifndef TQMAKE_LEX_H #define TQMAKE_LEX_H -#include "qmake_yacc.hpp" +#include "qmake_yacc.h" #include <iostream> #ifndef DONT_INCLUDE_FLEXLEXER @@ -45,5 +45,3 @@ namespace TQMake } #endif - -// kate: space-indent on; indent-width 4; tab-width: 4; replace-tabs on; auto-insert-doxygen on diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp index f9dea804..25ae0e85 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp @@ -35,12 +35,12 @@ // Take the name prefix into account. #define yylex TQMakelex -#include "qmake_yacc.hpp" +#include "qmake_yacc.h" /* User implementation prologue. */ -/* Line 317 of lalr1.cc. */ +/* Line 317 of lalr1.cpp. */ #line 45 "tqmake_yacc.cpp" #ifndef YY_ @@ -751,7 +751,7 @@ namespace TQMake break; - /* Line 675 of lalr1.cc. */ + /* Line 675 of lalr1.cpp. */ #line 756 "tqmake_yacc.cpp" default: break; } diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.h index fd130e65..4c4e3042 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.h @@ -39,7 +39,7 @@ #include <string> #include <iostream> -#include "stack.hh" +#include "stack.h" namespace TQMake { @@ -160,10 +160,10 @@ Don't forget to uncomment "yydebug = 1" line in qmakedriver.cpp. */ -/* Line 35 of lalr1.cc. */ -#line 165 "qmake_yacc.hpp" +/* Line 35 of lalr1.cpp. */ +#line 165 "qmake_yacc.h" -#include "location.hh" +#include "location.h" /* Enabling traces. */ #ifndef YYDEBUG diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp index 504303b5..1b4bcb87 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.cpp +++ b/buildtools/lib/parsers/qmake/qmakeast.cpp @@ -164,7 +164,3 @@ void IncludeAST::writeBack(TQString &/*buffer*/) } } - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - - diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp index 40fd9bd9..8b9b722a 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.cpp +++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp @@ -28,7 +28,7 @@ #include <sstream> #include "qmake_lex.h" -#include "qmake_yacc.hpp" +#include "qmake_yacc.h" namespace TQMake { diff --git a/buildtools/lib/parsers/qmake/stack.hh b/buildtools/lib/parsers/qmake/stack.h index dfc6c67e..1c18d4d0 100644 --- a/buildtools/lib/parsers/qmake/stack.hh +++ b/buildtools/lib/parsers/qmake/stack.h @@ -32,8 +32,8 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -#ifndef BISON_STACK_HH -# define BISON_STACK_HH +#ifndef BISON_STACK_H +# define BISON_STACK_H #include <deque> @@ -126,4 +126,4 @@ namespace TQMake }; } -#endif // not BISON_STACK_HH +#endif // not BISON_STACK_H diff --git a/buildtools/lib/parsers/qmake/tests/viewer.h b/buildtools/lib/parsers/qmake/tests/viewer.h index 86fe70fe..996b8f46 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.h +++ b/buildtools/lib/parsers/qmake/tests/viewer.h @@ -31,7 +31,7 @@ class ProjectAST; class TQListViewItem; class Viewer: public ViewerBase { -Q_OBJECT +TQ_OBJECT public: Viewer(TQWidget *parent = 0, const char *name = 0); diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui index ad580b4c..970f6ee8 100644 --- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui +++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui @@ -240,11 +240,11 @@ <slot>tabWidget2_selected(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>addAll_clicked()</slot> <slot>choose_clicked()</slot> <slot>files_currentChanged( TQListBoxItem * )</slot> <slot>tabWidget2_selected( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> 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/addenvvardlg.h b/buildtools/lib/widgets/addenvvardlg.h index 9069f493..d4afadf6 100644 --- a/buildtools/lib/widgets/addenvvardlg.h +++ b/buildtools/lib/widgets/addenvvardlg.h @@ -29,7 +29,7 @@ Dialog to add environment variables. */ class AddEnvvarDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: 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/addfilesdialog.h b/buildtools/lib/widgets/addfilesdialog.h index 8a7ed5c9..e2b8b5cd 100644 --- a/buildtools/lib/widgets/addfilesdialog.h +++ b/buildtools/lib/widgets/addfilesdialog.h @@ -33,7 +33,7 @@ with the relative path (e.g. ../../dir/filename) */ class AddFilesDialog : public KFileDialog { - Q_OBJECT + TQ_OBJECT public: enum Mode { Copy, Link, Relative }; diff --git a/buildtools/lib/widgets/environmentdisplaydialog.h b/buildtools/lib/widgets/environmentdisplaydialog.h index 28af5c6a..46b4bdb8 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.h +++ b/buildtools/lib/widgets/environmentdisplaydialog.h @@ -25,7 +25,7 @@ class EnvironmentDisplayDialog : public EnvironmentDisplayDialogBase { -Q_OBJECT +TQ_OBJECT public: 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/lib/widgets/environmentvariableswidget.h b/buildtools/lib/widgets/environmentvariableswidget.h index c49badc3..c9c9946e 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.h +++ b/buildtools/lib/widgets/environmentvariableswidget.h @@ -30,7 +30,7 @@ Environment variables widget. */ class EnvironmentVariablesWidget : public EnvironmentVariablesWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui index e7246de3..53605001 100644 --- a/buildtools/lib/widgets/environmentvariableswidgetbase.ui +++ b/buildtools/lib/widgets/environmentvariableswidgetbase.ui @@ -189,12 +189,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>addVarClicked()</slot> <slot>removeVarClicked()</slot> <slot>editVarClicked()</slot> <slot>environmentClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/makeoptionswidget.cpp b/buildtools/lib/widgets/makeoptionswidget.cpp index ef901cc8..c15b5a7a 100644 --- a/buildtools/lib/widgets/makeoptionswidget.cpp +++ b/buildtools/lib/widgets/makeoptionswidget.cpp @@ -33,7 +33,7 @@ MakeOptionsWidget::MakeOptionsWidget(TQDomDocument &dom, const TQString &configG : MakeOptionsWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { - env_var_group->setColumnLayout( 1, Qt::Vertical ); + env_var_group->setColumnLayout( 1, TQt::Vertical ); m_environmentVariablesWidget = new EnvironmentVariablesWidget( dom, configGroup + "/make/envvars", env_var_group ); abort_box->setChecked(DomUtil::readBoolEntry(dom, configGroup + "/make/abortonerror", true )); diff --git a/buildtools/lib/widgets/makeoptionswidget.h b/buildtools/lib/widgets/makeoptionswidget.h index bc4f8878..4a44c437 100644 --- a/buildtools/lib/widgets/makeoptionswidget.h +++ b/buildtools/lib/widgets/makeoptionswidget.h @@ -31,7 +31,7 @@ Make options widget. */ class MakeOptionsWidget : public MakeOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/lib/widgets/removesubprojectdialog.h b/buildtools/lib/widgets/removesubprojectdialog.h index 89426eb8..7de20af3 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.h +++ b/buildtools/lib/widgets/removesubprojectdialog.h @@ -27,7 +27,7 @@ Subproject removal dialog. */ class RemoveSubprojectDialog : public RemoveSubprojectDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui index d5206ac6..c9300c18 100644 --- a/buildtools/lib/widgets/removesubprojectdlgbase.ui +++ b/buildtools/lib/widgets/removesubprojectdlgbase.ui @@ -145,10 +145,10 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>accept()</slot> <slot>reject()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp index 6836ee77..717e9573 100644 --- a/buildtools/lib/widgets/runoptionswidget.cpp +++ b/buildtools/lib/widgets/runoptionswidget.cpp @@ -44,7 +44,7 @@ RunOptionsWidget::RunOptionsWidget(TQDomDocument &dom, const TQString &configGro m_dom(dom), m_configGroup(configGroup) { // Create the "Environment Variables" GUI - env_var_group->setColumnLayout( 1, Qt::Vertical ); + env_var_group->setColumnLayout( 1, TQt::Vertical ); m_environmentVariablesWidget = new EnvironmentVariablesWidget( dom, configGroup + "/run/envvars", env_var_group ); mainprogram_edit->completionObject()->setMode(KURLCompletion::FileCompletion); diff --git a/buildtools/lib/widgets/runoptionswidget.h b/buildtools/lib/widgets/runoptionswidget.h index f38c4a9e..2eaa8740 100644 --- a/buildtools/lib/widgets/runoptionswidget.h +++ b/buildtools/lib/widgets/runoptionswidget.h @@ -32,7 +32,7 @@ Run options widget. */ class RunOptionsWidget : public RunOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui index 404af030..27ce6736 100644 --- a/buildtools/lib/widgets/runoptionswidgetbase.ui +++ b/buildtools/lib/widgets/runoptionswidgetbase.ui @@ -235,9 +235,9 @@ <tabstop>startinterminal_box</tabstop> <tabstop>autocompile_box</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>mainProgramChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/lib/widgets/subclassesdlg.h b/buildtools/lib/widgets/subclassesdlg.h index 373ce267..75ced25b 100644 --- a/buildtools/lib/widgets/subclassesdlg.h +++ b/buildtools/lib/widgets/subclassesdlg.h @@ -27,7 +27,7 @@ Subclass creation dialog. */ class SubclassesDlg : public SubclassesDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui index a87cbd34..22873790 100644 --- a/buildtools/lib/widgets/subclassesdlgbase.ui +++ b/buildtools/lib/widgets/subclassesdlgbase.ui @@ -205,12 +205,12 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">changeCurrentURL(const TQString &str)</slot> <slot access="protected">removeRelation()</slot> <slot access="protected">newRelation()</slot> <slot access="protected">currentRelationChanged(TQListBoxItem *item)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/pascal/pascalglobaloptionsdlg.h b/buildtools/pascal/pascalglobaloptionsdlg.h index 5e6e3d23..18be3ebc 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.h +++ b/buildtools/pascal/pascalglobaloptionsdlg.h @@ -21,7 +21,7 @@ class PascalProjectPart; class PascalGlobalOptionsDlg : public PascalProjectOptionsDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/pascal/pascalproject_optionsdlgbase.ui b/buildtools/pascal/pascalproject_optionsdlgbase.ui index a6f9321c..3ec7662d 100644 --- a/buildtools/pascal/pascalproject_optionsdlgbase.ui +++ b/buildtools/pascal/pascalproject_optionsdlgbase.ui @@ -450,7 +450,7 @@ <tabstop>addconfig_button</tabstop> <tabstop>removeconfig_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">compiler_box_activated(const TQString&)</slot> <slot access="protected">addconfig_button_clicked()</slot> <slot access="protected">configRemoved()</slot> @@ -460,7 +460,7 @@ <slot access="protected">configAdded()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">setDefaultOptions()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index 98127f0a..63f5e42d 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -49,34 +49,34 @@ #include <kdevplugininfo.h> typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory; -static const KDevPluginInfo data("kdevpascalproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) ) +static const KDevPluginInfo pluginData("kdevpascalproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( pluginData ) ) PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" ) + :KDevBuildTool(&pluginData, parent, name ? name : "PascalProjectPart" ) { setInstance(PascalProjectFactory::instance()); setXMLFile("kdevpascalproject.rc"); 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/pascal/pascalproject_part.h b/buildtools/pascal/pascalproject_part.h index 54d09b2e..55d98c96 100644 --- a/buildtools/pascal/pascalproject_part.h +++ b/buildtools/pascal/pascalproject_part.h @@ -21,7 +21,7 @@ class KDevCompilerOptions; class PascalProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: PascalProjectPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/buildtools/pascal/pascalproject_widget.h b/buildtools/pascal/pascalproject_widget.h index 252c7500..1d94652a 100644 --- a/buildtools/pascal/pascalproject_widget.h +++ b/buildtools/pascal/pascalproject_widget.h @@ -12,7 +12,7 @@ class PascalProjectPart; class PascalProjectWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp index 9c7c2518..1b96d072 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.cpp +++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp @@ -29,7 +29,7 @@ PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl) : PascalProjectOptionsDlgBase(parent,name, fl), m_part(part) { - config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'"); diff --git a/buildtools/pascal/pascalprojectoptionsdlg.h b/buildtools/pascal/pascalprojectoptionsdlg.h index acedb14d..78698a45 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.h +++ b/buildtools/pascal/pascalprojectoptionsdlg.h @@ -20,7 +20,7 @@ class KDevCompilerOptions; class PascalProjectOptionsDlg : public PascalProjectOptionsDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index 815a6ef7..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)); @@ -109,6 +109,3 @@ QMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( ) #include "choosesubprojectdlg.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index e59ed6b9..e9daf2e1 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -33,7 +33,7 @@ private: class ChooseSubprojectDlg : public ChooseSubprojectDlgBase { - Q_OBJECT + TQ_OBJECT public: @@ -61,5 +61,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index 854966b3..cd595be1 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp index dfb8683a..abdd9e5b 100644 --- a/buildtools/qmake/createscopedlg.cpp +++ b/buildtools/qmake/createscopedlg.cpp @@ -96,5 +96,3 @@ void CreateScopeDlg::accept() } #include "createscopedlg.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h index 6596c021..30f72b59 100644 --- a/buildtools/qmake/createscopedlg.h +++ b/buildtools/qmake/createscopedlg.h @@ -19,7 +19,7 @@ class TrollProjectWigdet; class CreateScopeDlg : public CreateScopeDlgBase { - Q_OBJECT + TQ_OBJECT public: @@ -41,6 +41,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp index 9a5fbb1d..37aa79ea 100644 --- a/buildtools/qmake/disablesubprojectdlg.cpp +++ b/buildtools/qmake/disablesubprojectdlg.cpp @@ -45,6 +45,3 @@ TQStringList DisableSubprojectDlg::selectedProjects() } #include "disablesubprojectdlg.moc" - - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/disablesubprojectdlg.h b/buildtools/qmake/disablesubprojectdlg.h index 5ca64451..aa876866 100644 --- a/buildtools/qmake/disablesubprojectdlg.h +++ b/buildtools/qmake/disablesubprojectdlg.h @@ -16,7 +16,7 @@ class DisableSubprojectDlg : public DisableSubprojectDlgBase { - Q_OBJECT + TQ_OBJECT public: @@ -38,6 +38,3 @@ protected slots: }; #endif - - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index 2adc1544..1d522c84 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -90,9 +90,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui index 84d552b2..fde51b13 100644 --- a/buildtools/qmake/newwidgetdlgbase.ui +++ b/buildtools/qmake/newwidgetdlgbase.ui @@ -216,10 +216,10 @@ <tabstop>okayButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>subclassingPressed()</slot> <slot>templateSelChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index e2ebe9a2..dd86a06a 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -106,7 +106,7 @@ ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollPro prjWidget = _prjWidget; // m_projectConfiguration = conf; m_targetLibraryVersion->setValidator( new TQRegExpValidator( - TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), TQT_TQOBJECT(this) ) ); + TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), this ) ); customVariables->setSortColumn(0); customVariables->setSortOrder(TQt::Ascending); mocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); @@ -327,89 +327,6 @@ void ProjectConfigurationDlg::updateProjectConfiguration() else myProjectItem->removeValue( "CONFIG", "windows" ); - //TQt4 libs - if ( prjWidget->m_part->isTQt4Project() ) - { - if ( checkDebugReleaseMode->isChecked() ) - myProjectItem->addValue( "CONFIG", "debug_and_release" ); - else - myProjectItem->removeValue( "CONFIG", "debug_and_release" ); - - if ( checkTestlib->isChecked() ) - myProjectItem->addValue( "CONFIG", "qtestlib" ); - else - myProjectItem->removeValue( "CONFIG", "qtestlib" ); - if ( checkAssistant->isChecked() ) - myProjectItem->addValue( "CONFIG", "assistant" ); - else - myProjectItem->removeValue( "CONFIG", "assistant" ); - if ( checkUiTools->isChecked() ) - myProjectItem->addValue( "CONFIG", "uitools" ); - else - myProjectItem->removeValue( "CONFIG", "uitools" ); - if ( checkQDBus->isChecked() ) - myProjectItem->addValue( "CONFIG", "dbus" ); - else - myProjectItem->removeValue( "CONFIG", "dbus" ); - if ( checkBuildAll->isChecked() ) - myProjectItem->addValue( "CONFIG", "build_all" ); - else - myProjectItem->removeValue( "CONFIG", "build_all" ); - if ( checkQtHelp->isChecked() ) - myProjectItem->addValue( "CONFIG", "help" ); - else - myProjectItem->removeValue( "CONFIG", "help" ); - - if ( checkQt4Core->isChecked() ) - myProjectItem->addValue( "QT", "core" ); - else - myProjectItem->removeValue( "QT", "core" ); - if ( checkQt4Gui->isChecked() ) - myProjectItem->addValue( "QT", "gui" ); - else - myProjectItem->removeValue( "QT", "gui" ); - if ( checkQt4SQL->isChecked() ) - myProjectItem->addValue( "QT", "sql" ); - else - myProjectItem->removeValue( "QT", "sql" ); - if ( checkQt4SVG->isChecked() ) - myProjectItem->addValue( "QT", "svg" ); - else - myProjectItem->removeValue( "QT", "svg" ); - if ( checkQt4XML->isChecked() ) - myProjectItem->addValue( "QT", "xml" ); - else - myProjectItem->removeValue( "QT", "xml" ); - if ( checkQt4Network->isChecked() ) - myProjectItem->addValue( "QT", "network" ); - else - myProjectItem->removeValue( "QT", "network" ); - if ( checkQt3Support->isChecked() ) - myProjectItem->addValue( "QT", "qt3support" ); - else - myProjectItem->removeValue( "QT", "qt3support" ); - if ( checkQt4OpenGL->isChecked() ) - myProjectItem->addValue( "QT", "opengl" ); - else - myProjectItem->removeValue( "QT", "opengl" ); - if ( checkQtScript->isChecked() ) - myProjectItem->addValue( "QT", "script" ); - else - myProjectItem->removeValue( "QT", "script" ); - if ( checkQtWebKit->isChecked() ) - myProjectItem->addValue( "QT", "webkit" ); - else - myProjectItem->removeValue( "QT", "webkit" ); - if ( checkQtXmlPatterns->isChecked() ) - myProjectItem->addValue( "QT", "xmlpatterns" ); - else - myProjectItem->removeValue( "QT", "xmlpatterns" ); - if ( checkPhonon->isChecked() ) - myProjectItem->addValue( "QT", "phonon" ); - else - myProjectItem->removeValue( "QT", "phonon" ); - } - TQStringList confValues = myProjectItem->scope->variableValues( "CONFIG" ); TQStringList extraValues = TQStringList::split( " ", editConfigExtra->text() ); for ( TQStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it ) @@ -667,8 +584,6 @@ void ProjectConfigurationDlg::updateControls() { sharedRadio->setChecked( true ); checkPlugin->setEnabled( true ); - if( prjWidget->m_part->isTQt4Project() ) - checkDesigner->setEnabled( true ); m_targetLibraryVersion->setText( myProjectItem->scope->variableValues( "VERSION" ).front() ); } else @@ -805,92 +720,6 @@ void ProjectConfigurationDlg::updateControls() else checkWindows->setChecked( false ); - //TQt4 libs - if ( prjWidget->m_part->isTQt4Project() ) - { - - if ( configValues.findIndex( "assistant" ) != -1 ) - checkAssistant->setChecked( true ); - else - checkAssistant->setChecked( false ); - if ( configValues.findIndex( "qtestlib" ) != -1 ) - checkTestlib->setChecked( true ); - else - checkTestlib->setChecked( false ); - if ( configValues.findIndex( "uitools" ) != -1 ) - checkUiTools->setChecked( true ); - else - checkUiTools->setChecked( false ); - if ( configValues.findIndex( "dbus" ) != -1 ) - checkQDBus->setChecked( true ); - else - checkQDBus->setChecked( false ); - if ( configValues.findIndex( "build_all" ) != -1 ) - checkBuildAll->setChecked( true ); - else - checkBuildAll->setChecked( false ); - if ( configValues.findIndex( "help" ) != -1 ) - checkQtHelp->setChecked( true ); - else - checkQtHelp->setChecked( false ); - - TQStringList qtLibs = myProjectItem->scope->variableValues( "QT" ); - if ( qtLibs.findIndex( "core" ) != -1 ) - checkQt4Core->setChecked( true ); - else - checkQt4Core->setChecked( false ); - if ( qtLibs.findIndex( "gui" ) != -1 ) - checkQt4Gui->setChecked( true ); - else - checkQt4Gui->setChecked( false ); - if ( qtLibs.findIndex( "sql" ) != -1 ) - checkQt4SQL->setChecked( true ); - else - checkQt4SQL->setChecked( false ); - if ( qtLibs.findIndex( "xml" ) != -1 ) - checkQt4XML->setChecked( true ); - else - checkQt4XML->setChecked( false ); - if ( qtLibs.findIndex( "network" ) != -1 ) - checkQt4Network->setChecked( true ); - else - checkQt4Network->setChecked( false ); - if ( qtLibs.findIndex( "svg" ) != -1 ) - checkQt4SVG->setChecked( true ); - else - checkQt4SVG->setChecked( false ); - if ( qtLibs.findIndex( "opengl" ) != -1 ) - checkQt4OpenGL->setChecked( true ); - else - checkQt4OpenGL->setChecked( false ); - if ( qtLibs.findIndex( "qt3support" ) != -1 ) - checkQt3Support->setChecked( true ); - else - checkQt3Support->setChecked( false ); - if ( qtLibs.findIndex( "script" ) != -1 ) - checkQtScript->setChecked( true ); - else - checkQtScript->setChecked( false ); - if ( qtLibs.findIndex( "phonon" ) != -1 ) - checkPhonon->setChecked( true ); - else - checkPhonon->setChecked( false ); - if ( qtLibs.findIndex( "webkit" ) != -1 ) - checkQtWebKit->setChecked( true ); - else - checkQtWebKit->setChecked( false ); - if ( qtLibs.findIndex( "xmlpatterns" ) != -1 ) - checkQtXmlPatterns->setChecked( true ); - else - checkQtXmlPatterns->setChecked( false ); - - checkDebugReleaseMode->setEnabled( true ); - checkBuildAll->setEnabled( true ); - groupQt4Libs->setEnabled( checkQt->isChecked() ); - rccdir_url->setEnabled( true ); - rccdir_label->setEnabled( true ); - } - //fill the custom config edit TQStringList extraValues; for ( TQStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it ) @@ -1882,10 +1711,6 @@ void ProjectConfigurationDlg::groupLibrariesChanged( int ) checkPlugin->setEnabled( true ); checkDesigner->setEnabled( checkPlugin->isChecked() ); } - else if ( checkPlugin->isChecked() && prjWidget->m_part->isTQt4Project() ) - { - checkDesigner->setEnabled( true ); - } else { checkDesigner->setEnabled( false ); @@ -1978,14 +1803,6 @@ void ProjectConfigurationDlg::groupTemplateChanged( int ) void ProjectConfigurationDlg::groupRequirementsChanged( int ) { - if ( checkQt->isChecked() && prjWidget->m_part->isTQt4Project() ) - { - groupQt4Libs->setEnabled( true ); - } - else - { - groupQt4Libs->setEnabled( false ); - } activateApply( 0 ); } @@ -2170,5 +1987,3 @@ void ProjectConfigurationDlg::customVarChanged() } activateApply( 0 ); } - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index 7452e9e6..c4c9740b 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -141,5 +141,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 686240fe..d809814d 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -415,9 +415,6 @@ <property name="text"> <string>Debug && Release</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Set project to be built in debug_and_release mode</string> </property> @@ -579,9 +576,6 @@ <property name="text"> <string>Console</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Check to build a win32 console app</string> </property> @@ -590,164 +584,6 @@ </widget> <widget class="TQButtonGroup"> <property name="name"> - <cstring>groupQt4Libs</cstring> - </property> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="title"> - <string>Qt4 Libraries</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQCheckBox" row="1" column="0"> - <property name="name"> - <cstring>checkQt4Gui</cstring> - </property> - <property name="text"> - <string>Gui</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - <widget class="TQCheckBox" row="2" column="0"> - <property name="name"> - <cstring>checkQt4XML</cstring> - </property> - <property name="text"> - <string>XML</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="0"> - <property name="name"> - <cstring>checkQt4Network</cstring> - </property> - <property name="text"> - <string>Network</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="0"> - <property name="name"> - <cstring>checkQt4Core</cstring> - </property> - <property name="text"> - <string>Core</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="1"> - <property name="name"> - <cstring>checkQt4OpenGL</cstring> - </property> - <property name="text"> - <string>OpenGL</string> - </property> - </widget> - <widget class="TQCheckBox" row="1" column="1"> - <property name="name"> - <cstring>checkUiTools</cstring> - </property> - <property name="text"> - <string>QtUiTools</string> - </property> - </widget> - <widget class="TQCheckBox" row="2" column="1"> - <property name="name"> - <cstring>checkQt4SQL</cstring> - </property> - <property name="text"> - <string>SQL</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="1"> - <property name="name"> - <cstring>checkQt4SVG</cstring> - </property> - <property name="text"> - <string>SVG</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="2"> - <property name="name"> - <cstring>checkTestlib</cstring> - </property> - <property name="text"> - <string>QtTest</string> - </property> - </widget> - <widget class="TQCheckBox" row="1" column="2"> - <property name="name"> - <cstring>checkQt3Support</cstring> - </property> - <property name="text"> - <string>Qt3 Support</string> - </property> - </widget> - <widget class="TQCheckBox" row="2" column="2"> - <property name="name"> - <cstring>checkQDBus</cstring> - </property> - <property name="text"> - <string>QDBus (Qt4.2)</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="2"> - <property name="name"> - <cstring>checkAssistant</cstring> - </property> - <property name="text"> - <string>QtAssistant</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="3"> - <property name="name"> - <cstring>checkQtScript</cstring> - </property> - <property name="text"> - <string>QtScript (Qt4.3)</string> - </property> - </widget> - <widget class="TQCheckBox" row="1" column="3"> - <property name="name"> - <cstring>checkQtWebKit</cstring> - </property> - <property name="text"> - <string>QtWebKit (Qt4.4)</string> - </property> - </widget> - <widget class="TQCheckBox" row="2" column="3"> - <property name="name"> - <cstring>checkQtXmlPatterns</cstring> - </property> - <property name="text"> - <string>QtXmlPatterns (Qt4.4)</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="3"> - <property name="name"> - <cstring>checkPhonon</cstring> - </property> - <property name="text"> - <string>Phonon (Qt4.4)</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="4"> - <property name="name"> - <cstring>checkQtHelp</cstring> - </property> - <property name="text"> - <string>QtHelp (Qt4.4)</string> - </property> - </widget> - </grid> - </widget> - <widget class="TQButtonGroup"> - <property name="name"> <cstring>groupLibraries</cstring> </property> <property name="title"> @@ -849,9 +685,6 @@ <property name="text"> <string>Designer Plugin</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> @@ -2326,12 +2159,6 @@ <slot>activateApply(int)</slot> </connection> <connection> - <sender>groupQt4Libs</sender> - <signal>clicked(int)</signal> - <receiver>ProjectConfigurationDlgBase</receiver> - <slot>activateApply(int)</slot> - </connection> - <connection> <sender>insideinc_listview</sender> <signal>clicked(TQListViewItem*)</signal> <receiver>ProjectConfigurationDlgBase</receiver> @@ -2706,23 +2533,6 @@ <tabstop>checkConsole</tabstop> <tabstop>checkPCH</tabstop> <tabstop>editConfigExtra</tabstop> - <tabstop>checkQt4Core</tabstop> - <tabstop>checkQt4Gui</tabstop> - <tabstop>checkQt4XML</tabstop> - <tabstop>checkQt4Network</tabstop> - <tabstop>checkQt4OpenGL</tabstop> - <tabstop>checkUiTools</tabstop> - <tabstop>checkQt4SQL</tabstop> - <tabstop>checkQt4SVG</tabstop> - <tabstop>checkTestlib</tabstop> - <tabstop>checkQt3Support</tabstop> - <tabstop>checkQDBus</tabstop> - <tabstop>checkAssistant</tabstop> - <tabstop>checkQtScript</tabstop> - <tabstop>checkQtWebKit</tabstop> - <tabstop>checkQtXmlPatterns</tabstop> - <tabstop>checkPhonon</tabstop> - <tabstop>checkQtHelp</tabstop> <tabstop>staticRadio</tabstop> <tabstop>checkPlugin</tabstop> <tabstop>checkLibtool</tabstop> @@ -2786,7 +2596,7 @@ <tabstop>buttonApply</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>updateProjectConfiguration()</slot> <slot>buildorderMoveUpClicked()</slot> <slot>buildorderMoveDownClicked()</slot> @@ -2830,7 +2640,7 @@ <slot>activateApply( const TQString & )</slot> <slot>activateApply( TQListViewItem * )</slot> <slot>customVarChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp index 8c34c34b..fdbcad64 100644 --- a/buildtools/qmake/qmakedefaultopts.cpp +++ b/buildtools/qmake/qmakedefaultopts.cpp @@ -87,5 +87,3 @@ const TQStringList& TQMakeDefaultOpts::variables() const { return m_keys; } - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakedefaultopts.h b/buildtools/qmake/qmakedefaultopts.h index 1b38d80c..575f832f 100644 --- a/buildtools/qmake/qmakedefaultopts.h +++ b/buildtools/qmake/qmakedefaultopts.h @@ -44,6 +44,3 @@ private: }; #endif - - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakeoptionswidget.cpp b/buildtools/qmake/qmakeoptionswidget.cpp index c2f4cfdd..3aafb3a0 100644 --- a/buildtools/qmake/qmakeoptionswidget.cpp +++ b/buildtools/qmake/qmakeoptionswidget.cpp @@ -59,5 +59,3 @@ void QMakeOptionsWidget::accept() } #include "qmakeoptionswidget.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakeoptionswidget.h b/buildtools/qmake/qmakeoptionswidget.h index be1cc534..c64d9efb 100644 --- a/buildtools/qmake/qmakeoptionswidget.h +++ b/buildtools/qmake/qmakeoptionswidget.h @@ -18,7 +18,7 @@ class QMakeOptionsWidget : public QMakeOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup, @@ -34,7 +34,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - - diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index 496adad8..ec0cd2af 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -649,16 +649,6 @@ void QMakeScopeItem::buildGroups() item->files.append( createFileItem( *it ) ); } - if ( scope->isTQt4Project() ) - { - values = scope->variableValues( "RESOURCES" ); - item = createGroupItem( GroupItem::Resources, "RESOURCES", this ); - groups.insert( item->groupType, item ); - for ( it = values.begin(); it != values.end(); ++it ) - { - item->files.append( createFileItem( *it ) ); - } - } values = scope->variableValues( "IMAGES" ); item = createGroupItem( GroupItem::Images, "IMAGES", this ); groups.insert( item->groupType, item ); @@ -925,5 +915,3 @@ TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath ) kdDebug(9024) << "Running getLibInfo for" << scope->projectName() << "|" << map << endl; return result; } - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakescopeitem.h b/buildtools/qmake/qmakescopeitem.h index 2e275511..09b3bd06 100644 --- a/buildtools/qmake/qmakescopeitem.h +++ b/buildtools/qmake/qmakescopeitem.h @@ -124,5 +124,3 @@ private: #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp index 6cf86bf8..4e2b079a 100644 --- a/buildtools/qmake/scope.cpp +++ b/buildtools/qmake/scope.cpp @@ -514,10 +514,7 @@ Scope* Scope::createSimpleScope( const TQString& scopename ) ast->setDepth( m_root->depth() ); m_root->addChildAST( ast ); m_root->addChildAST( new TQMake::NewLineAST() ); - /* We can't unconditionally add the scope name to CONFIG, scope might be win32 which may only be in CONFIG under windows. - if ( m_part->isTQt4Project() ) - addToPlusOp( "CONFIG", TQStringList( scopename ) ); - */ + // We can't unconditionally add the scope name to CONFIG, scope might be win32 which may only be in CONFIG under windows. Scope* simpleScope = new Scope( m_environment, getNextScopeNum(), this, ast, m_defaultopts, m_part ); if( simpleScope->scopeType() != Scope::InvalidScope ) @@ -1182,11 +1179,6 @@ TQStringList Scope::cleanStringList(const TQStringList& list) const return result; } -bool Scope::isTQt4Project() const -{ - return m_part->isTQt4Project(); -} - void Scope::reloadProject() { if ( !m_root || !m_root->isProject() ) @@ -1426,16 +1418,6 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res } } - if ( isTQt4Project() ) - { - values = variableValues( "RESOURCES" ,false, false ); - for ( it = values.begin(); it != values.end(); ++it ) - { - file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; - file = resolveVariables( file ); - res.insert( TQDir::cleanDirPath( file ) ); - } - } values = variableValues( "IMAGES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { @@ -1481,22 +1463,12 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res file = resolveVariables( file ); res.insert( TQDir::cleanDirPath( file ) ); - if( !m_part->isTQt4Project()) - { - header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h"; - if( TQFileInfo(header).exists() ) - res.insert( TQDir::cleanDirPath( header ) ); - header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".cpp"; - if( TQFileInfo(header).exists() ) - res.insert( TQDir::cleanDirPath( header ) ); - } - else - { - header = projectDir()+TQString(TQChar(TQDir::separator())) + "ui_" +*it; - header.replace(TQRegExp("\\.ui$"),".h"); - if( TQFileInfo(header).exists() ) - res.insert( TQDir::cleanDirPath( header ) ); - } + header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h"; + if( TQFileInfo(header).exists() ) + res.insert( TQDir::cleanDirPath( header ) ); + header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".cpp"; + if( TQFileInfo(header).exists() ) + res.insert( TQDir::cleanDirPath( header ) ); } } @@ -1706,5 +1678,3 @@ TQString Scope::PrintAST::getIndent() return ind; } #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/scope.h b/buildtools/qmake/scope.h index 98519bdf..f50d4d99 100644 --- a/buildtools/qmake/scope.h +++ b/buildtools/qmake/scope.h @@ -125,9 +125,6 @@ public: /* deletes the subproject (including the subdir if deleteSubdir is true) */ bool deleteSubProject( unsigned int, bool deleteSubdir ); - /* find out wether the project is TQt4 or TQt3 */ - bool isTQt4Project() const ; - /* Provide a Map of Custom variables */ const TQMap<unsigned int, TQMap<TQString, TQString> > customVariables() const; @@ -303,6 +300,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/qmake/trolllistview.h b/buildtools/qmake/trolllistview.h index 8c2c021f..13c0565d 100644 --- a/buildtools/qmake/trolllistview.h +++ b/buildtools/qmake/trolllistview.h @@ -26,7 +26,7 @@ class TrollListView : public TDEListView { -Q_OBJECT +TQ_OBJECT public: TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name = 0); diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 6d92d03b..de9b7f6e 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -57,11 +57,11 @@ #include <urlutil.h> typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory; -static const KDevPluginInfo data("kdevtrollproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) +static const KDevPluginInfo pluginData("kdevtrollproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( pluginData ) ) TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) - : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") + : KDevBuildTool(&pluginData, parent, name ? name : "TrollProjectPart") { setInstance(TrollProjectFactory::instance()); @@ -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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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", ""); @@ -255,7 +255,7 @@ TQString TrollProjectPart::makeEnvironment() environstr += " "; } - if( !hasTQtDir && !isTQt4Project() && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) + if( !hasTQtDir && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { environstr += TQString( "TQTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " ); } @@ -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()) ); } @@ -291,7 +291,7 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj mainWindow()->statusBar()->message( i18n("Loading Project...") ); TQString defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); - if( !isTQt4Project() && ( defaultTQtDir.isEmpty() || !isValidTQtDir( defaultTQtDir ) ) ) + if( defaultTQtDir.isEmpty() || !isValidTQtDir( defaultTQtDir ) ) { bool doask = true; while( doask ) @@ -705,11 +705,6 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive) cmdline = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", "")+" "; } - if(isTQt4Project() && recursive) - { - cmdline += " -recursive "; - } - //TQString cmdline = TQString::fromLatin1( isTMakeProject() ? "tmake " : "qmake " ); // cmdline += fi.baseName() + ".pro"; TQDir d(dir); @@ -798,18 +793,15 @@ bool TrollProjectPart::isValidTQtDir( const TQString& path ) const TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+ "include"+TQString( TQChar( TQDir::separator() ) )+ "tqt.h" ); - return ( isTQt4Project() || ( !isTQt4Project() && inc.exists() ) ); + return ( inc.exists() ); } void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const { - if( !isTQt4Project() ) - { - TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); - if( !m_defaultTQtDir.isEmpty() ) - dirs << (m_defaultTQtDir + TQString( TQChar( TQDir::separator() ) ) + "bin" ); - dirs << ( ::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" ); - } + TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); + if( !m_defaultTQtDir.isEmpty() ) + dirs << (m_defaultTQtDir + TQString( TQChar( TQDir::separator() ) ) + "bin" ); + dirs << ( ::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" ); TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; TQString binpath = TQDir::rootDirPath() + "bin"; @@ -850,8 +842,7 @@ bool TrollProjectPart::isExecutable( const TQString& path ) const TQString TrollProjectPart::findTQtDir() { TQStringList qtdirs; - if( !isTQt4Project() ) - qtdirs.push_back( ::getenv("TQTDIR") ); + qtdirs.push_back( ::getenv("TQTDIR") ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); @@ -909,11 +900,6 @@ TQStringList TrollProjectPart::distFiles() const return sourceList + files; } -bool TrollProjectPart::isTQt4Project() const -{ - return ( DomUtil::readIntEntry( *projectDom(), "kdevcppsupport/qt/version", 3 ) == 4 ); -} - KDirWatch* TrollProjectPart::dirWatch() { return m_dirWatch; @@ -925,7 +911,3 @@ void TrollProjectPart::slotBuild() } #include "trollprojectpart.moc" - -//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - - diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h index e36ef202..1516c477 100644 --- a/buildtools/qmake/trollprojectpart.h +++ b/buildtools/qmake/trollprojectpart.h @@ -30,7 +30,7 @@ class TQMakeDefaultOpts; class TrollProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: @@ -38,7 +38,6 @@ public: ~TrollProjectPart(); bool isTMakeProject() const { return m_tmakeProject; } - bool isTQt4Project() const; bool isDirty(); KDirWatch* dirWatch(); virtual Options options() const; diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 79077bac..919ca69e 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -84,7 +84,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) m_rootScope ( 0 ), m_part ( part ), m_configDlg( 0 ), m_filesCached(false) { - TQSplitter * splitter = new TQSplitter(Qt::Vertical, this ); + TQSplitter * splitter = new TQSplitter(TQt::Vertical, this ); ////////////////// // PROJECT VIEW // @@ -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&) ) ); } @@ -1301,7 +1301,7 @@ void TrollProjectWidget::slotAddFiles() case AddFilesDialog::Link: { // Link selected files to current subproject folder - TDEProcess *proc = new TDEProcess( TQT_TQOBJECT(this) ); + TDEProcess *proc = new TDEProcess( this ); *proc << "ln"; *proc << "-s"; *proc << files[ i ]; @@ -1416,10 +1416,7 @@ void TrollProjectWidget::slotNewFile() fcext = "h"; break; case GroupItem::Forms: - if ( !m_part->isTQt4Project() ) - fcext = "ui-widget"; - else - fcext = "ui-widget-qt4"; + fcext = "ui-widget"; break; case GroupItem::Translations: fcext = "ts"; @@ -1645,7 +1642,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * case AddFilesDialog::Link: { // Link selected files to current subproject folder - TDEProcess *proc = new TDEProcess( TQT_TQOBJECT(this) ); + TDEProcess *proc = new TDEProcess( this ); *proc << "ln"; *proc << "-s"; *proc << files[ i ]; @@ -1694,10 +1691,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * fcext = "h"; break; case GroupItem::Forms: - if ( !m_part->isTQt4Project() ) - fcext = "ui-widget"; - else - fcext = "ui-widget-qt4"; + fcext = "ui-widget"; break; case GroupItem::Translations: fcext = "ts"; @@ -1782,11 +1776,8 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * popup.setWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. " "It allows to create a subclass from the class defined in .ui file. " "There is also possibility to implement slots and functions defined in the base class." ) ); - if ( !m_part->isTQt4Project() ) - { - idViewUIH = popup.insertItem( SmallIconSet( "qmake_ui_h" ), i18n( "Open ui.h File" ) ); - popup.setWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) ); - } + idViewUIH = popup.insertItem( SmallIconSet( "qmake_ui_h" ), i18n( "Open ui.h File" ) ); + popup.setWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) ); idUISubclasses = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "List of Subclasses..." ) ); popup.setWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. " "There is possibility to add or remove subclasses from the list." ) ); @@ -2340,21 +2331,15 @@ void TrollProjectWidget::setLastFocusedView( TrollProjectView view ) void TrollProjectWidget::runTQMakeRecursive( QMakeScopeItem* proj ) { - if( m_part->isTQt4Project() ) + if ( proj->scope->scopeType() == Scope::ProjectScope ) { - m_part->startTQMakeCommand( proj->scope->projectDir(), true ); - }else + m_part->startTQMakeCommand( proj->scope->projectDir() ); + } + QMakeScopeItem* item = static_cast<QMakeScopeItem*>( proj->firstChild() ); + while ( item ) { - if ( proj->scope->scopeType() == Scope::ProjectScope ) - { - m_part->startTQMakeCommand( proj->scope->projectDir() ); - } - QMakeScopeItem* item = static_cast<QMakeScopeItem*>( proj->firstChild() ); - while ( item ) - { - runTQMakeRecursive( item ); - item = static_cast<QMakeScopeItem*>( item->nextSibling() ); - } + runTQMakeRecursive( item ); + item = static_cast<QMakeScopeItem*>( item->nextSibling() ); } } @@ -2533,7 +2518,7 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const map[(*it).first] = (*it).second; } - if( !hasTQtDir && !m_part->isTQt4Project() && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) + if( !hasTQtDir && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { map["TQTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", ""); map["PATH"] = map["PATH"].prepend( DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "") +"/bin" ); @@ -2542,6 +2527,3 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const } #include "trollprojectwidget.moc" - -//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h index dac889c9..7821d075 100644 --- a/buildtools/qmake/trollprojectwidget.h +++ b/buildtools/qmake/trollprojectwidget.h @@ -43,7 +43,7 @@ class ProjectConfigurationDlg; class TrollProjectWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT public: @@ -215,5 +215,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on 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/scriptnewfiledlg.h b/buildtools/script/scriptnewfiledlg.h index fa054091..9c204894 100644 --- a/buildtools/script/scriptnewfiledlg.h +++ b/buildtools/script/scriptnewfiledlg.h @@ -21,7 +21,7 @@ class ScriptProjectPart; class ScriptNewFileDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h index 8f136d75..04a7e742 100644 --- a/buildtools/script/scriptoptionswidget.h +++ b/buildtools/script/scriptoptionswidget.h @@ -19,7 +19,7 @@ class KDevPlugin; class ScriptOptionsWidget : public ScriptOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index 8f6b5fb4..600ce07d 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -37,11 +37,11 @@ #include "kdevplugininfo.h" typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory; -static const KDevPluginInfo data("kdevscriptproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) ) +static const KDevPluginInfo pluginData("kdevscriptproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( pluginData ) ) ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &) - : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") + : KDevBuildTool(&pluginData, parent, name ? name : "ScriptProjectPart") { setInstance(ScriptProjectFactory::instance()); @@ -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/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h index 92087991..8a06fa81 100644 --- a/buildtools/script/scriptprojectpart.h +++ b/buildtools/script/scriptprojectpart.h @@ -24,7 +24,7 @@ class ScriptProjectWidget; class ScriptProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: |