diff options
710 files changed, 11299 insertions, 8221 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 09c4087c..47f3ce7d 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.5 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# diff --git a/CMakeLists.txt b/CMakeLists.txt index 0936e219..fb66b0c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,12 @@ # ################################################# -cmake_minimum_required( VERSION 3.5 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### @@ -34,11 +39,6 @@ include( FindPkgConfig ) include( TDEMacros ) -##### set version number ######################## - -tde_set_project_version( ) - - ##### setup install paths ####################### include( TDESetupPaths ) @@ -47,14 +47,8 @@ tde_setup_paths( ) ##### add apidox targets ############ -if( "${CMAKE_VERSION}" VERSION_LESS "3.1" ) - set( CMAKE_ENV "env" ) -else() - set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" ) -endif() - add_custom_target( apidox - COMMAND ${CMAKE_ENV} + COMMAND ${CMAKE_COMMAND} -E env "TQTDOCDIR=/usr/share/tqt3/doc/html" "DOXDATA=${HTML_INSTALL_DIR}/en/common" ${CMAKE_SOURCE_DIR}/admin/doxygen.sh @@ -171,7 +165,7 @@ endif( NOT DEFINED FULL_MAKE_COMMAND ) if( NOT DEFINED MAKE_COMMAND ) - GET_FILENAME_COMPONENT( MAKE_COMMAND "${FULL_MAKE_COMMAND}" NAME ) + get_filename_component( MAKE_COMMAND "${FULL_MAKE_COMMAND}" NAME ) endif( NOT DEFINED MAKE_COMMAND ) @@ -186,7 +180,6 @@ if( NOT WITH_DEPRECATION ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated" ) endif( ) -set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include tqt.h" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) diff --git a/admin b/admin -Subproject 3bdc9fd55ff86f033cc1ffab9178d8453fa1ab2 +Subproject 4185112a621d8c5bc88984b117f434c9560e2cc 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 f778c9b2..53086236 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -23,7 +23,7 @@ #include <kdialogbase.h> #include <tdemessagebox.h> #include <klibloader.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kservice.h> #include <tdeconfig.h> @@ -54,17 +54,17 @@ AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStrin TDEAction *action; action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, - this, TQT_SLOT(slotBuild()), + this, TQ_SLOT(slotBuild()), actionCollection(), "build_build" ); action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_execute" ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); // m_widget = new AdaProjectWidget(this); @@ -374,8 +374,8 @@ void AdaProjectPart::projectConfigWidget( KDialogBase * dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Ada Compiler")); AdaProjectOptionsDlg *w = new AdaProjectOptionsDlg(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(loadProjectConfig()) ); } void AdaProjectPart::loadProjectConfig( ) @@ -405,7 +405,7 @@ void AdaProjectPart::configWidget( KDialogBase * dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Ada Compiler")); AdaGlobalOptionsDlg *w = new AdaGlobalOptionsDlg(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) diff --git a/buildtools/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/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index f53357da..3c71e490 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -53,7 +53,7 @@ AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStrin setXMLFile("kdevantproject.rc"); m_buildProjectAction = new TDEAction(i18n("&Build Project"), "make_tdevelop", Key_F8, - this, TQT_SLOT(slotBuild()), + this, TQ_SLOT(slotBuild()), actionCollection(), "build_build" ); m_buildProjectAction->setToolTip(i18n("Build project")); m_buildProjectAction->setWhatsThis(i18n("<b>Build project</b><p>Executes <b>ant dist</b> command to build the project.")); @@ -65,9 +65,9 @@ AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStrin m_targetMenu = menu->popupMenu(); - connect(m_targetMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTargetMenuActivated(int))); - connect(core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(m_targetMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTargetMenuActivated(int))); + connect(core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(projectConfigWidget(KDialogBase*))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); m_antOptionsWidget = 0; } @@ -497,7 +497,7 @@ void AntProjectPart::projectConfigWidget(KDialogBase *dlg) ++i; } - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(optionsAccepted())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(optionsAccepted())); vbox = dlg->addVBoxPage(i18n("Classpath")); m_classPathWidget = new ClassPathWidget(vbox); @@ -563,13 +563,13 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context) if (inProject) { int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr), - this, TQT_SLOT(slotRemoveFromProject()) ); + this, TQ_SLOT(slotRemoveFromProject()) ); popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project.")); } else { int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr), - this, TQT_SLOT(slotAddToProject()) ); + this, TQ_SLOT(slotAddToProject()) ); popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project.")); } } diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui index e7495907..61e0d105 100644 --- a/buildtools/autotools/addapplicationdlgbase.ui +++ b/buildtools/autotools/addapplicationdlgbase.ui @@ -539,11 +539,11 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">addTypeClicked()</slot> <slot access="protected">iconClicked()</slot> <slot access="protected">removeTypeClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index efdff38f..72aff0a7 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -20,7 +20,7 @@ #include <kprogress.h> #include <tdelocale.h> #include <tdeio/netaccess.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "autolistviewitems.h" #include "autosubprojectview.h" @@ -87,14 +87,14 @@ void AddExistingDirectoriesDialog::init() importView->setMode ( TDEIconView::Select ); importView->setItemsMovable ( false ); - connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) ); + connect ( okButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotOk () ) ); - connect ( addSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSelected() ) ); - connect ( addAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddAll() ) ); - connect ( removeSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveSelected() ) ); - connect ( removeAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveAll() ) ); + connect ( addSelectedButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddSelected() ) ); + connect ( addAllButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddAll() ) ); + connect ( removeSelectedButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveSelected() ) ); + connect ( removeAllButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveAll() ) ); - connect ( importView, TQT_SIGNAL ( dropped( TQDropEvent* ) ), this, TQT_SLOT ( slotDropped ( TQDropEvent* ) ) ); + connect ( importView, TQ_SIGNAL ( dropped( TQDropEvent* ) ), this, TQ_SLOT ( slotDropped ( TQDropEvent* ) ) ); importView->setSelectionMode ( KFile::Multi ); diff --git a/buildtools/autotools/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h index c68e8113..9cdc20e7 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.h +++ b/buildtools/autotools/addexistingdirectoriesdlg.h @@ -41,7 +41,7 @@ class AddExistingDirectoriesDialog : public AddExistingDlgBase public: AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TQWidget* parent = 0, - const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + const char* name = 0, bool modal = false, WFlags fl = 0 ); ~AddExistingDirectoriesDialog(); private: diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index 20dbf41b..a58fe596 100644 --- a/buildtools/autotools/addexistingfilesdlg.cpp +++ b/buildtools/autotools/addexistingfilesdlg.cpp @@ -30,7 +30,7 @@ #include <tdefileview.h> #include <kguiitem.h> #include <kprogress.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kurldrag.h> #include <tdemessagebox.h> #include <kmimetype.h> @@ -53,7 +53,7 @@ * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, TQWidget* parent, const char* name, bool modal, WFlags fl ) @@ -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 3d9fed36..7ffefa31 100644 --- a/buildtools/autotools/addexistingfilesdlg.h +++ b/buildtools/autotools/addexistingfilesdlg.h @@ -44,7 +44,7 @@ class AddExistingFilesDialog : public AddExistingDlgBase public: AddExistingFilesDialog( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, TQWidget* parent = 0, - const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + const char* name = 0, bool modal = false, WFlags fl = 0 ); ~AddExistingFilesDialog(); private: 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/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp index 1a32de18..ffd70efc 100644 --- a/buildtools/autotools/addicondlg.cpp +++ b/buildtools/autotools/addicondlg.cpp @@ -16,8 +16,8 @@ #include <klineedit.h> #include <kdebug.h> #include <tdelocale.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <kicontheme.h> #include <tdeversion.h> // fix me! 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/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/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/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/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 936f7eb1..c9c2ce75 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) @@ -587,7 +587,7 @@ void AutoDetailsView::slotDetailsContextMenu( TDEListView *, TQListViewItem *ite popup.setWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file " "associated with the selected .ui.")); - if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst == true) + if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst) { popup.removeItem(idUISubclasses); popup.removeItem(idViewUIH); @@ -597,7 +597,7 @@ void AutoDetailsView::slotDetailsContextMenu( TDEListView *, TQListViewItem *ite if (fitem->uiFileLink.isEmpty()) popup.removeItem(idUpdateWidgetclass); - if(fitem->is_subst == false) + if(!fitem->is_subst) m_part->core()->fillContextMenu( &popup, &context ); int r = popup.exec( p ); diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index c1008072..820d2d35 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -38,11 +38,11 @@ #include <kdialogbase.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdeparts/part.h> #include <tdeversion.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <domutil.h> #include <kdevcore.h> @@ -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; } @@ -509,7 +509,7 @@ TQString AutoProjectPart::makeEnvironment() const environstr += " "; } - TDEConfigGroup grp( kapp->config(), "MakeOutputView" ); + TDEConfigGroup grp( tdeApp->config(), "MakeOutputView" ); if( grp.readBoolEntry( "ForceCLocale", true ) ) environstr += "LC_MESSAGES="+EnvVarTools::quote("C")+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" "; @@ -1197,7 +1197,7 @@ void AutoProjectPart::slotExecute() if (appFrontend()->isRunning()) { if (KMessageBox::questionYesNo(m_widget, i18n("Your application is currently running. Do you want to restart it?"), i18n("Application Already Running"), i18n("&Restart Application"), i18n("Do &Nothing")) == KMessageBox::No) return; - connect(appFrontend(), TQT_SIGNAL(processExited()), TQT_SLOT(slotExecute2())); + connect(appFrontend(), TQ_SIGNAL(processExited()), TQ_SLOT(slotExecute2())); appFrontend()->stopApplication(); return; } @@ -1221,8 +1221,8 @@ void AutoProjectPart::executeTarget(const TQDir& dir, const TargetItem* titem) if( DomUtil::readBoolEntry(*projectDom(), "/kdevautoproject/run/autocompile", true) && is_dirty ) { - connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteTargetAfterBuild(const TQString&)) ); - connect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotNotExecuteTargetAfterBuildFailed(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), this, TQ_SLOT(slotExecuteTargetAfterBuild(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFailed(const TQString&)), this, TQ_SLOT(slotNotExecuteTargetAfterBuildFailed(const TQString&)) ); m_runProg=titem->name; m_executeTargetAfterBuild.first = dir; @@ -1268,8 +1268,8 @@ void AutoProjectPart::slotExecuteTargetAfterBuild(const TQString& command) kdDebug(9020) << "slotExecuteTargetAfterBuild " << command << endl; if ( m_executeAfterBuild && constructMakeCommandLine(m_executeTargetAfterBuild.first.path(), m_executeTargetAfterBuild.second->name) == command ) { - disconnect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteAfterTargetBuild()) ); - disconnect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotExecuteAfterTargetBuildFailed()) ); + disconnect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), this, TQ_SLOT(slotExecuteAfterTargetBuild()) ); + disconnect( makeFrontend(), TQ_SIGNAL(commandFailed(const TQString&)), this, TQ_SLOT(slotExecuteAfterTargetBuildFailed()) ); kdDebug(9020) << "slotExecuteTargetAfterBuild " << endl; executeTarget(m_executeTargetAfterBuild.first, m_executeTargetAfterBuild.second); } @@ -1282,8 +1282,8 @@ void AutoProjectPart::slotNotExecuteTargetAfterBuildFailed(const TQString& comma if ( constructMakeCommandLine(m_executeTargetAfterBuild.first.path(), m_executeTargetAfterBuild.second->name) == command ) { m_executeAfterBuild=false; - disconnect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteTargetAfterBuild()) ); - disconnect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotNotExecuteTargetAfterBuildFailed()) ); + disconnect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), this, TQ_SLOT(slotExecuteTargetAfterBuild()) ); + disconnect( makeFrontend(), TQ_SIGNAL(commandFailed(const TQString&)), this, TQ_SLOT(slotNotExecuteTargetAfterBuildFailed()) ); } } @@ -1312,7 +1312,7 @@ TQString AutoProjectPart::environString() const */ void AutoProjectPart::slotExecute2() { - disconnect(appFrontend(), TQT_SIGNAL(processExited()), this, TQT_SLOT(slotExecute2())); + disconnect(appFrontend(), TQ_SIGNAL(processExited()), this, TQ_SLOT(slotExecute2())); if (m_runProg.isEmpty()){ // Do not execute non executable targets diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index aa4c9e34..1b732dde 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -113,8 +113,8 @@ void AutoProjectWidget::initDetailview ( TQWidget* parent ) void AutoProjectWidget::initActions() { - connect( m_subprojectView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); + connect( m_subprojectView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); } AutoSubprojectView* AutoProjectWidget::getSubprojectView () diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 6d6b6c01..9ce7b0cf 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -28,7 +28,7 @@ #include <tdepopupmenu.h> #include <tdemessagebox.h> #include <tdeapplication.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <ksqueezedtextlabel.h> #include <kdialogbase.h> #include <tdelistview.h> @@ -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())); } @@ -466,7 +466,7 @@ void AutoSubprojectView::slotRemoveSubproject() } parent->listView()->setSelected( parent, true ); - kapp->processEvents( 500 ); + tdeApp->processEvents( 500 ); if( removeSources ){ diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index c520a3de..66fe9f08 100644 --- a/buildtools/autotools/autotoolsaction.cpp +++ b/buildtools/autotools/autotoolsaction.cpp @@ -104,13 +104,13 @@ int AutoToolsAction::plug( TQWidget* w, int index ) } // Check if action is permitted - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; if ( ::tqt_cast<TQToolButton*>( w ) ) { TQToolButton* tb = static_cast<TQToolButton*>( w ); - connect( tb, TQT_SIGNAL( clicked() ), this, TQT_SLOT( activate() ) ); + connect( tb, TQ_SIGNAL( clicked() ), this, TQ_SLOT( activate() ) ); int id = getToolButtonID(); if ( !icon().isEmpty() ) diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index fc67a82e..112a3668 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <tdelistview.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <ksqueezedtextlabel.h> #include <kurl.h> @@ -138,10 +138,10 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP d->baseUI->newFileList->insertItem( new TQListViewItem( d->baseUI->newFileList, fileName ) ); } - connect ( d->baseUI->subprojectComboBox, TQT_SIGNAL ( activated ( const TQString& ) ), - this, TQT_SLOT( slotSubprojectChanged ( const TQString& ) ) ); - connect ( d->baseUI->targetComboBox, TQT_SIGNAL ( activated ( const TQString& ) ), - this, TQT_SLOT( slotTargetChanged ( const TQString& ) ) ); + connect ( d->baseUI->subprojectComboBox, TQ_SIGNAL ( activated ( const TQString& ) ), + this, TQ_SLOT( slotSubprojectChanged ( const TQString& ) ) ); + connect ( d->baseUI->targetComboBox, TQ_SIGNAL ( activated ( const TQString& ) ), + this, TQ_SLOT( slotTargetChanged ( const TQString& ) ) ); } diff --git a/buildtools/autotools/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 7d03ad3e..33c280f4 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -72,7 +72,7 @@ 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, TQt::Vertical ); @@ -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/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/managecustomcommandsbase.ui b/buildtools/autotools/managecustomcommandsbase.ui index eab430e9..9088ba07 100644 --- a/buildtools/autotools/managecustomcommandsbase.ui +++ b/buildtools/autotools/managecustomcommandsbase.ui @@ -117,9 +117,9 @@ <tabstop>addButton</tabstop> <tabstop>removeButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>addButton_clicked()</slot> <slot>removeButton_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index 6c4bac8c..a18fbf5d 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -72,7 +72,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ) { - KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) ); + KDevCompilerOptions * plugin = createCompilerOptions( compiler, parent ); if ( plugin ) { diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp index e265a969..5b173a54 100644 --- a/buildtools/autotools/removefiledlg.cpp +++ b/buildtools/autotools/removefiledlg.cpp @@ -75,8 +75,8 @@ RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* p else targetLabel->setText ( item->name ); - connect ( removeButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); - connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); + connect ( removeButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( accept() ) ); + connect ( cancelButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( reject() ) ); setIcon ( SmallIcon ( "editdelete.png" ) ); diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp index c9068ec8..fc88c913 100644 --- a/buildtools/autotools/removetargetdlg.cpp +++ b/buildtools/autotools/removetargetdlg.cpp @@ -53,8 +53,8 @@ RemoveTargetDialog::RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPa else targetLabel->setText ( titem->name ); - connect ( removeButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); - connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); + connect ( removeButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( accept() ) ); + connect ( cancelButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( reject() ) ); setIcon ( SmallIcon ( "edit-delete" ) ); diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp index bff524bb..1a12453f 100644 --- a/buildtools/autotools/subprojectoptionsdlg.cpp +++ b/buildtools/autotools/subprojectoptionsdlg.cpp @@ -79,7 +79,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj prefix_listview->setSorting(-1); buildorder_listview->setSorting(-1); - connect( prefix_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( editPrefixClicked() ) ); + connect( prefix_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( editPrefixClicked() ) ); // Insert all subdirectories as possible include directories TQStringList l = widget->allSubprojects(); diff --git a/buildtools/autotools/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 ac2767a7..f19f1873 100644 --- a/buildtools/autotools/targetoptionsdlg.cpp +++ b/buildtools/autotools/targetoptionsdlg.cpp @@ -133,7 +133,7 @@ void TargetOptionsDialog::readConfig() clitem = static_cast<TQCheckListItem*>(clitem->nextSibling()); } } - if ( inlistItem == false ) { + if ( !inlistItem ) { TQListViewItem *item = new TQListViewItem(outsidelib_listview, *l2it); if (lastItem) item->moveItem(lastItem); 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/tdefiledndiconview.cpp b/buildtools/autotools/tdefiledndiconview.cpp index f1f9afae..5109f2c8 100644 --- a/buildtools/autotools/tdefiledndiconview.cpp +++ b/buildtools/autotools/tdefiledndiconview.cpp @@ -168,9 +168,9 @@ void KFileDnDIconView::setAutoOpenTime( const int& time ){ void KFileDnDIconView::useAutoOpenTimer( bool use ){ m_useAutoOpenTimer = use; if ( use ) - connect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); + connect( &m_autoOpenTimer, TQ_SIGNAL( timeout() ),this, TQ_SLOT( slotOpenFolder() ) ); else { - disconnect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); + disconnect( &m_autoOpenTimer, TQ_SIGNAL( timeout() ),this, TQ_SLOT( slotOpenFolder() ) ); m_dropItem = 0L; m_autoOpenTimer.stop(); } diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp index 74c0d08f..f36dc78a 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.cpp +++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp @@ -44,10 +44,10 @@ CustomBuildOptionsWidget::CustomBuildOptionsWidget(TQDomDocument &dom, // This connection must not be made before the ant->setChecked() line, // because at this time makeToggled() would crash - connect( make_button, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(makeToggled(bool)) ); - connect( other_button, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(otherToggled(bool)) ); + connect( make_button, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(makeToggled(bool)) ); + connect( other_button, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(otherToggled(bool)) ); } diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui index 2b1bfdff..0e1658ea 100644 --- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui +++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui @@ -144,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 ceebb999..10855e60 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.cpp +++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp @@ -43,7 +43,7 @@ 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, TQt::Vertical ); 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 9dfad3e5..1500995d 100644 --- a/buildtools/custommakefiles/custommanagerwidget.cpp +++ b/buildtools/custommakefiles/custommanagerwidget.cpp @@ -44,7 +44,7 @@ CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, TQWidget* par m_blacklistBox->setButtons( KEditListBox::Add | KEditListBox::Remove ); m_blacklistBox->insertStringList( DomUtil::readListEntry( m_dom, "kdevcustomproject/blacklist","path") ); grid->addWidget( m_blacklistBox, 0, 1 ); - connect(m_blacklistBox, TQT_SIGNAL(added(const TQString&)), this, TQT_SLOT(checkUrl(const TQString&))); + connect(m_blacklistBox, TQ_SIGNAL(added(const TQString&)), this, TQ_SLOT(checkUrl(const TQString&))); } void CustomManagerWidget::checkUrl(const TQString& url) diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp index c7778a74..012dfd36 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.cpp +++ b/buildtools/custommakefiles/customotherconfigwidget.cpp @@ -38,7 +38,7 @@ 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, TQt::Vertical ); 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 cbbb4315..3afa0ff6 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -39,7 +39,7 @@ #include <tdeparts/part.h> #include <tdepopupmenu.h> #include <tdeversion.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "domutil.h" #include "kdevcore.h" @@ -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." ) ); } @@ -884,7 +884,7 @@ TQString CustomProjectPart::makeEnvironment() const environstr += " "; } - TDEConfigGroup grp( kapp->config(), "MakeOutputView" ); + TDEConfigGroup grp( tdeApp->config(), "MakeOutputView" ); if( grp.readBoolEntry( "ForceCLocale", true ) ) environstr += "LC_MESSAGES=" + EnvVarTools::quote( "C" )+" "+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" "; @@ -894,7 +894,7 @@ TQString CustomProjectPart::makeEnvironment() const void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &target, bool withKdesu ) { - if ( partController()->saveAllFiles() == false ) + if ( !partController()->saveAllFiles() ) return; //user cancelled TQDomDocument &dom = *projectDom(); @@ -1002,8 +1002,8 @@ void CustomProjectPart::slotCompileFile() //if there is no Makefile in the directory of the source file //try to build it from the main build dir //this works e.g. for non-recursive cmake Makefiles, Alex - if ( buildtool == "make" && ( TQFile::exists( sourceDir + "/Makefile" ) == false ) - && ( TQFile::exists( sourceDir + "/makefile" ) == false ) ) + if ( buildtool == "make" && !TQFile::exists( sourceDir + "/Makefile" ) + && !TQFile::exists( sourceDir + "/makefile" ) ) { buildDir = buildDirectory(); } 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/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/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp index f02d5b56..1508d48d 100644 --- a/buildtools/lib/widgets/addfilesdialog.cpp +++ b/buildtools/lib/widgets/addfilesdialog.cpp @@ -28,7 +28,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, TQWidget *parent, const char *name, bool modal): KFileDialog(startDir, filter, parent, name, modal) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Add Files Dialog"); m_extraWidget = new TQComboBox(false, this); @@ -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); @@ -48,14 +48,14 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget): KFileDialog(startDir, filter, parent, name, modal, extraWidget), m_extraWidget(extraWidget) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Add Files Dialog"); m_extraWidget->insertItem(i18n("Copy File(s)"), 0); 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); } @@ -72,7 +72,7 @@ AddFilesDialog::Mode AddFilesDialog::mode( ) void AddFilesDialog::storePreferred( int index ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Add Files Dialog"); config->writeEntry("Mode", index); } diff --git a/buildtools/lib/widgets/environmentdisplaydialog.h b/buildtools/lib/widgets/environmentdisplaydialog.h index 46b4bdb8..46925034 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.h +++ b/buildtools/lib/widgets/environmentdisplaydialog.h @@ -29,7 +29,7 @@ TQ_OBJECT public: - EnvironmentDisplayDialog(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + EnvironmentDisplayDialog(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); }; #endif 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/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/removesubprojectdialog.h b/buildtools/lib/widgets/removesubprojectdialog.h index 7de20af3..eeae1cd8 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.h +++ b/buildtools/lib/widgets/removesubprojectdialog.h @@ -31,7 +31,7 @@ class RemoveSubprojectDialog : public RemoveSubprojectDlgBase public: - RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~RemoveSubprojectDialog(); /*$PUBLIC_FUNCTIONS$*/ bool removeFromDisk(); 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/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 75ced25b..5ddec54b 100644 --- a/buildtools/lib/widgets/subclassesdlg.h +++ b/buildtools/lib/widgets/subclassesdlg.h @@ -31,7 +31,7 @@ class SubclassesDlg : public SubclassesDlgBase public: - SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~SubclassesDlg(); /*$PUBLIC_FUNCTIONS$*/ 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/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 d4670adb..c0bd71f3 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -29,7 +29,7 @@ #include <kservice.h> #include <tdeconfig.h> #include <tdeversion.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "domutil.h" #include "kdevcore.h" @@ -60,23 +60,23 @@ PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const T TDEAction *action; action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, - this, TQT_SLOT(slotBuild()), + this, TQ_SLOT(slotBuild()), actionCollection(), "build_build" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("<b>Build project</b><p>Runs the compiler on a main source file of the project. " "The compiler and the main source file can be set in project settings, <b>Pascal Compiler</b> tab.")); action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Execute program")); action->setWhatsThis(i18n("<b>Execute program</b><p>Executes the main program specified in project settings, <b>Run options</b> tab. " "If nothing is set, the binary file with the same name as the main source file name is executed.")); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); // m_widget = new PascalProjectWidget(this); @@ -397,12 +397,12 @@ void PascalProjectPart::projectConfigWidget( KDialogBase * dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Pascal Compiler")); PascalProjectOptionsDlg *w = new PascalProjectOptionsDlg(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(loadProjectConfig()) ); vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium )); RunOptionsWidget *w3 = new RunOptionsWidget(*projectDom(), "/kdevpascalproject", buildDirectory(), vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w3, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w3, TQ_SLOT(accept()) ); } @@ -433,7 +433,7 @@ void PascalProjectPart::configWidget( KDialogBase * dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Pascal Compiler")); PascalGlobalOptionsDlg *w = new PascalGlobalOptionsDlg(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name) diff --git a/buildtools/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/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index 22388b2d..f61caaf6 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -18,7 +18,7 @@ ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent, const char* name, bool modal, WFlags fl) : ChooseSubprojectDlgBase(parent,name, modal,fl), m_widget(widget) { - connect(subprojects_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(itemSelected(TQListViewItem *))); + connect(subprojects_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(itemSelected(TQListViewItem *))); if( m_widget->m_rootSubproject) { ChooseItem *it = new ChooseItem(m_widget->m_rootSubproject, subprojects_view, m_widget->m_rootSubproject->text(0)); diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index e9daf2e1..4cf4ea4e 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -37,7 +37,7 @@ class ChooseSubprojectDlg : public ChooseSubprojectDlgBase public: - ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~ChooseSubprojectDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/buildtools/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h index 30f72b59..26535c72 100644 --- a/buildtools/qmake/createscopedlg.h +++ b/buildtools/qmake/createscopedlg.h @@ -23,7 +23,7 @@ class CreateScopeDlg : public CreateScopeDlgBase public: - CreateScopeDlg( QMakeScopeItem* item, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreateScopeDlg( QMakeScopeItem* item, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~CreateScopeDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/buildtools/qmake/newwidgetdlg.h b/buildtools/qmake/newwidgetdlg.h index 994aead5..d2d92254 100644 --- a/buildtools/qmake/newwidgetdlg.h +++ b/buildtools/qmake/newwidgetdlg.h @@ -21,7 +21,7 @@ class TQDomDocument; class NewWidgetDlg : public NewWidgetDlgBase { public: - NewWidgetDlg(TQStringList &newFileNames,TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + NewWidgetDlg(TQStringList &newFileNames,TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~NewWidgetDlg(); 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 25137f04..95189fff 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); @@ -387,7 +387,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() myProjectItem->updateValues( "INCLUDEPATH", values ); //target.install - if ( checkInstallTarget->isChecked() == true ) + if ( checkInstallTarget->isChecked() ) { myProjectItem->addValue( "INSTALLS", "target" ); myProjectItem->scope->setEqualOp( "target.path", TQStringList( m_InstallTargetPath->text() ) ); diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index c4c9740b..bcf38005 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -56,7 +56,7 @@ class CustomVarListItem : public TDEListViewItem class ProjectConfigurationDlg : public ProjectConfigurationDlgBase { public: - ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~ProjectConfigurationDlg(); void updateControls(); void updateSubproject( QMakeScopeItem* _item ); diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 09193bdf..d809814d 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -2596,7 +2596,7 @@ <tabstop>buttonApply</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>updateProjectConfiguration()</slot> <slot>buildorderMoveUpClicked()</slot> <slot>buildorderMoveDownClicked()</slot> @@ -2640,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 fdbcad64..f33c277a 100644 --- a/buildtools/qmake/qmakedefaultopts.cpp +++ b/buildtools/qmake/qmakedefaultopts.cpp @@ -14,9 +14,9 @@ #include <kdebug.h> #include <tdetempfile.h> #include <tqregexp.h> -#include <kprocess.h> +#include <tdeprocess.h> -#include <blockingkprocess.h> +#include <blockingtdeprocess.h> TQMakeDefaultOpts::TQMakeDefaultOpts() { diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 49e228ad..58aa9d17 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -30,7 +30,7 @@ #include <kdevgenericfactory.h> #include <tdeaction.h> #include <tdeparts/part.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kurlrequesterdlg.h> @@ -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", ""); @@ -260,7 +260,7 @@ TQString TrollProjectPart::makeEnvironment() environstr += TQString( "TQTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " ); } - TDEConfigGroup grp( kapp->config(), "MakeOutputView" ); + TDEConfigGroup grp( tdeApp->config(), "MakeOutputView" ); if( grp.readBoolEntry( "ForceCLocale", true ) ) environstr += "LC_MESSAGES="+EnvVarTools::quote("C")+" "+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" "; @@ -280,9 +280,9 @@ void TrollProjectPart::projectConfigWidget(KDialogBase *dlg) QMakeOptionsWidget *qm = new QMakeOptionsWidget( projectDirectory(), *projectDom(), "/kdevtrollproject", vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w4, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), qm, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), optdlg, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w4, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), qm, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), optdlg, TQ_SLOT(accept()) ); } diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 551dcf27..bc5c850c 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -32,7 +32,7 @@ #include <tqptrstack.h> #include <tqtextstream.h> #include <tqcombobox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqtimer.h> #include <tqdir.h> #include <tqregexp.h> @@ -51,7 +51,6 @@ #include <iostream> #include <tdeparts/part.h> #include <tdeaction.h> -#include <kprocess.h> #include <kinputdialog.h> #include <tdeversion.h> #include <kdirwatch.h> @@ -156,16 +155,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 +174,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 +283,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&) ) ); } @@ -680,7 +679,7 @@ void TrollProjectWidget::slotExecuteTarget() m_part->appFrontend()->stopApplication(); while(m_part->appFrontend()->isRunning()) { - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); usleep(100); } } @@ -715,7 +714,7 @@ void TrollProjectWidget::slotExecuteTarget() void TrollProjectWidget::slotBuildProject() { - if ( m_part->partController() ->saveAllFiles() == false ) + if ( !m_part->partController() ->saveAllFiles() ) return ; //user cancelled TQString dir = projectDirectory(); @@ -733,7 +732,7 @@ void TrollProjectWidget::slotBuildProject() void TrollProjectWidget::slotInstallProject() { - if ( m_part->partController() ->saveAllFiles() == false ) + if ( !m_part->partController() ->saveAllFiles() ) return ; //user cancelled TQString dir = projectDirectory(); @@ -1301,7 +1300,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 ]; @@ -1371,7 +1370,7 @@ void TrollProjectWidget::slotNewFile() if ( gitem->groupType == GroupItem::InstallObject ) { // TQString relpath = m_shownSubproject->path.mid(projectDirectory().length()); - bool ok = FALSE; + bool ok = false; TQString filepattern = KInputDialog::getText( i18n( "Insert New Filepattern" ), i18n( "Please enter a filepattern relative the current " @@ -1387,7 +1386,7 @@ void TrollProjectWidget::slotNewFile() if ( gitem->groupType == GroupItem::InstallRoot ) { // TQString relpath = m_shownSubproject->path.mid(projectDirectory().length()); - bool ok = FALSE; + bool ok = false; TQString install_obj = KInputDialog::getText( i18n( "Insert New Install Object" ), i18n( "Please enter a name for the new object:" ), @@ -1596,7 +1595,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * } else if ( r == idInsNewFilepatternItem ) { - bool ok = FALSE; + bool ok = false; TQString filepattern = KInputDialog::getText( i18n( "Add Pattern of Files to Install" ), i18n( "Enter a pattern relative to the current " @@ -1642,7 +1641,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 ]; @@ -1714,7 +1713,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * } else if ( r == idInsInstallObject ) { - bool ok = FALSE; + bool ok = false; TQString install_obj = KInputDialog::getText( i18n( "Add Install Object" ), i18n( "Enter a name for the new object:" ), @@ -1891,7 +1890,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * { GroupItem * titem = static_cast<GroupItem*>( item->parent() ); - bool ok = FALSE; + bool ok = false; TQString filepattern = KInputDialog::getText( i18n( "Edit Pattern" ), i18n( "Enter a pattern relative to the current " @@ -2053,7 +2052,7 @@ void TrollProjectWidget::slotExecuteProject() m_part->appFrontend()->stopApplication(); while(m_part->appFrontend()->isRunning()) { - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); usleep(100); } } diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index 9308792a..001565b2 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -54,8 +54,8 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part, TQPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); ok_button->setDefault(true); - connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( ok_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancel_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); buttonbox->layout(); TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index 42ce8935..600ce07d 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -51,17 +51,17 @@ ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const T if (!extension<KDevCreateFile>("TDevelop/CreateFile")) { TDEAction *action; action = new TDEAction( i18n("New File..."), 0, - this, TQT_SLOT(slotNewFile()), + this, TQ_SLOT(slotNewFile()), actionCollection(), "file_newfile" ); action->setWhatsThis( i18n("<b>New file</b><p>Creates a new file.") ); action->setToolTip( i18n("Create a new file") ); } new TDEAction( i18n("Rescan Project"), 0, CTRL+ALT+Key_R, - this, TQT_SLOT(rescan()), + this, TQ_SLOT(rescan()), actionCollection(), "rescan" ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -74,7 +74,7 @@ void ScriptProjectPart::projectConfigWidget(KDialogBase *dlg) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Script Project Options"), i18n("Script Project Options"), BarIcon("tdevelop", TDEIcon::SizeMedium)); ScriptOptionsWidget *w = new ScriptOptionsWidget(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index fc21e33a..517d90b0 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -116,7 +116,7 @@ Initializes and controls a KDE application. </formalpara></listitem> <listitem><formalpara> -<title><ulink url="kdeapi:tdecore/KUniqueApplication">KUniqueApplication</ulink></title> +<title><ulink url="kdeapi:tdecore/TDEUniqueApplication">TDEUniqueApplication</ulink></title> <para> Makes sure only one instance of an application can run simultaneously. </para> @@ -149,13 +149,13 @@ Provides access to KDE's configuration database. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdecore/KSimpleConfig">KSimpleConfig</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDESimpleConfig">TDESimpleConfig</ulink></title> <para> Access to simple, non-hierarchical configuration files. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdecore/KDesktopFile">KDesktopFile</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEDesktopFile">TDEDesktopFile</ulink></title> <para> Access to <literal>.desktop</literal> files. </para> @@ -1420,23 +1420,23 @@ The corresponding part of the setup in C++ is: </para> <programlisting> - KStdAction::zoomIn ( this, SLOT(slotZoomIn()), actionCollection() ); - KStdAction::zoomOut ( this, SLOT(slotZoomOut()), actionCollection() ); - KStdAction::zoom ( this, SLOT(slotZoom()), actionCollection() ); + KStdAction::zoomIn ( this, TQ_SLOT(slotZoomIn()), actionCollection() ); + KStdAction::zoomOut ( this, TQ_SLOT(slotZoomOut()), actionCollection() ); + KStdAction::zoom ( this, TQ_SLOT(slotZoom()), actionCollection() ); new TDEAction ( i18n("&Half size"), ALT+Key_0, - this, SLOT(slotHalfSize()), + this, TQ_SLOT(slotHalfSize()), actionCollection(), "zoom50" ); new TDEAction ( i18n("&Normal size"), ALT+Key_1, - this, SLOT(slotDoubleSize()), + this, TQ_SLOT(slotDoubleSize()), actionCollection(), "zoom100" ); new TDEAction ( i18n("&Double size"), ALT+Key_2, - this, SLOT(slotDoubleSize()), + this, TQ_SLOT(slotDoubleSize()), actionCollection(), "zoom200" ); new TDEAction ( i18n("&Fill Screen"), ALT+Key_3, - this, SLOT(slotFillScreen()), + this, TQ_SLOT(slotFillScreen()), actionCollection(), "zoomMaxpect" ); new TDEAction ( i18n("Fullscreen &Mode"), CTRL+SHIFT+Key_F, - this, SLOT(slotFullScreen()), + this, TQ_SLOT(slotFullScreen()), actionCollection(), "fullscreen" ); </programlisting> @@ -1814,7 +1814,7 @@ class. In order to show the manual of your application, just use </para> <programlisting> -kapp->invokeHelp() +tdeApp->invokeHelp() </programlisting> <para> @@ -2097,7 +2097,7 @@ registered with DCOP and uses the running service. If it is not registered yet, KDE will start it up and wait until is registered. Thus, you can immediately send DCOP calls to the service. In such a case, the service should be implemented as a -<ulink url="kdeapi:tdecore/KUniqueApplication.html">KUniqueApplication</ulink>. +<ulink url="kdeapi:tdecore/TDEUniqueApplication.html">TDEUniqueApplication</ulink>. </para> <para> @@ -2139,7 +2139,7 @@ class: </para> <programlisting> -DCOPClient *client = kapp->dcopClient(); +DCOPClient *client = tdeApp->dcopClient(); client->attach(); if (!client->isApplicationRegistered("tdeio_uiserver")) { TQString error; @@ -2409,8 +2409,8 @@ void FooClass::findType() { KURL url("http://developer.kde.org/favicon.ico"); TDEIO::MimetypeJob *job = TDEIO::mimetype(url); - connect( job, SIGNAL(result(TDEIO::Job*)), - this, SLOT(mimeResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(mimeResult(TDEIO::Job*)) ); } void FooClass::mimeResult(TDEIO::Job *job) @@ -2603,8 +2603,8 @@ deletes itself. Thus, a typical use case will look like this: void FooClass::makeDirectory() { SimpleJob *job = TDEIO::mkdir(KURL("file:/home/bernd/tdeiodir")); - connect( job, SIGNAL(result(TDEIO::Job*)), - this, SLOT(mkdirResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(mkdirResult(TDEIO::Job*)) ); } void FooClass::mkdirResult(TDEIO::Job *job) @@ -2942,8 +2942,8 @@ void FooClass::printModifiedDate() { KURL url("http://developer.kde.org/documentation/kde2arch/index.html"); TDEIO::TransferJob *job = TDEIO::get(url, true, false); - connect( job, SIGNAL(result(TDEIO::Job*)), - this, SLOT(transferResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(transferResult(TDEIO::Job*)) ); } void FooClass::transferResult(TDEIO::Job *job) diff --git a/doc/tde_app_devel/index.docbook b/doc/tde_app_devel/index.docbook index 4ab2cd22..32a16a42 100644 --- a/doc/tde_app_devel/index.docbook +++ b/doc/tde_app_devel/index.docbook @@ -479,7 +479,7 @@ hello.resize( 100, 30 ); a.setMainWidget( &hello ); -TQObject::connect(&hello, SIGNAL( clicked() ), &a, SLOT( quit() )); +TQObject::connect(&hello, TQ_SIGNAL( clicked() ), &a, TQ_SLOT( quit() )); hello.show(); return a.exec(); @@ -488,7 +488,7 @@ return a.exec(); </para> <para> You see, the only addition to give the button more interaction is to use a <methodname>connect() -</methodname> method: <methodname>connect(&hello, SIGNAL( clicked() ), &a, SLOT( quit() ))</methodname>; +</methodname> method: <methodname>connect(&hello, TQ_SIGNAL( clicked() ), &a, TQ_SLOT( quit() ))</methodname>; is all you have to add. What is the meaning now? The class declaration of TQObject says about the <methodname>connect()</methodname> method: </para> @@ -573,7 +573,7 @@ hello.resize( 100, 30 ); a.setTopWidget( &hello ); -TQObject::connect(&hello, SIGNAL( clicked() ), &a, SLOT( quit() )); +TQObject::connect(&hello, TQ_SIGNAL( clicked() ), &a, TQ_SLOT( quit() )); hello.show(); return a.exec(); @@ -924,10 +924,10 @@ Let's have a look at the constructor and see how this instance is called 16 statusBar()->show(); 17 18 // allow the view to change the statusbar and caption -19 connect(m_view, SIGNAL(signalChangeStatusbar(const TQString&)), -20 this, SLOT(changeStatusbar(const TQString&))); -21 connect(m_view, SIGNAL(signalChangeCaption(const TQString&)), -22 this, SLOT(changeCaption(const TQString&))); +19 connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), +20 this, TQ_SLOT(changeStatusbar(const TQString&))); +21 connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), +22 this, TQ_SLOT(changeCaption(const TQString&))); 23 24 } </programlisting> @@ -1276,7 +1276,7 @@ As an example, we have a look at the "New File" button in a generic application: </para> <para> There, the part i18n("New File") provides a tool-tip message. It is enclosed by the i18n() -macro provided by kapp.h to translate the tool-tip towards the currently selected language. +macro provided by tdeapplication.h to translate the tool-tip towards the currently selected language. </para> <para> Tool-tips can also be added to any custom widget by using the <classname>QToolTip</classname> diff --git a/doc/tdevelop/setup.docbook b/doc/tdevelop/setup.docbook index 0c078a3b..6f217c27 100644 --- a/doc/tdevelop/setup.docbook +++ b/doc/tdevelop/setup.docbook @@ -344,8 +344,7 @@ A typical example of this user interface mode is KDEStudio, our friend C++-IDE i <listitem><para> <link linkend="toplevel-desc">Toplevel window mode</link> </para><para>All editor, browser and tool views will be toplevel windows (directly on desktop). -The main widget contains the menu, toolbars and statusbar only. -A typical example of this user interface mode is Borland Delphi 6.0.</para></listitem> +The main widget contains the menu, toolbars and statusbar only.</para></listitem> </itemizedlist> <para> diff --git a/editors/editor-chooser/editchooser.ui b/editors/editor-chooser/editchooser.ui index a1e265cd..40106306 100644 --- a/editors/editor-chooser/editchooser.ui +++ b/editors/editor-chooser/editchooser.ui @@ -122,9 +122,9 @@ already open files.</string> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>slotEditPartChanged(const TQString &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp index c700823d..b8b28e86 100644 --- a/editors/editor-chooser/editorchooser_part.cpp +++ b/editors/editor-chooser/editorchooser_part.cpp @@ -21,7 +21,7 @@ EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const T { setInstance(EditorChooserFactory::instance()); - connect(core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(configWidget(KDialogBase*))); + connect(core(), TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(configWidget(KDialogBase*))); } @@ -34,7 +34,7 @@ void EditorChooserPart::configWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Editor"), i18n("Editor"), BarIcon("kate", TDEIcon::SizeMedium) ); EditorChooserWidget *w = new EditorChooserWidget(vbox); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); } diff --git a/editors/editor-chooser/editorchooser_widget.cpp b/editors/editor-chooser/editorchooser_widget.cpp index ae253456..427830d4 100644 --- a/editors/editor-chooser/editorchooser_widget.cpp +++ b/editors/editor-chooser/editorchooser_widget.cpp @@ -41,7 +41,7 @@ void EditorChooserWidget::load() EditorPart->clear(); // find the editor to use - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Editor"); TQString editor = config->readPathEntry("EmbeddedKTextEditor"); @@ -78,7 +78,7 @@ void EditorChooserWidget::load() void EditorChooserWidget::save() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Editor"); TDETrader::OfferList::Iterator it; diff --git a/embedded/visualboyadvance/vbaconfigwidget.cpp b/embedded/visualboyadvance/vbaconfigwidget.cpp index f2f53c23..730d8615 100644 --- a/embedded/visualboyadvance/vbaconfigwidget.cpp +++ b/embedded/visualboyadvance/vbaconfigwidget.cpp @@ -98,7 +98,7 @@ VBAConfigWidget::VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *parent, co } addOptionsEdit->setText(addOptions); - connect(emuPathButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(emuPathButtonClicked())); + connect(emuPathButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(emuPathButtonClicked())); } VBAConfigWidget::~VBAConfigWidget(){ } diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp index effee085..f1191501 100644 --- a/embedded/visualboyadvance/visualboyadvance_part.cpp +++ b/embedded/visualboyadvance/visualboyadvance_part.cpp @@ -31,11 +31,11 @@ VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, c TDEAction *action; action = new TDEAction( i18n("Execute Program"), "application-x-executable", Key_F9, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_execute" ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -70,7 +70,7 @@ void VisualBoyAdvancePart::projectConfigWidget(KDialogBase *dlg){ TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium )); VBAConfigWidget* w = new VBAConfigWidget(this,vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp index 071845c9..0d524d9e 100644 --- a/kdevdesigner/designer/actiondnd.cpp +++ b/kdevdesigner/designer/actiondnd.cpp @@ -106,12 +106,12 @@ bool QDesignerAction::addTo( TQWidget *w ) return TQAction::addTo( w ); if ( ::tqt_cast<TQPopupMenu*>(w) ) - return FALSE; + return false; - widgetToInsert->reparent( w, TQPoint( 0, 0 ), FALSE ); + widgetToInsert->reparent( w, TQPoint( 0, 0 ), false ); widgetToInsert->show(); addedTo( widgetToInsert, w ); - return TRUE; + return true; } bool QDesignerAction::removeFrom( TQWidget *w ) @@ -120,23 +120,23 @@ bool QDesignerAction::removeFrom( TQWidget *w ) return TQAction::removeFrom( w ); remove(); - return TRUE; + return true; } void QDesignerAction::remove() { if ( !widgetToInsert ) return; - MainWindow::self->formWindow()->selectWidget( TQT_TQOBJECT(widgetToInsert), FALSE ); - widgetToInsert->reparent( 0, TQPoint( 0, 0 ), FALSE ); + MainWindow::self->formWindow()->selectWidget( widgetToInsert, false ); + widgetToInsert->reparent( 0, TQPoint( 0, 0 ), false ); } QDesignerToolBarSeparator::QDesignerToolBarSeparator(TQt::Orientation o , TQToolBar *parent, const char* name ) : TQWidget( parent, name ) { - connect( parent, TQT_SIGNAL(orientationChanged(TQt::Orientation)), - this, TQT_SLOT(setOrientation(TQt::Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(TQt::Orientation)), + this, TQ_SLOT(setOrientation(TQt::Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); @@ -187,25 +187,25 @@ bool QSeparatorAction::addTo( TQWidget *w ) if ( ::tqt_cast<TQToolBar*>(w) ) { TQToolBar *tb = (TQToolBar*)w; wid = new QDesignerToolBarSeparator( tb->orientation(), tb ); - return TRUE; + return true; } else if ( ::tqt_cast<TQPopupMenu*>(w) ) { idx = ( (TQPopupMenu*)w )->count(); ( (TQPopupMenu*)w )->insertSeparator( idx ); - return TRUE; + return true; } - return FALSE; + return false; } bool QSeparatorAction::removeFrom( TQWidget *w ) { if ( ::tqt_cast<TQToolBar*>(w) ) { delete wid; - return TRUE; + return true; } else if ( ::tqt_cast<TQPopupMenu*>(w) ) { ( (TQPopupMenu*)w )->removeItemAt( idx ); - return TRUE; + return true; } - return FALSE; + return false; } TQWidget *QSeparatorAction::widget() const @@ -219,31 +219,31 @@ QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw ) : TQToolBar( mw ), lastIndicatorPos( -1, -1 ) { insertAnchor = 0; - afterAnchor = TRUE; - setAcceptDrops( TRUE ); - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + afterAnchor = true; + setAcceptDrops( true ); + MetaDataBase::addEntry( this ); lastIndicatorPos = TQPoint( -1, -1 ); indicator = new QDesignerIndicatorWidget( this ); indicator->hide(); installEventFilter( this ); - widgetInserting = FALSE; + widgetInserting = false; findFormWindow(); - mw->setDockEnabled( DockTornOff, FALSE ); + mw->setDockEnabled( DockTornOff, false ); } QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw, Dock dock ) : TQToolBar( TQString(), mw, dock), lastIndicatorPos( -1, -1 ) { insertAnchor = 0; - afterAnchor = TRUE; - setAcceptDrops( TRUE ); + afterAnchor = true; + setAcceptDrops( true ); indicator = new QDesignerIndicatorWidget( this ); indicator->hide(); - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); installEventFilter( this ); - widgetInserting = FALSE; + widgetInserting = false; findFormWindow(); - mw->setDockEnabled( DockTornOff, FALSE ); + mw->setDockEnabled( DockTornOff, false ); } void QDesignerToolBar::findFormWindow() @@ -260,7 +260,7 @@ void QDesignerToolBar::findFormWindow() void QDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); - connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); if ( ::tqt_cast<TQActionGroup*>(a) ) { ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); @@ -287,7 +287,7 @@ bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) if ( o == this && e->type() == TQEvent::MouseButtonPress && ( ( TQMouseEvent*)e )->button() == TQt::LeftButton ) { mousePressEvent( (TQMouseEvent*)e ); - return TRUE; + return true; } if ( o == this ) @@ -297,30 +297,30 @@ bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) TQMouseEvent *ke = (TQMouseEvent*)e; fixObject( o ); if ( !o ) - return FALSE; + return false; buttonMousePressEvent( ke, o ); - return TRUE; + return true; } else if(e->type() == TQEvent::ContextMenu ) { TQContextMenuEvent *ce = (TQContextMenuEvent*)e; fixObject( o ); if( !o ) - return FALSE; + return false; buttonContextMenuEvent( ce, o ); - return TRUE; + return true; } else if ( e->type() == TQEvent::MouseMove ) { TQMouseEvent *ke = (TQMouseEvent*)e; fixObject( o ); if ( !o ) - return FALSE; + return false; buttonMouseMoveEvent( ke, o ); - return TRUE; + return true; } else if ( e->type() == TQEvent::MouseButtonRelease ) { TQMouseEvent *ke = (TQMouseEvent*)e; fixObject( o ); if ( !o ) - return FALSE; + return false; buttonMouseReleaseEvent( ke, o ); - return TRUE; + return true; } else if ( e->type() == TQEvent::DragEnter ) { TQDragEnterEvent *de = (TQDragEnterEvent*)e; if (ActionDrag::canDecode(de)) @@ -358,20 +358,20 @@ void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e ) void QDesignerToolBar::mousePressEvent( TQMouseEvent *e ) { - widgetInserting = FALSE; + widgetInserting = false; if ( e->button() == TQt::LeftButton && MainWindow::self->currentTool() != POINTER_TOOL && MainWindow::self->currentTool() != ORDER_TOOL && MainWindow::self->currentTool() != CONNECT_TOOL && MainWindow::self->currentTool() != BUDDY_TOOL ) - widgetInserting = TRUE; + widgetInserting = true; } void QDesignerToolBar::mouseReleaseEvent( TQMouseEvent *e ) { if ( widgetInserting ) doInsertWidget( mapFromGlobal( e->globalPos() ) ); - widgetInserting = FALSE; + widgetInserting = false; } void QDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w ) @@ -379,10 +379,10 @@ void QDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w ) if ( widgetInserting ) doInsertWidget( mapFromGlobal( e->globalPos() ) ); else if ( w->isWidgetType() && formWindow->widgets()->find( w ) ) { - formWindow->clearSelection( FALSE ); + formWindow->clearSelection( false ); formWindow->selectWidget( w ); } - widgetInserting = FALSE; + widgetInserting = false; } void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *o ) @@ -438,7 +438,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) { - widgetInserting = FALSE; + widgetInserting = false; if ( e->button() == TQt::MidButton ) return; @@ -448,7 +448,7 @@ void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) MainWindow::self->currentTool() != ORDER_TOOL && MainWindow::self->currentTool() != CONNECT_TOOL && MainWindow::self->currentTool() != BUDDY_TOOL ) { - widgetInserting = TRUE; + widgetInserting = true; return; } @@ -500,7 +500,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) drag->setPixmap( a->iconSet().pixmap() ); if ( ::tqt_cast<QDesignerAction*>(a) ) { if ( formWindow->widgets()->find( ( (QDesignerAction*)a )->widget() ) ) - formWindow->selectWidget( ( TQT_TQOBJECT(( (QDesignerAction*)a )->widget())), FALSE ); + formWindow->selectWidget( ( ( (QDesignerAction*)a )->widget()), false ); } if ( !drag->drag() ) { AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ). @@ -517,7 +517,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) void QDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e ) { - widgetInserting = FALSE; + widgetInserting = false; lastIndicatorPos = TQPoint( -1, -1 ); if (ActionDrag::canDecode(e)) e->accept(); @@ -535,7 +535,7 @@ void QDesignerToolBar::dragLeaveEvent( TQDragLeaveEvent * ) { indicator->hide(); insertAnchor = 0; - afterAnchor = TRUE; + afterAnchor = true; } void QDesignerToolBar::dropEvent( TQDropEvent *e ) @@ -614,7 +614,7 @@ TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos ) if ( orientation() ==TQt::Horizontal ) { TQPoint pnt( width() - 2, 0 ); insertAnchor = 0; - afterAnchor = TRUE; + afterAnchor = true; TQObjectList clo = childrenListObject(); if ( clo.isEmpty() ) return pnt; @@ -629,7 +629,7 @@ TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos ) if ( w->x() < pos.x() ) { pnt.setX( w->x() + w->width() + 1 ); insertAnchor = w; - afterAnchor = TRUE; + afterAnchor = true; } } } @@ -637,7 +637,7 @@ TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos ) } else { TQPoint pnt( 0, height() - 2 ); insertAnchor = 0; - afterAnchor = TRUE; + afterAnchor = true; TQObjectList clo = childrenListObject(); if ( clo.isEmpty() ) return pnt; @@ -652,7 +652,7 @@ TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos ) if ( w->y() < pos.y() ) { pnt.setY( w->y() + w->height() + 1 ); insertAnchor = w; - afterAnchor = TRUE; + afterAnchor = true; } } } @@ -689,9 +689,9 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p ) if ( formWindow != MainWindow::self->formWindow() ) return; calcIndicatorPos( p ); - TQWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, TRUE ); + TQWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, true ); installEventFilters( w ); - MainWindow::self->formWindow()->insertWidget( w, TRUE ); + MainWindow::self->formWindow()->insertWidget( w, true ); QDesignerAction *a = new QDesignerAction( w, parent() ); int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) diff --git a/kdevdesigner/designer/actioneditor.ui b/kdevdesigner/designer/actioneditor.ui index 13a56a04..9cb136ae 100644 --- a/kdevdesigner/designer/actioneditor.ui +++ b/kdevdesigner/designer/actioneditor.ui @@ -210,14 +210,14 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">connectionsClicked()</slot> <slot access="protected">currentActionChanged( TQListViewItem * )</slot> <slot access="protected">deleteAction()</slot> <slot access="protected">newAction()</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> diff --git a/kdevdesigner/designer/actioneditorimpl.cpp b/kdevdesigner/designer/actioneditorimpl.cpp index a08edc67..45b70994 100644 --- a/kdevdesigner/designer/actioneditorimpl.cpp +++ b/kdevdesigner/designer/actioneditorimpl.cpp @@ -50,21 +50,21 @@ ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) explicitlyClosed(false) { listActions->addColumn( i18n( "Actions" ) ); - setEnabled( FALSE ); - buttonConnect->setEnabled( FALSE ); + setEnabled( false ); + buttonConnect->setEnabled( false ); TQPopupMenu *popup = new TQPopupMenu( this ); - popup->insertItem( i18n( "New &Action" ), this, TQT_SLOT( newAction() ) ); - popup->insertItem( i18n( "New Action &Group" ), this, TQT_SLOT( newActionGroup() ) ); - popup->insertItem( i18n( "New &Dropdown Action Group" ), this, TQT_SLOT( newDropDownActionGroup() ) ); + popup->insertItem( i18n( "New &Action" ), this, TQ_SLOT( newAction() ) ); + popup->insertItem( i18n( "New Action &Group" ), this, TQ_SLOT( newActionGroup() ) ); + popup->insertItem( i18n( "New &Dropdown Action Group" ), this, TQ_SLOT( newDropDownActionGroup() ) ); buttonNewAction->setPopup( popup ); buttonNewAction->setPopupDelay( 0 ); - connect( listActions, TQT_SIGNAL( insertAction() ), this, TQT_SLOT( newAction() ) ); - connect( listActions, TQT_SIGNAL( insertActionGroup() ), this, TQT_SLOT( newActionGroup() ) ); - connect( listActions, TQT_SIGNAL( insertDropDownActionGroup() ), this, TQT_SLOT( newDropDownActionGroup() ) ); - connect( listActions, TQT_SIGNAL( deleteAction() ), this, TQT_SLOT( deleteAction() ) ); - connect( listActions, TQT_SIGNAL( connectAction() ), this, TQT_SLOT( connectionsClicked() ) ); + connect( listActions, TQ_SIGNAL( insertAction() ), this, TQ_SLOT( newAction() ) ); + connect( listActions, TQ_SIGNAL( insertActionGroup() ), this, TQ_SLOT( newActionGroup() ) ); + connect( listActions, TQ_SIGNAL( insertDropDownActionGroup() ), this, TQ_SLOT( newDropDownActionGroup() ) ); + connect( listActions, TQ_SIGNAL( deleteAction() ), this, TQ_SLOT( deleteAction() ) ); + connect( listActions, TQ_SIGNAL( connectAction() ), this, TQ_SLOT( connectionsClicked() ) ); } void ActionEditor::closeEvent( TQCloseEvent *e ) @@ -101,21 +101,21 @@ void ActionEditor::setCurrentAction( TQAction *a ) TQAction *ActionEditor::newActionEx() { - ActionItem *i = new ActionItem( listActions, (bool)FALSE ); + ActionItem *i = new ActionItem( listActions, (bool)false ); TQAction *a = i->action(); - TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->action() ); TQString n = "Action"; - formWindow->unify( i->action(), n, TRUE ); + formWindow->unify( i->action(), n, true ); i->setText( 0, n ); i->action()->setName( n ); i->action()->setText( i->action()->name() ); - MetaDataBase::setPropertyChanged( i->action(), "text", TRUE ); - MetaDataBase::setPropertyChanged( i->action(), "name", TRUE ); + MetaDataBase::setPropertyChanged( i->action(), "text", true ); + MetaDataBase::setPropertyChanged( i->action(), "name", true ); formWindow->actionList().append( i->action() ); if ( formWindow->formFile() ) - formWindow->formFile()->setModified( TRUE ); + formWindow->formFile()->setModified( true ); return i->action(); } @@ -139,9 +139,9 @@ void ActionEditor::deleteAction() ++it; } if ( formWindow ) { - formWindow->setActiveObject( TQT_TQOBJECT(formWindow->mainContainer()) ); + formWindow->setActiveObject( formWindow->mainContainer() ); if ( formWindow->formFile() ) - formWindow->formFile()->setModified( TRUE ); + formWindow->formFile()->setModified( true ); } } @@ -157,28 +157,28 @@ void ActionEditor::newAction() if ( actionParent ) i = new ActionItem( actionParent ); else - i = new ActionItem( listActions, (bool)FALSE ); + i = new ActionItem( listActions, (bool)false ); TQAction *a = i->action(); - TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->action() ); TQString n = "Action"; - formWindow->unify( i->action(), n, TRUE ); + formWindow->unify( i->action(), n, true ); i->setText( 0, n ); i->action()->setName( n ); i->action()->setText( i->action()->name() ); if ( actionParent && actionParent->actionGroup() && actionParent->actionGroup()->usesDropDown() ) { - i->action()->setToggleAction( TRUE ); - MetaDataBase::setPropertyChanged( i->action(), "toggleAction", TRUE ); + i->action()->setToggleAction( true ); + MetaDataBase::setPropertyChanged( i->action(), "toggleAction", true ); } - MetaDataBase::setPropertyChanged( i->action(), "text", TRUE ); - MetaDataBase::setPropertyChanged( i->action(), "name", TRUE ); + MetaDataBase::setPropertyChanged( i->action(), "text", true ); + MetaDataBase::setPropertyChanged( i->action(), "name", true ); listActions->setCurrentItem( i ); if ( !actionParent ) formWindow->actionList().append( i->action() ); if ( formWindow->formFile() ) - formWindow->formFile()->setModified( TRUE ); + formWindow->formFile()->setModified( true ); } void ActionEditor::newActionGroup() @@ -191,33 +191,33 @@ void ActionEditor::newActionGroup() ActionItem *i = 0; if ( actionParent ) - i = new ActionItem( actionParent, TRUE ); + i = new ActionItem( actionParent, true ); else - i = new ActionItem( listActions, TRUE ); + i = new ActionItem( listActions, true ); TQAction *ag = i->actionGroup(); - TQObject::connect( ag, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( ag, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->actionGroup() ); - MetaDataBase::setPropertyChanged( i->actionGroup(), "usesDropDown", TRUE ); + MetaDataBase::setPropertyChanged( i->actionGroup(), "usesDropDown", true ); TQString n = "ActionGroup"; - formWindow->unify( i->action(), n, TRUE ); + formWindow->unify( i->action(), n, true ); i->setText( 0, n ); i->actionGroup()->setName( n ); i->actionGroup()->setText( i->actionGroup()->name() ); - MetaDataBase::setPropertyChanged( i->actionGroup(), "text", TRUE ); - MetaDataBase::setPropertyChanged( i->actionGroup(), "name", TRUE ); + MetaDataBase::setPropertyChanged( i->actionGroup(), "text", true ); + MetaDataBase::setPropertyChanged( i->actionGroup(), "name", true ); listActions->setCurrentItem( i ); - i->setOpen( TRUE ); + i->setOpen( true ); if ( !actionParent ) formWindow->actionList().append( i->actionGroup() ); if ( formWindow->formFile() ) - formWindow->formFile()->setModified( TRUE ); + formWindow->formFile()->setModified( true ); } void ActionEditor::newDropDownActionGroup() { newActionGroup(); - ( (ActionItem*)listActions->currentItem() )->actionGroup()->setUsesDropDown( TRUE ); + ( (ActionItem*)listActions->currentItem() )->actionGroup()->setUsesDropDown( true ); } void ActionEditor::setFormWindow( FormWindow *fw ) @@ -226,9 +226,9 @@ void ActionEditor::setFormWindow( FormWindow *fw ) formWindow = fw; if ( !formWindow || !::tqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) { - setEnabled( FALSE ); + setEnabled( false ); } else { - setEnabled( TRUE ); + setEnabled( true ); for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) { ActionItem *i = 0; if ( ::tqt_cast<TQAction*>(a->parent()) ) @@ -237,17 +237,17 @@ void ActionEditor::setFormWindow( FormWindow *fw ) i->setText( 0, a->name() ); i->setPixmap( 0, a->iconSet().pixmap() ); // make sure we don't duplicate the connection - TQObject::disconnect( a, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject * ) ) ); - TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject* ) ) ); + TQObject::disconnect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); if ( ::tqt_cast<TQActionGroup*>(a) ) { insertChildActions( i ); } } if ( listActions->firstChild() ) { listActions->setCurrentItem( listActions->firstChild() ); - listActions->setSelected( listActions->firstChild(), TRUE ); + listActions->setSelected( listActions->firstChild(), true ); } } } @@ -265,14 +265,14 @@ void ActionEditor::insertChildActions( ActionItem *i ) continue; TQAction *a = (TQAction*)o; ActionItem *i2 = new ActionItem( (TQListViewItem*)i, a ); - i->setOpen( TRUE ); + i->setOpen( true ); i2->setText( 0, a->name() ); i2->setPixmap( 0, a->iconSet().pixmap() ); // make sure we don't duplicate the connection - TQObject::disconnect( o, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject * ) ) ); - TQObject::connect( o, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject * ) ) ); + TQObject::disconnect( o, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); + TQObject::connect( o, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); if ( ::tqt_cast<TQActionGroup*>(a) ) insertChildActions( i2 ); } @@ -305,7 +305,7 @@ void ActionEditor::updateActionIcon( TQAction *a ) void ActionEditor::connectionsClicked() { ConnectionDialog dlg( formWindow->mainWindow() ); - dlg.setDefault( TQT_TQOBJECT(currentAction), TQT_TQOBJECT(formWindow) ); + dlg.setDefault( currentAction, formWindow ); dlg.addConnection(); dlg.exec(); } @@ -313,9 +313,9 @@ void ActionEditor::connectionsClicked() void ActionEditor::removeConnections( TQObject *o ) { TQValueList<MetaDataBase::Connection> conns = - MetaDataBase::connections( TQT_TQOBJECT(formWindow), o ); + MetaDataBase::connections( formWindow, o ); for ( TQValueList<MetaDataBase::Connection>::Iterator it2 = conns.begin(); it2 != conns.end(); ++it2 ) - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow), (*it2).sender, (*it2).signal, + MetaDataBase::removeConnection( formWindow, (*it2).sender, (*it2).signal, (*it2).receiver, (*it2).slot ); } diff --git a/kdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp index 21a1dc6d..d34aca5d 100644 --- a/kdevdesigner/designer/actionlistview.cpp +++ b/kdevdesigner/designer/actionlistview.cpp @@ -33,11 +33,11 @@ ActionListView::ActionListView( TQWidget *parent, const char *name ) : TQListView( parent, name ) { - setShowSortIndicator( TRUE ); + setShowSortIndicator( true ); setResizeMode( LastColumn ); - setRootIsDecorated( TRUE ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); + setRootIsDecorated( true ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); } ActionItem::ActionItem( TQListView *lv, TQAction *ac ) @@ -46,7 +46,7 @@ ActionItem::ActionItem( TQListView *lv, TQAction *ac ) g = ::tqt_cast<QDesignerActionGroup*>(ac); if ( !g ) a = ::tqt_cast<QDesignerAction*>(ac); - setDragEnabled( TRUE ); + setDragEnabled( true ); } ActionItem::ActionItem( TQListViewItem *i, TQAction *ac ) @@ -55,7 +55,7 @@ ActionItem::ActionItem( TQListViewItem *i, TQAction *ac ) g = ::tqt_cast<QDesignerActionGroup*>(ac); if ( !g ) a = ::tqt_cast<QDesignerAction*>(ac); - setDragEnabled( TRUE ); + setDragEnabled( true ); moveToEnd(); } diff --git a/kdevdesigner/designer/actionlistview.h b/kdevdesigner/designer/actionlistview.h index 093c884c..a7b1fa45 100644 --- a/kdevdesigner/designer/actionlistview.h +++ b/kdevdesigner/designer/actionlistview.h @@ -36,13 +36,13 @@ public: ActionItem( TQListView *lv, bool group ) : TQListViewItem( lv ), a( group ? 0 : new QDesignerAction( 0 ) ), - g( group ? new QDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); } + g( group ? new QDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( true ); } ActionItem( TQListView *lv, TQAction *ac ); ActionItem( TQListViewItem *i, TQAction *ac ); - ActionItem( ActionItem *parent, bool group = FALSE ) + ActionItem( ActionItem *parent, bool group = false ) : TQListViewItem( parent ), a( group ? 0 : new QDesignerAction( parent->actionGroup() ) ), - g( group ? new QDesignerActionGroup( parent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); } + g( group ? new QDesignerActionGroup( parent->actionGroup() ) : 0 ) { setDragEnabled( true ); moveToEnd(); } QDesignerAction *action() const { return a; } QDesignerActionGroup *actionGroup() const { return g; } diff --git a/kdevdesigner/designer/asciivalidator.cpp b/kdevdesigner/designer/asciivalidator.cpp index 667b0a61..696ffeae 100644 --- a/kdevdesigner/designer/asciivalidator.cpp +++ b/kdevdesigner/designer/asciivalidator.cpp @@ -29,7 +29,7 @@ #include <tqstring.h> AsciiValidator::AsciiValidator( TQObject * parent, const char *name ) - : TQValidator( parent, name ), functionName( FALSE ) + : TQValidator( parent, name ), functionName( false ) { } @@ -39,7 +39,7 @@ AsciiValidator::AsciiValidator( bool funcName, TQObject * parent, const char *na } AsciiValidator::AsciiValidator( const TQString &allow, TQObject * parent, const char *name ) - : TQValidator( parent, name ), functionName( FALSE ), allowedChars( allow ) + : TQValidator( parent, name ), functionName( false ), allowedChars( allow ) { } @@ -49,8 +49,8 @@ AsciiValidator::~AsciiValidator() TQValidator::State AsciiValidator::validate( TQString &s, int & ) const { - bool inParen = FALSE; - bool outParen = FALSE; + bool inParen = false; + bool outParen = false; if ( !s.isEmpty() && s[0].row() == 0 && s[0].cell() >= '0' && s[0].cell() <= '9' ) s[0] = '_'; for ( int i = 0, j = 0; i < (int) s.length(); i++ ) { @@ -75,11 +75,11 @@ TQValidator::State AsciiValidator::validate( TQString &s, int & ) const if ( functionName ) { if ( c == '(' ) { - inParen = TRUE; + inParen = true; continue; } if ( c == ')' ) { - outParen = TRUE; + outParen = true; j = i + 1; continue; } diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp index a1c445ad..4e4eab06 100644 --- a/kdevdesigner/designer/command.cpp +++ b/kdevdesigner/designer/command.cpp @@ -63,8 +63,8 @@ CommandHistory::CommandHistory( int s ) : current( -1 ), steps( s ), savedAt( -1 ) { - history.setAutoDelete( TRUE ); - modified = FALSE; + history.setAutoDelete( true ); + modified = false; compressedCommand = 0; } @@ -80,7 +80,7 @@ void CommandHistory::addCommand( Command *cmd, bool tryCompress ) if ( compressedCommand ) { compressedCommand->merge( cmd ); - modified = TRUE; + modified = true; modificationChanged( modified ); return; } @@ -94,7 +94,7 @@ void CommandHistory::addCommand( Command *cmd, bool tryCompress ) savedAt = -2; TQPtrList<Command> commands; - commands.setAutoDelete( FALSE ); + commands.setAutoDelete( false ); for( int i = 0; i <= current; ++i ) { commands.insert( i, history.at( 0 ) ); @@ -104,7 +104,7 @@ void CommandHistory::addCommand( Command *cmd, bool tryCompress ) commands.append( cmd ); history.clear(); history = commands; - history.setAutoDelete( TRUE ); + history.setAutoDelete( true ); } else { history.append( cmd ); } @@ -117,7 +117,7 @@ void CommandHistory::addCommand( Command *cmd, bool tryCompress ) } emitUndoRedo(); - modified = TRUE; + modified = true; modificationChanged( modified ); } @@ -228,7 +228,7 @@ void Command::merge( Command * ) bool Command::canMerge( Command * ) { - return FALSE; + return false; } // ------------------------------------------------------------ @@ -243,7 +243,7 @@ void ResizeCommand::execute() { widget->setGeometry( newRect ); formWindow()->updateSelection( widget ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) ); + formWindow()->emitUpdateProperties( widget ); if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout ) formWindow()->updateChildSelections( widget ); } @@ -252,7 +252,7 @@ void ResizeCommand::unexecute() { widget->setGeometry( oldRect ); formWindow()->updateSelection( widget ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) ); + formWindow()->emitUpdateProperties( widget ); if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout ) formWindow()->updateChildSelections( widget ); } @@ -278,16 +278,16 @@ void InsertCommand::execute() } widget->show(); formWindow()->widgets()->insert( widget, widget ); - formWindow()->clearSelection( FALSE ); - formWindow()->selectWidget( TQT_TQOBJECT(widget) ); + formWindow()->clearSelection( false ); + formWindow()->selectWidget( widget ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( widget ); } void InsertCommand::unexecute() { widget->hide(); - formWindow()->selectWidget( TQT_TQOBJECT(widget), FALSE ); - formWindow()->widgets()->remove( TQT_TQOBJECT(widget) ); + formWindow()->selectWidget( widget, false ); + formWindow()->widgets()->remove( widget ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( widget ); } @@ -301,7 +301,7 @@ MoveCommand::MoveCommand( const TQString &n, FormWindow *fw, : Command( n, fw ), widgets( w ), oldPos( op ), newPos( np ), oldParent( opr ), newParent( npr ) { - widgets.setAutoDelete( FALSE ); + widgets.setAutoDelete( false ); } void MoveCommand::merge( Command *c ) @@ -323,10 +323,10 @@ void MoveCommand::execute() if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) { if ( newParent && oldParent && newParent != oldParent ) { TQPoint pos = newParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) ); - w->reparent( newParent, pos, TRUE ); + w->reparent( newParent, pos, true ); formWindow()->raiseSelection( w ); formWindow()->raiseChildSelections( w ); - formWindow()->widgetChanged( TQT_TQOBJECT(w) ); + formWindow()->widgetChanged( w ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w ); } @@ -334,7 +334,7 @@ void MoveCommand::execute() } formWindow()->updateSelection( w ); formWindow()->updateChildSelections( w ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) ); + formWindow()->emitUpdateProperties( w ); } } @@ -344,10 +344,10 @@ void MoveCommand::unexecute() if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) { if ( newParent && oldParent && newParent != oldParent ) { TQPoint pos = oldParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) ); - w->reparent( oldParent, pos, TRUE ); + w->reparent( oldParent, pos, true ); formWindow()->raiseSelection( w ); formWindow()->raiseChildSelections( w ); - formWindow()->widgetChanged( TQT_TQOBJECT(w) ); + formWindow()->widgetChanged( w ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w ); } @@ -355,7 +355,7 @@ void MoveCommand::unexecute() } formWindow()->updateSelection( w ); formWindow()->updateChildSelections( w ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) ); + formWindow()->emitUpdateProperties( w ); } } @@ -365,9 +365,9 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw, const TQWidgetList &wl ) : Command( n, fw ), widgets( wl ) { - widgets.setAutoDelete( FALSE ); + widgets.setAutoDelete( false ); TQWidgetList copyOfWidgets = widgets; - copyOfWidgets.setAutoDelete(FALSE); + copyOfWidgets.setAutoDelete(false); // Include the children of the selected items when deleting for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { @@ -385,24 +385,24 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw, void DeleteCommand::execute() { - formWindow()->setPropertyShowingBlocked( TRUE ); + formWindow()->setPropertyShowingBlocked( true ); connections.clear(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->hide(); TQString s = w->name(); s.prepend( "qt_dead_widget_" ); w->setName( s ); - formWindow()->selectWidget( TQT_TQOBJECT(w), FALSE ); + formWindow()->selectWidget( w, false ); formWindow()->widgets()->remove( w ); - TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( TQT_TQOBJECT(formWindow()), TQT_TQOBJECT(w) ); + TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( formWindow(), w ); connections.insert( w, conns ); TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), (*it).sender, + MetaDataBase::removeConnection( formWindow(), (*it).sender, (*it).signal, (*it).receiver, (*it).slot ); } } - formWindow()->setPropertyShowingBlocked( FALSE ); + formWindow()->setPropertyShowingBlocked( false ); formWindow()->emitShowProperties(); formWindow()->mainWindow()->objectHierarchy()->widgetsRemoved( widgets ); @@ -410,23 +410,23 @@ void DeleteCommand::execute() void DeleteCommand::unexecute() { - formWindow()->setPropertyShowingBlocked( TRUE ); - formWindow()->clearSelection( FALSE ); + formWindow()->setPropertyShowingBlocked( true ); + formWindow()->clearSelection( false ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->show(); TQString s = w->name(); s.remove( 0, TQString( "qt_dead_widget_" ).length() ); w->setName( s ); formWindow()->widgets()->insert( w, w ); - formWindow()->selectWidget( TQT_TQOBJECT(w) ); + formWindow()->selectWidget( w ); TQValueList<MetaDataBase::Connection> conns = *connections.find( w ); TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), (*it).sender, + MetaDataBase::addConnection( formWindow(), (*it).sender, (*it).signal, (*it).receiver, (*it).slot ); } } - formWindow()->setPropertyShowingBlocked( FALSE ); + formWindow()->setPropertyShowingBlocked( false ); formWindow()->emitShowProperties(); formWindow()->mainWindow()->objectHierarchy()->widgetsInserted( widgets ); } @@ -440,7 +440,7 @@ SetPropertyCommand::SetPropertyCommand( const TQString &n, FormWindow *fw, const TQString &ocut, bool reset ) : Command( n, fw ), widget( w ), editor( e ), propName( pn ), oldValue( ov ), newValue( nv ), oldCurrentItemText( ocut ), newCurrentItemText( ncut ), - wasChanged( TRUE ), isResetCommand( reset ) + wasChanged( true ), isResetCommand( reset ) { wasChanged = MetaDataBase::isPropertyChanged( w, propName ); if ( oldCurrentItemText.isNull() ) @@ -453,12 +453,12 @@ SetPropertyCommand::SetPropertyCommand( const TQString &n, FormWindow *fw, void SetPropertyCommand::execute() { if ( !wasChanged ) - MetaDataBase::setPropertyChanged( widget, propName, TRUE ); + MetaDataBase::setPropertyChanged( widget, propName, true ); if ( isResetCommand ) { - MetaDataBase::setPropertyChanged( widget, propName, FALSE ); + MetaDataBase::setPropertyChanged( widget, propName, false ); if ( WidgetFactory::resetProperty( widget, propName ) ) { - if ( !formWindow()->isWidgetSelected( widget ) && TQT_TQOBJECT(formWindow()) != TQT_TQOBJECT(widget) ) - formWindow()->selectWidget( TQT_TQOBJECT(widget) ); + if ( !formWindow()->isWidgetSelected( widget ) && formWindow() != widget ) + formWindow()->selectWidget( widget ); if ( editor->widget() != widget ) editor->setWidget( widget, formWindow() ); editor->propertyList()->setCurrentProperty( propName ); @@ -466,7 +466,7 @@ void SetPropertyCommand::execute() if ( !i ) return; i->setValue( widget->property( propName ) ); - i->setChanged( FALSE ); + i->setChanged( false ); editor->refetchData(); editor->emitWidgetChanged(); return; @@ -478,9 +478,9 @@ void SetPropertyCommand::execute() void SetPropertyCommand::unexecute() { if ( !wasChanged ) - MetaDataBase::setPropertyChanged( widget, propName, FALSE ); + MetaDataBase::setPropertyChanged( widget, propName, false ); if ( isResetCommand ) - MetaDataBase::setPropertyChanged( widget, propName, TRUE ); + MetaDataBase::setPropertyChanged( widget, propName, true ); setProperty( oldValue, oldCurrentItemText ); } @@ -488,24 +488,24 @@ bool SetPropertyCommand::canMerge( Command *c ) { SetPropertyCommand *cmd = (SetPropertyCommand*)c; if ( !widget ) - return FALSE; + return false; const TQMetaProperty *p = - widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE ); + widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true ); if ( !p ) { if ( propName == "toolTip" || propName == "whatsThis" ) - return TRUE; + return true; if ( ::tqt_cast<CustomWidget*>((TQObject *)widget) ) { MetaDataBase::CustomWidget *cw = ((CustomWidget*)(TQObject*)widget)->customWidget(); if ( !cw ) - return FALSE; + return false; for ( TQValueList<MetaDataBase::Property>::Iterator it = cw->lstProperties.begin(); it != cw->lstProperties.end(); ++it ) { if ( TQString( (*it ).property ) == propName ) { if ( (*it).type == "String" || (*it).type == "CString" || (*it).type == "Int" || (*it).type == "UInt" ) - return TRUE; + return true; } } } - return FALSE; + return false; } TQVariant::Type t = TQVariant::nameToType( p->type() ); return ( cmd->propName == propName && @@ -523,7 +523,7 @@ bool SetPropertyCommand::checkProperty() { if ( propName == "name" /*|| propName == "itemName"*/ ) { // ### fix that TQString s = newValue.toString(); - if ( !formWindow()->unify( widget, s, FALSE ) ) { + if ( !formWindow()->unify( widget, s, false ) ) { TQMessageBox::information( formWindow()->mainWindow(), i18n( "Set 'name' Property" ), i18n( "The name of a widget must be unique.\n" @@ -532,8 +532,8 @@ bool SetPropertyCommand::checkProperty() arg( newValue.toString() ). arg( formWindow()->name() ). arg( oldValue.toString() )); - setProperty( oldValue, oldCurrentItemText, FALSE ); - return FALSE; + setProperty( oldValue, oldCurrentItemText, false ); + return false; } if ( s.isEmpty() ) { TQMessageBox::information( formWindow()->mainWindow(), @@ -541,14 +541,14 @@ bool SetPropertyCommand::checkProperty() i18n( "The name of a widget must not be null.\n" "The name has been reverted to '%1'." ). arg( oldValue.toString() )); - setProperty( oldValue, oldCurrentItemText, FALSE ); - return FALSE; + setProperty( oldValue, oldCurrentItemText, false ); + return false; } if ( ::tqt_cast<FormWindow*>(widget->parent()) ) formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->parentWidget() ); } - return TRUE; + return true; } void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤tItemText, bool select ) @@ -557,22 +557,22 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ return; if ( !formWindow()->isWidgetSelected( widget ) && !formWindow()->isMainContainer( widget ) && select ) - formWindow()->selectWidget( TQT_TQOBJECT(widget) ); + formWindow()->selectWidget( widget ); if ( editor->widget() != widget && select ) editor->setWidget( widget, formWindow() ); if ( select ) editor->propertyList()->setCurrentProperty( propName ); const TQMetaProperty *p = - widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE ); + widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true ); if ( !p ) { if ( propName == "hAlign" ) { - p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE ); + p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true ); int align = widget->property( "alignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); align |= p->keyToValue( currentItemText ); widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { - p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE ); + p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true ); int align = widget->property( "alignment" ).toInt(); align &= ~( AlignVertical_Mask ); align |= p->keyToValue( currentItemText ); @@ -587,14 +587,14 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ TQVariant val = v; if ( val.toString() == "default" ) val = -1; - MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), val.toInt() ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ), val.toInt() ); } else if ( propName == "layoutMargin" ) { TQVariant val = v; if ( val.toString() == "default" ) val = -1; - MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), val.toInt() ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ), val.toInt() ); } else if ( propName == "resizeMode" ) { - MetaDataBase::setResizeMode( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), currentItemText ); + MetaDataBase::setResizeMode( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ), currentItemText ); } else if ( propName == "toolTip" || propName == "whatsThis" || propName == "database" || propName == "frameworkCode" ) { MetaDataBase::setFakeProperty( editor->widget(), propName, v ); } else if ( ::tqt_cast<CustomWidget*>(editor->widget()) ) { @@ -634,9 +634,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ oldSerNum = v.toPixmap().serialNumber(); widget->setProperty( propName, v ); if ( oldSerNum != -1 && oldSerNum != widget->property( propName ).toPixmap().serialNumber() ) - MetaDataBase::setPixmapKey( TQT_TQOBJECT(formWindow()), + MetaDataBase::setPixmapKey( formWindow(), widget->property( propName ).toPixmap().serialNumber(), - MetaDataBase::pixmapKey( TQT_TQOBJECT(formWindow()), oldSerNum ) ); + MetaDataBase::pixmapKey( formWindow(), oldSerNum ) ); if ( propName == "cursor" ) { MetaDataBase::setCursor( (TQWidget*)((TQObject *)widget), v.toCursor() ); } @@ -666,7 +666,7 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ ( ( PropertyItem* )editor->propertyList()->currentItem() )->setChanged( MetaDataBase::isPropertyChanged( widget, propName ) ); } editor->emitWidgetChanged(); - formWindow()->killAccels( TQT_TQOBJECT(widget) ); + formWindow()->killAccels( widget ); } // ------------------------------------------------------------ @@ -680,14 +680,14 @@ LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow void LayoutHorizontalCommand::execute() { - formWindow()->clearSelection( FALSE ); + formWindow()->clearSelection( false ); layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutHorizontalCommand::unexecute() { - formWindow()->clearSelection( FALSE ); + formWindow()->clearSelection( false ); layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -697,20 +697,20 @@ void LayoutHorizontalCommand::unexecute() LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase, true, true ) { } void LayoutHorizontalSplitCommand::execute() { - formWindow()->clearSelection( FALSE ); + formWindow()->clearSelection( false ); layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutHorizontalSplitCommand::unexecute() { - formWindow()->clearSelection( FALSE ); + formWindow()->clearSelection( false ); layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -726,14 +726,14 @@ LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw, void LayoutVerticalCommand::execute() { - formWindow()->clearSelection( FALSE ); + formWindow()->clearSelection( false ); layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutVerticalCommand::unexecute() { - formWindow()->clearSelection( FALSE ); + formWindow()->clearSelection( false ); layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -743,20 +743,20 @@ void LayoutVerticalCommand::unexecute() LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase, true, true ) { } void LayoutVerticalSplitCommand::execute() { - formWindow()->clearSelection( FALSE ); + formWindow()->clearSelection( false ); layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutVerticalSplitCommand::unexecute() { - formWindow()->clearSelection( FALSE ); + formWindow()->clearSelection( false ); layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -772,14 +772,14 @@ LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw, void LayoutGridCommand::execute() { - formWindow()->clearSelection( FALSE ); + formWindow()->clearSelection( false ); layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutGridCommand::unexecute() { - formWindow()->clearSelection( FALSE ); + formWindow()->clearSelection( false ); layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -791,22 +791,22 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw, : Command( n, fw ), lb( layoutBase ), widgets( wl ) { WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase ); - spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) ); - margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) ); + spacing = MetaDataBase::spacing( layoutBase ); + margin = MetaDataBase::margin( layoutBase ); layout = 0; if ( lay == WidgetFactory::HBox ) - layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqt_cast<TQSplitter*>(layoutBase) != 0 ); + layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, ::tqt_cast<TQSplitter*>(layoutBase) != 0 ); else if ( lay == WidgetFactory::VBox ) - layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqt_cast<TQSplitter*>(layoutBase) != 0 ); + layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, ::tqt_cast<TQSplitter*>(layoutBase) != 0 ); else if ( lay == WidgetFactory::Grid ) - layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE ); + layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), false ); } void BreakLayoutCommand::execute() { if ( !layout ) return; - formWindow()->clearSelection( FALSE ); + formWindow()->clearSelection( false ); layout->breakLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) @@ -817,11 +817,11 @@ void BreakLayoutCommand::unexecute() { if ( !layout ) return; - formWindow()->clearSelection( FALSE ); + formWindow()->clearSelection( false ); layout->doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); - MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing ); - MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( lb ), spacing ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( lb ), margin ); } // ------------------------------------------------------------ @@ -853,7 +853,7 @@ AddTabPageCommand::AddTabPageCommand( const TQString &n, FormWindow *fw, tabPage = new QDesignerWidget( formWindow(), tabWidget, "TabPage" ); tabPage->hide(); index = -1; - MetaDataBase::addEntry( TQT_TQOBJECT(tabPage) ); + MetaDataBase::addEntry( tabPage ); } void AddTabPageCommand::execute() @@ -862,7 +862,7 @@ void AddTabPageCommand::execute() index = ( (QDesignerTabWidget*)tabWidget )->count(); tabWidget->insertTab( tabPage, tabLabel, index ); tabWidget->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -870,7 +870,7 @@ void AddTabPageCommand::unexecute() { tabWidget->removePage( tabPage ); tabPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -889,7 +889,7 @@ void MoveTabPageCommand::execute() ((QDesignerTabWidget*)tabWidget )->removePage( tabPage ); ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, newIndex ); ((QDesignerTabWidget*)tabWidget )->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -898,7 +898,7 @@ void MoveTabPageCommand::unexecute() ((QDesignerTabWidget*)tabWidget )->removePage( tabPage ); ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, oldIndex ); ((QDesignerTabWidget*)tabWidget )->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -916,7 +916,7 @@ void DeleteTabPageCommand::execute() { tabWidget->removePage( tabPage ); tabPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -924,7 +924,7 @@ void DeleteTabPageCommand::unexecute() { tabWidget->insertTab( tabPage, tabLabel, index ); tabWidget->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -937,13 +937,13 @@ AddWidgetStackPageCommand::AddWidgetStackPageCommand( const TQString &n, FormWin stackPage = new QDesignerWidget( formWindow(), widgetStack, "WStackPage" ); stackPage->hide(); index = -1; - MetaDataBase::addEntry( TQT_TQOBJECT(stackPage) ); + MetaDataBase::addEntry( stackPage ); } void AddWidgetStackPageCommand::execute() { index = widgetStack->insertPage( stackPage, index ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( 0 ); } @@ -951,7 +951,7 @@ void AddWidgetStackPageCommand::unexecute() { index = widgetStack->removePage( stackPage ); stackPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( 0 ); } @@ -966,7 +966,7 @@ void DeleteWidgetStackPageCommand::execute() { index = widgetStack->removePage( stackPage ); stackPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( stackPage ); } @@ -974,7 +974,7 @@ void DeleteWidgetStackPageCommand::unexecute() { index = widgetStack->insertPage( stackPage, index ); widgetStack->raiseWidget( stackPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( stackPage ); } @@ -988,7 +988,7 @@ AddWizardPageCommand::AddWizardPageCommand( const TQString &n, FormWindow *fw, page->hide(); index = i; show = s; - MetaDataBase::addEntry( TQT_TQOBJECT(page) ); + MetaDataBase::addEntry( page ); } void AddWizardPageCommand::execute() @@ -998,7 +998,7 @@ void AddWizardPageCommand::execute() wizard->insertPage( page, pageLabel, index ); if ( show ) ( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1006,7 +1006,7 @@ void AddWizardPageCommand::unexecute() { wizard->removePage( page ); page->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1025,7 +1025,7 @@ void DeleteWizardPageCommand::execute() pageLabel = wizard->title( page ); wizard->removePage( page ); page->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1034,7 +1034,7 @@ void DeleteWizardPageCommand::unexecute() wizard->insertPage( page, pageLabel, index ); if ( show ) ( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1054,7 +1054,7 @@ void RenameWizardPageCommand::execute() wizard->setTitle( page, label ); label = oldLabel; - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); } void RenameWizardPageCommand::unexecute() @@ -1079,7 +1079,7 @@ void SwapWizardPagesCommand::execute() wizard->removePage( page2 ); wizard->insertPage( page1, page1Label, index2 ); wizard->insertPage( page2, page2Label, index1 ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1101,7 +1101,7 @@ void MoveWizardPageCommand::execute() TQString pageLabel = wizard->title( page ); wizard->removePage( page ); wizard->insertPage( page, pageLabel, index2 ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1112,7 +1112,7 @@ void MoveWizardPageCommand::unexecute() TQString pageLabel = wizard->title( page ); wizard->removePage( page ); wizard->insertPage( page, pageLabel, index1 ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1126,7 +1126,7 @@ AddConnectionCommand::AddConnectionCommand( const TQString &name, FormWindow *fw void AddConnectionCommand::execute() { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::addConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); if ( connection.receiver == formWindow()->mainContainer() ) formWindow()->mainWindow()->propertyeditor()->eventList()->setup(); @@ -1134,7 +1134,7 @@ void AddConnectionCommand::execute() void AddConnectionCommand::unexecute() { - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::removeConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); if ( connection.receiver == formWindow()->mainContainer() ) formWindow()->mainWindow()->propertyeditor()->eventList()->setup(); @@ -1150,7 +1150,7 @@ RemoveConnectionCommand::RemoveConnectionCommand( const TQString &name, FormWind void RemoveConnectionCommand::execute() { - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::removeConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); if ( connection.receiver == formWindow()->mainContainer() ) formWindow()->mainWindow()->propertyeditor()->eventList()->setup(); @@ -1158,7 +1158,7 @@ void RemoveConnectionCommand::execute() void RemoveConnectionCommand::unexecute() { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::addConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); if ( connection.receiver == formWindow()->mainContainer() ) formWindow()->mainWindow()->propertyeditor()->eventList()->setup(); @@ -1176,7 +1176,7 @@ AddFunctionCommand::AddFunctionCommand( const TQString &name, FormWindow *fw, co void AddFunctionCommand::execute() { - MetaDataBase::addFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType ); + MetaDataBase::addFunction( formWindow(), function, specifier, access, functionType, language, returnType ); formWindow()->mainWindow()->functionsChanged(); //integration (add - execute) @@ -1190,12 +1190,12 @@ void AddFunctionCommand::execute() formWindow()->mainWindow()->part()->emitAddedFunction(formWindow()->fileName(), f); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } void AddFunctionCommand::unexecute() { - MetaDataBase::removeFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType ); + MetaDataBase::removeFunction( formWindow(), function, specifier, access, functionType, language, returnType ); formWindow()->mainWindow()->functionsChanged(); //integration (add - unexecute) @@ -1208,7 +1208,7 @@ void AddFunctionCommand::unexecute() formWindow()->mainWindow()->part()->emitRemovedFunction(formWindow()->fileName(), f); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } // ------------------------------------------------------------ @@ -1230,7 +1230,7 @@ ChangeFunctionAttribCommand::ChangeFunctionAttribCommand( const TQString &name, void ChangeFunctionAttribCommand::execute() { - MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formWindow()), oldName, newName, newSpec, newAccess, + MetaDataBase::changeFunctionAttributes( formWindow(), oldName, newName, newSpec, newAccess, newType, newLang, newReturnType ); formWindow()->formFile()->functionNameChanged( oldName, newName ); formWindow()->formFile()->functionRetTypeChanged( newName, oldReturnType, newReturnType ); @@ -1252,12 +1252,12 @@ void ChangeFunctionAttribCommand::execute() formWindow()->mainWindow()->part()->emitEditedFunction(formWindow()->fileName(), of, f); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } void ChangeFunctionAttribCommand::unexecute() { - MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formWindow()), newName, oldName, oldSpec, oldAccess, + MetaDataBase::changeFunctionAttributes( formWindow(), newName, oldName, oldSpec, oldAccess, oldType, oldLang, oldReturnType ); formWindow()->formFile()->functionNameChanged( newName, oldName ); formWindow()->formFile()->functionRetTypeChanged( oldName, newReturnType, oldReturnType ); @@ -1279,7 +1279,7 @@ void ChangeFunctionAttribCommand::unexecute() formWindow()->mainWindow()->part()->emitEditedFunction(formWindow()->fileName(), f, of); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } // ------------------------------------------------------------ @@ -1291,7 +1291,7 @@ RemoveFunctionCommand::RemoveFunctionCommand( const TQString &name, FormWindow * returnType( rt ) { if ( spec.isNull() ) { - TQValueList<MetaDataBase::Function> lst = MetaDataBase::functionList( TQT_TQOBJECT(fw) ); + TQValueList<MetaDataBase::Function> lst = MetaDataBase::functionList( fw ); for ( TQValueList<MetaDataBase::Function>::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( MetaDataBase::normalizeFunction( (*it).function ) == MetaDataBase::normalizeFunction( function ) ) { @@ -1308,7 +1308,7 @@ RemoveFunctionCommand::RemoveFunctionCommand( const TQString &name, FormWindow * void RemoveFunctionCommand::execute() { - MetaDataBase::removeFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType ); + MetaDataBase::removeFunction( formWindow(), function, specifier, access, functionType, language, returnType ); formWindow()->mainWindow()->functionsChanged(); //integration (remove - execute) @@ -1321,14 +1321,14 @@ void RemoveFunctionCommand::execute() formWindow()->mainWindow()->part()->emitRemovedFunction(formWindow()->fileName(), f); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } void RemoveFunctionCommand::unexecute() { - if ( MetaDataBase::hasFunction( TQT_TQOBJECT(formWindow()), function ) ) + if ( MetaDataBase::hasFunction( formWindow(), function ) ) return; - MetaDataBase::addFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType ); + MetaDataBase::addFunction( formWindow(), function, specifier, access, functionType, language, returnType ); formWindow()->mainWindow()->functionsChanged(); //integration (remove - unexecute) @@ -1342,7 +1342,7 @@ void RemoveFunctionCommand::unexecute() formWindow()->mainWindow()->part()->emitAddedFunction(formWindow()->fileName(), f); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } // ------------------------------------------------------------ @@ -1354,18 +1354,18 @@ AddVariableCommand::AddVariableCommand( const TQString &name, FormWindow *fw, co void AddVariableCommand::execute() { - MetaDataBase::addVariable( TQT_TQOBJECT(formWindow()), varName, access ); + MetaDataBase::addVariable( formWindow(), varName, access ); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } void AddVariableCommand::unexecute() { - MetaDataBase::removeVariable( TQT_TQOBJECT(formWindow()), varName ); + MetaDataBase::removeVariable( formWindow(), varName ); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } // ------------------------------------------------------------ @@ -1374,23 +1374,23 @@ SetVariablesCommand::SetVariablesCommand( const TQString &name, FormWindow *fw, TQValueList<MetaDataBase::Variable> lst ) : Command( name, fw ), newList( lst ) { - oldList = MetaDataBase::variables( TQT_TQOBJECT(formWindow()) ); + oldList = MetaDataBase::variables( formWindow() ); } void SetVariablesCommand::execute() { - MetaDataBase::setVariables( TQT_TQOBJECT(formWindow()), newList ); + MetaDataBase::setVariables( formWindow(), newList ); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } void SetVariablesCommand::unexecute() { - MetaDataBase::setVariables( TQT_TQOBJECT(formWindow()), oldList ); + MetaDataBase::setVariables( formWindow(), oldList ); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } // ------------------------------------------------------------ @@ -1398,7 +1398,7 @@ void SetVariablesCommand::unexecute() RemoveVariableCommand::RemoveVariableCommand( const TQString &name, FormWindow *fw, const TQString &vn ) : Command( name, fw ), varName( vn ) { - TQValueList<MetaDataBase::Variable> lst = MetaDataBase::variables( TQT_TQOBJECT(fw) ); + TQValueList<MetaDataBase::Variable> lst = MetaDataBase::variables( fw ); for ( TQValueList<MetaDataBase::Variable>::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( (*it).varName == varName ) { access = (*it).varAccess; @@ -1409,18 +1409,18 @@ RemoveVariableCommand::RemoveVariableCommand( const TQString &name, FormWindow * void RemoveVariableCommand::execute() { - MetaDataBase::removeVariable( TQT_TQOBJECT(formWindow()), varName ); + MetaDataBase::removeVariable( formWindow(), varName ); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } void RemoveVariableCommand::unexecute() { - MetaDataBase::addVariable( TQT_TQOBJECT(formWindow()), varName, access ); + MetaDataBase::addVariable( formWindow(), varName, access ); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } // ------------------------------------------------------------ @@ -1438,7 +1438,7 @@ void EditDefinitionsCommand::execute() lIface->release(); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } void EditDefinitionsCommand::unexecute() @@ -1447,7 +1447,7 @@ void EditDefinitionsCommand::unexecute() lIface->release(); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) - formWindow()->formFile()->setModified( TRUE ); + formWindow()->formFile()->setModified( true ); } // ------------------------------------------------------------ @@ -1510,7 +1510,7 @@ void PasteCommand::execute() { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->show(); - formWindow()->selectWidget( TQT_TQOBJECT(w) ); + formWindow()->selectWidget( w ); formWindow()->widgets()->insert( w, w ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w ); } @@ -1520,7 +1520,7 @@ void PasteCommand::unexecute() { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->hide(); - formWindow()->selectWidget( TQT_TQOBJECT(w), FALSE ); + formWindow()->selectWidget( w, false ); formWindow()->widgets()->remove( w ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w ); } @@ -1542,7 +1542,7 @@ void TabOrderCommand::merge( Command *c ) bool TabOrderCommand::canMerge( Command * ) { - return TRUE; + return true; } void TabOrderCommand::execute() @@ -1704,7 +1704,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) toLasts.pop(); toLasts.push( ni ); if ( pi ) - pi->setOpen( TRUE ); + pi->setOpen( true ); } else { if ( i->parent() == fromLast ) { fromParents.push( fromLast ); @@ -1724,7 +1724,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) toLasts.pop(); toLasts.push( ni ); if ( pi ) - pi->setOpen( TRUE ); + pi->setOpen( true ); } else { while ( fromParents.top() != i->parent() ) { fromParents.pop(); @@ -1744,7 +1744,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) ni->setPixmap( c, *i->pixmap( c ) ); } if ( pi ) - pi->setOpen( TRUE ); + pi->setOpen( true ); toLasts.pop(); toLasts.push( ni ); } @@ -1762,21 +1762,21 @@ PopulateMultiLineEditCommand::PopulateMultiLineEditCommand( const TQString &n, F : Command( n, fw ), newText( txt ), mlined( mle ) { oldText = mlined->text(); - wasChanged = MetaDataBase::isPropertyChanged( TQT_TQOBJECT(mlined), "text" ); + wasChanged = MetaDataBase::isPropertyChanged( mlined, "text" ); } void PopulateMultiLineEditCommand::execute() { mlined->setText( newText ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", TRUE ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) ); + MetaDataBase::setPropertyChanged( mlined, "text", true ); + formWindow()->emitUpdateProperties( mlined ); } void PopulateMultiLineEditCommand::unexecute() { mlined->setText( oldText ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", wasChanged ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) ); + MetaDataBase::setPropertyChanged( mlined, "text", wasChanged ); + formWindow()->emitUpdateProperties( mlined ); } // ------------------------------------------------------------ @@ -1788,7 +1788,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T { #ifndef TQT_NO_TABLE int i = 0; - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table ); for ( i = 0; i < table->horizontalHeader()->count(); ++i ) { PopulateTableCommand::Column col; col.text = table->horizontalHeader()->label( i ); @@ -1818,7 +1818,7 @@ void PopulateTableCommand::execute() if ( !(*cit).field.isEmpty() ) columnFields.insert( (*cit).text, (*cit).field ); } - MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields ); + MetaDataBase::setColumnFields( table, columnFields ); table->setNumRows( newRows.count() ); i = 0; for ( TQValueList<Row>::Iterator rit = newRows.begin(); rit != newRows.end(); ++rit, ++i ) @@ -1837,7 +1837,7 @@ void PopulateTableCommand::unexecute() if ( !(*cit).field.isEmpty() ) columnFields.insert( (*cit).text, (*cit).field ); } - MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields ); + MetaDataBase::setColumnFields( table, columnFields ); table->setNumRows( oldRows.count() ); i = 0; for ( TQValueList<Row>::Iterator rit = oldRows.begin(); rit != oldRows.end(); ++rit, ++i ) @@ -1880,7 +1880,7 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index, action ); toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } else { TQObjectList clo = action->childrenListObject(); if ( !clo.isEmpty() ) { @@ -1901,11 +1901,11 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index + (i++), ac ); } - TQObject::connect( o, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( o, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -1920,7 +1920,7 @@ void AddActionToToolBarCommand::unexecute() toolBar->removeAction( action ); action->removeFrom( toolBar ); - TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); if ( !::tqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { @@ -1936,7 +1936,7 @@ void AddActionToToolBarCommand::unexecute() o->removeEventFilter( toolBar ); toolBar->removeAction( (TQAction*)o ); } - TQObject::disconnect( o, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::disconnect( o, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } } @@ -1955,7 +1955,7 @@ void AddToolBarCommand::execute() if ( !toolBar ) { toolBar = new QDesignerToolBar( mainWindow ); TQString n = "Toolbar"; - formWindow()->unify( TQT_TQOBJECT(toolBar), n, TRUE ); + formWindow()->unify( toolBar, n, true ); toolBar->setName( n ); mainWindow->addToolBar( toolBar, n ); } else { @@ -2011,7 +2011,7 @@ void AddContainerPageCommand::execute() wiface->insertPage( wClassName, container, pageLabel, index, page ); MetaDataBase::addEntry( page ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); // #### show and update pages in object hierarchy view } @@ -2020,7 +2020,7 @@ void AddContainerPageCommand::unexecute() if ( !wiface || !wiface->supportsPages( wClassName ) ) return; wiface->removePage( wClassName, container, index ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); // #### show and update pages in object hierarchy view } @@ -2054,7 +2054,7 @@ void DeleteContainerPageCommand::execute() return; wiface->removePage( wClassName, container, index ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); // #### show and update pages in object hierarchy view } @@ -2066,7 +2066,7 @@ void DeleteContainerPageCommand::unexecute() index = wiface->count( wClassName, container ); wiface->insertPage( wClassName, container, pageLabel, index, page ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); // #### show and update pages in object hierarchy view } @@ -2099,7 +2099,7 @@ void RenameContainerPageCommand::execute() if ( !wiface || !wiface->supportsPages( wClassName ) ) return; wiface->renamePage( wClassName, container, index, newLabel ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); // #### show and update pages in object hierarchy view } @@ -2108,7 +2108,7 @@ void RenameContainerPageCommand::unexecute() if ( !wiface || !wiface->supportsPages( wClassName ) ) return; wiface->renamePage( wClassName, container, index, oldLabel ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); // #### show and update pages in object hierarchy view } #endif // TQT_CONTAINER_CUSTOM_WIDGETS @@ -2233,7 +2233,7 @@ void SetActionIconsCommand::execute() ActionEditor *ae = actionEditor(); if ( ae ) ae->updateActionIcon( action ); - MetaDataBase::setPropertyChanged( action, "iconSet", TRUE ); + MetaDataBase::setPropertyChanged( action, "iconSet", true ); } void SetActionIconsCommand::unexecute() @@ -2242,7 +2242,7 @@ void SetActionIconsCommand::unexecute() ActionEditor *ae = actionEditor(); if ( ae ) ae->updateActionIcon( action ); - MetaDataBase::setPropertyChanged( action, "iconSet", TRUE ); + MetaDataBase::setPropertyChanged( action, "iconSet", true ); } // ------------------------------------------------------------ @@ -2272,19 +2272,19 @@ void AddMenuCommand::execute() if ( !mb ) { mb = new MenuBarEditor( formWindow(), mw ); mb->setName( "MenuBarEditor" ); - formWindow()->insertWidget( mb, TRUE ); + formWindow()->insertWidget( mb, true ); } if ( !item ) { PopupMenuEditor *popup = new PopupMenuEditor( formWindow(), mw ); popup->setName( "PopupMenuEditor" ); - formWindow()->insertWidget( popup, TRUE ); + formWindow()->insertWidget( popup, true ); mb->insertItem( name, popup, index ); index = mb->findItem( popup ); item = mb->item( index ); } else { PopupMenuEditor *popup = item->menu(); popup->setName( item->menuText() ); - formWindow()->insertWidget( popup, TRUE ); + formWindow()->insertWidget( popup, true ); mb->insertItem( item, index ); } formWindow()->mainWindow()->objectHierarchy()->rebuild(); @@ -2407,7 +2407,7 @@ void RenameMenuCommand::execute() PopupMenuEditor *popup = item->menu(); item->setMenuText( newName ); TQString legal = makeLegal( newName ); - formWindow()->unify( TQT_TQOBJECT(popup), legal, TRUE ); + formWindow()->unify( popup, legal, true ); popup->setName( legal ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -2429,14 +2429,14 @@ AddToolBoxPageCommand::AddToolBoxPageCommand( const TQString &n, FormWindow *fw, toolBoxPage = new QDesignerWidget( formWindow(), toolBox, "page" ); toolBoxPage->hide(); index = -1; - MetaDataBase::addEntry( TQT_TQOBJECT(toolBoxPage) ); + MetaDataBase::addEntry( toolBoxPage ); } void AddToolBoxPageCommand::execute() { index = toolBox->insertItem( index, toolBoxPage, toolBoxLabel); toolBox->setCurrentIndex( index ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -2444,7 +2444,7 @@ void AddToolBoxPageCommand::unexecute() { toolBox->removeItem( toolBoxPage ); toolBoxPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -2462,7 +2462,7 @@ void DeleteToolBoxPageCommand::execute() { toolBox->removeItem( toolBoxPage ); toolBoxPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -2470,6 +2470,6 @@ void DeleteToolBoxPageCommand::unexecute() { index = toolBox->insertItem( index, toolBoxPage, toolBoxLabel ); toolBox->setCurrentIndex( index ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h index a4c1243d..eb34952d 100644 --- a/kdevdesigner/designer/command.h +++ b/kdevdesigner/designer/command.h @@ -155,7 +155,7 @@ class CommandHistory : public TQObject public: CommandHistory( int s ); - void addCommand( Command *cmd, bool tryCompress = FALSE ); + void addCommand( Command *cmd, bool tryCompress = false ); void undo(); void redo(); @@ -256,7 +256,7 @@ public: const TQString &pn, const TQVariant &ov, const TQVariant &nv, const TQString &ncut, const TQString &ocut, - bool reset = FALSE ); + bool reset = false ); void execute(); void unexecute(); @@ -266,7 +266,7 @@ public: bool checkProperty(); private: - void setProperty( const TQVariant &v, const TQString ¤tItemText, bool select = TRUE ); + void setProperty( const TQVariant &v, const TQString ¤tItemText, bool select = true ); TQGuardedPtr<TQObject> widget; PropertyEditor *editor; @@ -484,7 +484,7 @@ class AddWizardPageCommand : public Command { public: AddWizardPageCommand( const TQString &n, FormWindow *fw, - TQWizard *w, const TQString &label, int index = -1, bool show = TRUE ); + TQWizard *w, const TQString &label, int index = -1, bool show = true ); void execute(); void unexecute(); @@ -503,7 +503,7 @@ class DeleteWizardPageCommand : public Command { public: DeleteWizardPageCommand( const TQString &n, FormWindow *fw, - TQWizard *w, int index, bool show = TRUE ); + TQWizard *w, int index, bool show = true ); void execute(); void unexecute(); diff --git a/kdevdesigner/designer/configtoolboxdialog.ui b/kdevdesigner/designer/configtoolboxdialog.ui index 226cdd35..6b006d74 100644 --- a/kdevdesigner/designer/configtoolboxdialog.ui +++ b/kdevdesigner/designer/configtoolboxdialog.ui @@ -305,7 +305,7 @@ <includes> <include location="local" impldecl="in implementation">configtoolboxdialog.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>addTool()</slot> <slot>removeTool()</slot> <slot>moveToolUp()</slot> @@ -313,7 +313,7 @@ <slot>currentToolChanged( TQListViewItem * i )</slot> <slot>currentCommonToolChanged( TQListViewItem * i )</slot> <slot>ok()</slot> -</Q_SLOTS> +</slots> <functions> <function access="private">init()</function> </functions> diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h index 7dcd6530..ef7c280e 100644 --- a/kdevdesigner/designer/configtoolboxdialog.ui.h +++ b/kdevdesigner/designer/configtoolboxdialog.ui.h @@ -40,10 +40,10 @@ void ConfigToolboxDialog::init() ListViewDnd *commonDnd = new ListViewDnd( listViewCommon ); commonDnd->setDragMode( ListViewDnd::Both | ListViewDnd::Move | ListViewDnd::Flat ); - TQObject::connect( toolsDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ), - commonDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) ); - TQObject::connect( commonDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ), - commonDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( toolsDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + commonDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( commonDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + commonDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); TQDict<TQListViewItem> groups; TQAction *a; @@ -55,7 +55,7 @@ void ConfigToolboxDialog::init() if ( !parent ) { parent = new TQListViewItem( listViewTools ); parent->setText( 0, grp ); - parent->setOpen( TRUE ); + parent->setOpen( true ); groups.insert( grp, parent ); } TQListViewItem *i = new TQListViewItem( parent ); @@ -76,14 +76,14 @@ void ConfigToolboxDialog::addTool() { TQListView *src = listViewTools; - bool addKids = FALSE; + bool addKids = false; TQListViewItem *nextSibling = 0; TQListViewItem *nextParent = 0; TQListViewItemIterator it = src->firstChild(); for ( ; *it; it++ ) { // Hit the nextSibling, turn of child processing if ( (*it) == nextSibling ) - addKids = FALSE; + addKids = false; if ( (*it)->isSelected() ) { if ( (*it)->childCount() == 0 ) { @@ -97,7 +97,7 @@ void ConfigToolboxDialog::addTool() // Children processing not set, so set it // Also find the item were we shall quit // processing children...if any such item - addKids = TRUE; + addKids = true; nextSibling = (*it)->nextSibling(); nextParent = (*it)->parent(); while ( nextParent && !nextSibling ) { @@ -168,11 +168,11 @@ void ConfigToolboxDialog::moveToolDown() void ConfigToolboxDialog::currentToolChanged( TQListViewItem *i ) { - bool canAdd = FALSE; + bool canAdd = false; TQListViewItemIterator it = listViewTools->firstChild(); for ( ; *it; it++ ) { if ( (*it)->isSelected() ) { - canAdd = TRUE; + canAdd = true; break; } } @@ -185,11 +185,11 @@ void ConfigToolboxDialog::currentCommonToolChanged( TQListViewItem *i ) buttonUp->setEnabled( (bool) (i && i->itemAbove()) ); buttonDown->setEnabled( (bool) (i && i->itemBelow()) ); - bool canRemove = FALSE; + bool canRemove = false; TQListViewItemIterator it = listViewCommon->firstChild(); for ( ; *it; it++ ) { if ( (*it)->isSelected() ) { - canRemove = TRUE; + canRemove = true; break; } } diff --git a/kdevdesigner/designer/connectiondialog.ui b/kdevdesigner/designer/connectiondialog.ui index 51995633..d6712a84 100644 --- a/kdevdesigner/designer/connectiondialog.ui +++ b/kdevdesigner/designer/connectiondialog.ui @@ -201,7 +201,7 @@ <variable>TQObject *defaultSender;</variable> <variable>TQObject *defaultReceiver;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>addConnection()</slot> <slot returnType="ConnectionContainer *">addConnection( TQObject * sender, TQObject * receiver, const TQString & signal, const TQString & slot )</slot> @@ -214,6 +214,6 @@ <slot>updateEditSlotsButton()</slot> <slot>updateConnectionContainers()</slot> <slot>ensureConnectionVisible()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/connectiondialog.ui.h b/kdevdesigner/designer/connectiondialog.ui.h index 25a5d5f2..7163d793 100644 --- a/kdevdesigner/designer/connectiondialog.ui.h +++ b/kdevdesigner/designer/connectiondialog.ui.h @@ -69,11 +69,11 @@ static TQPixmap *validConnection = 0; void ConnectionDialog::init() { - connect( connectionsTable, TQT_SIGNAL( currentChanged( int, int ) ), - this, TQT_SLOT( updateEditSlotsButton() ) ); - connect( connectionsTable, TQT_SIGNAL( resorted() ), - this, TQT_SLOT( updateConnectionContainers() ) ); - buttonEditSlots->setEnabled( FALSE ); + connect( connectionsTable, TQ_SIGNAL( currentChanged( int, int ) ), + this, TQ_SLOT( updateEditSlotsButton() ) ); + connect( connectionsTable, TQ_SIGNAL( resorted() ), + this, TQ_SLOT( updateConnectionContainers() ) ); + buttonEditSlots->setEnabled( false ); if ( !invalidConnection ) { invalidConnection = new TQPixmap( invalid_connection ); @@ -81,12 +81,12 @@ void ConnectionDialog::init() } TQValueList<MetaDataBase::Connection> conns = - MetaDataBase::connections( TQT_TQOBJECT(MainWindow::self->formWindow()) ); + MetaDataBase::connections( MainWindow::self->formWindow() ); for ( TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); it != conns.end(); ++it ) { ConnectionContainer *c = addConnection( (*it).sender, (*it).receiver, (*it).signal, (*it).slot ); - c->setModified( FALSE ); + c->setModified( false ); updateConnectionState( c ); } @@ -144,13 +144,13 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject re->setSlot( sl ); sl->setSlot( sl ); - connect( re, TQT_SIGNAL( currentReceiverChanged( TQObject * ) ), - this, TQT_SLOT( updateEditSlotsButton() ) ); + connect( re, TQ_SIGNAL( currentReceiverChanged( TQObject * ) ), + this, TQ_SLOT( updateEditSlotsButton() ) ); - ConnectionContainer *c = new ConnectionContainer( TQT_TQOBJECT(this), se, si, re, sl, row ); + ConnectionContainer *c = new ConnectionContainer( this, se, si, re, sl, row ); connections.append( c ); - connect( c, TQT_SIGNAL( changed( ConnectionContainer * ) ), - this, TQT_SLOT( updateConnectionState( ConnectionContainer * ) ) ); + connect( c, TQ_SIGNAL( changed( ConnectionContainer * ) ), + this, TQ_SLOT( updateConnectionState( ConnectionContainer * ) ) ); connectionsTable->setCurrentCell( row, 0 ); @@ -169,7 +169,7 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject sl->setCurrentItem( slot ); } - c->setModified( TRUE ); + c->setModified( true ); return c; } @@ -188,7 +188,7 @@ void ConnectionDialog::updateConnectionState( ConnectionContainer *c ) void ConnectionDialog::okClicked() { TQValueList<MetaDataBase::Connection> oldConnections = - MetaDataBase::connections( TQT_TQOBJECT(MainWindow::self->formWindow()) ); + MetaDataBase::connections( MainWindow::self->formWindow() ); TQPtrList<Command> newConnectionCmds; TQPtrList<Command> oldConnectionCmds; for ( ConnectionContainer *c = connections.first(); c; c = connections.next() ) { @@ -215,7 +215,7 @@ void ConnectionDialog::okClicked() TQValueList<MetaDataBase::Connection> conns = - MetaDataBase::connections( TQT_TQOBJECT(MainWindow::self->formWindow()) ); + MetaDataBase::connections( MainWindow::self->formWindow() ); for ( TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); it != conns.end(); ++it ) { RemoveConnectionCommand *cmd = new RemoveConnectionCommand( i18n( "Remove Signal/Slot " @@ -263,7 +263,7 @@ void ConnectionDialog::deleteClicked() void ConnectionDialog::editSlots() { - EditFunctions dlg( this, MainWindow::self->formWindow(), TRUE ); + EditFunctions dlg( this, MainWindow::self->formWindow(), true ); dlg.exec(); int currentCol = connectionsTable->currentColumn(); connectionsTable->setCurrentCell( connectionsTable->currentRow(), 0 ); diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp index f0a04362..a835e3e9 100644 --- a/kdevdesigner/designer/connectionitems.cpp +++ b/kdevdesigner/designer/connectionitems.cpp @@ -83,9 +83,9 @@ static const char* const ignore_slots[] = { }; ConnectionItem::ConnectionItem( TQTable *table, FormWindow *fw ) - : TQComboTableItem( table, TQStringList(), FALSE ), formWindow( fw ), conn( 0 ) + : TQComboTableItem( table, TQStringList(), false ), formWindow( fw ), conn( 0 ) { - setReplaceable( FALSE ); + setReplaceable( false ); } void ConnectionItem::senderChanged( TQObject * ) @@ -122,26 +122,26 @@ void ConnectionItem::slotChanged( const TQString & ) void ConnectionItem::setSender( SenderItem *i ) { - connect( i, TQT_SIGNAL( currentSenderChanged( TQObject * ) ), - this, TQT_SLOT( senderChanged( TQObject * ) ) ); + connect( i, TQ_SIGNAL( currentSenderChanged( TQObject * ) ), + this, TQ_SLOT( senderChanged( TQObject * ) ) ); } void ConnectionItem::setReceiver( ReceiverItem *i ) { - connect( i, TQT_SIGNAL( currentReceiverChanged( TQObject * ) ), - this, TQT_SLOT( receiverChanged( TQObject * ) ) ); + connect( i, TQ_SIGNAL( currentReceiverChanged( TQObject * ) ), + this, TQ_SLOT( receiverChanged( TQObject * ) ) ); } void ConnectionItem::setSignal( SignalItem *i ) { - connect( i, TQT_SIGNAL( currentSignalChanged( const TQString & ) ), - this, TQT_SLOT( signalChanged( const TQString & ) ) ); + connect( i, TQ_SIGNAL( currentSignalChanged( const TQString & ) ), + this, TQ_SLOT( signalChanged( const TQString & ) ) ); } void ConnectionItem::setSlot( SlotItem *i ) { - connect( i, TQT_SIGNAL( currentSlotChanged( const TQString & ) ), - this, TQT_SLOT( slotChanged( const TQString & ) ) ); + connect( i, TQ_SIGNAL( currentSlotChanged( const TQString & ) ), + this, TQ_SLOT( slotChanged( const TQString & ) ) ); } void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg, @@ -166,7 +166,7 @@ void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg, TQFont f( p->font() ); TQFont oldf( p->font() ); if ( conn && conn->isModified() ) { - f.setBold( TRUE ); + f.setBold( true ); p->setFont( f ); } @@ -245,8 +245,8 @@ TQWidget *SenderItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( senderChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( senderChanged( const TQString & ) ) ); return cb; } @@ -302,8 +302,8 @@ TQWidget *ReceiverItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( receiverChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( receiverChanged( const TQString & ) ) ); return cb; } @@ -338,7 +338,7 @@ SignalItem::SignalItem( TQTable *table, FormWindow *fw ) void SignalItem::senderChanged( TQObject *sender ) { - TQStrList sigs = sender->metaObject()->signalNames( TRUE ); + TQStrList sigs = sender->metaObject()->signalNames( true ); sigs.remove( "destroyed()" ); sigs.remove( "destroyed(TQObject*)" ); sigs.remove( "accessibilityChanged(int)" ); @@ -354,7 +354,7 @@ void SignalItem::senderChanged( TQObject *sender ) } if ( sender == formWindow->mainContainer() ) { - TQStringList extra = MetaDataBase::signalList( TQT_TQOBJECT(formWindow) ); + TQStringList extra = MetaDataBase::signalList( formWindow ); if ( !extra.isEmpty() ) lst += extra; } @@ -371,8 +371,8 @@ TQWidget *SignalItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SIGNAL( currentSignalChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SIGNAL( currentSignalChanged( const TQString & ) ) ); return cb; } @@ -409,25 +409,25 @@ bool SlotItem::ignoreSlot( const char* slot ) const #ifndef TQT_NO_SQL if ( qstrcmp( slot, "update()" ) == 0 && ::tqt_cast<TQDataBrowser*>(lastReceiver) ) - return FALSE; + return false; #endif for ( int i = 0; ignore_slots[i]; i++ ) { if ( qstrcmp( slot, ignore_slots[i] ) == 0 ) - return TRUE; + return true; } - if ( !formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) ) { + if ( !formWindow->isMainContainer( lastReceiver ) ) { if ( qstrcmp( slot, "close()" ) == 0 ) - return TRUE; + return true; } if ( qstrcmp( slot, "setFocus()" ) == 0 ) if ( lastReceiver->isWidgetType() && ( (TQWidget*)lastReceiver )->focusPolicy() == TQWidget::NoFocus ) - return TRUE; + return true; - return FALSE; + return false; } void SlotItem::updateSlotList() @@ -441,15 +441,15 @@ void SlotItem::updateSlotList() } TQString signal = MetaDataBase::normalizeFunction( lastSignal ); - int n = lastReceiver->metaObject()->numSlots( TRUE ); + int n = lastReceiver->metaObject()->numSlots( true ); TQStringList slts; for( int i = 0; i < n; ++i ) { // accept only public slots. For the form window, also accept protected slots - const TQMetaData* md = lastReceiver->metaObject()->slot( i, TRUE ); - if ( ( (lastReceiver->metaObject()->slot( i, TRUE )->access == TQMetaData::Public) || - (formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) && - lastReceiver->metaObject()->slot(i, TRUE)->access == + const TQMetaData* md = lastReceiver->metaObject()->slot( i, true ); + if ( ( (lastReceiver->metaObject()->slot( i, true )->access == TQMetaData::Public) || + (formWindow->isMainContainer( lastReceiver ) && + lastReceiver->metaObject()->slot(i, true)->access == TQMetaData::Protected) ) && !ignoreSlot( md->name ) && checkConnectArgs( signal.latin1(), lastReceiver, md->name ) ) @@ -460,8 +460,8 @@ void SlotItem::updateSlotList() LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); if ( !iface || iface->supports( LanguageInterface::ConnectionsToCustomSlots ) ) { - if ( formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) ) { - TQValueList<MetaDataBase::Function> moreSlots = MetaDataBase::slotList( TQT_TQOBJECT(formWindow) ); + if ( formWindow->isMainContainer( lastReceiver ) ) { + TQValueList<MetaDataBase::Function> moreSlots = MetaDataBase::slotList( formWindow ); if ( !moreSlots.isEmpty() ) { for ( TQValueList<MetaDataBase::Function>::Iterator it = moreSlots.begin(); it != moreSlots.end(); ++it ) { @@ -502,8 +502,8 @@ TQWidget *SlotItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SIGNAL( currentSlotChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SIGNAL( currentSlotChanged( const TQString & ) ) ); return cb; } diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h index 115f9f27..ef1a060d 100644 --- a/kdevdesigner/designer/connectionitems.h +++ b/kdevdesigner/designer/connectionitems.h @@ -170,16 +170,16 @@ class ConnectionContainer : public TQObject public: ConnectionContainer( TQObject *parent, SenderItem *i1, SignalItem *i2, ReceiverItem *i3, SlotItem *i4, int r ) - : TQObject( parent ), mod( FALSE ), se( i1 ), si( i2 ), + : TQObject( parent ), mod( false ), se( i1 ), si( i2 ), re( i3 ), sl( i4 ), rw ( r ) { i1->setConnection( this ); i2->setConnection( this ); i3->setConnection( this ); i4->setConnection( this ); - connect( i1, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); - connect( i2, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); - connect( i3, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); - connect( i4, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); + connect( i1, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i2, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i3, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i4, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); } bool isModified() const { return mod; } @@ -207,7 +207,7 @@ public: SlotItem *slotItem() const { return sl; } public slots: - void somethingChanged() { mod = TRUE; emit changed( this ); } + void somethingChanged() { mod = true; emit changed( this ); } signals: void changed( ConnectionContainer *c ); diff --git a/kdevdesigner/designer/connectiontable.cpp b/kdevdesigner/designer/connectiontable.cpp index 834fdc96..2e433dc8 100644 --- a/kdevdesigner/designer/connectiontable.cpp +++ b/kdevdesigner/designer/connectiontable.cpp @@ -31,26 +31,26 @@ ConnectionTable::ConnectionTable( TQWidget *parent, const char *name ) : TQTable( 0, 4, parent, name ) { - setSorting( TRUE ); - setShowGrid( FALSE ); + setSorting( true ); + setShowGrid( false ); setFocusStyle( FollowStyle ); setSelectionMode( SingleRow ); horizontalHeader()->setLabel( 0, i18n( "Sender" ) ); horizontalHeader()->setLabel( 1, i18n( "Signal" ) ); horizontalHeader()->setLabel( 2, i18n( "Receiver" ) ); horizontalHeader()->setLabel( 3, i18n( "Slot" ) ); - setColumnStretchable( 0, TRUE ); - setColumnStretchable( 1, TRUE ); - setColumnStretchable( 2, TRUE ); - setColumnStretchable( 3, TRUE ); + setColumnStretchable( 0, true ); + setColumnStretchable( 1, true ); + setColumnStretchable( 2, true ); + setColumnStretchable( 3, true ); } void ConnectionTable::sortColumn( int col, bool ascending, bool ) { horizontalHeader()->setSortIndicator( col, ascending ); if ( isEditing() ) - endEdit( currEditRow(), currEditCol(), FALSE, FALSE ); - TQTable::sortColumn( col, ascending, TRUE ); + endEdit( currEditRow(), currEditCol(), false, false ); + TQTable::sortColumn( col, ascending, true ); setCurrentCell( 0, 0 ); emit resorted(); } diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui index 99f98961..d1cfc071 100644 --- a/kdevdesigner/designer/customwidgeteditor.ui +++ b/kdevdesigner/designer/customwidgeteditor.ui @@ -573,7 +573,7 @@ <cstring>listSignals</cstring> </property> <property name="whatsThis" stdset="0"> - <string>The list of all the Q_SIGNALS that the selected widget can emit.</string> + <string>The list of all the signals that the selected widget can emit.</string> </property> </widget> <widget class="TQLayoutWidget"> @@ -787,7 +787,7 @@ <string>Change slot access</string> </property> <property name="whatsThis" stdset="0"> - <string><b>Change the slot's access policy.</b><p>You can only connect to the widget's public Q_SLOTS.</p></string> + <string><b>Change the slot's access policy.</b><p>You can only connect to the widget's public slots.</p></string> </property> </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="4"> diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp index f417f6f2..333582b5 100644 --- a/kdevdesigner/designer/customwidgeteditorimpl.cpp +++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp @@ -56,29 +56,29 @@ #include <tdelocale.h> CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw ) - : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw ) + : CustomWidgetEditorBase( parent, 0, true ), mainWindow( mw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); checkTimer = new TQTimer( this ); - connect( checkTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( checkWidgetName() ) ); - - editClass->setEnabled( FALSE ); - editHeader->setEnabled( FALSE ); - buttonChooseHeader->setEnabled( FALSE ); - buttonChoosePixmap->setEnabled( FALSE ); - spinWidth->setEnabled( FALSE ); - spinHeight->setEnabled( FALSE ); - sizeHor->setEnabled( FALSE ); - sizeVer->setEnabled( FALSE ); - checkContainer->setEnabled( FALSE ); - localGlobalCombo->setEnabled( FALSE ); - editClass->setValidator( new AsciiValidator( TQString(":"), TQT_TQOBJECT(editClass) ) ); - editSignal->setValidator( new AsciiValidator( TRUE, TQT_TQOBJECT(editSignal) ) ); - editSlot->setValidator( new AsciiValidator( TRUE, TQT_TQOBJECT(editSignal) ) ); - editProperty->setValidator( new AsciiValidator( TQT_TQOBJECT(editSignal) ) ); - editSignal->setEnabled( FALSE ); - buttonRemoveSignal->setEnabled( FALSE ); + connect( checkTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( checkWidgetName() ) ); + + editClass->setEnabled( false ); + editHeader->setEnabled( false ); + buttonChooseHeader->setEnabled( false ); + buttonChoosePixmap->setEnabled( false ); + spinWidth->setEnabled( false ); + spinHeight->setEnabled( false ); + sizeHor->setEnabled( false ); + sizeVer->setEnabled( false ); + checkContainer->setEnabled( false ); + localGlobalCombo->setEnabled( false ); + editClass->setValidator( new AsciiValidator( TQString(":"), editClass ) ); + editSignal->setValidator( new AsciiValidator( true, editSignal ) ); + editSlot->setValidator( new AsciiValidator( true, editSignal ) ); + editProperty->setValidator( new AsciiValidator( editSignal ) ); + editSignal->setEnabled( false ); + buttonRemoveSignal->setEnabled( false ); setupDefinition(); setupSignals(); @@ -100,15 +100,15 @@ void CustomWidgetEditor::setupDefinition() if ( boxWidgets->firstItem() ) { boxWidgets->setCurrentItem( boxWidgets->firstItem() ); - boxWidgets->setSelected( boxWidgets->firstItem(), TRUE ); + boxWidgets->setSelected( boxWidgets->firstItem(), true ); } oldItem = 0; } void CustomWidgetEditor::setupSignals() { - editSignal->setEnabled( FALSE ); - buttonRemoveSignal->setEnabled( FALSE ); + editSignal->setEnabled( false ); + buttonRemoveSignal->setEnabled( false ); MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w ) return; @@ -117,15 +117,15 @@ void CustomWidgetEditor::setupSignals() listSignals->insertItem( TQString( *it ) ); if ( listSignals->firstItem() ) { listSignals->setCurrentItem( listSignals->firstItem() ); - listSignals->setSelected( listSignals->firstItem(), TRUE ); + listSignals->setSelected( listSignals->firstItem(), true ); } } void CustomWidgetEditor::setupSlots() { - editSlot->setEnabled( FALSE ); - comboAccess->setEnabled( FALSE ); - buttonRemoveSlot->setEnabled( FALSE ); + editSlot->setEnabled( false ); + comboAccess->setEnabled( false ); + buttonRemoveSlot->setEnabled( false ); MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w ) @@ -136,15 +136,15 @@ void CustomWidgetEditor::setupSlots() if ( listSlots->firstChild() ) { listSlots->setCurrentItem( listSlots->firstChild() ); - listSlots->setSelected( listSlots->firstChild(), TRUE ); + listSlots->setSelected( listSlots->firstChild(), true ); } } void CustomWidgetEditor::setupProperties() { - editProperty->setEnabled( FALSE ); - comboType->setEnabled( FALSE ); - buttonRemoveProperty->setEnabled( FALSE ); + editProperty->setEnabled( false ); + comboType->setEnabled( false ); + buttonRemoveProperty->setEnabled( false ); MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w ) @@ -155,7 +155,7 @@ void CustomWidgetEditor::setupProperties() if ( listProperties->firstChild() ) { listProperties->setCurrentItem( listProperties->firstChild() ); - listProperties->setSelected( listProperties->firstChild(), TRUE ); + listProperties->setSelected( listProperties->firstChild(), true ); } } @@ -166,33 +166,33 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i ) MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) { - buttonChooseHeader->setEnabled( FALSE ); - editClass->setEnabled( FALSE ); - editHeader->setEnabled( FALSE ); - buttonChoosePixmap->setEnabled( FALSE ); - spinWidth->setEnabled( FALSE ); - spinHeight->setEnabled( FALSE ); - localGlobalCombo->setEnabled( FALSE ); - sizeHor->setEnabled( FALSE ); - sizeVer->setEnabled( FALSE ); - checkContainer->setEnabled( FALSE ); + buttonChooseHeader->setEnabled( false ); + editClass->setEnabled( false ); + editHeader->setEnabled( false ); + buttonChoosePixmap->setEnabled( false ); + spinWidth->setEnabled( false ); + spinHeight->setEnabled( false ); + localGlobalCombo->setEnabled( false ); + sizeHor->setEnabled( false ); + sizeVer->setEnabled( false ); + checkContainer->setEnabled( false ); return; } - buttonChooseHeader->setEnabled( TRUE ); - editClass->setEnabled( TRUE ); - editHeader->setEnabled( TRUE ); - buttonChoosePixmap->setEnabled( TRUE ); - spinWidth->setEnabled( TRUE ); - spinHeight->setEnabled( TRUE ); - localGlobalCombo->setEnabled( TRUE ); - sizeHor->setEnabled( TRUE ); - sizeVer->setEnabled( TRUE ); - checkContainer->setEnabled( TRUE ); - - editClass->blockSignals( TRUE ); + buttonChooseHeader->setEnabled( true ); + editClass->setEnabled( true ); + editHeader->setEnabled( true ); + buttonChoosePixmap->setEnabled( true ); + spinWidth->setEnabled( true ); + spinHeight->setEnabled( true ); + localGlobalCombo->setEnabled( true ); + sizeHor->setEnabled( true ); + sizeVer->setEnabled( true ); + checkContainer->setEnabled( true ); + + editClass->blockSignals( true ); editClass->setText( w->className ); - editClass->blockSignals( FALSE ); + editClass->blockSignals( false ); editHeader->setText( w->includeFile ); localGlobalCombo->setCurrentItem( (int)w->includePolicy ); if ( w->pixmap ) @@ -230,7 +230,7 @@ void CustomWidgetEditor::addWidgetClicked() customWidgets.insert( i, w ); boxWidgets->setCurrentItem( i ); - boxWidgets->setSelected( i, TRUE ); + boxWidgets->setSelected( i, true ); } void CustomWidgetEditor::classNameChanged( const TQString &s ) @@ -243,7 +243,7 @@ void CustomWidgetEditor::classNameChanged( const TQString &s ) WidgetDatabase::customWidgetClassNameChanged( w->className, s ); checkTimer->stop(); - boxWidgets->blockSignals( TRUE ); + boxWidgets->blockSignals( true ); oldName = w->className; w->className = s; TQListBoxItem *old = i; @@ -255,8 +255,8 @@ void CustomWidgetEditor::classNameChanged( const TQString &s ) oldItem = i; customWidgets.insert( i, w ); customWidgets.remove( old ); - boxWidgets->blockSignals( FALSE ); - checkTimer->start( 1000, TRUE ); + boxWidgets->blockSignals( false ); + checkTimer->start( 1000, true ); } void CustomWidgetEditor::deleteWidgetClicked() @@ -289,7 +289,7 @@ void CustomWidgetEditor::deleteWidgetClicked() i = boxWidgets->item( boxWidgets->currentItem() ); if ( i ) { boxWidgets->setCurrentItem( i ); - boxWidgets->setSelected( i, TRUE ); + boxWidgets->setSelected( i, true ); } } @@ -337,13 +337,13 @@ void CustomWidgetEditor::pixmapChoosen() delete w->pixmap; w->pixmap = new TQPixmap( pix ); - boxWidgets->blockSignals( TRUE ); + boxWidgets->blockSignals( true ); TQListBoxItem *old = i; boxWidgets->changeItem( *w->pixmap, w->className, boxWidgets->currentItem() ); i = boxWidgets->item( boxWidgets->currentItem() ); customWidgets.insert( i, w ); customWidgets.remove( old ); - boxWidgets->blockSignals( FALSE ); + boxWidgets->blockSignals( false ); previewPixmap->setPixmap( *w->pixmap ); } @@ -417,28 +417,28 @@ void CustomWidgetEditor::closeClicked() void CustomWidgetEditor::currentSignalChanged( TQListBoxItem *i ) { - editSignal->blockSignals( TRUE ); + editSignal->blockSignals( true ); editSignal->setText( "" ); - editSignal->blockSignals( FALSE ); + editSignal->blockSignals( false ); if ( !i ) { - editSignal->setEnabled( FALSE ); - buttonRemoveSignal->setEnabled( FALSE ); + editSignal->setEnabled( false ); + buttonRemoveSignal->setEnabled( false ); return; } - editSignal->blockSignals( TRUE ); - editSignal->setEnabled( TRUE ); - buttonRemoveSignal->setEnabled( TRUE ); + editSignal->blockSignals( true ); + editSignal->setEnabled( true ); + buttonRemoveSignal->setEnabled( true ); editSignal->setText( i->text() ); - editSignal->blockSignals( FALSE ); + editSignal->blockSignals( false ); } void CustomWidgetEditor::addSignal() { TQListBoxItem *i = new TQListBoxText( listSignals, "signal()" ); listSignals->setCurrentItem( i ); - listSignals->setSelected( i, TRUE ); + listSignals->setSelected( i, true ); MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) w->lstSignals.append( i->text().latin1() ); @@ -449,7 +449,7 @@ void CustomWidgetEditor::removeSignal() TQString s = listSignals->currentText(); delete listSignals->item( listSignals->currentItem() ); if ( listSignals->currentItem() != -1 ) - listSignals->setSelected( listSignals->currentItem(), TRUE ); + listSignals->setSelected( listSignals->currentItem(), true ); MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) w->lstSignals.remove( s.latin1() ); @@ -464,9 +464,9 @@ void CustomWidgetEditor::signalNameChanged( const TQString &s ) TQValueList<TQCString>::Iterator it = w->lstSignals.find( listSignals->currentText().latin1() ); if ( it != w->lstSignals.end() ) w->lstSignals.remove( it ); - listSignals->blockSignals( TRUE ); + listSignals->blockSignals( true ); listSignals->changeItem( s, listSignals->currentItem() ); - listSignals->blockSignals( FALSE ); + listSignals->blockSignals( false ); w->lstSignals.append( s.latin1() ); } @@ -511,7 +511,7 @@ void CustomWidgetEditor::addSlot() { TQListViewItem *i = new TQListViewItem( listSlots, "slot()", "public" ); listSlots->setCurrentItem( i ); - listSlots->setSelected( i, TRUE ); + listSlots->setSelected( i, true ); MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) { MetaDataBase::Function slot; @@ -532,7 +532,7 @@ void CustomWidgetEditor::removeSlot() } delete listSlots->currentItem(); if ( listSlots->currentItem() ) - listSlots->setSelected( listSlots->currentItem(), TRUE ); + listSlots->setSelected( listSlots->currentItem(), true ); MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w && slot.function != "1 2 3" ) w->lstSlots.remove( slot ); @@ -540,29 +540,29 @@ void CustomWidgetEditor::removeSlot() void CustomWidgetEditor::currentSlotChanged( TQListViewItem *i ) { - editSlot->blockSignals( TRUE ); + editSlot->blockSignals( true ); editSlot->setText( "" ); - editSignal->blockSignals( FALSE ); + editSignal->blockSignals( false ); if ( !i ) { - editSlot->setEnabled( FALSE ); - comboAccess->setEnabled( FALSE ); - buttonRemoveSlot->setEnabled( FALSE ); + editSlot->setEnabled( false ); + comboAccess->setEnabled( false ); + buttonRemoveSlot->setEnabled( false ); return; } - editSlot->setEnabled( TRUE ); - comboAccess->setEnabled( TRUE ); - buttonRemoveSlot->setEnabled( TRUE ); - editSlot->blockSignals( TRUE ); - comboAccess->blockSignals( TRUE ); + editSlot->setEnabled( true ); + comboAccess->setEnabled( true ); + buttonRemoveSlot->setEnabled( true ); + editSlot->blockSignals( true ); + comboAccess->blockSignals( true ); editSlot->setText( i->text( 0 ) ); if ( i->text( 1 ) == i18n( "protected" ) ) comboAccess->setCurrentItem( 1 ); else comboAccess->setCurrentItem( 0 ); - editSlot->blockSignals( FALSE ); - comboAccess->blockSignals( FALSE ); + editSlot->blockSignals( false ); + comboAccess->blockSignals( false ); } void CustomWidgetEditor::propertyTypeChanged( const TQString &s ) @@ -605,7 +605,7 @@ void CustomWidgetEditor::addProperty() { TQListViewItem *i = new TQListViewItem( listProperties, "property", "String" ); listProperties->setCurrentItem( i ); - listProperties->setSelected( i, TRUE ); + listProperties->setSelected( i, true ); MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) { MetaDataBase::Property prop; @@ -625,7 +625,7 @@ void CustomWidgetEditor::removeProperty() } delete listProperties->currentItem(); if ( listProperties->currentItem() ) - listProperties->setSelected( listProperties->currentItem(), TRUE ); + listProperties->setSelected( listProperties->currentItem(), true ); MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w && property.property != "1 2 3" ) w->lstProperties.remove( property ); @@ -633,22 +633,22 @@ void CustomWidgetEditor::removeProperty() void CustomWidgetEditor::currentPropertyChanged( TQListViewItem *i ) { - editProperty->blockSignals( TRUE ); + editProperty->blockSignals( true ); editProperty->setText( "" ); - editSignal->blockSignals( FALSE ); + editSignal->blockSignals( false ); if ( !i ) { - editProperty->setEnabled( FALSE ); - comboType->setEnabled( FALSE ); - buttonRemoveProperty->setEnabled( FALSE ); + editProperty->setEnabled( false ); + comboType->setEnabled( false ); + buttonRemoveProperty->setEnabled( false ); return; } - editProperty->setEnabled( TRUE ); - comboType->setEnabled( TRUE ); - buttonRemoveProperty->setEnabled( TRUE ); - editProperty->blockSignals( TRUE ); - comboType->blockSignals( TRUE ); + editProperty->setEnabled( true ); + comboType->setEnabled( true ); + buttonRemoveProperty->setEnabled( true ); + editProperty->blockSignals( true ); + comboType->blockSignals( true ); editProperty->setText( i->text( 0 ) ); for ( int j = 0; j < comboType->count(); ++j ) { @@ -657,8 +657,8 @@ void CustomWidgetEditor::currentPropertyChanged( TQListViewItem *i ) break; } } - editProperty->blockSignals( FALSE ); - comboType->blockSignals( FALSE ); + editProperty->blockSignals( false ); + comboType->blockSignals( false ); } static TQString makeIndent2( int indent ) diff --git a/kdevdesigner/designer/database.cpp b/kdevdesigner/designer/database.cpp index e7fdf0df..f8065d5c 100644 --- a/kdevdesigner/designer/database.cpp +++ b/kdevdesigner/designer/database.cpp @@ -82,13 +82,13 @@ bool QDesignerDataBrowser::event( TQEvent* e ) #endif if ( e->type() == TQEvent::Show ) { if ( con ) { - TQSqlCursor* cursor = new TQSqlCursor( tbl, TRUE, con ); - setSqlCursor( cursor, TRUE ); + TQSqlCursor* cursor = new TQSqlCursor( tbl, true, con ); + setSqlCursor( cursor, true ); setForm( frm ); refresh(); first(); } - return TRUE; + return true; } #if defined(DESIGNER) } @@ -110,7 +110,7 @@ bool QDesignerDataView::event( TQEvent* e ) if ( e->type() == TQEvent::Show ) { setForm( frm ); readFields(); - return TRUE; + return true; } #if defined(DESIGNER) } diff --git a/kdevdesigner/designer/dbconnection.ui b/kdevdesigner/designer/dbconnection.ui index 1510629b..c21e0ce8 100644 --- a/kdevdesigner/designer/dbconnection.ui +++ b/kdevdesigner/designer/dbconnection.ui @@ -214,10 +214,10 @@ <tabstop>editHostname</tabstop> <tabstop>editPort</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/dbconnectionimpl.cpp b/kdevdesigner/designer/dbconnectionimpl.cpp index 3cfd1fdc..d9d48556 100644 --- a/kdevdesigner/designer/dbconnectionimpl.cpp +++ b/kdevdesigner/designer/dbconnectionimpl.cpp @@ -60,20 +60,20 @@ void DatabaseConnectionEditor::accept() void DatabaseConnectionEditor::init() { - connectionWidget->editName->setEnabled( FALSE ); - connectionWidget->editName->setValidator( new AsciiValidator( TQT_TQOBJECT(connectionWidget->editName) ) ); + connectionWidget->editName->setEnabled( false ); + connectionWidget->editName->setValidator( new AsciiValidator( connectionWidget->editName ) ); connectionWidget->editName->setText( conn->name() ); - connectionWidget->comboDriver->setEnabled( FALSE ); + connectionWidget->comboDriver->setEnabled( false ); connectionWidget->comboDriver->lineEdit()->setText( conn->driver() ); - connectionWidget->editDatabase->setEnabled( FALSE ); + connectionWidget->editDatabase->setEnabled( false ); connectionWidget->editDatabase->setText( conn->database() ); - connectionWidget->editUsername->setEnabled( TRUE ); + connectionWidget->editUsername->setEnabled( true ); connectionWidget->editUsername->setText( conn->username() ); - connectionWidget->editPassword->setEnabled( TRUE ); + connectionWidget->editPassword->setEnabled( true ); connectionWidget->editPassword->setText( "" ); - connectionWidget->editHostname->setEnabled( TRUE ); + connectionWidget->editHostname->setEnabled( true ); connectionWidget->editHostname->setText( conn->hostname() ); - connectionWidget->editPort->setEnabled( TRUE ); + connectionWidget->editPort->setEnabled( true ); connectionWidget->editPort->setValue( conn->port() ); connectionWidget->editUsername->setFocus(); connectionWidget->editUsername->selectAll(); diff --git a/kdevdesigner/designer/dbconnectionimpl.h b/kdevdesigner/designer/dbconnectionimpl.h index bb92c27e..27578bc6 100644 --- a/kdevdesigner/designer/dbconnectionimpl.h +++ b/kdevdesigner/designer/dbconnectionimpl.h @@ -40,7 +40,7 @@ class DatabaseConnectionEditor : public DatabaseConnectionEditorBase public: DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent = 0, - const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + const char* name = 0, bool modal = false, WFlags fl = 0 ); ~DatabaseConnectionEditor(); public slots: diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp index e589679b..bd9a594c 100644 --- a/kdevdesigner/designer/dbconnectionsimpl.cpp +++ b/kdevdesigner/designer/dbconnectionsimpl.cpp @@ -42,19 +42,19 @@ #include <tdelocale.h> -static bool blockChanges = FALSE; +static bool blockChanges = false; /* * Constructs a DatabaseConnectionsEditor which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) : DatabaseConnectionBase( parent, name, modal, fl ), project( pro ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); connectionWidget = new DatabaseConnectionWidget( grp ); grpLayout->addWidget( connectionWidget, 0, 0 ); #ifndef TQT_NO_SQL @@ -63,8 +63,8 @@ DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* pa listConnections->insertItem( conn->name() ); connectionWidget->comboDriver->insertStringList( TQSqlDatabase::drivers() ); #endif - connectionWidget->editName->setValidator( new AsciiValidator( TQT_TQOBJECT(connectionWidget->editName) ) ); - enableAll( FALSE ); + connectionWidget->editName->setValidator( new AsciiValidator( connectionWidget->editName ) ); + enableAll( false ); } DatabaseConnectionsEditor::~DatabaseConnectionsEditor() @@ -81,15 +81,15 @@ void DatabaseConnectionsEditor::deleteConnection() listConnections->setCurrentItem( 0 ); currentConnectionChanged( listConnections->currentText() ); } else { - enableAll( FALSE ); + enableAll( false ); } project->saveConnections(); } void DatabaseConnectionsEditor::newConnection() { - blockChanges = TRUE; - enableAll( TRUE ); + blockChanges = true; + enableAll( true ); TQString n( "(default)" ); if ( project->databaseConnection( n ) ) { n = "connection"; @@ -100,9 +100,9 @@ void DatabaseConnectionsEditor::newConnection() } connectionWidget->editName->setText( n ); listConnections->clearSelection(); - buttonConnect->setDefault( TRUE ); + buttonConnect->setDefault( true ); connectionWidget->editName->setFocus(); - blockChanges = FALSE; + blockChanges = false; } void DatabaseConnectionsEditor::doConnect() @@ -151,15 +151,15 @@ void DatabaseConnectionsEditor::currentConnectionChanged( const TQString &s ) { #ifndef TQT_NO_SQL DatabaseConnection *conn = project->databaseConnection( s ); - blockChanges = TRUE; + blockChanges = true; enableAll( conn != 0 ); - connectionWidget->editName->setEnabled( FALSE ); - blockChanges = FALSE; + connectionWidget->editName->setEnabled( false ); + blockChanges = false; if ( !conn ) return; - blockChanges = TRUE; + blockChanges = true; connectionWidget->editName->setText( conn->name() ); - blockChanges = FALSE; + blockChanges = false; connectionWidget->comboDriver->lineEdit()->setText( conn->driver() ); connectionWidget->editDatabase->setText( conn->database() ); connectionWidget->editUsername->setText( conn->username() ); diff --git a/kdevdesigner/designer/dbconnectionsimpl.h b/kdevdesigner/designer/dbconnectionsimpl.h index 18bd60bb..66f43b29 100644 --- a/kdevdesigner/designer/dbconnectionsimpl.h +++ b/kdevdesigner/designer/dbconnectionsimpl.h @@ -39,7 +39,7 @@ class DatabaseConnectionsEditor : public DatabaseConnectionBase public: DatabaseConnectionsEditor( Project *pro, TQWidget* parent = 0, - const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + const char* name = 0, bool modal = false, WFlags fl = 0 ); ~DatabaseConnectionsEditor(); protected slots: diff --git a/kdevdesigner/designer/designeraction.h b/kdevdesigner/designer/designeraction.h index 9d6aeaed..eade6982 100644 --- a/kdevdesigner/designer/designeraction.h +++ b/kdevdesigner/designer/designeraction.h @@ -33,9 +33,9 @@ public: :TQAction(menuText, accel, parent, name) {} DesignerAction ( const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0 ) :TQAction(icon, menuText, accel, parent, name) {} - DesignerAction ( const TQString & text, const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = FALSE ) + DesignerAction ( const TQString & text, const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = false ) :TQAction(text, icon, menuText, accel, parent, name, toggle) {} - DesignerAction ( const TQString & text, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = FALSE ) + DesignerAction ( const TQString & text, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = false ) :TQAction(text, menuText, accel, parent, name, toggle) {} DesignerAction ( TQObject * parent, const char * name, bool toggle ) :TQAction(parent, name, toggle) {} diff --git a/kdevdesigner/designer/designerapp.cpp b/kdevdesigner/designer/designerapp.cpp index 22d1e531..8a96049a 100644 --- a/kdevdesigner/designer/designerapp.cpp +++ b/kdevdesigner/designer/designerapp.cpp @@ -72,7 +72,7 @@ TQSplashScreen *DesignerApplication::showSplash() TQRect mainRect; TQString keybase = settingsKey(); - bool show = config.readBoolEntry( keybase + "SplashScreen", TRUE ); + bool show = config.readBoolEntry( keybase + "SplashScreen", true ); mainRect.setX( config.readNumEntry( keybase + "Geometries/MainwindowX", 0 ) ); mainRect.setY( config.readNumEntry( keybase + "Geometries/MainwindowY", 0 ) ); mainRect.setWidth( config.readNumEntry( keybase + "Geometries/MainwindowWidth", 500 ) ); @@ -151,7 +151,7 @@ bool DesignerApplication::winEventFilter( MSG *msg ) TQObjectList* l = MainWindow::self->queryList( "FormWindow" ); FormWindow* fw = (FormWindow*) l->first(); FormWindow* totop = 0; - bool haveit = FALSE; + bool haveit = false; while ( fw ) { haveit = haveit || fw->fileName() == arg; if ( haveit ) @@ -161,7 +161,7 @@ bool DesignerApplication::winEventFilter( MSG *msg ) } if ( !haveit ) { - FlashWindow( MainWindow::self->winId(), TRUE ); + FlashWindow( MainWindow::self->winId(), true ); MainWindow::self->openFormWindow( arg ); } else if ( totop ) { totop->setFocus(); @@ -169,7 +169,7 @@ bool DesignerApplication::winEventFilter( MSG *msg ) delete l; } } - return TRUE; + return true; } return TQApplication::winEventFilter( msg ); } diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp index 4a223cef..9cb8957f 100644 --- a/kdevdesigner/designer/designerappiface.cpp +++ b/kdevdesigner/designer/designerappiface.cpp @@ -129,13 +129,13 @@ void DesignerInterfaceImpl::updateFunctionList() void DesignerInterfaceImpl::onProjectChange( TQObject *receiver, const char *slot ) { - TQObject::connect( mainWindow, TQT_SIGNAL( projectChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( projectChanged() ), receiver, slot ); } void DesignerInterfaceImpl::onFormChange( TQObject *receiver, const char *slot ) { - TQObject::connect( mainWindow, TQT_SIGNAL( formWindowChanged() ), receiver, slot ); - TQObject::connect( mainWindow, TQT_SIGNAL( editorChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( formWindowChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( editorChanged() ), receiver, slot ); } bool DesignerInterfaceImpl::singleProjectMode() const @@ -146,7 +146,7 @@ bool DesignerInterfaceImpl::singleProjectMode() const void DesignerInterfaceImpl::showError( TQWidget *widget, int line, const TQString &message ) { - mainWindow->showErrorMessage( TQT_TQOBJECT(widget), line, message ); + mainWindow->showErrorMessage( widget, line, message ); } void DesignerInterfaceImpl::runFinished() @@ -156,12 +156,12 @@ void DesignerInterfaceImpl::runFinished() void DesignerInterfaceImpl::showStackFrame( TQWidget *w, int line ) { - mainWindow->showStackFrame( TQT_TQOBJECT(w), line ); + mainWindow->showStackFrame( w, line ); } void DesignerInterfaceImpl::showDebugStep( TQWidget *w, int line ) { - mainWindow->showDebugStep( TQT_TQOBJECT(w), line ); + mainWindow->showDebugStep( w, line ); } void DesignerInterfaceImpl::runProjectPrecondition() @@ -335,7 +335,7 @@ void DesignerProjectImpl::breakPoints( TQMap<TQString, TQValueList<uint> > &bps for ( TQPtrListIterator<FormFile> forms = project->formFiles(); forms.current(); ++forms ) { if ( forms.current()->formWindow() ) - bps.insert( TQString( forms.current()->formWindow()->name() ) + " <Form>", MetaDataBase::breakPoints( TQT_TQOBJECT(forms.current()->formWindow()) ) ); + bps.insert( TQString( forms.current()->formWindow()->name() ) + " <Form>", MetaDataBase::breakPoints( forms.current()->formWindow() ) ); } } @@ -360,7 +360,7 @@ void DesignerProjectImpl::clearAllBreakpoints() const for ( TQPtrListIterator<FormFile> forms = project->formFiles(); forms.current(); ++forms ) { if ( forms.current()->formWindow() ) - MetaDataBase::setBreakPoints( TQT_TQOBJECT(forms.current()->formWindow()), empty ); + MetaDataBase::setBreakPoints( forms.current()->formWindow(), empty ); MainWindow::self->resetBreakPoints(); } } @@ -535,7 +535,7 @@ void DesignerPixmapCollectionImpl::addPixmap( const TQPixmap &p, const TQString pixCollection->addPixmap( pix, force ); FormWindow *fw = MainWindow::self->formWindow(); if ( fw ) - MetaDataBase::setPixmapKey( TQT_TQOBJECT(fw), p.serialNumber(), name ); + MetaDataBase::setPixmapKey( fw, p.serialNumber(), name ); } TQPixmap DesignerPixmapCollectionImpl::pixmap( const TQString &name ) const @@ -585,8 +585,8 @@ void DesignerFormWindowImpl::insertWidget( TQWidget * ) TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *parent, const char *name ) { TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, name ); - formWindow->insertWidget( w, TRUE ); - formWindow->killAccels( TQT_TQOBJECT(formWindow->mainContainer()) ); + formWindow->insertWidget( w, true ); + formWindow->killAccels( formWindow->mainContainer() ); return w; } @@ -674,7 +674,7 @@ void DesignerFormWindowImpl::breakLayout() void DesignerFormWindowImpl::selectWidget( TQWidget * w ) { - formWindow->selectWidget( TQT_TQOBJECT(w), TRUE ); + formWindow->selectWidget( w, true ); } void DesignerFormWindowImpl::selectAll() @@ -688,7 +688,7 @@ void DesignerFormWindowImpl::clearSelection() bool DesignerFormWindowImpl::isWidgetSelected( TQWidget * ) const { - return FALSE; + return false; } TQWidgetList DesignerFormWindowImpl::selectedWidgets() const @@ -736,12 +736,12 @@ void DesignerFormWindowImpl::addAction( TQAction *a ) return; formWindow->actionList().append( a ); MetaDataBase::addEntry( a ); - setPropertyChanged( a, "name", TRUE ); - setPropertyChanged( a, "text", TRUE ); - setPropertyChanged( a, "menuText", TRUE ); - setPropertyChanged( a, "accel", TRUE ); + setPropertyChanged( a, "name", true ); + setPropertyChanged( a, "text", true ); + setPropertyChanged( a, "menuText", true ); + setPropertyChanged( a, "accel", true ); if ( !a->iconSet().isNull() && !a->iconSet().pixmap().isNull() ) - setPropertyChanged( a, "iconSet", TRUE ); + setPropertyChanged( a, "iconSet", true ); } void DesignerFormWindowImpl::removeAction( TQAction *a ) @@ -755,14 +755,14 @@ void DesignerFormWindowImpl::preview() const void DesignerFormWindowImpl::addConnection( TQObject *sender, const char *signal, TQObject *receiver, const char *slot ) { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow), sender, signal, receiver, slot ); + MetaDataBase::addConnection( formWindow, sender, signal, receiver, slot ); } void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQString &specifier, const TQString &access, const TQString &type, const TQString &language, const TQString &returnType ) { - MetaDataBase::addFunction( TQT_TQOBJECT(formWindow), function, specifier, access, type, language, returnType ); + MetaDataBase::addFunction( formWindow, function, specifier, access, type, language, returnType ); formWindow->mainWindow()->functionsChanged(); } @@ -770,8 +770,8 @@ void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQStr void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, const TQVariant &value ) { - int id = o->metaObject()->findProperty( property, TRUE ); - const TQMetaProperty* p = o->metaObject()->property( id, TRUE ); + int id = o->metaObject()->findProperty( property, true ); + const TQMetaProperty* p = o->metaObject()->property( id, true ); if ( p && p->isValid() ) o->setProperty( property, value ); else @@ -780,8 +780,8 @@ void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, con TQVariant DesignerFormWindowImpl::property( TQObject *o, const char *prop ) const { - int id = o->metaObject()->findProperty( prop, TRUE ); - const TQMetaProperty* p = o->metaObject()->property( id, TRUE ); + int id = o->metaObject()->findProperty( prop, true ); + const TQMetaProperty* p = o->metaObject()->property( id, true ); if ( p && p->isValid() ) return o->property( prop ); return MetaDataBase::fakeProperty( o, prop ); @@ -804,7 +804,7 @@ void DesignerFormWindowImpl::setColumnFields( TQObject *o, const TQMap<TQString, TQStringList DesignerFormWindowImpl::implementationIncludes() const { - TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formWindow ); TQStringList lst; for ( TQValueList<MetaDataBase::Include>::Iterator it = includes.begin(); it != includes.end(); ++it ) { MetaDataBase::Include inc = *it; @@ -825,7 +825,7 @@ TQStringList DesignerFormWindowImpl::implementationIncludes() const TQStringList DesignerFormWindowImpl::declarationIncludes() const { - TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formWindow ); TQStringList lst; for ( TQValueList<MetaDataBase::Include>::Iterator it = includes.begin(); it != includes.end(); ++it ) { MetaDataBase::Include inc = *it; @@ -846,7 +846,7 @@ TQStringList DesignerFormWindowImpl::declarationIncludes() const void DesignerFormWindowImpl::setImplementationIncludes( const TQStringList &lst ) { - TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( formWindow ); TQValueList<MetaDataBase::Include> includes; for ( TQValueList<MetaDataBase::Include>::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) { MetaDataBase::Include inc = *it; @@ -882,13 +882,13 @@ void DesignerFormWindowImpl::setImplementationIncludes( const TQStringList &lst includes << inc; } } - MetaDataBase::setIncludes( TQT_TQOBJECT(formWindow), includes ); + MetaDataBase::setIncludes( formWindow, includes ); formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup(); } void DesignerFormWindowImpl::setDeclarationIncludes( const TQStringList &lst ) { - TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( formWindow ); TQValueList<MetaDataBase::Include> includes; for ( TQValueList<MetaDataBase::Include>::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) { MetaDataBase::Include inc = *it; @@ -924,35 +924,35 @@ void DesignerFormWindowImpl::setDeclarationIncludes( const TQStringList &lst ) includes << inc; } } - MetaDataBase::setIncludes( TQT_TQOBJECT(formWindow), includes ); + MetaDataBase::setIncludes( formWindow, includes ); formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup(); } TQStringList DesignerFormWindowImpl::forwardDeclarations() const { - return MetaDataBase::forwards( TQT_TQOBJECT(formWindow) ); + return MetaDataBase::forwards( formWindow ); } void DesignerFormWindowImpl::setForwardDeclarations( const TQStringList &lst ) { - MetaDataBase::setForwards( TQT_TQOBJECT(formWindow), lst ); + MetaDataBase::setForwards( formWindow, lst ); formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup(); } TQStringList DesignerFormWindowImpl::signalList() const { - return MetaDataBase::signalList( TQT_TQOBJECT(formWindow) ); + return MetaDataBase::signalList( formWindow ); } void DesignerFormWindowImpl::setSignalList( const TQStringList &lst ) { - MetaDataBase::setSignalList( TQT_TQOBJECT(formWindow), lst ); + MetaDataBase::setSignalList( formWindow, lst ); formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup(); } void DesignerFormWindowImpl::onModificationChange( TQObject *receiver, const char *slot ) { - TQObject::connect( formWindow, TQT_SIGNAL( modificationChanged( bool, FormWindow * ) ), receiver, slot ); + TQObject::connect( formWindow, TQ_SIGNAL( modificationChanged( bool, FormWindow * ) ), receiver, slot ); } void DesignerFormWindowImpl::addMenu( const TQString &text, const TQString &name ) @@ -963,16 +963,16 @@ void DesignerFormWindowImpl::addMenu( const TQString &text, const TQString &name TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); PopupMenuEditor *popup = new PopupMenuEditor( formWindow, mw ); TQString n = name; - formWindow->unify( TQT_TQOBJECT(popup), n, TRUE ); + formWindow->unify( popup, n, true ); popup->setName( n ); MenuBarEditor *mb = (MenuBarEditor *)mw->child( 0, "MenuBarEditor" ); if ( !mb ) { mb = new MenuBarEditor( formWindow, mw ); mb->setName( "MenuBar" ); - MetaDataBase::addEntry( TQT_TQOBJECT(mb) ); + MetaDataBase::addEntry( mb ); } mb->insertItem( text, popup ); - MetaDataBase::addEntry( TQT_TQOBJECT(popup) ); + MetaDataBase::addEntry( popup ); } void DesignerFormWindowImpl::addMenuAction( const TQString &menu, TQAction *a ) @@ -1009,7 +1009,7 @@ void DesignerFormWindowImpl::addToolBar( const TQString &text, const TQString &n TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); TQToolBar *tb = new QDesignerToolBar( mw ); TQString n = name; - formWindow->unify( TQT_TQOBJECT(tb), n, TRUE ); + formWindow->unify( tb, n, true ); tb->setName( n ); mw->addToolBar( tb, text ); } @@ -1075,7 +1075,7 @@ void DesignerOutputDockImpl::appendError( const TQString &s, int l ) ls << s; TQValueList<uint> ll; ll << l; - outWin->setErrorMessages( ls, ll, FALSE, TQStringList(), TQObjectList() ); + outWin->setErrorMessages( ls, ll, false, TQStringList(), TQObjectList() ); } void DesignerOutputDockImpl::clearError() diff --git a/kdevdesigner/designer/designerappiface.h b/kdevdesigner/designer/designerappiface.h index 2ddcd47c..7a56f84a 100644 --- a/kdevdesigner/designer/designerappiface.h +++ b/kdevdesigner/designer/designerappiface.h @@ -142,7 +142,7 @@ public: void setTables( const TQStringList & ); TQMap<TQString, TQStringList> fields() const; void setFields( const TQMap<TQString, TQStringList> & ); - void open( bool suppressDialog = TRUE ) const; + void open( bool suppressDialog = true ) const; void close() const; TQSqlDatabase* connection(); private: @@ -205,7 +205,7 @@ public: void setCurrentWidget( TQWidget * ); TQPtrList<TQAction> actionList() const; TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, - TQObject* parent, const char* name = 0, bool toggle = FALSE ); + TQObject* parent, const char* name = 0, bool toggle = false ); void addAction( TQAction * ); void removeAction( TQAction * ); void preview() const; diff --git a/kdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui index a5075250..fefe1dfe 100644 --- a/kdevdesigner/designer/editfunctions.ui +++ b/kdevdesigner/designer/editfunctions.ui @@ -696,7 +696,7 @@ <tabstop>addFunction</tabstop> <tabstop>deleteFunction</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">currentItemChanged( TQListViewItem * )</slot> <slot access="protected">currentSpecifierChanged( const TQString & )</slot> <slot access="protected">currentTextChanged( const TQString & )</slot> @@ -709,7 +709,7 @@ <slot access="protected">functionAdd()</slot> <slot access="protected">functionRemove()</slot> <slot access="protected">displaySlots( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp index 4d006097..b0c5ffaf 100644 --- a/kdevdesigner/designer/editfunctionsimpl.cpp +++ b/kdevdesigner/designer/editfunctionsimpl.cpp @@ -50,14 +50,14 @@ #include <tdelocale.h> EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) - : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw ) + : EditFunctionsBase( parent, 0, true ), formWindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); id = 0; functList.clear(); - TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(fw) ); + TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( fw ); for ( TQValueList<MetaDataBase::Function>::Iterator it = functionList.begin(); it != functionList.end(); ++it ) { TQListViewItem *i = new TQListViewItem( functionListView ); @@ -86,7 +86,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) id++; if ( (*it).type == "slot" ) { - if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), MetaDataBase::normalizeFunction( (*it).function ).latin1() ) ) + if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( (*it).function ).latin1() ) ) i->setText( 5, i18n( "Yes" ) ); else i->setText( 5, i18n( "No" ) ); @@ -95,8 +95,8 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) } } - boxProperties->setEnabled( FALSE ); - functionName->setValidator( new AsciiValidator( TRUE, TQT_TQOBJECT(functionName) ) ); + boxProperties->setEnabled( false ); + functionName->setValidator( new AsciiValidator( true, functionName ) ); if ( functionListView->firstChild() ) functionListView->setCurrentItem( functionListView->firstChild() ); @@ -107,13 +107,13 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) // Enable rename for all TQListViewItems TQListViewItemIterator lvit = functionListView->firstChild(); for ( ; *lvit; lvit++ ) - (*lvit)->setRenameEnabled( 0, TRUE ); + (*lvit)->setRenameEnabled( 0, true ); // Connect listview signal to signal-relay TQObject::connect( functionListView, - TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), + TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), this, - TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); + TQ_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "functionName" TQObjectList *l = parent->queryList( "TQLineEdit", "functionName" ); @@ -122,27 +122,27 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) while ( (obj = itemsLineEditIt.current()) != 0 ) { ++itemsLineEditIt; TQObject::connect( this, - TQT_SIGNAL( itemRenamed( const TQString & ) ), + TQ_SIGNAL( itemRenamed( const TQString & ) ), obj, - TQT_SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; } void EditFunctions::okClicked() { - TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow ); TQString n = i18n( "Add/Remove functions of '%1'" ).arg( formWindow->name() ); TQPtrList<Command> commands; TQValueList<MetaDataBase::Function>::Iterator fit; if ( !functionList.isEmpty() ) { for ( fit = functionList.begin(); fit != functionList.end(); ++fit ) { - bool functionFound = FALSE; + bool functionFound = false; TQValueList<FunctItem>::Iterator it = functList.begin(); for ( ; it != functList.end(); ++it ) { if ( MetaDataBase::normalizeFunction( (*it).oldName ) == MetaDataBase::normalizeFunction( (*fit).function ) ) { - functionFound = TRUE; + functionFound = true; break; } } @@ -156,7 +156,7 @@ void EditFunctions::okClicked() } } - bool invalidFunctions = FALSE; + bool invalidFunctions = false; TQValueList<FunctItem> invalidItems; if ( !functList.isEmpty() ) { @@ -179,15 +179,15 @@ void EditFunctions::okClicked() bool illegalSpace = s.find( ' ' ) != -1 && s.find( ' ' ) < s.find( '(' ); if ( startNum || noParens || illegalSpace || lst.find( function.function ) != -1 ) { - invalidFunctions = TRUE; + invalidFunctions = true; invalidItems.append( (*it) ); continue; } - bool functionFound = FALSE; + bool functionFound = false; for ( fit = functionList.begin(); fit != functionList.end(); ++fit ) { if ( MetaDataBase::normalizeFunction( (*fit).function ) == MetaDataBase::normalizeFunction( (*it).oldName ) ) { - functionFound = TRUE; + functionFound = true; break; } } @@ -218,12 +218,12 @@ void EditFunctions::okClicked() "Remove these functions?" ), i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) { TQValueList<FunctItem>::Iterator it = functList.begin(); while ( it != functList.end() ) { - bool found = FALSE; + bool found = false; TQValueList<FunctItem>::Iterator vit = invalidItems.begin(); for ( ; vit != invalidItems.end(); ++vit ) { if ( (*vit).newName == (*it).newName ) { invalidItems.remove( vit ); - found = TRUE; + found = true; break; } } @@ -237,7 +237,7 @@ void EditFunctions::okClicked() functionIds.remove( fit ); delete litem; if ( functionListView->currentItem() ) - functionListView->setSelected( functionListView->currentItem(), TRUE ); + functionListView->setSelected( functionListView->currentItem(), true ); currentItemChanged( functionListView->currentItem() ); break; } @@ -249,7 +249,7 @@ void EditFunctions::okClicked() } if ( functionListView->firstChild() ) { functionListView->setCurrentItem( functionListView->firstChild() ); - functionListView->setSelected( functionListView->firstChild(), TRUE ); + functionListView->setSelected( functionListView->firstChild(), true ); } } formWindow->mainWindow()->objectHierarchy()->updateFormDefinitionView(); @@ -270,7 +270,7 @@ void EditFunctions::functionAdd( const TQString &access, const TQString &type ) { TQListViewItem *i = new TQListViewItem( functionListView ); i->setPixmap( 0, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()) ); - i->setRenameEnabled( 0, TRUE ); + i->setRenameEnabled( 0, true ); i->setText( 1, "void" ); i->setText( 2, "virtual" ); @@ -291,7 +291,7 @@ void EditFunctions::functionAdd( const TQString &access, const TQString &type ) if ( i->text( 4 ) == "slot" ) { i->setText( 0, "newSlot()" ); - if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), "newSlot()" ) ) + if ( MetaDataBase::isSlotUsed( formWindow, "newSlot()" ) ) i->setText( 5, i18n( "Yes" ) ); else i->setText( 5, i18n( "No" ) ); @@ -301,7 +301,7 @@ void EditFunctions::functionAdd( const TQString &access, const TQString &type ) } functionListView->setCurrentItem( i ); - functionListView->setSelected( i, TRUE ); + functionListView->setSelected( i, true ); functionListView->ensureItemVisible( i ); functionName->setFocus(); functionName->selectAll(); @@ -329,7 +329,7 @@ void EditFunctions::functionRemove() if ( !functionListView->currentItem() ) return; - functionListView->blockSignals( TRUE ); + functionListView->blockSignals( true ); removedFunctions << MetaDataBase::normalizeFunction( functionListView->currentItem()->text( 0 ) ); int delId = functionIds[ functionListView->currentItem() ]; TQValueList<FunctItem>::Iterator it = functList.begin(); @@ -343,24 +343,24 @@ void EditFunctions::functionRemove() functionIds.remove( functionListView->currentItem() ); delete functionListView->currentItem(); if ( functionListView->currentItem() ) - functionListView->setSelected( functionListView->currentItem(), TRUE ); - functionListView->blockSignals( FALSE ); + functionListView->setSelected( functionListView->currentItem(), true ); + functionListView->blockSignals( false ); currentItemChanged( functionListView->currentItem() ); } void EditFunctions::currentItemChanged( TQListViewItem *i ) { - functionName->blockSignals( TRUE ); + functionName->blockSignals( true ); functionName->setText( "" ); functionAccess->setCurrentItem( 0 ); - functionName->blockSignals( FALSE ); + functionName->blockSignals( false ); if ( !i ) { - boxProperties->setEnabled( FALSE ); + boxProperties->setEnabled( false ); return; } - functionName->blockSignals( TRUE ); + functionName->blockSignals( true ); functionName->setText( i->text( 0 ) ); editType->setText( i->text( 1 ) ); TQString specifier = i->text( 2 ); @@ -385,8 +385,8 @@ void EditFunctions::currentItemChanged( TQListViewItem *i ) else functionType->setCurrentItem( 1 ); - functionName->blockSignals( FALSE ); - boxProperties->setEnabled( TRUE ); + functionName->blockSignals( false ); + boxProperties->setEnabled( true ); } void EditFunctions::currentTextChanged( const TQString &txt ) @@ -398,7 +398,7 @@ void EditFunctions::currentTextChanged( const TQString &txt ) functionListView->currentItem()->setText( 0, txt ); if ( functionListView->currentItem()->text( 4 ) == "slot" ) { - if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), MetaDataBase::normalizeFunction( txt.latin1() ).latin1() ) ) + if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( txt.latin1() ).latin1() ) ) functionListView->currentItem()->setText( 5, i18n( "Yes" ) ); else functionListView->currentItem()->setText( 5, i18n( "No" ) ); @@ -441,7 +441,7 @@ void EditFunctions::currentTypeChanged( const TQString &type ) lastType = type; functionListView->currentItem()->setText( 4, type ); if ( type == "slot" ) { - if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), + if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( functionListView->currentItem()->text( 0 ).latin1() ).latin1() ) ) functionListView->currentItem()->setText( 5, i18n( "Yes" ) ); else @@ -490,7 +490,7 @@ void EditFunctions::setCurrentFunction( const TQString &function ) while ( it.current() ) { if ( MetaDataBase::normalizeFunction( it.current()->text( 0 ) ) == function ) { functionListView->setCurrentItem( it.current() ); - functionListView->setSelected( it.current(), TRUE ); + functionListView->setSelected( it.current(), true ); currentItemChanged( it.current() ); return; } @@ -515,7 +515,7 @@ void EditFunctions::displaySlots( bool justSlots ) i->setText( 4, (*it).type ); if ( (*it).type == "slot" ) { - if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), MetaDataBase::normalizeFunction( (*it).newName ).latin1() ) ) + if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( (*it).newName ).latin1() ) ) i->setText( 5, i18n( "Yes" ) ); else i->setText( 5, i18n( "No" ) ); @@ -525,7 +525,7 @@ void EditFunctions::displaySlots( bool justSlots ) } if ( functionListView->firstChild() ) - functionListView->setSelected( functionListView->firstChild(), TRUE ); + functionListView->setSelected( functionListView->firstChild(), true ); } void EditFunctions::emitItemRenamed( TQListViewItem *, int, const TQString & text ) diff --git a/kdevdesigner/designer/editfunctionsimpl.h b/kdevdesigner/designer/editfunctionsimpl.h index c4ddf83b..a0c8fc66 100644 --- a/kdevdesigner/designer/editfunctionsimpl.h +++ b/kdevdesigner/designer/editfunctionsimpl.h @@ -41,7 +41,7 @@ class EditFunctions : public EditFunctionsBase public: - EditFunctions( TQWidget *parent, FormWindow *fw, bool showOnlySlots = FALSE ); + EditFunctions( TQWidget *parent, FormWindow *fw, bool showOnlySlots = false ); void setCurrentFunction( const TQString &function ); void functionAdd( const TQString &access = TQString(), diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp index 0f4c426e..6923e94c 100644 --- a/kdevdesigner/designer/filechooser.cpp +++ b/kdevdesigner/designer/filechooser.cpp @@ -41,15 +41,15 @@ FileChooser::FileChooser( TQWidget *parent, const char *name ) lineEdit = new TQLineEdit( this, "filechooser_lineedit" ); layout->addWidget( lineEdit ); - connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) ); + connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( fileNameChanged( const TQString & ) ) ); button = new TQPushButton( "...", this, "filechooser_button" ); button->setFixedWidth( button->fontMetrics().width( " ... " ) ); layout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( chooseFile() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( chooseFile() ) ); setFocusProxy( lineEdit ); } diff --git a/kdevdesigner/designer/finddialog.ui b/kdevdesigner/designer/finddialog.ui index 9b16cd8c..c257206e 100644 --- a/kdevdesigner/designer/finddialog.ui +++ b/kdevdesigner/designer/finddialog.ui @@ -264,11 +264,11 @@ <variable>EditorInterface *editor;</variable> <variable>TQObject *formWindow;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>doFind()</slot> <slot>setEditor( EditorInterface * e, TQObject * fw )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/finddialog.ui.h b/kdevdesigner/designer/finddialog.ui.h index 126c0a5f..c3218edd 100644 --- a/kdevdesigner/designer/finddialog.ui.h +++ b/kdevdesigner/designer/finddialog.ui.h @@ -43,16 +43,16 @@ void FindDialog::doFind() if ( !editor->find( comboFind->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked() ) ) - checkBegin->setChecked( TRUE ); + checkBegin->setChecked( true ); else - checkBegin->setChecked( FALSE ); + checkBegin->setChecked( false ); } void FindDialog::setEditor( EditorInterface * e, TQObject * fw ) { if ( fw != formWindow ) - checkBegin->setChecked( TRUE ); + checkBegin->setChecked( true ); formWindow = fw; if ( editor ) editor->release(); diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp index 1ef0b0b7..d32a0611 100644 --- a/kdevdesigner/designer/formfile.cpp +++ b/kdevdesigner/designer/formfile.cpp @@ -66,8 +66,8 @@ static TQString make_func_pretty( const TQString &s ) FormFile::FormFile( const TQString &fn, bool temp, Project *p, const char *name ) : filename( fn ), fileNameTemp( temp ), pro( p ), fw( 0 ), ed( 0 ), - timeStamp( 0, fn + codeExtension() ), codeEdited( FALSE ), pkg( FALSE ), - cm( FALSE ), codeFileStat( None ) + timeStamp( 0, fn + codeExtension() ), codeEdited( false ), pkg( false ), + cm( false ), codeFileStat( None ) { MetaDataBase::addEntry( this ); fake = qstrcmp( name, "qt_fakewindow" ) == 0; @@ -75,15 +75,15 @@ FormFile::FormFile( const TQString &fn, bool temp, Project *p, const char *name pro->addFormFile( this ); loadCode(); if ( !temp ) - checkFileName( FALSE ); + checkFileName( false ); - connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewStatus(FormFile* ))); + connect(this, TQ_SIGNAL(somethingChanged(FormFile* )), this, TQ_SLOT(emitNewStatus(FormFile* ))); } FormFile::~FormFile() { pro->removeFormFile( this ); - if ( TQT_TQOBJECT(formWindow()) ) + if ( formWindow() ) formWindow()->setFormFile( 0 ); } @@ -96,8 +96,8 @@ void FormFile::setFormWindow( FormWindow *f ) fw = f; if ( fw ) fw->setFormFile( this ); - parseCode( cod, FALSE ); - TQTimer::singleShot( 0, this, TQT_SLOT( notifyFormWindowChange() ) ); + parseCode( cod, false ); + TQTimer::singleShot( 0, this, TQ_SLOT( notifyFormWindowChange() ) ); } void FormFile::setEditor( SourceEditor *e ) @@ -110,12 +110,12 @@ void FormFile::setFileName( const TQString &fn ) if ( fn == filename ) return; if ( fn.isEmpty() ) { - fileNameTemp = TRUE; + fileNameTemp = true; if ( filename.find( "unnamed" ) != 0 ) filename = createUnnamedFileName(); return; } else { - fileNameTemp = FALSE; + fileNameTemp = false; } filename = fn; timeStamp.setFileName( filename + codeExtension() ); @@ -166,14 +166,14 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) if ( fileNameTemp ) return saveAs(); if ( !ignoreModified && !isModified() ) - return TRUE; + return true; if ( ed ) ed->save(); - if ( TQT_TQOBJECT(formWindow()) && isModified( WFormWindow ) ) { + if ( formWindow() && isModified( WFormWindow ) ) { if ( withMsgBox ) { if ( !formWindow()->checkCustomWidgets() ) - return FALSE; + return false; } if ( TQFile::exists( pro->makeAbsolute( filename ) ) ) { @@ -221,7 +221,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) } } - if ( TQT_TQOBJECT(formWindow()) ) { + if ( formWindow() ) { Resource resource( MainWindow::self ); resource.setWidget( formWindow() ); bool formCodeOnly = isModified( WFormCode ) && !isModified( WFormWindow ); @@ -229,7 +229,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) if ( MainWindow::self ) MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").arg( formCodeOnly ? codeFile(): filename ) ); if ( formCodeOnly ) - return FALSE; + return false; return saveAs(); } if ( MainWindow::self ) @@ -237,22 +237,22 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) arg( formCodeOnly ? codeFile() : filename )); } else { if ( !Resource::saveFormCode(this, MetaDataBase::languageInterface(pro->language())) ) - return FALSE; + return false; } timeStamp.update(); - setModified( FALSE ); - return TRUE; + setModified( false ); + return true; } bool FormFile::saveAs( bool ignoreModified ) { TQString f = pro->makeAbsolute( fileName() ); - if ( fileNameTemp && TQT_TQOBJECT(formWindow()) ) { + if ( fileNameTemp && formWindow() ) { f = TQString( formWindow()->name() ).lower(); f.replace( "::", "_" ); f = pro->makeAbsolute( f + ".ui" ); } - bool saved = FALSE; + bool saved = false; if ( ignoreModified ) { TQString dir = TQStringList::split( ':', pro->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first(); f = TQFileInfo( f ).fileName(); @@ -266,11 +266,11 @@ bool FormFile::saveAs( bool ignoreModified ) i18n( "Save Form '%1' As").arg( formName() )/*, MainWindow::self ? &MainWindow::self->lastSaveFilter : 0*/ ); if ( fn.isEmpty() ) - return FALSE; + return false; TQFileInfo fi( fn ); if ( fi.extension() != "ui" ) fn += ".ui"; - fileNameTemp = FALSE; + fileNameTemp = false; filename = pro->makeRelative( fn ); TQFileInfo relfi( filename ); if ( relfi.exists() ) { @@ -278,27 +278,27 @@ bool FormFile::saveAs( bool ignoreModified ) i18n( "The file already exists. Do you wish to overwrite it?" ), TQMessageBox::Yes, TQMessageBox::No ) == TQMessageBox::Yes ) { - saved = TRUE; + saved = true; } else { filename = f; } } else { - saved = TRUE; + saved = true; } } - if ( !checkFileName( TRUE ) ) { + if ( !checkFileName( true ) ) { filename = f; - return FALSE; + return false; } - pro->setModified( TRUE ); + pro->setModified( true ); timeStamp.setFileName( pro->makeAbsolute( codeFile() ) ); - if ( ed && TQT_TQOBJECT(formWindow()) ) + if ( ed && formWindow() ) ed->setCaption( i18n( "Edit %1" ).arg( formWindow()->name() ) ); - setModified( TRUE ); + setModified( true ); if ( pro->isDummy() ) fw->mainWindow()->addRecentlyOpenedFile( fn ); - return save( TRUE, ignoreModified ); + return save( true, ignoreModified ); } bool FormFile::close() @@ -307,20 +307,20 @@ bool FormFile::close() editor()->save(); editor()->close(); } - if ( TQT_TQOBJECT(formWindow()) ) + if ( formWindow() ) return formWindow()->close(); - return TRUE; + return true; } bool FormFile::closeEvent() { if ( !isModified() && fileNameTemp ) { pro->removeFormFile( this ); - return TRUE; + return true; } if ( !isModified() ) - return TRUE; + return true; if ( editor() ) editor()->save(); @@ -330,7 +330,7 @@ bool FormFile::closeEvent() i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save if ( !save() ) - return FALSE; + return false; case 1: // don't save loadCode(); if ( ed ) @@ -341,16 +341,16 @@ bool FormFile::closeEvent() MainWindow::self->workspace()->update(); break; case 2: // cancel - return FALSE; + return false; default: break; } - setModified( FALSE ); + setModified( false ); if ( MainWindow::self ) MainWindow::self->updateFunctionList(); - setCodeEdited( FALSE ); - return TRUE; + setCodeEdited( false ); + return true; } void FormFile::setModified( bool m, int who ) @@ -372,8 +372,8 @@ bool FormFile::isModified( int who ) bool FormFile::isFormWindowModified() const { - if ( !TQT_TQOBJECT(formWindow()) || !formWindow()->commandHistory() ) - return FALSE; + if ( !formWindow() || !formWindow()->commandHistory() ) + return false; return formWindow()->commandHistory()->isModified(); } @@ -389,7 +389,7 @@ void FormFile::setFormWindowModified( bool m ) bool b = isFormWindowModified(); if ( m == b ) return; - if ( !TQT_TQOBJECT(formWindow()) || !formWindow()->commandHistory() ) + if ( !formWindow() || !formWindow()->commandHistory() ) return; formWindow()->commandHistory()->setModified( m ); emit somethingChanged( this ); @@ -411,18 +411,18 @@ void FormFile::showFormWindow() { if ( !MainWindow::self ) return; - if ( TQT_TQOBJECT(formWindow()) ) { + if ( formWindow() ) { if ( ( formWindow()->hasFocus() || MainWindow::self->qWorkspace()->activeWindow() == formWindow() ) && MainWindow::self->propertyeditor()->formWindow() != formWindow() ) { - MainWindow::self->propertyeditor()->setWidget( TQT_TQOBJECT(formWindow()->currentWidget()), formWindow() ); + MainWindow::self->propertyeditor()->setWidget( formWindow()->currentWidget(), formWindow() ); MainWindow::self->objectHierarchy()->setFormWindow( formWindow(), - TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->currentWidget() ); } formWindow()->setFocus(); return; } - MainWindow::self->openFormWindow( pro->makeAbsolute( filename ), TRUE, this ); + MainWindow::self->openFormWindow( pro->makeAbsolute( filename ), true, this ); } bool FormFile::setupUihFile( bool askForUih ) @@ -430,10 +430,10 @@ bool FormFile::setupUihFile( bool askForUih ) if ( !pro->isCpp() || !askForUih ) { if ( !hasFormCode() ) { createFormCode(); - setModified( TRUE ); + setModified( true ); } codeFileStat = FormFile::Ok; - return TRUE; + return true; } if ( codeFileStat != FormFile::Ok && !ed ) { if ( hasFormCode() ) { @@ -443,20 +443,20 @@ bool FormFile::setupUihFile( bool askForUih ) i18n( "Use Existing" ), i18n( "Create New" ), i18n( "Cancel" ), 2, 2 ); if ( i == 2 ) - return FALSE; + return false; if ( i == 1 ) createFormCode(); } else { if ( TQMessageBox::Yes != TQMessageBox::information( MainWindow::self, i18n( "Creating ui.h file" ), i18n( "Do you want to create an new \"ui.h\" file?" ), TQMessageBox::Yes, TQMessageBox::No ) ) - return FALSE; + return false; createFormCode(); } - setModified( TRUE ); + setModified( true ); } codeFileStat = FormFile::Ok; - return TRUE; + return true; } SourceEditor *FormFile::showEditor( bool askForUih ) @@ -519,14 +519,14 @@ void FormFile::setCodeFileState( UihState s ) void FormFile::createFormCode() { - if ( !TQT_TQOBJECT(formWindow()) ) + if ( !formWindow() ) return; LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); if ( !iface ) return; if ( pro->isCpp() ) cod = codeComment(); - TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow()) ); + TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow() ); for ( TQValueList<MetaDataBase::Function>::Iterator it = functionList.begin(); it != functionList.end(); ++it ) { cod += (!cod.isEmpty() ? "\n\n" : "") + iface->createFunctionStart( formWindow()->name(), make_func_pretty((*it).function), @@ -535,7 +535,7 @@ void FormFile::createFormCode() (*it).returnType, (*it).access ) + "\n" + iface->createEmptyFunction(); } - parseCode( cod, FALSE ); + parseCode( cod, false ); } void FormFile::load() @@ -550,15 +550,15 @@ bool FormFile::loadCode() if ( !f.open( IO_ReadOnly ) ) { cod = ""; setCodeFileState( FormFile::None ); - return FALSE; + return false; } TQTextStream ts( &f ); cod = ts.read(); - parseCode( cod, FALSE ); + parseCode( cod, false ); if ( hasFormCode() && codeFileStat != FormFile::Ok ) setCodeFileState( FormFile::Deleted ); timeStamp.update(); - return TRUE; + return true; } bool FormFile::isCodeEdited() const @@ -573,25 +573,25 @@ void FormFile::setCodeEdited( bool b ) void FormFile::parseCode( const TQString &txt, bool allowModify ) { - if ( !TQT_TQOBJECT(formWindow()) ) + if ( !formWindow() ) return; LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); if ( !iface ) return; TQValueList<LanguageInterface::Function> functions; TQValueList<MetaDataBase::Function> newFunctions, oldFunctions; - oldFunctions = MetaDataBase::functionList( TQT_TQOBJECT(formWindow()) ); + oldFunctions = MetaDataBase::functionList( formWindow() ); iface->functions( txt, &functions ); TQMap<TQString, TQString> funcs; for ( TQValueList<LanguageInterface::Function>::Iterator it = functions.begin(); it != functions.end(); ++it ) { - bool found = FALSE; + bool found = false; for ( TQValueList<MetaDataBase::Function>::Iterator fit = oldFunctions.begin(); fit != oldFunctions.end(); ++fit ) { TQString f( (*fit).function ); if ( MetaDataBase::normalizeFunction( f ) == MetaDataBase::normalizeFunction( (*it).name ) ) { - found = TRUE; + found = true; MetaDataBase::Function function; function.function = make_func_pretty( (*it).name ); function.specifier = (*fit).specifier; @@ -627,21 +627,21 @@ void FormFile::parseCode( const TQString &txt, bool allowModify ) newFunctions << function; funcs.insert( (*it).name, (*it).body ); if ( allowModify ) - setFormWindowModified( TRUE ); + setFormWindowModified( true ); } } if ( allowModify && oldFunctions.count() > 0 ) - setFormWindowModified( TRUE ); + setFormWindowModified( true ); - MetaDataBase::setFunctionList( TQT_TQOBJECT(formWindow()), newFunctions ); + MetaDataBase::setFunctionList( formWindow(), newFunctions ); } void FormFile::syncCode() { if ( !editor() ) return; - parseCode( editor()->editorInterface()->text(), TRUE ); + parseCode( editor()->editorInterface()->text(), true ); cod = editor()->editorInterface()->text(); } @@ -672,14 +672,14 @@ void FormFile::checkTimeStamp() bool FormFile::isUihFileUpToDate() { if ( timeStamp.isUpToDate() ) - return TRUE; + return true; if ( !editor() ) { MainWindow::self->editSource(); tqDebug( "parse Code" ); - parseCode( editor()->editorInterface()->text(), TRUE ); + parseCode( editor()->editorInterface()->text(), true ); } checkTimeStamp(); - return FALSE; + return false; } void FormFile::addFunctionCode( MetaDataBase::Function function ) @@ -692,11 +692,11 @@ void FormFile::addFunctionCode( MetaDataBase::Function function ) TQValueList<LanguageInterface::Function> funcs; iface->functions( cod, &funcs ); - bool hasFunc = FALSE; + bool hasFunc = false; for ( TQValueList<LanguageInterface::Function>::Iterator it = funcs.begin(); it != funcs.end(); ++it ) { if ( MetaDataBase::normalizeFunction( (*it).name ) == MetaDataBase::normalizeFunction( function.function ) ) { - hasFunc = TRUE; + hasFunc = true; break; } } @@ -704,7 +704,7 @@ void FormFile::addFunctionCode( MetaDataBase::Function function ) if ( !hasFunc ) { if ( !codeEdited && !timeStamp.isUpToDate() ) loadCode(); - MetaDataBase::MetaInfo mi = MetaDataBase::metaInfo( TQT_TQOBJECT(formWindow()) ); + MetaDataBase::MetaInfo mi = MetaDataBase::metaInfo( formWindow() ); TQString cn; if ( mi.classNameChanged ) cn = mi.className; @@ -718,7 +718,7 @@ void FormFile::addFunctionCode( MetaDataBase::Function function ) "\n" + iface->createEmptyFunction(); cod += body; if ( codeEdited ) { - setModified( TRUE ); + setModified( true ); emit somethingChanged( this ); } } @@ -802,7 +802,7 @@ void FormFile::functionRetTypeChanged( const TQString &fuName, const TQString &o TQString FormFile::formName() const { FormFile* that = (FormFile*) this; - if ( TQT_TQOBJECT(formWindow()) ) { + if ( formWindow() ) { that->cachedFormName = formWindow()->name(); return cachedFormName; } @@ -865,12 +865,12 @@ bool FormFile::checkFileName( bool allowBreak ) arg( formWindow()->name() )/*, MainWindow::self ? &MainWindow::self->lastSaveFilter : 0 */); if ( allowBreak && fn.isEmpty() ) - return FALSE; + return false; } filename = pro->makeRelative( fn ); ff = pro->findFormFile( filename, this ); } - return TRUE; + return true; } void FormFile::addConnection( const TQString &sender, const TQString &signal, diff --git a/kdevdesigner/designer/formfile.h b/kdevdesigner/designer/formfile.h index 6f80e040..8988e5dc 100644 --- a/kdevdesigner/designer/formfile.h +++ b/kdevdesigner/designer/formfile.h @@ -73,8 +73,8 @@ public: bool loadCode(); void load(); - bool save( bool withMsgBox = TRUE, bool ignoreModified = FALSE ); - bool saveAs( bool ignoreModified = FALSE ); + bool save( bool withMsgBox = true, bool ignoreModified = false ); + bool saveAs( bool ignoreModified = false ); bool close(); bool closeEvent(); bool isModified( int who = WAnyOrAll ); @@ -89,7 +89,7 @@ public: void functionRetTypeChanged( const TQString &fuName, const TQString &oldType, const TQString &newType ); void showFormWindow(); - SourceEditor *showEditor( bool askForUih = TRUE ); + SourceEditor *showEditor( bool askForUih = true ); static TQString createUnnamedFileName(); TQString formName() const; @@ -106,7 +106,7 @@ public: bool hasTempFileName() const { return fileNameTemp; } void setCodeFileState( UihState ); int codeFileState() const; - bool setupUihFile( bool askForUih = TRUE ); + bool setupUihFile( bool askForUih = true ); Project *project() const { return pro; } diff --git a/kdevdesigner/designer/formsettings.ui b/kdevdesigner/designer/formsettings.ui index 812f30a0..89afbd97 100644 --- a/kdevdesigner/designer/formsettings.ui +++ b/kdevdesigner/designer/formsettings.ui @@ -542,9 +542,9 @@ <tabstop>buttonCancel</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>okClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/formsettingsimpl.cpp b/kdevdesigner/designer/formsettingsimpl.cpp index e29ea157..f3de8578 100644 --- a/kdevdesigner/designer/formsettingsimpl.cpp +++ b/kdevdesigner/designer/formsettingsimpl.cpp @@ -41,10 +41,10 @@ #include <tqcheckbox.h> FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) - : FormSettingsBase( parent, 0, TRUE ), formwindow( fw ) + : FormSettingsBase( parent, 0, true ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(fw) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( fw ); if ( info.classNameChanged && !info.className.isEmpty() ) editClassName->setText( info.className ); else @@ -52,21 +52,21 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) editComment->setText( info.comment ); editAuthor->setText( info.author ); - editClassName->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editClassName) ) ); - editPixmapFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editPixmapFunction) ) ); + editClassName->setValidator( new AsciiValidator( TQString( ":" ), editClassName ) ); + editPixmapFunction->setValidator( new AsciiValidator( TQString( ":" ), editPixmapFunction ) ); if ( formwindow->savePixmapInline() ) - radioPixmapInline->setChecked( TRUE ); + radioPixmapInline->setChecked( true ); else if ( formwindow->savePixmapInProject() ) - radioProjectImageFile->setChecked( TRUE ); + radioProjectImageFile->setChecked( true ); else - radioPixmapFunction->setChecked( TRUE ); + radioPixmapFunction->setChecked( true ); editPixmapFunction->setText( formwindow->pixmapLoaderFunction() ); radioProjectImageFile->setEnabled( !fw->project()->isDummy() ); spinSpacing->setValue( formwindow->layoutDefaultSpacing() ); spinMargin->setValue( formwindow->layoutDefaultMargin() ); - editSpacingFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editSpacingFunction) ) ); - editMarginFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editMarginFunction) ) ); + editSpacingFunction->setValidator( new AsciiValidator( TQString( ":" ), editSpacingFunction ) ); + editMarginFunction->setValidator( new AsciiValidator( TQString( ":" ), editMarginFunction ) ); checkLayoutFunctions->setChecked( formwindow->hasLayoutFunctions() ); editSpacingFunction->setText( formwindow->spacingFunction() ); editMarginFunction->setText( formwindow->marginFunction() ); @@ -79,34 +79,34 @@ void FormSettings::okClicked() info.classNameChanged = info.className != TQString( formwindow->name() ); info.comment = editComment->text(); info.author = editAuthor->text(); - MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), info ); + MetaDataBase::setMetaInfo( formwindow, info ); - formwindow->commandHistory()->setModified( TRUE ); + formwindow->commandHistory()->setModified( true ); if ( formwindow->savePixmapInline() ) { - MetaDataBase::clearPixmapArguments( TQT_TQOBJECT(formwindow) ); - MetaDataBase::clearPixmapKeys( TQT_TQOBJECT(formwindow) ); + MetaDataBase::clearPixmapArguments( formwindow ); + MetaDataBase::clearPixmapKeys( formwindow ); } else if ( formwindow->savePixmapInProject() ) { - MetaDataBase::clearPixmapArguments( TQT_TQOBJECT(formwindow) ); + MetaDataBase::clearPixmapArguments( formwindow ); } else { - MetaDataBase::clearPixmapKeys( TQT_TQOBJECT(formwindow) ); + MetaDataBase::clearPixmapKeys( formwindow ); } if ( radioPixmapInline->isChecked() ) { - formwindow->setSavePixmapInline( TRUE ); - formwindow->setSavePixmapInProject( FALSE ); + formwindow->setSavePixmapInline( true ); + formwindow->setSavePixmapInProject( false ); } else if ( radioProjectImageFile->isChecked() ){ - formwindow->setSavePixmapInline( FALSE ); - formwindow->setSavePixmapInProject( TRUE ); + formwindow->setSavePixmapInline( false ); + formwindow->setSavePixmapInProject( true ); } else { - formwindow->setSavePixmapInline( FALSE ); - formwindow->setSavePixmapInProject( FALSE ); + formwindow->setSavePixmapInline( false ); + formwindow->setSavePixmapInProject( false ); } if ( checkLayoutFunctions->isChecked() ) - formwindow->hasLayoutFunctions( TRUE ); + formwindow->hasLayoutFunctions( true ); else - formwindow->hasLayoutFunctions( FALSE ); + formwindow->hasLayoutFunctions( false ); formwindow->setPixmapLoaderFunction( editPixmapFunction->text() ); formwindow->setLayoutDefaultSpacing( spinSpacing->value() ); diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp index 2dc7bb9d..6bea093f 100644 --- a/kdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -112,7 +112,7 @@ static void restoreCursors( TQWidget *start, FormWindow *fw ) #include <tqt_windows.h> static void flickerfree_update( TQWidget *w ) { - InvalidateRect( w->winId(), 0, FALSE ); + InvalidateRect( w->winId(), 0, false ); } #endif @@ -136,7 +136,7 @@ static void flickerfree_update( TQWidget *w ) FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name ) : TQWidget( parent, name, WDestructiveClose ), mainwindow( mw ), - commands( 100 ), pixInline( TRUE ), pixProject( FALSE ) + commands( 100 ), pixInline( true ), pixProject( false ) { ff = f; init(); @@ -145,7 +145,7 @@ FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const cha FormWindow::FormWindow( FormFile *f, TQWidget *parent, const char *name ) : TQWidget( parent, name, WDestructiveClose ), mainwindow( 0 ), - commands( 100 ), pixInline( TRUE ) + commands( 100 ), pixInline( true ) { ff = f; init(); @@ -156,63 +156,63 @@ void FormWindow::init() setWFlags(getWFlags() & TQt::WStyle_Maximize); fake = qstrcmp( name(), "qt_fakewindow" ) == 0; - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); ff->setFormWindow( this ); iface = 0; proj = 0; propertyWidget = 0; - toolFixed = FALSE; - checkedSelectionsForMove = FALSE; + toolFixed = false; + checkedSelectionsForMove = false; mContainer = 0; startWidget = endWidget = 0; currTool = POINTER_TOOL; unclippedPainter = 0; - widgetPressed = FALSE; - drawRubber = FALSE; + widgetPressed = false; + drawRubber = false; setFocusPolicy( TQWidget::ClickFocus ); sizePreviewLabel = 0; checkSelectionsTimer = new TQTimer( this, "checkSelectionsTimer" ); - connect( checkSelectionsTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( invalidCheckedSelections() ) ); + connect( checkSelectionsTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( invalidCheckedSelections() ) ); updatePropertiesTimer = new TQTimer( this ); - connect( updatePropertiesTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( updatePropertiesTimerDone() ) ); + connect( updatePropertiesTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updatePropertiesTimerDone() ) ); showPropertiesTimer = new TQTimer( this ); //!!!! - connect( showPropertiesTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( showPropertiesTimerDone() ) ); + connect( showPropertiesTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( showPropertiesTimerDone() ) ); selectionChangedTimer = new TQTimer( this ); - connect( selectionChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( selectionChangedTimerDone() ) ); + connect( selectionChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( selectionChangedTimerDone() ) ); windowsRepaintWorkaroundTimer = new TQTimer( this ); - connect( windowsRepaintWorkaroundTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( windowsRepaintWorkaroundTimerTimeout() ) ); + connect( windowsRepaintWorkaroundTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( windowsRepaintWorkaroundTimerTimeout() ) ); insertParent = 0; - connect( &commands, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - this, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) ); - propShowBlocked = FALSE; + connect( &commands, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + this, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) ); + propShowBlocked = false; setIcon( SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()) ); - connect( &commands, TQT_SIGNAL( modificationChanged( bool ) ), - this, TQT_SLOT( modificationChanged( bool ) ) ); + connect( &commands, TQ_SIGNAL( modificationChanged( bool ) ), + this, TQ_SLOT( modificationChanged( bool ) ) ); buffer = 0; TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this ); setMainContainer( w ); - propertyWidget = TQT_TQOBJECT(w); + propertyWidget = w; targetContainer = 0; - hadOwnPalette = FALSE; + hadOwnPalette = false; defSpacing = BOXLAYOUT_DEFAULT_SPACING; defMargin = BOXLAYOUT_DEFAULT_MARGIN; - hasLayoutFunc = FALSE; + hasLayoutFunc = false; } void FormWindow::setMainWindow( MainWindow *w ) { mainwindow = w; - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); initSlots(); } @@ -236,7 +236,7 @@ FormWindow::~FormWindow() if ( MainWindow::self && MainWindow::self->objectHierarchy()->formWindow() == this ) MainWindow::self->objectHierarchy()->setFormWindow( 0, 0 ); - MetaDataBase::clear( TQT_TQOBJECT(this) ); + MetaDataBase::clear( this ); if ( ff ) ff->setFormWindow( 0 ); delete iface; @@ -365,7 +365,7 @@ void FormWindow::insertWidget() } - TQWidget *w = WidgetFactory::create( currTool, insertParent, 0, TRUE, &currRect, orient ); + TQWidget *w = WidgetFactory::create( currTool, insertParent, 0, true, &currRect, orient ); if ( !w ) return; @@ -375,7 +375,7 @@ void FormWindow::insertWidget() pix.convertFromImage( SmallIcon( "designer_image.png" , KDevDesignerPartFactory::instance()).convertToImage() ); ( (TQLabel*)w )->setPixmap( pix ); } - int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) ); + int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) ); if ( WidgetDatabase::isCustomWidget( id ) ) { TQWhatsThis::add( w, i18n("<b>A %1 (custom widget)</b> " "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> " @@ -393,7 +393,7 @@ void FormWindow::insertWidget() } TQString s = w->name(); - unify( TQT_TQOBJECT(w), s, TRUE ); + unify( w, s, true ); w->setName( s ); insertWidget( w ); TQRect r( currRect ); @@ -429,7 +429,7 @@ void FormWindow::insertWidget() const TQObjectList l = insertParent->childrenListObject(); TQObjectListIt it( l ); TQWidgetList lst; - if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) { + if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) { for ( ; it.current(); ) { TQObject *o = it.current(); ++it; @@ -497,12 +497,12 @@ void FormWindow::insertWidget( TQWidget *w, bool checkName ) return; if ( checkName ) { TQString s = w->name(); - unify( TQT_TQOBJECT(w), s, TRUE ); + unify( w, s, true ); w->setName( s ); } - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); - int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) ); + MetaDataBase::addEntry( w ); + int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) ); if ( WidgetDatabase::isCustomWidget( id ) ) { TQWhatsThis::add( w, i18n("<b>A %1 (custom widget)</b> " "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> " @@ -526,7 +526,7 @@ void FormWindow::insertWidget( TQWidget *w, bool checkName ) void FormWindow::removeWidget( TQWidget *w ) { - MetaDataBase::removeEntry( TQT_TQOBJECT(w) ); + MetaDataBase::removeEntry( w ); widgets()->take( w ); } @@ -535,9 +535,9 @@ void FormWindow::handleContextMenu( TQContextMenuEvent *e, TQWidget *w ) CHECK_MAINWINDOW; switch ( currTool ) { case POINTER_TOOL: { - if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget + if ( !isMainContainer( w ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget raiseChildSelections( w ); // raise selections and select widget - selectWidget( TQT_TQOBJECT(w) ); + selectWidget( w ); // if widget is laid out, find the first non-laid out super-widget TQWidget *realWidget = w; // but store the original one while ( w->parentWidget() && @@ -565,7 +565,7 @@ void FormWindow::handleContextMenu( TQContextMenuEvent *e, TQWidget *w ) void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) { CHECK_MAINWINDOW; - checkedSelectionsForMove = FALSE; + checkedSelectionsForMove = false; checkSelectionsTimer->stop(); if ( !sizePreviewLabel ) { sizePreviewLabel = new TQLabel( this ); @@ -576,33 +576,33 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) switch ( currTool ) { case POINTER_TOOL: - if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget + if ( !isMainContainer( w ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget // if the clicked widget is not in a layout, raise it if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) w->raise(); if ( ( e->state() & ControlButton ) ) { // with control pressed, always start rubber band selection - drawRubber = TRUE; + drawRubber = true; currRect = TQRect( 0, 0, -1, -1 ); startRectDraw( mapFromGlobal( e->globalPos() ), e->globalPos(), this, Rubber ); break; } - bool sel = isWidgetSelected( TQT_TQOBJECT(w) ); + bool sel = isWidgetSelected( w ); if ( !( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) ) { // control not pressed... if ( !sel ) { // ...and widget no selectted: unselect all - clearSelection( FALSE ); + clearSelection( false ); } else { // ...widget selected // only if widget has a layout (it is a layout meta widget or a laid out container!), unselect its childs if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ) { TQObjectList *l = w->queryList( "TQWidget" ); - setPropertyShowingBlocked( TRUE ); + setPropertyShowingBlocked( true ); for ( TQObject *o = l->first(); o; o = l->next() ) { if ( !o->isWidgetType() ) continue; if ( insertedWidgets.find( (TQWidget*)o ) ) - selectWidget( TQT_TQOBJECT(o), FALSE ); + selectWidget( o, false ); } - setPropertyShowingBlocked( FALSE ); + setPropertyShowingBlocked( false ); delete l; } } @@ -610,12 +610,12 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) } if ( ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) && sel && e->button() == TQt::LeftButton ) { // control pressed and selected, unselect widget - selectWidget( TQT_TQOBJECT(w), FALSE ); + selectWidget( w, false ); break; } raiseChildSelections( w ); // raise selections and select widget - selectWidget( TQT_TQOBJECT(w) ); + selectWidget( w ); // if widget is laid out, find the first non-laid out super-widget while ( w->parentWidget() && @@ -623,13 +623,13 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) w = w->parentWidget(); if ( e->button() == TQt::LeftButton ) { // left button: store original geometry and more as the widget might start moving - widgetPressed = TRUE; + widgetPressed = true; widgetGeom = TQRect( w->pos(), w->size() ); oldPressPos = w->mapFromGlobal( e->globalPos() ); origPressPos = oldPressPos; - checkedSelectionsForMove = FALSE; + checkedSelectionsForMove = false; moving.clear(); - if ( w->parentWidget() && !isMainContainer( TQT_TQOBJECT(w->parentWidget()) ) && !isCentralWidget( TQT_TQOBJECT(w->parentWidget()) ) ) { + if ( w->parentWidget() && !isMainContainer( w->parentWidget() ) && !isCentralWidget( w->parentWidget() ) ) { targetContainer = w->parentWidget(); hadOwnPalette = w->parentWidget()->ownPalette(); restorePalette = w->parentWidget()->palette(); @@ -637,11 +637,11 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) } } else { // press was on the formwindow if ( e->button() == TQt::LeftButton ) { // left button: start rubber selection and show formwindow properties - drawRubber = TRUE; + drawRubber = true; if ( !( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) ) { - clearSelection( FALSE ); + clearSelection( false ); TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); } @@ -654,12 +654,12 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) case BUDDY_TOOL: if ( e->button() != TQt::LeftButton ) break; - validForBuddy = FALSE; + validForBuddy = false; if ( currTool == BUDDY_TOOL ) { if ( !::tqt_cast<TQLabel*>(w) ) break; - clearSelection( FALSE ); - validForBuddy = TRUE; + clearSelection( false ); + validForBuddy = true; mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).arg( w->name() ) ); } else { mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).arg( w->name() ) ); @@ -667,13 +667,13 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) saveBackground(); startPos = mapFromGlobal( e->globalPos() ); currentPos = startPos; - startWidget = designerWidget( TQT_TQOBJECT(w) ); + startWidget = designerWidget( w ); endWidget = startWidget; - beginUnclippedPainter( FALSE ); + beginUnclippedPainter( false ); drawConnectionLine(); break; case ORDER_TOOL: - if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press on a child widget + if ( !isMainContainer( w ) ) { // press on a child widget orderedWidgets.removeRef( w ); orderedWidgets.append( w ); for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { @@ -686,17 +686,17 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) TQWidgetList oldl = MetaDataBase::tabOrder( this ); TabOrderCommand *cmd = new TabOrderCommand( i18n( "Change Tab Order" ), this, oldl, stackedWidgets ); cmd->execute(); - commandHistory()->addCommand( cmd, TRUE ); + commandHistory()->addCommand( cmd, true ); updateOrderIndicators(); } break; default: // any insert widget tool if ( e->button() == TQt::LeftButton ) { insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default parent for new widget is the formwindow - if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press was not on formwindow, check if we can find another parent + if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another parent TQWidget *wid = w; for (;;) { - int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(wid) ) ); + int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( wid ) ); if ( ( WidgetDatabase::isContainer( id ) || wid == mainContainer() ) && !::tqt_cast<TQLayoutWidget*>(wid) && !::tqt_cast<TQSplitter*>(wid) ) { insertParent = WidgetFactory::containerOfWidget( wid ); // found another parent, store it @@ -719,7 +719,7 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w ) CHECK_MAINWINDOW; switch ( currTool ) { case ORDER_TOOL: - if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press on a child widget + if ( !isMainContainer( w ) ) { // press on a child widget orderedWidgets.clear(); orderedWidgets.append( w ); for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { @@ -732,11 +732,11 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w ) TQWidgetList oldl = MetaDataBase::tabOrder( this ); TabOrderCommand *cmd = new TabOrderCommand( i18n( "Change Tab Order" ), this, oldl, stackedWidgets ); cmd->execute(); - commandHistory()->addCommand( cmd, TRUE ); + commandHistory()->addCommand( cmd, true ); updateOrderIndicators(); } default: - if ( !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) && + if ( !WidgetFactory::isPassiveInteractor( w ) && ( isMainContainer( w ) || w == this ) ) mainWindow()->editSource(); break; @@ -799,10 +799,10 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) if ( x - p.x() != 0 || y - p.y() != 0 ) { // if we actually have to move if ( !checkedSelectionsForMove ) { // if not checked yet, check if the correct widget are selected... - if ( !isWidgetSelected( TQT_TQOBJECT(w) ) ) { // and unselect others. Only siblings can be moved at the same time - setPropertyShowingBlocked( TRUE ); - selectWidget( TQT_TQOBJECT(w) ); - setPropertyShowingBlocked( FALSE ); + if ( !isWidgetSelected( w ) ) { // and unselect others. Only siblings can be moved at the same time + setPropertyShowingBlocked( true ); + selectWidget( w ); + setPropertyShowingBlocked( false ); } checkSelectionsForMove( w ); } @@ -810,7 +810,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) // check whether we would have to reparent the selection and highlight the possible new parent container TQMapConstIterator<TQWidget*, TQPoint> it = moving.begin(); TQWidget* wa = containerAt( e->globalPos(), it.key() ); - if ( wa && !isMainContainer( TQT_TQOBJECT(wa) ) && !isCentralWidget( TQT_TQOBJECT(wa) ) ) { + if ( wa && !isMainContainer( wa ) && !isCentralWidget( wa ) ) { wa = WidgetFactory::containerOfWidget( wa ); // ok, looks like we moved onto a container @@ -845,7 +845,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) sizePreviewLabel->raise(); sizePreviewLabel->show(); #if defined(TQ_WS_WIN32) - windowsRepaintWorkaroundTimer->start( 100, TRUE ); + windowsRepaintWorkaroundTimer->start( 100, true ); #endif } else { // if we don't need to move, do some indication TQRect lg( mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), sizePreviewLabel->size() ); @@ -860,16 +860,16 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) break; case CONNECT_TOOL: restoreConnectionLine(); - wid = tqApp->widgetAt( e->globalPos(), TRUE ); + wid = tqApp->widgetAt( e->globalPos(), true ); if ( wid ) - wid = designerWidget( TQT_TQOBJECT(wid) ); - if ( wid && ( isMainContainer( TQT_TQOBJECT(wid) ) || insertedWidgets.find( wid ) ) && wid->isVisibleTo( this ) ) + wid = designerWidget( wid ); + if ( wid && ( isMainContainer( wid ) || insertedWidgets.find( wid ) ) && wid->isVisibleTo( this ) ) newendWidget = wid; if ( ::tqt_cast<TQLayoutWidget*>(newendWidget) || ::tqt_cast<Spacer*>(newendWidget) ) newendWidget = (TQWidget*)endWidget; drawRecRect = newendWidget != endWidget; if ( newendWidget && - ( isMainContainer( TQT_TQOBJECT(newendWidget) ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) + ( isMainContainer( newendWidget ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( newendWidget ) ) endWidget = newendWidget; mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).arg( startWidget->name() ). arg( endWidget->name() ) ); @@ -884,9 +884,9 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) if ( !validForBuddy ) break; restoreConnectionLine(); - wid = tqApp->widgetAt( e->globalPos(), TRUE ); + wid = tqApp->widgetAt( e->globalPos(), true ); if ( wid ) - wid = designerWidget( TQT_TQOBJECT(wid) ); + wid = designerWidget( wid ); if ( wid && canBeBuddy( wid ) && wid->isVisibleTo( this ) ) newendWidget = wid; else @@ -896,7 +896,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) drawRecRect = newendWidget != endWidget; if ( !newendWidget ) endWidget = newendWidget; - else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) + else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( newendWidget ) ) endWidget = newendWidget; if ( endWidget ) mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).arg( startWidget->name() ). @@ -974,28 +974,28 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) } // doesn't need to be a command, the MoveCommand does reparenting too - bool emitSelChanged = FALSE; + bool emitSelChanged = false; for ( TQMap<TQWidget*, TQPoint>::Iterator it = moving.begin(); it != moving.end(); ++it ) { TQWidget *i = it.key(); if ( !emitSelChanged && ::tqt_cast<TQButton*>(i) ) { if ( ::tqt_cast<TQButtonGroup*>(i->parentWidget()) || ::tqt_cast<TQButtonGroup*>(wa) ) - emitSelChanged = TRUE; + emitSelChanged = true; if ( !::tqt_cast<TQButtonGroup*>(wa) ) { - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(i), "buttonGroupId", FALSE ); + MetaDataBase::setPropertyChanged( i, "buttonGroupId", false ); if ( ::tqt_cast<TQButtonGroup*>(i->parentWidget()) ) ( (TQButtonGroup*)i->parentWidget() )->remove( (TQButton*)i ); } } TQPoint pos = wa->mapFromGlobal( i->mapToGlobal( TQPoint(0,0) ) ); - i->reparent( wa, pos, TRUE ); + i->reparent( wa, pos, true ); raiseSelection( i ); raiseChildSelections( i ); - widgetChanged( TQT_TQOBJECT(i) ); + widgetChanged( i ); mainWindow()->objectHierarchy()->widgetRemoved( i ); mainWindow()->objectHierarchy()->widgetInserted( i ); } if ( emitSelChanged ) { - emit showProperties( TQT_TQOBJECT(wa) ); + emit showProperties( wa ); emit showProperties( propertyWidget ); } newParent = wa; @@ -1015,9 +1015,9 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) oldPos, newPos, oldParent, newParent ) ); } else if ( drawRubber ) { // we were drawing a rubber selection endRectDraw(); // get rid of the rectangle - blockSignals( TRUE ); + blockSignals( true ); selectWidgets(); // select widgets which intersect the rect - blockSignals( FALSE ); + blockSignals( false ); emitSelectionChanged(); // inform about selection changes if ( propertyWidget ) emitShowProperties( propertyWidget ); @@ -1045,13 +1045,13 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) if ( oldBuddy.isNull() ) oldBuddy = ""; SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).arg( startWidget->name() ), - this, TQT_TQOBJECT(startWidget), mainWindow()->propertyeditor(), + this, startWidget, mainWindow()->propertyeditor(), "buddy", startWidget->property( "buddy" ), endWidget->name(), endWidget->name(), oldBuddy ); - commandHistory()->addCommand( cmd, TRUE ); + commandHistory()->addCommand( cmd, true ); cmd->execute(); - emitUpdateProperties( TQT_TQOBJECT(startWidget) ); + emitUpdateProperties( startWidget ); } } if ( !toolFixed ) @@ -1085,8 +1085,8 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) } break; } - widgetPressed = FALSE; - drawRubber = FALSE; + widgetPressed = false; + drawRubber = false; insertParent = 0; delete buffer; buffer = 0; @@ -1104,7 +1104,7 @@ void FormWindow::handleKeyPress( TQKeyEvent *e, TQWidget *w ) e->key() == Key_Down ) && propertyWidget->isWidgetType() ) checkSelectionsForMove( (TQWidget*)propertyWidget ); - checkSelectionsTimer->start( 1000, TRUE ); + checkSelectionsTimer->start( 1000, true ); if ( e->key() == Key_Left || e->key() == Key_Right || e->key() == Key_Up || e->key() == Key_Down ) { TQWidgetList widgets; @@ -1155,7 +1155,7 @@ void FormWindow::handleKeyPress( TQKeyEvent *e, TQWidget *w ) if ( !widgets.isEmpty() ) { MoveCommand *cmd = new MoveCommand( i18n( "Move" ), this, widgets, oldPos, newPos, 0, 0 ); - commandHistory()->addCommand( cmd, TRUE ); + commandHistory()->addCommand( cmd, true ); cmd->execute(); } } @@ -1163,7 +1163,7 @@ void FormWindow::handleKeyPress( TQKeyEvent *e, TQWidget *w ) TQObjectList *l = queryList( "TQWidget" ); if ( !l ) return; - if ( l->find( TQT_TQOBJECT(w) ) != -1 ) + if ( l->find( w ) != -1 ) e->accept(); delete l; } @@ -1185,9 +1185,9 @@ void FormWindow::selectWidget( TQObject *o, bool select ) TQWidget *w = (TQWidget*)o; - if ( isMainContainer( TQT_TQOBJECT(w) ) ) { + if ( isMainContainer( w ) ) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); emitShowProperties( propertyWidget ); @@ -1196,7 +1196,7 @@ void FormWindow::selectWidget( TQObject *o, bool select ) if ( ::tqt_cast<TQMainWindow*>(mainContainer()) && w == ( (TQMainWindow*)mainContainer() )->centralWidget() ) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); emitShowProperties( propertyWidget ); @@ -1208,7 +1208,7 @@ void FormWindow::selectWidget( TQObject *o, bool select ) if ( select ) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(w); + propertyWidget = w; if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); if ( !isPropertyShowingBlocked() ) @@ -1238,9 +1238,9 @@ void FormWindow::selectWidget( TQObject *o, bool select ) s->setWidget( 0 ); TQObject *opw = propertyWidget; if ( !usedSelections.isEmpty() ) - propertyWidget = TQT_TQOBJECT(TQPtrDictIterator<WidgetSelection>( usedSelections ).current()->widget()); + propertyWidget = TQPtrDictIterator<WidgetSelection>( usedSelections ).current()->widget(); else - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); if ( !isPropertyShowingBlocked() ) @@ -1260,7 +1260,7 @@ void FormWindow::updateSelection( TQWidget *w ) { WidgetSelection *s = usedSelections.find( w ); if ( !w->isVisibleTo( this ) ) - selectWidget( TQT_TQOBJECT(w), FALSE ); + selectWidget( w, false ); else if ( s ) s->updateGeometry(); } @@ -1283,12 +1283,12 @@ void FormWindow::clearSelection( bool changePropertyDisplay ) { TQPtrDictIterator<WidgetSelection> it( usedSelections ); for ( ; it.current(); ++it ) - it.current()->setWidget( 0, FALSE ); + it.current()->setWidget( 0, false ); usedSelections.clear(); if ( changePropertyDisplay ) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); emitShowProperties( propertyWidget ); @@ -1300,8 +1300,8 @@ void FormWindow::startRectDraw( const TQPoint &p, const TQPoint &global, TQWidge { TQPoint pos( p ); pos = mapFromGlobal( global ); - oldRectValid = FALSE; - beginUnclippedPainter( TRUE ); + oldRectValid = false; + beginUnclippedPainter( true ); if ( t == Rubber ) unclippedPainter->setPen( TQPen( color0, 1 ) ); if ( t == Insert ) @@ -1335,7 +1335,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi if ( oldRectValid ) unclippedPainter->drawRect( currRect ); if ( r.width() > 1 || r.height() > 1 ) { - oldRectValid = TRUE; + oldRectValid = true; currRect = r; if ( t == Insert ) { TQString t = i18n( "%1/%2" ); @@ -1344,9 +1344,9 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi } unclippedPainter->setClipRegion( TQRegion( rect() ).subtract( TQRect( sizePreviewPos, sizePreviewPixmap.size() ) ) ); unclippedPainter->drawRect( currRect ); - unclippedPainter->setClipping( FALSE ); + unclippedPainter->setClipping( false ); } else { - oldRectValid = FALSE; + oldRectValid = false; if ( t == Insert ) drawSizePreview( pos, i18n("Use Size Hint") ); } @@ -1374,7 +1374,7 @@ void FormWindow::selectWidgets() p = mapFromGlobal( p ); TQRect r( p, ( (TQWidget*)o )->size() ); if ( r.intersects( currRect ) && !r.contains( currRect ) ) - selectWidget( TQT_TQOBJECT(o) ); + selectWidget( o ); } } delete l; @@ -1386,7 +1386,7 @@ bool FormWindow::isWidgetSelected( TQObject *w ) { if ( w->isWidgetType() ) return usedSelections.find( (TQWidget*)w ) != 0; - return FALSE; // #### do stuff for TQObjects + return false; // #### do stuff for TQObjects } void FormWindow::moveSelectedWidgets( int dx, int dy ) @@ -1428,7 +1428,7 @@ void FormWindow::raiseChildSelections( TQWidget *w ) TQPtrDictIterator<WidgetSelection> it( usedSelections ); for ( ; it.current(); ++it ) { - if ( l->findRef( TQT_TQOBJECT(it.current()->widget()) ) != -1 ) + if ( l->findRef( it.current()->widget() ) != -1 ) it.current()->show(); } delete l; @@ -1449,9 +1449,9 @@ void FormWindow::updateChildSelections( TQWidget *w ) void FormWindow::checkSelectionsForMove( TQWidget *w ) { - checkedSelectionsForMove = TRUE; + checkedSelectionsForMove = true; - TQObjectList *l = w->parentWidget()->queryList( "TQWidget", 0, FALSE, FALSE ); + TQObjectList *l = w->parentWidget()->queryList( "TQWidget", 0, false, false ); moving.clear(); if ( l ) { TQPtrDictIterator<WidgetSelection> it( usedSelections ); @@ -1460,7 +1460,7 @@ void FormWindow::checkSelectionsForMove( TQWidget *w ) if ( it.current()->widget() == mainContainer() ) continue; ++it; - if ( l->find( TQT_TQOBJECT(sel->widget()) ) == -1 ) { + if ( l->find( sel->widget() ) == -1 ) { if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) sel->setWidget( 0 ); } else { @@ -1483,7 +1483,7 @@ void FormWindow::deleteWidgets() TQPtrDictIterator<WidgetSelection> it( usedSelections ); for ( ; it.current(); ++it ) { TQWidget *tb = 0; - if ( !( tb = mainWindow()->isAToolBarChild( TQT_TQOBJECT(it.current()->widget()) ) ) ) + if ( !( tb = mainWindow()->isAToolBarChild( it.current()->widget() ) ) ) widgets.append( it.current()->widget() ); else ( (QDesignerToolBar*)tb )->removeWidget( it.current()->widget() ); @@ -1564,7 +1564,7 @@ TQLabel *FormWindow::sizePreview() const void FormWindow::invalidCheckedSelections() { - checkedSelectionsForMove = FALSE; + checkedSelectionsForMove = false; } void FormWindow::checkPreviewGeometry( TQRect &r ) @@ -1591,7 +1591,7 @@ void FormWindow::focusOutEvent( TQFocusEvent * ) { if ( propertyWidget && !isMainContainer( propertyWidget ) && !isWidgetSelected( propertyWidget ) ) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); } @@ -1603,10 +1603,10 @@ void FormWindow::resizeEvent( TQResizeEvent *e ) if ( currTool == ORDER_TOOL ) repositionOrderIndicators(); if ( isVisible() ) - formFile()->setModified( TRUE, FormFile::WFormWindow ); + formFile()->setModified( true, FormFile::WFormWindow ); #if defined(TQ_WS_WIN32) - windowsRepaintWorkaroundTimer->start( 100, TRUE ); + windowsRepaintWorkaroundTimer->start( 100, true ); #endif } @@ -1632,7 +1632,7 @@ TQWidget *FormWindow::designerWidget( TQObject *o ) const if ( !o || !o->isWidgetType() ) return 0; TQWidget *w = (TQWidget*)o; - while ( w && !isMainContainer( TQT_TQOBJECT(w) ) && !insertedWidgets[ (void*)w ] || isCentralWidget( TQT_TQOBJECT(w) ) ) + while ( w && !isMainContainer( w ) && !insertedWidgets[ (void*)w ] || isCentralWidget( w ) ) w = (TQWidget*)w->parent(); return w; } @@ -1646,7 +1646,7 @@ void FormWindow::emitShowProperties( TQObject *w ) repaintSelection( (TQWidget*)opw ); } showPropertiesTimer->stop(); -// showPropertiesTimer->start( 0, TRUE ); +// showPropertiesTimer->start( 0, true ); showPropertiesTimerDone(); } @@ -1654,14 +1654,14 @@ void FormWindow::emitUpdateProperties( TQObject *w ) { if ( w == propertyWidget ) { updatePropertiesTimer->stop(); - updatePropertiesTimer->start( 0, TRUE ); + updatePropertiesTimer->start( 0, true ); } } void FormWindow::emitSelectionChanged() { selectionChangedTimer->stop(); - selectionChangedTimer->start( 0, TRUE ); + selectionChangedTimer->start( 0, true ); } void FormWindow::updatePropertiesTimerDone() @@ -1686,7 +1686,7 @@ void FormWindow::selectionChangedTimerDone() void FormWindow::currentToolChanged() { CHECK_MAINWINDOW; - toolFixed = FALSE; + toolFixed = false; int t = mainwindow->currentTool(); if ( currTool == t && t != ORDER_TOOL ) return; @@ -1718,8 +1718,8 @@ void FormWindow::currentToolChanged() } startWidget = endWidget = 0; - widgetPressed = FALSE; - drawRubber = FALSE; + widgetPressed = false; + drawRubber = false; insertParent = 0; delete buffer; buffer = 0; @@ -1727,7 +1727,7 @@ void FormWindow::currentToolChanged() currTool = t; if ( hasFocus() ) - clearSelection( FALSE ); + clearSelection( false ); mainWindow()->statusBar()->clear(); @@ -1735,7 +1735,7 @@ void FormWindow::currentToolChanged() switch ( currTool ) { case POINTER_TOOL: if ( propertyWidget && !isMainContainer( propertyWidget ) && !isWidgetSelected( propertyWidget ) ) - emitShowProperties( TQT_TQOBJECT(mainContainer()) ); + emitShowProperties( mainContainer() ); restoreCursors( this, this ); break; case ORDER_TOOL: @@ -1744,7 +1744,7 @@ void FormWindow::currentToolChanged() orderedWidgets.clear(); showOrderIndicators(); if ( mainWindow()->formWindow() == this ) - emitShowProperties( TQT_TQOBJECT(mainContainer()) ); + emitShowProperties( mainContainer() ); setCursorToAll( ArrowCursor, this ); } break; @@ -1756,13 +1756,13 @@ void FormWindow::currentToolChanged() mainWindow()->statusMessage( i18n( "Drag a line to set a buddy...") ); setCursorToAll( CrossCursor, this ); if ( mainWindow()->formWindow() == this ) - emitShowProperties( TQT_TQOBJECT(mainContainer()) ); + emitShowProperties( mainContainer() ); break; default: mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).arg( WidgetDatabase::toolTip( currTool ).lower() ) ); setCursorToAll( CrossCursor, this ); if ( mainWindow()->formWindow() == this ) - emitShowProperties( TQT_TQOBJECT(mainContainer()) ); + emitShowProperties( mainContainer() ); break; } } @@ -1770,7 +1770,7 @@ void FormWindow::currentToolChanged() void FormWindow::showOrderIndicators() { hideOrderIndicators(); - orderIndicators.setAutoDelete( TRUE ); + orderIndicators.setAutoDelete( true ); TQObjectList *l = mainContainer()->queryList( "TQWidget" ); stackedWidgets = MetaDataBase::tabOrder( this ); if ( l ) { @@ -1824,7 +1824,7 @@ bool FormWindow::checkCustomWidgets() TQPtrDictIterator<TQWidget> it( insertedWidgets ); for ( ; it.current(); ++it ) { if ( it.current()->isA( "CustomWidget" ) ) { - TQString className = WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) ); + TQString className = WidgetFactory::classNameOf( it.current() ); if ( !MetaDataBase::hasCustomWidget( className ) ) missingCustomWidgets << className; } @@ -1839,9 +1839,9 @@ bool FormWindow::checkCustomWidgets() "the generated code will not compile.\n" "Do you want to save this form now?" ); if ( TQMessageBox::information( mainWindow(), i18n( "Save Form" ), txt ) == 1 ) - return FALSE; + return false; } - return TRUE; + return true; } void FormWindow::setPropertyShowingBlocked( bool b ) @@ -1910,11 +1910,11 @@ void FormWindow::checkAccels() insertedWidgets[ (void*)o ] ) { TQWidget *w = (TQWidget*)o; const TQMetaProperty* text = - w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE ); + w->metaObject()->property( w->metaObject()->findProperty( "text", true ), true ); const TQMetaProperty* title = - w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE ); + w->metaObject()->property( w->metaObject()->findProperty( "title", true ), true ); const TQMetaProperty* pageTitle = - w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE ); + w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", true ), true ); if ( text ) find_accel( w->property( "text" ).toString(), accels, w ); if ( title ) @@ -1928,20 +1928,20 @@ void FormWindow::checkAccels() delete l; } - bool ok = TRUE; + bool ok = true; TQWidget *wid; for ( TQMap<TQChar, TQWidgetList >::Iterator it = accels.begin(); it != accels.end(); ++it ) { if ( (*it).count() > 1 ) { - ok = FALSE; + ok = false; switch ( TQMessageBox::information( mainWindow(), i18n( "Check Accelerators" ), i18n( "Accelerator '%1' is used once.", "Accelerator '%1' is used %n times.", (*it).count() ).arg( it.key().upper() ), i18n( "&Select" ), i18n( "&Cancel" ), TQString(), 2 ) ) { case 0: // select - clearSelection( FALSE ); + clearSelection( false ); for ( wid = (*it).first(); wid; wid = (*it).next() ) - selectWidget( TQT_TQOBJECT(wid), TRUE ); + selectWidget( wid, true ); return; case 1: // cancel return; @@ -1976,20 +1976,20 @@ void FormWindow::paste( const TQString &cb, TQWidget *parent ) void FormWindow::selectAll() { - checkedSelectionsForMove = FALSE; - blockSignals( TRUE ); + checkedSelectionsForMove = false; + blockSignals( true ); TQObjectList *l = mainContainer()->queryList( "TQWidget" ); if ( l ) { for ( TQObject *o = l->first(); o; o = l->next() ) { if ( ( (TQWidget*)o )->isVisibleTo( this ) && insertedWidgets[ (void*)o ] ) { - selectWidget( TQT_TQOBJECT(o) ); + selectWidget( o ); } } delete l; } - blockSignals( FALSE ); + blockSignals( false ); emitSelectionChanged(); if ( propertyWidget ) emitShowProperties( propertyWidget ); @@ -2001,7 +2001,7 @@ void FormWindow::layoutHorizontal() TQWidgetList widgets( selectedWidgets() ); LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out Horizontally" ), this, mainContainer(), 0, widgets ); - clearSelection( FALSE ); + clearSelection( false ); commandHistory()->addCommand( cmd ); cmd->execute(); } @@ -2011,7 +2011,7 @@ void FormWindow::layoutVertical() TQWidgetList widgets( selectedWidgets() ); LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out Vertically" ), this, mainContainer(), 0, widgets ); - clearSelection( FALSE ); + clearSelection( false ); commandHistory()->addCommand( cmd ); cmd->execute(); } @@ -2021,7 +2021,7 @@ void FormWindow::layoutHorizontalSplit() TQWidgetList widgets( selectedWidgets() ); LayoutHorizontalSplitCommand *cmd = new LayoutHorizontalSplitCommand( i18n( "Lay Out Horizontally (in splitter)" ), this, mainContainer(), 0, widgets ); - clearSelection( FALSE ); + clearSelection( false ); commandHistory()->addCommand( cmd ); cmd->execute(); } @@ -2031,7 +2031,7 @@ void FormWindow::layoutVerticalSplit() TQWidgetList widgets( selectedWidgets() ); LayoutVerticalSplitCommand *cmd = new LayoutVerticalSplitCommand( i18n( "Lay Out Vertically (in splitter)" ), this, mainContainer(), 0, widgets ); - clearSelection( FALSE ); + clearSelection( false ); commandHistory()->addCommand( cmd ); cmd->execute(); } @@ -2044,7 +2044,7 @@ void FormWindow::layoutGrid() TQWidgetList widgets( selectedWidgets() ); LayoutGridCommand *cmd = new LayoutGridCommand( i18n( "Lay Out in a Grid" ), this, mainContainer(), 0, widgets, xres, yres ); - clearSelection( FALSE ); + clearSelection( false ); commandHistory()->addCommand( cmd ); cmd->execute(); } @@ -2065,7 +2065,7 @@ void FormWindow::layoutHorizontalContainer( TQWidget *w ) } LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out Children Horizontally" ), this, mainContainer(), w, widgets ); - clearSelection( FALSE ); + clearSelection( false ); commandHistory()->addCommand( cmd ); cmd->execute(); } @@ -2086,7 +2086,7 @@ void FormWindow::layoutVerticalContainer( TQWidget *w ) } LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out Children Vertically" ), this, mainContainer(), w, widgets ); - clearSelection( FALSE ); + clearSelection( false ); commandHistory()->addCommand( cmd ); cmd->execute(); } @@ -2110,7 +2110,7 @@ void FormWindow::layoutGridContainer( TQWidget *w ) } LayoutGridCommand *cmd = new LayoutGridCommand( i18n( "Lay Out Children in a Grid" ), this, mainContainer(), w, widgets, xres, yres ); - clearSelection( FALSE ); + clearSelection( false ); commandHistory()->addCommand( cmd ); cmd->execute(); } @@ -2126,7 +2126,7 @@ void FormWindow::breakLayout( TQWidget *w ) if ( !w || w == this ) break; if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout && - WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) { + WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) { Command *cmd = breakLayoutCommand( w ); if ( cmd ) commands.insert( 0, cmd ); @@ -2139,7 +2139,7 @@ void FormWindow::breakLayout( TQWidget *w ) if ( commands.isEmpty() ) return; - clearSelection( FALSE ); + clearSelection( false ); MacroCommand *cmd = new MacroCommand( i18n( "Break Layout" ), this, commands ); commandHistory()->addCommand( cmd ); cmd->execute(); @@ -2155,7 +2155,7 @@ BreakLayoutCommand *FormWindow::breakLayoutCommand( TQWidget *w ) TQWidgetList widgets; for ( TQObject *o = l.first(); o; o = l.next() ) { if ( o->isWidgetType() && - !mainWindow()->isAToolBarChild( TQT_TQOBJECT(o) ) && + !mainWindow()->isAToolBarChild( o ) && ( (TQWidget*)o )->isVisibleTo( this ) && insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); @@ -2177,14 +2177,14 @@ int FormWindow::numVisibleWidgets() const bool FormWindow::hasInsertedChildren( TQWidget *w ) const { if ( !w ) - return FALSE; + return false; w = WidgetFactory::containerOfWidget( w ); if ( !w ) - return FALSE; + return false; TQObjectList *l = w->queryList( "TQWidget" ); if ( !l || !l->first() ) { delete l; - return FALSE; + return false; } for ( TQObject *o = l->first(); o; o = l->next() ) { @@ -2192,23 +2192,23 @@ bool FormWindow::hasInsertedChildren( TQWidget *w ) const ( (TQWidget*)o )->isVisibleTo( (FormWindow*)this ) && insertedWidgets.find( (TQWidget*)o ) ) { delete l; - return TRUE; + return true; } } delete l; - return FALSE; + return false; } bool FormWindow::allowMove( TQWidget *w ) { w = w->parentWidget(); while ( w ) { - if ( ( isMainContainer( TQT_TQOBJECT(w) ) || insertedWidgets.find( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) - return TRUE; + if ( ( isMainContainer( w ) || insertedWidgets.find( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) + return true; w = w->parentWidget(); } - return FALSE; + return false; } @@ -2221,8 +2221,8 @@ void FormWindow::editConnections() ConnectionDialog dlg( mainwindow ); mainWindow()->statusMessage( i18n( "Edit connections...") ); - dlg.addConnection( TQT_TQOBJECT(startWidget), TQT_TQOBJECT(endWidget), TQString(), TQString() ); - TQTimer::singleShot( 0, &dlg, TQT_SLOT(ensureConnectionVisible()) ); + dlg.addConnection( startWidget, endWidget, TQString(), TQString() ); + TQTimer::singleShot( 0, &dlg, TQ_SLOT(ensureConnectionVisible()) ); dlg.exec(); } @@ -2363,7 +2363,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt ) for ( ; it.current();) { if ( it.current() != w && qstrcmp( it.current()->name(), s.latin1() ) == 0 ) { - found = TRUE; + found = true; if ( !changeIt ) break; s = orig + "_" + TQString::number( ++num ); @@ -2385,7 +2385,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt ) for ( a = al.first(); a; a = al.next() ) { if ( a != w && qstrcmp( a->name(), s.latin1() ) == 0 ) { - found = TRUE; + found = true; if ( !changeIt ) break; s = orig + "_" + TQString::number( ++num ); @@ -2398,7 +2398,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt ) for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o != w && qstrcmp ( o->name(), s.latin1() ) == 0 ) { - found = TRUE; + found = true; if ( !changeIt ) break; s = orig + "_" + TQString::number( ++num ); @@ -2409,11 +2409,11 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt ) } if ( ::tqt_cast<TQMainWindow*>(mainContainer()) ) { if ( !found ) { - TQObjectList *l = mainContainer()->queryList( "TQDockWindow", 0, TRUE ); + TQObjectList *l = mainContainer()->queryList( "TQDockWindow", 0, true ); for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o != w && qstrcmp( o->name(), s.latin1() ) == 0 ) { - found = TRUE; + found = true; if ( !changeIt ) break; s = orig + "_" + TQString::number( ++num ); @@ -2426,8 +2426,8 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt ) } if ( !found ) - return TRUE; - return FALSE; + return true; + return false; } bool FormWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *w ) @@ -2435,12 +2435,12 @@ bool FormWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *w ) TQPtrDictIterator<TQWidget> it( insertedWidgets ); for ( ; it.current(); ++it ) { if ( it.current()->isA( "CustomWidget" ) ) { - if ( qstrcmp( WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) ), w->className.utf8() ) == 0 ) - return TRUE; + if ( qstrcmp( WidgetFactory::classNameOf( it.current() ), w->className.utf8() ) == 0 ) + return true; } } - return FALSE; + return false; } bool FormWindow::isDatabaseWidgetUsed() const @@ -2452,28 +2452,28 @@ bool FormWindow::isDatabaseWidgetUsed() const for ( ; it.current(); ++it ) { TQString c( it.current()->className() ); if ( dbClasses.contains( c ) > 0 ) { - return TRUE; + return true; } } #endif - return FALSE; + return false; } bool FormWindow::isDatabaseAware() const { #ifndef TQT_NO_SQL if ( TQString(mContainer->className()) == "QDesignerDataBrowser" || TQString(mContainer->className()) == "QDesignerDataView" ) - return TRUE; + return true; return isDatabaseWidgetUsed(); #else - return FALSE; + return false; #endif } void FormWindow::visibilityChanged() { if ( currTool != ORDER_TOOL ) { - emitUpdateProperties( TQT_TQOBJECT(currentWidget()) ); + emitUpdateProperties( currentWidget() ); } else { updateOrderIndicators(); repositionOrderIndicators(); @@ -2491,7 +2491,7 @@ TQPoint FormWindow::mapToForm( const TQWidget* w, const TQPoint& pos ) const { TQPoint p = pos; const TQWidget* i = w; - while ( i && !i->isTopLevel() && !isMainContainer( TQT_TQOBJECT(const_cast<TQWidget*>(i)) ) ) { + while ( i && !i->isTopLevel() && !isMainContainer( const_cast<TQWidget*>(i) ) ) { p = i->mapToParent( p ); i = i->parentWidget(); } @@ -2513,10 +2513,10 @@ static bool isChildOf( TQWidget *c, TQWidget *p ) { while ( c && !c->isTopLevel() ) { if ( c == p ) - return TRUE; + return true; c = c->parentWidget(); } - return FALSE; + return false; } TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) @@ -2538,7 +2538,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) continue; if ( selected.find( it.current() ) != -1 ) continue; - if ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) ) ) ) && + if ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( it.current() ) ) ) && it.current() != mainContainer() ) continue; @@ -2553,8 +2553,8 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) int wd = widgetDepth( it.current() ); if ( wd == depth && container ) { - if ( ( it.current()->parentWidget()->childrenListObject() ).find( TQT_TQOBJECT(it.current()) ) > - ( container->parentWidget()->childrenListObject() ).find( TQT_TQOBJECT(container) ) ) + if ( ( it.current()->parentWidget()->childrenListObject() ).find( it.current() ) > + ( container->parentWidget()->childrenListObject() ).find( container ) ) wd++; } if ( wd > depth && !isChildOf( it.current(), notParentOf ) ) { @@ -2586,24 +2586,24 @@ void FormWindow::setMainContainer( TQWidget *w ) l->addWidget( w ); if ( resetPropertyWidget ) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mContainer); + propertyWidget = mContainer; if ( opw && opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); } if ( project() ) { LanguageInterface *iface = MetaDataBase::languageInterface( project()->language() ); if ( iface && !project()->isCpp() && !isFake() ) { - if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(this), "init()" ) ) - MetaDataBase::addFunction( TQT_TQOBJECT(this), "init()", "", "private", "function", + if ( !MetaDataBase::hasFunction( this, "init()" ) ) + MetaDataBase::addFunction( this, "init()", "", "private", "function", project()->language(), "void" ); - if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(this), "destroy()" ) ) - MetaDataBase::addFunction( TQT_TQOBJECT(this), "destroy()", "", "private", "function", + if ( !MetaDataBase::hasFunction( this, "destroy()" ) ) + MetaDataBase::addFunction( this, "destroy()", "", "private", "function", project()->language(), "void" ); - if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "shown()", TQT_TQOBJECT(mainContainer()), "init" ) ) - MetaDataBase::addConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "shown()", TQT_TQOBJECT(mainContainer()), "init" ); - if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "destroyed()", TQT_TQOBJECT(mainContainer()), "destroy" ) ) - MetaDataBase::addConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "destroyed()", - TQT_TQOBJECT(mainContainer()), "destroy" ); + if ( !MetaDataBase::hasConnection( this, mainContainer(), "shown()", mainContainer(), "init" ) ) + MetaDataBase::addConnection( this, mainContainer(), "shown()", mainContainer(), "init" ); + if ( !MetaDataBase::hasConnection( this, mainContainer(), "destroyed()", mainContainer(), "destroy" ) ) + MetaDataBase::addConnection( this, mainContainer(), "destroyed()", + mainContainer(), "destroy" ); } } } @@ -2627,14 +2627,14 @@ void FormWindow::setSavePixmapInline( bool b ) { pixInline = b; if ( b ) - pixProject = FALSE; + pixProject = false; } void FormWindow::setSavePixmapInProject( bool b ) { pixProject = b; if ( b ) - pixInline = FALSE; + pixInline = false; } void FormWindow::setPixmapLoaderFunction( const TQString &func ) @@ -2676,7 +2676,7 @@ void FormWindow::killAccels( TQObject *top ) if ( !l ) return; for ( TQObject *o = l->first(); o; o = l->next() ) - ( (TQAccel*)o )->setEnabled( FALSE ); + ( (TQAccel*)o )->setEnabled( false ); delete l; } @@ -2690,7 +2690,7 @@ DesignerFormWindow *FormWindow::iFace() bool FormWindow::isCentralWidget( TQObject *w ) const { if ( !::tqt_cast<TQMainWindow*>(mainContainer()) ) - return FALSE; + return false; return w == ((TQMainWindow*)mainContainer())->centralWidget(); } @@ -2753,7 +2753,7 @@ void FormWindow::setFormFile( FormFile *f ) { ff = f; if ( ff ) - connect( this, TQT_SIGNAL( modificationChanged(bool, const TQString&) ), ff, TQT_SLOT( formWindowChangedSomehow() ) ); + connect( this, TQ_SIGNAL( modificationChanged(bool, const TQString&) ), ff, TQ_SLOT( formWindowChangedSomehow() ) ); } bool FormWindow::canBeBuddy( const TQWidget *w ) const diff --git a/kdevdesigner/designer/formwindow.h b/kdevdesigner/designer/formwindow.h index 43e26321..52546f79 100644 --- a/kdevdesigner/designer/formwindow.h +++ b/kdevdesigner/designer/formwindow.h @@ -104,12 +104,12 @@ public: virtual void breakLayout( TQWidget *w ); - virtual void selectWidget( TQObject *w, bool select = TRUE ); + virtual void selectWidget( TQObject *w, bool select = true ); virtual void selectAll(); virtual void updateSelection( TQWidget *w ); virtual void raiseSelection( TQWidget *w ); virtual void repaintSelection( TQWidget *w ); - virtual void clearSelection( bool changePropertyDisplay = TRUE ); + virtual void clearSelection( bool changePropertyDisplay = true ); virtual void selectWidgets(); bool isWidgetSelected( TQObject *w ); virtual void updateChildSelections( TQWidget *w ); @@ -143,7 +143,7 @@ public: virtual MainWindow *mainWindow() const { return mainwindow; } bool checkCustomWidgets(); - virtual void insertWidget( TQWidget *w, bool checkName = FALSE ); + virtual void insertWidget( TQWidget *w, bool checkName = false ); virtual void removeWidget( TQWidget *w ); virtual void deleteWidgets(); virtual void editAdjustSize(); @@ -178,7 +178,7 @@ public: bool savePixmapInProject() const; void setSavePixmapInProject( bool b ); - void setToolFixed() { toolFixed = TRUE; } + void setToolFixed() { toolFixed = true; } void setActiveObject( TQObject *o ); diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp index 11531834..781a62a3 100644 --- a/kdevdesigner/designer/hierarchyview.cpp +++ b/kdevdesigner/designer/hierarchyview.cpp @@ -90,14 +90,14 @@ void HierarchyItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, if ( rtti() == Function && MainWindow::self->currProject()->isCpp() && ( txt == "init()" || txt == "destroy()" ) ) { - listView()->setUpdatesEnabled( FALSE ); + listView()->setUpdatesEnabled( false ); if ( txt == "init()" ) setText( 0, txt + " " + "(Constructor)" ); else setText( 0, txt + " " + "(Destructor)" ); TQListViewItem::paintCell( p, g, column, width, align ); setText( 0, txt ); - listView()->setUpdatesEnabled( TRUE ); + listView()->setUpdatesEnabled( true ); } else { TQListViewItem::paintCell( p, g, column, width, align ); } @@ -183,8 +183,8 @@ HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects init_colors(); setDefaultRenameAction( Accept ); - header()->setMovingEnabled( FALSE ); - header()->setStretchEnabled( TRUE ); + header()->setMovingEnabled( false ); + header()->setStretchEnabled( true ); normalMenu = 0; tabWidgetMenu = 0; addColumn( i18n( "Name" ) ); @@ -193,46 +193,46 @@ HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) ); (void)*selectedBack; // hack setPalette( p ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); if ( doConnects ) { - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( objectDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), - this, TQT_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( objectDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), + this, TQ_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); } - deselect = TRUE; + deselect = true; setColumnWidthMode( 1, Manual ); } void HierarchyList::keyPressEvent( TQKeyEvent *e ) { if ( e->key() == Key_Shift || e->key() == Key_Control ) - deselect = FALSE; + deselect = false; else - deselect = TRUE; + deselect = true; TQListView::keyPressEvent( e ); } void HierarchyList::keyReleaseEvent( TQKeyEvent *e ) { - deselect = TRUE; + deselect = true; TQListView::keyReleaseEvent( e ); } void HierarchyList::viewportMousePressEvent( TQMouseEvent *e ) { if ( e->state() & ShiftButton || e->state() & ControlButton ) - deselect = FALSE; + deselect = false; else - deselect = TRUE; + deselect = true; TQListView::viewportMousePressEvent( e ); } @@ -251,8 +251,8 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) return 0; if ( formWindow == o ) { if ( deselect ) - formWindow->clearSelection( FALSE ); - formWindow->emitShowProperties( TQT_TQOBJECT(formWindow) ); + formWindow->clearSelection( false ); + formWindow->emitShowProperties( formWindow ); return 0; } if ( o->isWidgetType() ) { @@ -261,20 +261,20 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) if ( ::tqt_cast<TQWidgetStack*>(w->parent()) ) { if (::tqt_cast<TQTabWidget*>(w->parent()->parent()) ) { ((TQTabWidget*)w->parent()->parent())->showPage( w ); - o = TQT_TQOBJECT((TQWidget*)w->parent()->parent()); - formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) ); + o = (TQWidget*)w->parent()->parent(); + formWindow->emitUpdateProperties( formWindow->currentWidget() ); } else if ( ::tqt_cast<TQWizard*>(w->parent()->parent()) ) { ((QDesignerWizard*)w->parent()->parent())-> setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) ); - o = TQT_TQOBJECT((TQWidget*)w->parent()->parent()); - formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) ); + o = (TQWidget*)w->parent()->parent(); + formWindow->emitUpdateProperties( formWindow->currentWidget() ); } else { ( (TQWidgetStack*)w->parent() )->raiseWidget( w ); if ( (TQWidgetStack*)w->parent()->isA( "QDesignerWidgetStack" ) ) ( (QDesignerWidgetStack*)w->parent() )->updateButtons(); } } else if ( ::tqt_cast<TQMenuBar*>(w) || ::tqt_cast<TQDockWindow*>(w) ) { - formWindow->setActiveObject( TQT_TQOBJECT(w) ); + formWindow->setActiveObject( w ); } else if ( ::tqt_cast<TQPopupMenu*>(w) ) { return 0; // ### we could try to find our menu bar and change the currentMenu to our index } else { @@ -283,11 +283,11 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) } } else if ( ::tqt_cast<TQAction*>(o) ) { MainWindow::self->actioneditor()->setCurrentAction( (TQAction*)o ); - deselect = TRUE; + deselect = true; } if ( deselect ) - formWindow->clearSelection( FALSE ); + formWindow->clearSelection( false ); return o; } @@ -303,7 +303,7 @@ void HierarchyList::objectDoubleClicked( TQListViewItem *i ) if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) w->raise(); - formWindow->selectWidget( TQT_TQOBJECT(w), TRUE ); + formWindow->selectWidget( w, true ); } } @@ -314,7 +314,7 @@ void HierarchyList::objectClicked( TQListViewItem *i ) return; if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( formWindow ) ) { TQWidget *w = (TQWidget*)o; - formWindow->selectWidget( TQT_TQOBJECT(w), TRUE ); + formWindow->selectWidget( w, true ); } } @@ -388,7 +388,7 @@ void HierarchyList::setup() if ( !widgetStacks ) widgetStacks = new TQPtrList<TQWidgetStack>; if ( w ) - insertObject( TQT_TQOBJECT(w), 0 ); + insertObject( w, 0 ); widgetStacks->clear(); } @@ -401,12 +401,12 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) { if ( TQString( o->name() ).startsWith( "qt_dead_widget_" ) ) return; - bool fakeMainWindow = FALSE; + bool fakeMainWindow = false; if ( ::tqt_cast<TQMainWindow*>(o) ) { - TQObject *cw = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + TQObject *cw = ( (TQMainWindow*)o )->centralWidget(); if ( cw ) { o = cw; - fakeMainWindow = TRUE; + fakeMainWindow = true; } } TQListViewItem *item = 0; @@ -454,7 +454,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) item = new HierarchyItem( HierarchyItem::Widget, this, 0, name, className, dbInfo ); else item = new HierarchyItem( HierarchyItem::Widget, parent, 0, name, className, dbInfo ); - item->setOpen( TRUE ); + item->setOpen( true ); if ( !parent ) item->setPixmap( 0, DesignerFormPix ); else if ( ::tqt_cast<TQLayoutWidget*>(o) ) @@ -491,7 +491,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) if ( widgetStacks->findRef( stack ) != -1 ) continue; widgetStacks->append( stack ); - TQObjectList *l2 = stack->queryList( "TQWidget", 0, TRUE, FALSE ); + TQObjectList *l2 = stack->queryList( "TQWidget", 0, true, false ); for ( obj = l2->last(); obj; obj = l2->prev() ) { if ( qstrcmp( obj->className(), "TQWidgetStackPrivate::Invisible" ) == 0 || @@ -510,7 +510,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) continue; TQToolBox *tb = (TQToolBox*)it.current()->parent(); for ( int i = tb->count() - 1; i >= 0; --i ) - insertObject( TQT_TQOBJECT(tb->item( i )), item ); + insertObject( tb->item( i ), item ); } continue; } @@ -544,7 +544,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) if ( da->supportsMenu() ) insertObject( da, item ); else - insertObject( TQT_TQOBJECT(da->widget()), item ); + insertObject( da->widget(), item ); } else if ( ::tqt_cast<QDesignerActionGroup*>(a) ) { insertObject( a, item ); } @@ -558,7 +558,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) if ( da->supportsMenu() ) insertObject( da, item ); else - insertObject( TQT_TQOBJECT(da->widget()), item ); + insertObject( da->widget(), item ); } else if ( ::tqt_cast<QDesignerActionGroup*>(obj) ) { insertObject( obj, item ); } @@ -569,7 +569,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) MenuBarEditorItem *md = mb->item( i ); if ( !md || !md->menu() ) continue; - insertObject( TQT_TQOBJECT(md->menu()), item ); + insertObject( md->menu(), item ); } } } @@ -579,10 +579,10 @@ void HierarchyList::setCurrent( TQObject *o ) TQListViewItemIterator it( this ); while ( it.current() ) { if ( ( (HierarchyItem*)it.current() )->object() == o ) { - blockSignals( TRUE ); + blockSignals( true ); setCurrentItem( it.current() ); ensureItemVisible( it.current() ); - blockSignals( FALSE ); + blockSignals( false ); return; } ++it; @@ -612,8 +612,8 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) if ( !tabWidgetMenu ) tabWidgetMenu = formWindow->mainWindow()->setupTabWidgetHierarchyMenu( - this, TQT_SLOT( addTabPage() ), - TQT_SLOT( removeTabPage() ) ); + this, TQ_SLOT( addTabPage() ), + TQ_SLOT( removeTabPage() ) ); tabWidgetMenu->popup( p ); } } @@ -667,7 +667,7 @@ void HierarchyList::removeTabPage() new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ). arg( dw->pageTitle() ).arg( wiz->name() ), formWindow, wiz, - wiz->indexOf( wiz->currentPage() ), TRUE ); + wiz->indexOf( wiz->currentPage() ), true ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } @@ -677,13 +677,13 @@ void HierarchyList::removeTabPage() // ------------------------------------------------------------ FormDefinitionView::FormDefinitionView( TQWidget *parent, FormWindow *fw ) - : HierarchyList( parent, fw, TRUE ) + : HierarchyList( parent, fw, true ) { header()->hide(); removeColumn( 1 ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, TQT_SLOT( renamed( TQListViewItem * ) ) ); - popupOpen = FALSE; + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); + popupOpen = false; } void FormDefinitionView::setup() @@ -710,14 +710,14 @@ void FormDefinitionView::setup() HierarchyItem *itemDef = new HierarchyItem( HierarchyItem::DefinitionParent, this, 0, i18n( *dit ), TQString(), TQString() ); itemDef->setPixmap( 0, DesignerFolderPix ); - itemDef->setOpen( TRUE ); + itemDef->setOpen( true ); TQStringList entries = lIface->definitionEntries( *dit, formWindow->mainWindow()->designerInterface() ); HierarchyItem *item = 0; for ( TQStringList::Iterator eit = entries.begin(); eit != entries.end(); ++eit ) { item = new HierarchyItem( HierarchyItem::Definition, itemDef, item, *eit, TQString(), TQString() ); - item->setRenameEnabled( 0, TRUE ); + item->setRenameEnabled( 0, true ); } } lIface->release(); @@ -729,7 +729,7 @@ void FormDefinitionView::setup() void FormDefinitionView::setupVariables() { bool pubOpen, protOpen, privOpen; - pubOpen = protOpen = privOpen = TRUE; + pubOpen = protOpen = privOpen = true; TQListViewItem *i = firstChild(); while ( i ) { if ( i->rtti() == HierarchyItem::VarParent ) { @@ -753,7 +753,7 @@ void FormDefinitionView::setupVariables() HierarchyItem *itemVar = new HierarchyItem( HierarchyItem::VarParent, this, 0, i18n( "Class Variables" ), TQString(), TQString() ); itemVar->setPixmap( 0, DesignerFolderPix ); - itemVar->setOpen( TRUE ); + itemVar->setOpen( true ); itemVarPriv = new HierarchyItem( HierarchyItem::VarPrivate, itemVar, 0, i18n( "private" ), TQString(), TQString() ); @@ -762,7 +762,7 @@ void FormDefinitionView::setupVariables() itemVarPubl = new HierarchyItem( HierarchyItem::VarPublic, itemVar, 0, i18n( "public" ), TQString(), TQString() ); - TQValueList<MetaDataBase::Variable> varList = MetaDataBase::variables( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Variable> varList = MetaDataBase::variables( formWindow ); TQValueList<MetaDataBase::Variable>::Iterator it = --( varList.end() ); if ( !varList.isEmpty() && itemVar ) { for (;;) { @@ -782,7 +782,7 @@ void FormDefinitionView::setupVariables() --it; } } - itemVar->setOpen( TRUE ); + itemVar->setOpen( true ); itemVarPriv->setOpen( privOpen ); itemVarProt->setOpen( protOpen ); itemVarPubl->setOpen( pubOpen ); @@ -794,7 +794,7 @@ void FormDefinitionView::refresh() return; bool fuPub, fuProt, fuPriv, slPub, slProt, slPriv; - fuPub = fuProt = fuPriv = slPub = slProt = slPriv = TRUE; + fuPub = fuProt = fuPriv = slPub = slProt = slPriv = true; TQListViewItem *i = firstChild(); while ( i ) { if ( i->rtti() == HierarchyItem::SlotParent || @@ -852,7 +852,7 @@ void FormDefinitionView::refresh() itemPublic = new HierarchyItem( HierarchyItem::SlotPublic, itemSlots, 0, i18n( "public" ), TQString(), TQString() ); - TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow ); TQValueList<MetaDataBase::Function>::Iterator it = --( functionList.end() ); if ( !functionList.isEmpty() && itemFunct ) { for (;;) { @@ -885,12 +885,12 @@ void FormDefinitionView::refresh() } } - itemFunct->setOpen( TRUE ); + itemFunct->setOpen( true ); itemFunctPubl->setOpen( fuPub ); itemFunctProt->setOpen( fuProt ); itemFunctPriv->setOpen( fuPriv ); - itemSlots->setOpen( TRUE ); + itemSlots->setOpen( true ); itemPublic->setOpen( slPub ); itemProtected->setOpen( slProt ); itemPrivate->setOpen( slPriv ); @@ -956,7 +956,7 @@ void HierarchyList::insertEntry( TQListViewItem *i, const TQPixmap &pix, const T TQString(), TQString() ); if ( !pix.isNull() ) item->setPixmap( 0, pix ); - item->setRenameEnabled( 0, TRUE ); + item->setRenameEnabled( 0, true ); setCurrentItem( item ); ensureItemVisible( item ); tqApp->processEvents(); @@ -981,22 +981,22 @@ void FormDefinitionView::contentsMouseDoubleClickEvent( TQMouseEvent *e ) if ( formWindow->project()->isCpp() ) switch( i->rtti() ) { case HierarchyItem::FunctPublic: - execFunctionDialog( "public", "function", TRUE ); + execFunctionDialog( "public", "function", true ); break; case HierarchyItem::FunctProtected: - execFunctionDialog( "protected", "function", TRUE ); + execFunctionDialog( "protected", "function", true ); break; case HierarchyItem::FunctPrivate: - execFunctionDialog( "private", "function", TRUE ); + execFunctionDialog( "private", "function", true ); break; case HierarchyItem::SlotPublic: - execFunctionDialog( "public", "slot", TRUE ); + execFunctionDialog( "public", "slot", true ); break; case HierarchyItem::SlotProtected: - execFunctionDialog( "protected", "slot", TRUE ); + execFunctionDialog( "protected", "slot", true ); break; case HierarchyItem::SlotPrivate: - execFunctionDialog( "private", "slot", TRUE ); + execFunctionDialog( "private", "slot", true ); break; case HierarchyItem::VarPublic: case HierarchyItem::VarProtected: @@ -1023,7 +1023,7 @@ void FormDefinitionView::execFunctionDialog( const TQString &access, const TQStr // refresh the functions list in the metadatabase SourceEditor *editor = formFile->editor(); if ( editor ) - editor->refresh( TRUE ); + editor->refresh( true ); EditFunctions dlg( this, formWindow ); if ( addFunc ) @@ -1043,7 +1043,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) const int GOIMPL = 5; TQPopupMenu menu; - bool insertDelete = FALSE; + bool insertDelete = false; if ( i->rtti() == HierarchyItem::FunctParent || i->rtti() == HierarchyItem::SlotParent || i->rtti() == HierarchyItem::VarParent ) { @@ -1059,7 +1059,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) menu.insertItem( SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), i18n( "Properties" ), PROPS ); if ( MetaDataBase::hasEditor( formWindow->project()->language() ) ) menu.insertItem( i18n( "Goto Implementation" ), GOIMPL ); - insertDelete = TRUE; + insertDelete = true; } if ( insertDelete || i->rtti() == HierarchyItem::Variable || i->rtti() == HierarchyItem::Function || i->rtti() == HierarchyItem::Slot || @@ -1067,19 +1067,19 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) menu.insertSeparator(); menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()), i18n( "Delete" ), DEL ); } - popupOpen = TRUE; + popupOpen = true; int res = menu.exec( pos ); - popupOpen = FALSE; + popupOpen = false; if ( res == -1 ) return; if ( res == EDIT ) { switch( i->rtti() ) { case HierarchyItem::FunctParent: - execFunctionDialog( "public", "function", FALSE ); + execFunctionDialog( "public", "function", false ); break; case HierarchyItem::SlotParent: - execFunctionDialog( "public", "slot", FALSE ); + execFunctionDialog( "public", "slot", false ); break; case HierarchyItem::VarParent: case HierarchyItem::VarPublic: @@ -1091,7 +1091,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) if ( i ) varDia.setCurrentItem( i->text( 0 ) ); if ( varDia.exec() == TQDialog::Accepted ) - formWindow->commandHistory()->setModified( TRUE ); + formWindow->commandHistory()->setModified( true ); break; } case HierarchyItem::Definition: @@ -1101,7 +1101,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) return; if ( i->rtti() == HierarchyItem::Definition ) i = i->parent(); - ListEditor dia( this, 0, TRUE ); + ListEditor dia( this, 0, true ); dia.setCaption( i18n( "Edit %1" ).arg( i->text( 0 ) ) ); TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() ); dia.setList( entries ); @@ -1117,22 +1117,22 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) i = i->parent(); switch( i->rtti() ) { case HierarchyItem::SlotPublic: - execFunctionDialog( "public", "slot", TRUE ); + execFunctionDialog( "public", "slot", true ); break; case HierarchyItem::SlotProtected: - execFunctionDialog( "protected", "slot", TRUE ); + execFunctionDialog( "protected", "slot", true ); break; case HierarchyItem::SlotPrivate: - execFunctionDialog( "private" , "slot", TRUE ); + execFunctionDialog( "private" , "slot", true ); break; case HierarchyItem::FunctPublic: - execFunctionDialog( "public", "function", TRUE ); + execFunctionDialog( "public", "function", true ); break; case HierarchyItem::FunctProtected: - execFunctionDialog( "protected", "function", TRUE ); + execFunctionDialog( "protected", "function", true ); break; case HierarchyItem::FunctPrivate: - execFunctionDialog( "private" , "function", TRUE ); + execFunctionDialog( "private" , "function", true ); break; default: insertEntry( i ); @@ -1192,12 +1192,12 @@ void FormDefinitionView::save( TQListViewItem *p, TQListViewItem *i ) } if ( i && i->rtti() == HierarchyItem::Variable ) { - i->setRenameEnabled( 0, FALSE ); + i->setRenameEnabled( 0, false ); TQString varName = i->text( 0 ); varName = varName.simplifyWhiteSpace(); if ( varName[(int)varName.length() - 1] != ';' ) varName += ";"; - if ( MetaDataBase::hasVariable( TQT_TQOBJECT(formWindow), varName ) ) { + if ( MetaDataBase::hasVariable( formWindow, varName ) ) { TQMessageBox::information( this, i18n( "Edit Variables" ), i18n( "This variable has already been declared." ) ); } else { @@ -1268,9 +1268,9 @@ HierarchyView::HierarchyView( TQWidget *parent ) ClassBrowser cb( ciface->createClassBrowser( this ), ciface ); addTab( cb.lv, i18n( "Class Declarations" ) ); setTabToolTip( cb.lv, i18n( "List of all classes and its declarations of the current source file" ) ); - ciface->onClick( TQT_TQOBJECT(this), TQT_SLOT( jumpTo( const TQString &, const TQString &, int ) ) ); + ciface->onClick( this, TQ_SLOT( jumpTo( const TQString &, const TQString &, int ) ) ); classBrowsers->insert( *it, cb ); - setTabEnabled( cb.lv, FALSE ); + setTabEnabled( cb.lv, false ); } } } @@ -1301,13 +1301,13 @@ void HierarchyView::setFormWindow( FormWindow *fw, TQObject *o ) editor = 0; } - setTabEnabled( listview, TRUE ); + setTabEnabled( listview, true ); setTabEnabled( fView, fw && fw->project()->isCpp() ); if ( fw == formwindow ) { if ( fw ) { if ( !fake ) - listview->setCurrent( TQT_TQOBJECT(o) ); + listview->setCurrent( o ); else listview->clear(); if ( MainWindow::self->qWorkspace()->activeWindow() == fw ) @@ -1330,7 +1330,7 @@ void HierarchyView::setFormWindow( FormWindow *fw, TQObject *o ) fView->setFormWindow( fw ); if ( !fake ) { listview->setup(); - listview->setCurrent( TQT_TQOBJECT(o) ); + listview->setCurrent( o ); } fView->setup(); @@ -1356,7 +1356,7 @@ void HierarchyView::showClasses( SourceEditor *se ) return; lastSourceEditor = se; - TQTimer::singleShot( 100, this, TQT_SLOT( showClassesTimeout() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( showClassesTimeout() ) ); } void HierarchyView::showClassesTimeout() @@ -1367,14 +1367,14 @@ void HierarchyView::showClassesTimeout() if ( !se->object() ) return; if ( se->formWindow() && se->formWindow()->project()->isCpp() ) { - setFormWindow( se->formWindow(), TQT_TQOBJECT(se->formWindow()->currentWidget()) ); - MainWindow::self->propertyeditor()->setWidget( TQT_TQOBJECT(se->formWindow()->currentWidget()), + setFormWindow( se->formWindow(), se->formWindow()->currentWidget() ); + MainWindow::self->propertyeditor()->setWidget( se->formWindow()->currentWidget(), se->formWindow() ); return; } setTabEnabled( listview, !!se->formWindow() && !se->formWindow()->isFake() ); - setTabEnabled( fView, FALSE ); + setTabEnabled( fView, false ); formwindow = 0; listview->setFormWindow( 0 ); @@ -1389,10 +1389,10 @@ void HierarchyView::showClassesTimeout() it != classBrowsers->end(); ++it ) { if ( it.key() == se->project()->language() ) { (*it).iface->update( se->text() ); - setTabEnabled( (*it).lv, TRUE ); + setTabEnabled( (*it).lv, true ); showPage( (*it).lv ); } else { - setTabEnabled( (*it).lv, FALSE ); + setTabEnabled( (*it).lv, false ); (*it).iface->clear(); } } @@ -1447,7 +1447,7 @@ void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & ) TQWidget *w2 = w; if ( ::tqt_cast<TQMainWindow*>(w) ) w2 = ( (TQMainWindow*)w )->centralWidget(); - listview->changeNameOf( TQT_TQOBJECT(w2), w->name() ); + listview->changeNameOf( w2, w->name() ); } @@ -1455,7 +1455,7 @@ void HierarchyView::databasePropertyChanged( TQWidget *w, const TQStringList& in { #ifndef TQT_NO_SQL TQString i = info.join( "." ); - listview->changeDatabaseOf( TQT_TQOBJECT(w), i ); + listview->changeDatabaseOf( w, i ); #endif } diff --git a/kdevdesigner/designer/hierarchyview.h b/kdevdesigner/designer/hierarchyview.h index fc4e563f..e47754b9 100644 --- a/kdevdesigner/designer/hierarchyview.h +++ b/kdevdesigner/designer/hierarchyview.h @@ -31,7 +31,7 @@ #include <tqlistview.h> #include <tqtabwidget.h> #include <tqguardedptr.h> -#include <tqcom_p.h> +#include <private/tqcom_p.h> #include "../interfaces/classbrowserinterface.h" class FormWindow; @@ -101,7 +101,7 @@ class HierarchyList : public TQListView public: - HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects = TRUE ); + HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects = true ); virtual void setup(); virtual void setCurrent( TQObject *o ); @@ -111,9 +111,9 @@ public: void setFormWindow( FormWindow *fw ) { formWindow = fw; } void drawContentsOffset( TQPainter *p, int ox, int oy, int cx, int cy, int cw, int ch ) { - setUpdatesEnabled( FALSE ); + setUpdatesEnabled( false ); triggerUpdate(); - setUpdatesEnabled( TRUE ); + setUpdatesEnabled( true ); TQListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch ); } diff --git a/kdevdesigner/designer/iconvieweditor.ui b/kdevdesigner/designer/iconvieweditor.ui index 8711bd6b..93cb8ac7 100644 --- a/kdevdesigner/designer/iconvieweditor.ui +++ b/kdevdesigner/designer/iconvieweditor.ui @@ -439,7 +439,7 @@ <tabstop>buttonHelp</tabstop> <tabstop>buttonApply</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">applyClicked()</slot> @@ -451,7 +451,7 @@ <slot access="protected">insertNewItem()</slot> <slot access="protected">deletePixmap()</slot> <slot access="protected">okClicked()</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp index 32a81412..47c820f6 100644 --- a/kdevdesigner/designer/iconvieweditorimpl.cpp +++ b/kdevdesigner/designer/iconvieweditorimpl.cpp @@ -38,16 +38,16 @@ #include <tdelocale.h> IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) - : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw ) + : IconViewEditorBase( parent, 0, true ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); iconview = (TQIconView*)editWidget; itemText->setText( "" ); - itemText->setEnabled( FALSE ); + itemText->setEnabled( false ); itemPixmap->setText( "" ); - itemChoosePixmap->setEnabled( FALSE ); - itemDeletePixmap->setEnabled( FALSE ); + itemChoosePixmap->setEnabled( false ); + itemDeletePixmap->setEnabled( false ); TQIconViewItem *i = 0; for ( i = iconview->firstItem(); i; i = i->nextItem() ) { @@ -62,7 +62,7 @@ void IconViewEditor::insertNewItem() { TQIconViewItem *i = new TQIconViewItem( preview, i18n( "New Item" ) ); preview->setCurrentItem( i ); - preview->setSelected( i, TRUE ); + preview->setSelected( i, true ); itemText->setFocus(); itemText->selectAll(); } @@ -71,31 +71,31 @@ void IconViewEditor::deleteCurrentItem() { delete preview->currentItem(); if ( preview->currentItem() ) - preview->setSelected( preview->currentItem(), TRUE ); + preview->setSelected( preview->currentItem(), true ); } void IconViewEditor::currentItemChanged( TQIconViewItem *i ) { - itemText->blockSignals( TRUE ); + itemText->blockSignals( true ); itemText->setText( "" ); itemPixmap->setText( "" ); - itemText->blockSignals( FALSE ); + itemText->blockSignals( false ); if ( !i ) { - itemText->setEnabled( FALSE ); - itemChoosePixmap->setEnabled( FALSE ); + itemText->setEnabled( false ); + itemChoosePixmap->setEnabled( false ); return; } - itemText->blockSignals( TRUE ); - itemText->setEnabled( TRUE ); - itemChoosePixmap->setEnabled( TRUE ); + itemText->blockSignals( true ); + itemText->setEnabled( true ); + itemChoosePixmap->setEnabled( true ); itemDeletePixmap->setEnabled( i->pixmap() && !i->pixmap()->isNull() ); itemText->setText( i->text() ); if ( i->pixmap() ) itemPixmap->setPixmap( *i->pixmap() ); - itemText->blockSignals( FALSE ); + itemText->blockSignals( false ); } void IconViewEditor::currentTextChanged( const TQString &txt ) @@ -151,7 +151,7 @@ void IconViewEditor::choosePixmap() preview->currentItem()->setPixmap( pix ); itemPixmap->setPixmap( pix ); - itemDeletePixmap->setEnabled( TRUE ); + itemDeletePixmap->setEnabled( true ); } void IconViewEditor::deletePixmap() @@ -161,5 +161,5 @@ void IconViewEditor::deletePixmap() preview->currentItem()->setPixmap( TQPixmap() ); itemPixmap->setText( "" ); - itemDeletePixmap->setEnabled( FALSE ); + itemDeletePixmap->setEnabled( false ); } diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp index 8c8917a2..22add7fd 100644 --- a/kdevdesigner/designer/kdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -20,7 +20,7 @@ #include "kdevdesigner_part.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <tdeactionclasses.h> #include <kstdaction.h> @@ -62,7 +62,7 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widge setReadWrite(true); setModified(false); - connect(m_widget, TQT_SIGNAL(formModified(bool )), this, TQT_SLOT(formModified(bool))); + connect(m_widget, TQ_SIGNAL(formModified(bool )), this, TQ_SLOT(formModified(bool))); } void KDevDesignerPart::setupDesignerWindow() @@ -87,48 +87,48 @@ static TQIconSet createPartIconSet( const TQString &name ) void KDevDesignerPart::setupActions( ) { TDEAction *action; - action = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - action = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - action = KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection()); + action = KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + action = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + action = KStdAction::close(this, TQ_SLOT(fileClose()), actionCollection()); stateSync(action, m_widget->actionFileClose); - action = KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + action = KStdAction::save(this, TQ_SLOT(save()), actionCollection()); stateSync(action, m_widget->actionFileSave); - action = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + action = KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); stateSync(action, m_widget->actionFileSaveAs); - action = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(fileSaveAs()), actionCollection(), "file_saveall"); + action = new TDEAction(i18n("Save Al&l"), 0, this, TQ_SLOT(fileSaveAs()), actionCollection(), "file_saveall"); stateSync(action, m_widget->actionFileSaveAll); - new TDEAction(i18n("Create &Template..."), 0, this, TQT_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate"); + new TDEAction(i18n("Create &Template..."), 0, this, TQ_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate"); - action = KStdAction::undo(this, TQT_SLOT(editUndo()), actionCollection()); + action = KStdAction::undo(this, TQ_SLOT(editUndo()), actionCollection()); stateSync(action, m_widget->actionEditUndo); - action = KStdAction::redo(this, TQT_SLOT(editRedo()), actionCollection()); + action = KStdAction::redo(this, TQ_SLOT(editRedo()), actionCollection()); stateSync(action, m_widget->actionEditRedo); - action = KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection()); + action = KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection()); stateSync(action, m_widget->actionEditCut); - action = KStdAction::copy(this, TQT_SLOT(editCopy()), actionCollection()); + action = KStdAction::copy(this, TQ_SLOT(editCopy()), actionCollection()); stateSync(action, m_widget->actionEditCopy); - action = KStdAction::paste(this, TQT_SLOT(editPaste()), actionCollection()); + action = KStdAction::paste(this, TQ_SLOT(editPaste()), actionCollection()); stateSync(action, m_widget->actionEditPaste); - action = new TDEAction(i18n("&Delete"), Key_Delete, this, TQT_SLOT(editDelete()), actionCollection(), "edit_delete"); + action = new TDEAction(i18n("&Delete"), Key_Delete, this, TQ_SLOT(editDelete()), actionCollection(), "edit_delete"); stateSync(action, m_widget->actionEditDelete); - action = KStdAction::selectAll(this, TQT_SLOT(editSelectAll()), actionCollection()); + action = KStdAction::selectAll(this, TQ_SLOT(editSelectAll()), actionCollection()); stateSync(action, m_widget->actionEditSelectAll); - action = new TDEAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()), actionCollection(), "edit_accels"); + action = new TDEAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQ_SLOT(editAccels()), actionCollection(), "edit_accels"); stateSync(action, m_widget->actionEditAccels); - action = new TDEAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQT_SLOT(editFunctions()), actionCollection(), "edit_functions"); + action = new TDEAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQ_SLOT(editFunctions()), actionCollection(), "edit_functions"); stateSync(action, m_widget->actionEditFunctions); - action = new TDEAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQT_SLOT(editConnections()), actionCollection(), "edit_connections"); + action = new TDEAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQ_SLOT(editConnections()), actionCollection(), "edit_connections"); stateSync(action, m_widget->actionEditConnections); - action = new TDEAction(i18n("&Form Settings..."), 0, this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_formsettings"); + action = new TDEAction(i18n("&Form Settings..."), 0, this, TQ_SLOT(editFormSettings()), actionCollection(), "edit_formsettings"); stateSync(action, m_widget->actionEditFormSettings); - action = new TDEAction(i18n("&Add File..."), 0, this, TQT_SLOT(projectAddFile()), actionCollection(), "project_addfile"); + action = new TDEAction(i18n("&Add File..."), 0, this, TQ_SLOT(projectAddFile()), actionCollection(), "project_addfile"); stateSync(action, m_widget->actionProjectAddFile); - action = new TDEAction(i18n("&Image Collection..."), 0, this, TQT_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection"); + action = new TDEAction(i18n("&Image Collection..."), 0, this, TQ_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection"); stateSync(action, m_widget->actionEditPixmapCollection); - action = new TDEAction(i18n("&Database Connections..."), 0, this, TQT_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections"); + action = new TDEAction(i18n("&Database Connections..."), 0, this, TQ_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections"); stateSync(action, m_widget->actionEditDatabaseConnections); - action = new TDEAction(i18n("&Designer Project Settings..."), 0, this, TQT_SLOT(projectSettings()), actionCollection(), "project_settings"); + action = new TDEAction(i18n("&Designer Project Settings..."), 0, this, TQ_SLOT(projectSettings()), actionCollection(), "project_settings"); stateSync(action, m_widget->actionEditProjectSettings); TDERadioAction *toggle; @@ -141,34 +141,34 @@ void KDevDesignerPart::setupActions( ) setupToolsAction(toggle, m_widget->actionOrderTool); toggle = new TDERadioAction(i18n("Set &Buddy"), createPartIconSet("designer_setbuddy.png"), Key_F12, actionCollection(), "tools_setbuddy"); setupToolsAction(toggle, m_widget->actionBuddyTool); - new TDEAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox"); - new TDEAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets"); + new TDEAction(i18n("Configure Toolbox..."), 0, this, TQ_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox"); + new TDEAction(i18n("Edit &Custom Widgets..."), 0, this, TQ_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets"); - action = new TDEAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize"); + action = new TDEAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQ_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize"); stateSync(action, m_widget->actionEditAdjustSize); - action = new TDEAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h"); + action = new TDEAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQ_SLOT(layoutHLayout()), actionCollection(), "layout_h"); stateSync(action, m_widget->actionEditHLayout); - action = new TDEAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v"); + action = new TDEAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQ_SLOT(layoutVLayout()), actionCollection(), "layout_v"); stateSync(action, m_widget->actionEditVLayout); - action = new TDEAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid"); + action = new TDEAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQ_SLOT(layoutGridLayout()), actionCollection(), "layout_grid"); stateSync(action, m_widget->actionEditGridLayout); - action = new TDEAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith"); + action = new TDEAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQ_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith"); stateSync(action, m_widget->actionEditSplitHorizontal); - action = new TDEAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv"); + action = new TDEAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQ_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv"); stateSync(action, m_widget->actionEditSplitVertical); - action = new TDEAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break"); + action = new TDEAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQ_SLOT(layoutBreak()), actionCollection(), "layout_break"); stateSync(action, m_widget->actionEditBreakLayout); toggle = new TDERadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer"); setupToolsAction(toggle, m_widget->actionInsertSpacer); - action = new TDEAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview"); + action = new TDEAction(i18n("Preview &Form"), CTRL + Key_T, this, TQ_SLOT(windowPreview()), actionCollection(), "window_preview"); stateSync(action, m_widget->actionPreview); - action = new TDEAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQT_SLOT(windowNext()), actionCollection(), "window_next"); + action = new TDEAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQ_SLOT(windowNext()), actionCollection(), "window_next"); stateSync(action, m_widget->actionWindowNext); - action = new TDEAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQT_SLOT(windowPrev()), actionCollection(), "window_prev"); + action = new TDEAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQ_SLOT(windowPrev()), actionCollection(), "window_prev"); stateSync(action, m_widget->actionWindowPrevious); - action = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection()); + action = KStdAction::preferences(this, TQ_SLOT(editPreferences()), actionCollection()); action->setText(i18n("Configure &KDevDesigner...")); stateSync(action, m_widget->actionEditPreferences); } @@ -203,7 +203,7 @@ bool KDevDesignerPart::openFile() bool KDevDesignerPart::saveFile() { - if (isReadWrite() == false) + if (!isReadWrite()) return false; m_widget->actionFileSaveAll->activate(); return true; @@ -217,7 +217,7 @@ void KDevDesignerPart::stateSync( TDEAction * tdeaction, TQAction * qaction ) DesignerAction *ac = dynamic_cast<DesignerAction*>(qaction); if (!ac) return; - connect(ac, TQT_SIGNAL(actionEnabled(bool )), tdeaction, TQT_SLOT(setEnabled(bool ))); + connect(ac, TQ_SIGNAL(actionEnabled(bool )), tdeaction, TQ_SLOT(setEnabled(bool ))); } void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * action ) @@ -227,8 +227,8 @@ void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * act toggle->setGroup("tools"); toggle->setExclusiveGroup("tools"); - connect(action, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); - connect(toggle, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToggleActionOn(bool))); + connect(action, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(setToggleActionChecked(bool ))); + connect(toggle, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToggleActionOn(bool))); toggle->setChecked(action->isOn()); m_actionMap[action] = toggle; m_actionMap2[toggle] = action; @@ -495,9 +495,9 @@ void KDevDesignerPart::setToggleActionOn( bool b ) TQAction *qaction = m_actionMap2[action]; if (!qaction) return; - disconnect(qaction, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); + disconnect(qaction, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(setToggleActionChecked(bool ))); qaction->setOn(b); - connect(qaction, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); + connect(qaction, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(setToggleActionChecked(bool ))); } void KDevDesignerPart::openProject( const TQString & // projectFile diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp index 4aae7be6..b776b97b 100644 --- a/kdevdesigner/designer/layout.cpp +++ b/kdevdesigner/designer/layout.cpp @@ -64,7 +64,7 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> & Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup, bool splitter ) : widgets( wl ), parent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter ) { - widgets.setAutoDelete( FALSE ); + widgets.setAutoDelete( false ); layoutBase = lb; if ( !doSetup && layoutBase ) oldGeometry = layoutBase->geometry(); @@ -103,7 +103,7 @@ void Layout::setup() } if ( !lastList ) { TQWidgetList l; - l.setAutoDelete( FALSE ); + l.setAutoDelete( false ); lists.append( l ); lastList = &lists.last(); } @@ -124,7 +124,7 @@ void Layout::setup() // we leave here. if ( !lastList || ( lastList->count() < 2 && ( !layoutBase || - ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(layoutBase) ) ) ) && + ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) && layoutBase != formWindow->mainContainer() ) ) ) ) { widgets.clear(); @@ -142,8 +142,8 @@ void Layout::setup() // widgets to get informed if one gets deleted to be able to // handle that and do not crash in this case for ( w = widgets.first(); w; w = widgets.next() ) { - connect( w, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( widgetDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( widgetDestroyed() ) ); startPoint = TQPoint( TQMIN( startPoint.x(), w->x() ), TQMIN( startPoint.y(), w->y() ) ); geometries.insert( w, TQRect( w->pos(), w->size() ) ); @@ -163,7 +163,7 @@ void Layout::widgetDestroyed() bool Layout::prepareLayout( bool &needMove, bool &needReparent ) { if ( !widgets.count() ) - return FALSE; + return false; for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->raise(); needMove = !layoutBase; @@ -179,7 +179,7 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent ) WidgetFactory::deleteLayout( layoutBase ); } - return TRUE; + return true; } void Layout::finishLayout( bool needMove, TQLayout *layout ) @@ -195,7 +195,7 @@ void Layout::finishLayout( bool needMove, TQLayout *layout ) layoutBase->show(); layout->activate(); formWindow->insertWidget( layoutBase ); - formWindow->selectWidget( TQT_TQOBJECT(layoutBase) ); + formWindow->selectWidget( layoutBase ); TQString n = layoutBase->name(); if ( n.find( "qt_dead_widget_" ) != -1 ) { n.remove( 0, TQString( "qt_dead_widget_" ).length() ); @@ -214,7 +214,7 @@ void Layout::undoLayout() it.key()->reparent( WidgetFactory::containerOfWidget( parent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) ); it.key()->resize( ( *it ).size() ); } - formWindow->selectWidget( TQT_TQOBJECT(layoutBase), FALSE ); + formWindow->selectWidget( layoutBase, false ); WidgetFactory::deleteLayout( layoutBase ); if ( parent != layoutBase && !::tqt_cast<TQMainWindow*>(layoutBase) ) { layoutBase->hide(); @@ -225,9 +225,9 @@ void Layout::undoLayout() layoutBase->setGeometry( oldGeometry ); } if ( widgets.first() ) - formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) ); + formWindow->selectWidget( widgets.first() ); else - formWindow->selectWidget( TQT_TQOBJECT(formWindow) ); + formWindow->selectWidget( formWindow ); } void Layout::breakLayout() @@ -241,14 +241,14 @@ void Layout::breakLayout() WidgetFactory::deleteLayout( layoutBase ); bool needReparent = qstrcmp( layoutBase->className(), "TQLayoutWidget" ) == 0 || qstrcmp( layoutBase->className(), "TQSplitter" ) == 0 || - ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(layoutBase) ) ) ) && + ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) && layoutBase != formWindow->mainContainer() ); bool needResize = qstrcmp( layoutBase->className(), "TQSplitter" ) == 0; bool add = geometries.isEmpty(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent ) w->reparent( layoutBase->parentWidget(), 0, - layoutBase->pos() + w->pos(), TRUE ); + layoutBase->pos() + w->pos(), true ); if ( needResize ) { TQMap<TQWidget*, TQRect>::Iterator it = rects.find( w ); if ( it != rects.end() ) @@ -267,9 +267,9 @@ void Layout::breakLayout() parent = layoutBase; } if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) ) - formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) ); + formWindow->selectWidget( widgets.first() ); else - formWindow->selectWidget( TQT_TQOBJECT(formWindow) ); + formWindow->selectWidget( formWindow ); } class HorizontalLayoutList : public TQWidgetList @@ -315,7 +315,7 @@ void HorizontalLayout::doLayout() for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent && w->parent() != layoutBase ) - w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); + w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); @@ -379,7 +379,7 @@ void VerticalLayout::doLayout() for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent && w->parent() != layoutBase ) - w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); + w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); @@ -495,10 +495,10 @@ bool Grid::isWidgetStartCol( int c ) const int r; for ( r = 0; r < nrows; r++ ) { if ( cell( r, c ) && ( (c==0) || (cell( r, c) != cell( r, c-1) )) ) { - return TRUE; + return true; } } - return FALSE; + return false; } bool Grid::isWidgetEndCol( int c ) const @@ -506,9 +506,9 @@ bool Grid::isWidgetEndCol( int c ) const int r; for ( r = 0; r < nrows; r++ ) { if ( cell( r, c ) && ((c == ncols-1) || (cell( r, c) != cell( r, c+1) )) ) - return TRUE; + return true; } - return FALSE; + return false; } bool Grid::isWidgetStartRow( int r ) const @@ -516,9 +516,9 @@ bool Grid::isWidgetStartRow( int r ) const int c; for ( c = 0; c < ncols; c++ ) { if ( cell( r, c ) && ( (r==0) || (cell( r, c) != cell( r-1, c) )) ) - return TRUE; + return true; } - return FALSE; + return false; } bool Grid::isWidgetEndRow( int r ) const @@ -526,9 +526,9 @@ bool Grid::isWidgetEndRow( int r ) const int c; for ( c = 0; c < ncols; c++ ) { if ( cell( r, c ) && ((r == nrows-1) || (cell( r, c) != cell( r+1, c) )) ) - return TRUE; + return true; } - return FALSE; + return false; } @@ -536,7 +536,7 @@ bool Grid::isWidgetTopLeft( int r, int c ) const { TQWidget* w = cell( r, c ); if ( !w ) - return FALSE; + return false; return ( !r || cell( r-1, c) != w ) && (!c || cell( r, c-1) != w); } @@ -677,16 +677,16 @@ void Grid::merge() { int r,c; for ( c = 0; c < ncols; c++ ) - cols[c] = FALSE; + cols[c] = false; for ( r = 0; r < nrows; r++ ) - rows[r] = FALSE; + rows[r] = false; for ( c = 0; c < ncols; c++ ) { for ( r = 0; r < nrows; r++ ) { if ( isWidgetTopLeft( r, c ) ) { - rows[r] = TRUE; - cols[c] = TRUE; + rows[r] = true; + cols[c] = true; } } } @@ -718,11 +718,11 @@ bool Grid::locateWidget( TQWidget* w, int& row, int& col, int& rowspan, int & co if ( cols[ c2] ) colspan++; } - return TRUE; + return true; } } } - return FALSE; + return false; } @@ -757,7 +757,7 @@ void GridLayout::doLayout() for ( w = widgets.first(); w; w = widgets.next() ) { if ( grid->locateWidget( w, r, c, rs, cs) ) { if ( needReparent && w->parent() != layoutBase ) - w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); + w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( rs * cs == 1 ) { layout->addWidget( w, r, c, ::tqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 ); } else { @@ -865,10 +865,10 @@ void GridLayout::buildGrid() Spacer::Spacer( TQWidget *parent, const char *name ) : TQWidget( parent, name, WMouseNoMask ), - orient(TQt::Vertical ), interactive(TRUE), sh( TQSize(20,20) ) + orient(TQt::Vertical ), interactive(true), sh( TQSize(20,20) ) { setSizeType( Expanding ); - setAutoMask( TRUE ); + setAutoMask( true ); } void Spacer::paintEvent( TQPaintEvent * ) diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h index af37b323..e870aca0 100644 --- a/kdevdesigner/designer/layout.h +++ b/kdevdesigner/designer/layout.h @@ -44,7 +44,7 @@ class Layout : public TQObject public: - Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE ); + Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = true, bool splitter = false ); virtual ~Layout() {} virtual void doLayout() = 0; @@ -75,7 +75,7 @@ protected slots: class HorizontalLayout : public Layout { public: - HorizontalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE ); + HorizontalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = true, bool splitter = false ); void doLayout(); @@ -87,7 +87,7 @@ protected: class VerticalLayout : public Layout { public: - VerticalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE ); + VerticalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = true, bool splitter = false ); void doLayout(); @@ -101,7 +101,7 @@ class Grid; class GridLayout : public Layout { public: - GridLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, const TQSize &res, bool doSetup = TRUE ); + GridLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, const TQSize &res, bool doSetup = true ); ~GridLayout(); void doLayout(); diff --git a/kdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp index 4e8a7822..cfdfd587 100644 --- a/kdevdesigner/designer/listboxdnd.cpp +++ b/kdevdesigner/designer/listboxdnd.cpp @@ -35,7 +35,7 @@ class ListBoxItemDrag : public TQStoredDrag { public: - ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * parent = 0, const char * name = 0 ); + ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = false, TQListBox * parent = 0, const char * name = 0 ); ~ListBoxItemDrag() {}; static bool canDecode( TQDragMoveEvent * event ); static bool decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * insertPoint ); @@ -48,7 +48,7 @@ ListBoxDnd::ListBoxDnd( TQListBox * eventSource, const char * name ) void ListBoxDnd::confirmDrop( TQListBoxItem * ) { - dropConfirmed = TRUE; + dropConfirmed = true; } bool ListBoxDnd::dropEvent( TQDropEvent * event ) @@ -58,7 +58,7 @@ bool ListBoxDnd::dropEvent( TQDropEvent * event ) if ( dMode & NullDrop ) { // combined with Move, a NullDrop will delete an item event->accept(); emit dropped( 0 ); // a NullDrop - return TRUE; + return true; } TQPoint pos = event->pos(); @@ -74,9 +74,9 @@ bool ListBoxDnd::dropEvent( TQDropEvent * event ) } line->hide(); - dragInside = FALSE; + dragInside = false; - return TRUE; + return true; } bool ListBoxDnd::mouseMoveEvent( TQMouseEvent * event ) @@ -104,15 +104,15 @@ bool ListBoxDnd::mouseMoveEvent( TQMouseEvent * event ) if ( dMode & Move ) { if ( dropConfirmed ) { // ###FIX: memleak ? in internal mode, only pointers are transfered... - //list.setAutoDelete( TRUE ); + //list.setAutoDelete( true ); list.clear(); - dropConfirmed = FALSE; + dropConfirmed = false; } insertList( list ); // "show" items } } } - return FALSE; + return false; } int ListBoxDnd::buildList( ListBoxItemList & list ) @@ -120,7 +120,7 @@ int ListBoxDnd::buildList( ListBoxItemList & list ) TQListBoxItem * i = ((TQListBox *)src)->firstItem(); while ( i ) { if ( i->isSelected() ) { - ((TQListBox *)src)->setSelected( i, FALSE ); + ((TQListBox *)src)->setSelected( i, false ); list.append( i ); } i = i->next(); @@ -299,7 +299,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox } - return TRUE; + return true; } - return FALSE; + return false; } diff --git a/kdevdesigner/designer/listboxeditor.ui b/kdevdesigner/designer/listboxeditor.ui index 6c5a8408..628a622c 100644 --- a/kdevdesigner/designer/listboxeditor.ui +++ b/kdevdesigner/designer/listboxeditor.ui @@ -434,7 +434,7 @@ <tabstop>helpButton</tabstop> <tabstop>buttonApply</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">insertNewItem()</slot> @@ -448,7 +448,7 @@ <slot access="protected">deletePixmap()</slot> <slot access="protected">moveItemUp()</slot> <slot access="protected">moveItemDown()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>BarIcon2</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <includes> diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp index 85a321ab..42f97497 100644 --- a/kdevdesigner/designer/listboxeditorimpl.cpp +++ b/kdevdesigner/designer/listboxeditorimpl.cpp @@ -41,16 +41,16 @@ #include <tdelocale.h> ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) - : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw ) + : ListBoxEditorBase( parent, 0, true ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); listbox = (TQListBox*)editWidget; itemText->setText( "" ); - itemText->setEnabled( FALSE ); + itemText->setEnabled( false ); itemPixmap->setText( "" ); - itemChoosePixmap->setEnabled( FALSE ); - itemDeletePixmap->setEnabled( FALSE ); + itemChoosePixmap->setEnabled( false ); + itemDeletePixmap->setEnabled( false ); TQListBoxItem *i = 0; for ( i = listbox->firstItem(); i; i = i->next() ) { @@ -65,8 +65,8 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow ListBoxDnd *editorDnd = new ListBoxDnd( preview ); editorDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( editorDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), - editorDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( editorDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + editorDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); ListBoxRename *editorRename = new ListBoxRename( preview ); @@ -76,9 +76,9 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow while ( (obj = it.current()) != 0 ) { ++it; TQObject::connect( editorRename, - TQT_SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), obj, - TQT_SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; @@ -88,7 +88,7 @@ void ListBoxEditor::insertNewItem() { TQListBoxItem *i = new TQListBoxText( preview, i18n("New Item") ); preview->setCurrentItem( i ); - preview->setSelected( i, TRUE ); + preview->setSelected( i, true ); itemText->setFocus(); itemText->selectAll(); } @@ -97,32 +97,32 @@ void ListBoxEditor::deleteCurrentItem() { delete preview->item( preview->currentItem() ); if ( preview->currentItem() != -1 ) - preview->setSelected( preview->currentItem(), TRUE ); + preview->setSelected( preview->currentItem(), true ); } void ListBoxEditor::currentItemChanged( TQListBoxItem *i ) { - itemText->blockSignals( TRUE ); + itemText->blockSignals( true ); itemText->setText( "" ); itemPixmap->setText( "" ); - itemText->blockSignals( FALSE ); + itemText->blockSignals( false ); if ( !i ) { - itemText->setEnabled( FALSE ); - itemChoosePixmap->setEnabled( FALSE ); - itemDeletePixmap->setEnabled( FALSE ); + itemText->setEnabled( false ); + itemChoosePixmap->setEnabled( false ); + itemDeletePixmap->setEnabled( false ); return; } - itemText->blockSignals( TRUE ); - itemText->setEnabled( TRUE ); - itemChoosePixmap->setEnabled( TRUE ); + itemText->blockSignals( true ); + itemText->setEnabled( true ); + itemChoosePixmap->setEnabled( true ); itemDeletePixmap->setEnabled( i->pixmap() && !i->pixmap()->isNull() ); itemText->setText( i->text() ); if ( i->pixmap() ) itemPixmap->setPixmap( *i->pixmap() ); - itemText->blockSignals( FALSE ); + itemText->blockSignals( false ); } void ListBoxEditor::currentTextChanged( const TQString &txt ) @@ -130,12 +130,12 @@ void ListBoxEditor::currentTextChanged( const TQString &txt ) if ( preview->currentItem() == -1 ) return; - preview->blockSignals( TRUE ); + preview->blockSignals( true ); if ( preview->item( preview->currentItem() )->pixmap() ) preview->changeItem( *preview->item( preview->currentItem() )->pixmap(), txt, preview->currentItem() ); else preview->changeItem( txt, preview->currentItem() ); - preview->blockSignals( FALSE ); + preview->blockSignals( false ); } void ListBoxEditor::okClicked() @@ -183,7 +183,7 @@ void ListBoxEditor::choosePixmap() TQString txt = preview->item( preview->currentItem() )->text(); preview->changeItem( pix, txt, preview->currentItem() ); - itemDeletePixmap->setEnabled( TRUE ); + itemDeletePixmap->setEnabled( true ); } void ListBoxEditor::moveItemUp() @@ -241,5 +241,5 @@ void ListBoxEditor::deletePixmap() TQListBoxItem *i = preview->item( preview->currentItem() ); preview->changeItem( i->text(), preview->currentItem() ); - itemDeletePixmap->setEnabled( FALSE ); + itemDeletePixmap->setEnabled( false ); } diff --git a/kdevdesigner/designer/listboxrename.cpp b/kdevdesigner/designer/listboxrename.cpp index e5b705b9..748bba88 100644 --- a/kdevdesigner/designer/listboxrename.cpp +++ b/kdevdesigner/designer/listboxrename.cpp @@ -40,16 +40,16 @@ public: ListBoxRename::ListBoxRename( TQListBox * eventSource, const char * name ) : TQObject( eventSource, name ), - clickedItem( 0 ), activity( FALSE ) + clickedItem( 0 ), activity( false ) { src = eventSource; src->installEventFilter( this ); ed = new TQLineEdit( src->viewport() ); ed->hide(); - ed->setFrame( FALSE ); + ed->setFrame( false ); - TQObject::connect( ed, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( renameClickedItem() ) ); + TQObject::connect( ed, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( renameClickedItem() ) ); } bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) @@ -63,10 +63,10 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) if ( clickedItem && clickedItem->isSelected() && (clickedItem == src->itemAt( pos )) ) { - TQTimer::singleShot( 500, this, TQT_SLOT( showLineEdit() ) ); - activity = FALSE; // no drags or clicks for 500 ms before we start the renaming + TQTimer::singleShot( 500, this, TQ_SLOT( showLineEdit() ) ); + activity = false; // no drags or clicks for 500 ms before we start the renaming } else { // new item clicked - activity = TRUE; + activity = true; clickedItem = src->itemAt( pos ); ed->hide(); } @@ -76,7 +76,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) case TQEvent::MouseMove: if ( ((TQMouseEvent *) event)->state() & TQt::LeftButton ) { - activity = TRUE; // drag + activity = true; // drag } break; @@ -86,7 +86,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) case TQt::Key_F2: - activity = FALSE; + activity = false; clickedItem = src->item( src->currentItem() ); showLineEdit(); break; @@ -94,7 +94,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) case TQt::Key_Escape: if ( !ed->isHidden() ) { hideLineEdit(); // abort rename - return TRUE; + return true; } break; @@ -104,7 +104,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) case TQt::Key_PageDown: if ( !ed->isHidden() ) - return TRUE; // Filter out the keystrokes + return true; // Filter out the keystrokes break; } @@ -123,7 +123,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) break; } - return FALSE; + return false; } void ListBoxRename::showLineEdit() diff --git a/kdevdesigner/designer/listdnd.cpp b/kdevdesigner/designer/listdnd.cpp index 2e3206ae..bb43ed02 100644 --- a/kdevdesigner/designer/listdnd.cpp +++ b/kdevdesigner/designer/listdnd.cpp @@ -30,10 +30,10 @@ ListDnd::ListDnd( TQScrollView * eventSource, const char * name ) : TQObject( eventSource, name ), - dragInside( FALSE ), dragDelete( TRUE ), dropConfirmed( FALSE ), dMode( Both ) + dragInside( false ), dragDelete( true ), dropConfirmed( false ), dMode( Both ) { src = eventSource; - src->setAcceptDrops( TRUE ); + src->setAcceptDrops( true ); src->installEventFilter( this ); src->viewport()->installEventFilter( this ); @@ -71,14 +71,14 @@ bool ListDnd::eventFilter( TQObject *, TQEvent * event ) default: break; } - return FALSE; + return false; } bool ListDnd::dragEnterEvent( TQDragEnterEvent * event ) { if ( dMode == None ) { - return TRUE; + return true; } bool ok = ( ( ( dMode & Both ) == Both ) || @@ -87,20 +87,20 @@ bool ListDnd::dragEnterEvent( TQDragEnterEvent * event ) if ( ok && canDecode( event ) ) { event->accept(); - dragInside = TRUE; + dragInside = true; if ( !( dMode & NullDrop ) ) { updateLine( event->pos() ); line->show(); } } - return TRUE; + return true; } bool ListDnd::dragLeaveEvent( TQDragLeaveEvent * ) { - dragInside = FALSE; + dragInside = false; line->hide(); - return TRUE; + return true; } bool ListDnd::dragMoveEvent( TQDragMoveEvent * event ) @@ -108,26 +108,26 @@ bool ListDnd::dragMoveEvent( TQDragMoveEvent * event ) if ( dragInside && dMode && !( dMode & NullDrop ) ) { updateLine( event->pos() ); } - return TRUE; + return true; } bool ListDnd::dropEvent( TQDropEvent * ) { // do nothing - return FALSE; + return false; } bool ListDnd::mousePressEvent( TQMouseEvent * event ) { if ( event->button() == TQt::LeftButton ) mousePressPos = event->pos(); - return FALSE; + return false; } bool ListDnd::mouseMoveEvent( TQMouseEvent * ) { // do nothing - return FALSE; + return false; } void ListDnd::updateLine( const TQPoint & ) @@ -138,5 +138,5 @@ void ListDnd::updateLine( const TQPoint & ) bool ListDnd::canDecode( TQDragEnterEvent * ) { // do nothing - return FALSE; + return false; } diff --git a/kdevdesigner/designer/listeditor.ui b/kdevdesigner/designer/listeditor.ui index addab137..2376ea9b 100644 --- a/kdevdesigner/designer/listeditor.ui +++ b/kdevdesigner/designer/listeditor.ui @@ -158,7 +158,7 @@ <forwards> <forward>class TQStringList;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>setList( const TQStringList & l )</slot> <slot>addItem()</slot> @@ -166,7 +166,7 @@ <slot>removeItems()</slot> <slot returnType="TQStringList">items()</slot> <slot>renameItem()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>BarIcon2</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <includes> diff --git a/kdevdesigner/designer/listeditor.ui.h b/kdevdesigner/designer/listeditor.ui.h index 7f179cef..772d2290 100644 --- a/kdevdesigner/designer/listeditor.ui.h +++ b/kdevdesigner/designer/listeditor.ui.h @@ -22,14 +22,14 @@ void ListEditor::setList( const TQStringList &l ) for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { i = new TQListViewItem( listview, i ); i->setText( 0, *it ); - i->setRenameEnabled( 0, TRUE ); + i->setRenameEnabled( 0, true ); } } void ListEditor::addItem() { TQListViewItem *i = new TQListViewItem( listview, listview->lastItem() ); - i->setRenameEnabled( 0, TRUE ); + i->setRenameEnabled( 0, true ); tqApp->processEvents(); i->startRename( 0 ); } diff --git a/kdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp index f5f89d4d..6a2b7130 100644 --- a/kdevdesigner/designer/listviewdnd.cpp +++ b/kdevdesigner/designer/listviewdnd.cpp @@ -48,7 +48,7 @@ ListViewDnd::ListViewDnd( TQListView * eventSource, const char * name ) void ListViewDnd::confirmDrop( TQListViewItem * ) { - dropConfirmed = TRUE; + dropConfirmed = true; } bool ListViewDnd::dropEvent( TQDropEvent * event ) @@ -58,7 +58,7 @@ bool ListViewDnd::dropEvent( TQDropEvent * event ) if ( dMode & NullDrop ) { // combined with Move, a NullDrop will delete an item event->accept(); emit dropped( 0 ); // a NullDrop - return TRUE; + return true; } TQPoint pos = event->pos(); @@ -85,9 +85,9 @@ bool ListViewDnd::dropEvent( TQDropEvent * event ) } line->hide(); - dragInside = FALSE; + dragInside = false; - return TRUE; + return true; } bool ListViewDnd::mouseMoveEvent( TQMouseEvent * event ) @@ -105,7 +105,7 @@ bool ListViewDnd::mouseMoveEvent( TQMouseEvent * event ) if ( dMode & Move ) { disabledItems = list; - setVisibleItems( FALSE ); + setVisibleItems( false ); } dragobject->dragCopy(); @@ -116,29 +116,29 @@ bool ListViewDnd::mouseMoveEvent( TQMouseEvent * event ) // Shouldn't autoDelete handle this? for( list.first(); list.current(); list.next() ) delete list.current(); - dropConfirmed = FALSE; + dropConfirmed = false; } else { // Reenable disabled items since // drag'n'drop was aborted - setVisibleItems( TRUE ); + setVisibleItems( true ); } disabledItems.clear(); } } } - return FALSE; + return false; } int ListViewDnd::buildFlatList( ListViewItemList & list ) { - bool addKids = FALSE; + bool addKids = false; TQListViewItem *nextSibling = 0; TQListViewItem *nextParent = 0; TQListViewItemIterator it = ((TQListView *)src)->firstChild(); for ( ; *it; it++ ) { // Hit the nextSibling, turn of child processing if ( (*it) == nextSibling ) - addKids = FALSE; + addKids = false; if ( (*it)->isSelected() ) { if ( (*it)->childCount() == 0 ) { @@ -148,7 +148,7 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) // Children processing not set, so set it // Also find the item were we shall quit // processing children...if any such item - addKids = TRUE; + addKids = true; nextSibling = (*it)->nextSibling(); nextParent = (*it)->parent(); while ( nextParent && !nextSibling ) { @@ -303,15 +303,15 @@ bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListV for( int i = 0; i < count; i++ ) { if ( itemParent ) { insertPoint = new TQListViewItem( itemParent, insertPoint ); - itemParent->setOpen( TRUE ); + itemParent->setOpen( true ); } else { // No parent for insertPoint, use TQListView insertPoint = new TQListViewItem( parent, insertPoint ); } stream >> *insertPoint; } - return TRUE; + return true; } - return FALSE; + return false; } diff --git a/kdevdesigner/designer/listvieweditor.ui b/kdevdesigner/designer/listvieweditor.ui index 8a0abe14..234b52ba 100644 --- a/kdevdesigner/designer/listvieweditor.ui +++ b/kdevdesigner/designer/listvieweditor.ui @@ -897,7 +897,7 @@ <tabstop>colClickable</tabstop> <tabstop>colResizable</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">applyClicked()</slot> @@ -925,7 +925,7 @@ <slot access="protected">newColumnClicked()</slot> <slot access="protected">itemRightClicked()</slot> <slot access="protected">okClicked()</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp index 8e4c2a32..69a99dfe 100644 --- a/kdevdesigner/designer/listvieweditorimpl.cpp +++ b/kdevdesigner/designer/listvieweditorimpl.cpp @@ -47,13 +47,13 @@ #include <tdelocale.h> ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) - : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw ) + : ListViewEditorBase( parent, 0, true ), listview( lv ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); - itemText->setEnabled( FALSE ); - itemChoosePixmap->setEnabled( FALSE ); - itemDeletePixmap->setEnabled( FALSE ); - itemColumn->setEnabled( FALSE ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); + itemText->setEnabled( false ); + itemChoosePixmap->setEnabled( false ); + itemDeletePixmap->setEnabled( false ); + itemColumn->setEnabled( false ); setupColumns(); PopulateListViewCommand::transferItems( listview, itemsPreview ); @@ -65,25 +65,25 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw if ( itemsPreview->firstChild() ) { itemsPreview->setCurrentItem( itemsPreview->firstChild() ); - itemsPreview->setSelected( itemsPreview->firstChild(), TRUE ); + itemsPreview->setSelected( itemsPreview->firstChild(), true ); } // Clamp on drag and drop to TQListView ListViewDnd *itemsDnd = new ListViewDnd( itemsPreview ); itemsDnd->setDragMode( ListViewDnd::Internal | ListViewDnd::Move ); - TQObject::connect( itemsDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ), - itemsDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( itemsDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + itemsDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); // Enable rename for all TQListViewItems TQListViewItemIterator it = ((TQListView *)itemsPreview)->firstChild(); for ( ; *it; it++ ) - (*it)->setRenameEnabled( 0, TRUE ); + (*it)->setRenameEnabled( 0, true ); // Connect listview signal to signal-relay TQObject::connect( itemsPreview, - TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), + TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), this, - TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); + TQ_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "itemText" TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" ); @@ -92,24 +92,24 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw while ( (obj = itemsLineEditIt.current()) != 0 ) { ++itemsLineEditIt; TQObject::connect( this, - TQT_SIGNAL( itemRenamed( const TQString & ) ), + TQ_SIGNAL( itemRenamed( const TQString & ) ), obj, - TQT_SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; // Clamp on drag and drop to TQListBox ListBoxDnd *columnsDnd = new ListBoxDnd( colPreview ); columnsDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( columnsDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), - columnsDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( columnsDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + columnsDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); // Clamp on rename to TQListBox ListBoxRename *columnsRename = new ListBoxRename( colPreview ); TQObject::connect( columnsRename, - TQT_SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), this, - TQT_SLOT( columnTextChanged( const TQString & ) ) ); + TQ_SLOT( columnTextChanged( const TQString & ) ) ); // Find TQLineEdit "colText" and connect l = parent->queryList( "TQLineEdit", "colText" ); @@ -117,9 +117,9 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw while ( (obj = columnsLineEditIt.current()) != 0 ) { ++columnsLineEditIt; TQObject::connect( columnsRename, - TQT_SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), obj, - TQT_SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; } @@ -161,7 +161,7 @@ void ListViewEditor::columnDownClicked() colPreview->insertItem( i, below ); colPreview->setCurrentItem( i ); - colPreview->setSelected( i, TRUE ); + colPreview->setSelected( i, true ); } void ListViewEditor::columnPixmapChosen() @@ -180,15 +180,15 @@ void ListViewEditor::columnPixmapChosen() return; c->pixmap = pix; - colPreview->blockSignals( TRUE ); + colPreview->blockSignals( true ); if ( !c->pixmap.isNull() ) colPreview->changeItem( c->pixmap, c->text, colPreview->index( c->item ) ); else colPreview->changeItem( c->text, colPreview->index( c->item ) ); c->item = colPreview->item( colPreview->currentItem() ); colPixmap->setPixmap( c->pixmap ); - colPreview->blockSignals( FALSE ); - colDeletePixmap->setEnabled( TRUE ); + colPreview->blockSignals( false ); + colDeletePixmap->setEnabled( true ); } void ListViewEditor::columnPixmapDeleted() @@ -198,15 +198,15 @@ void ListViewEditor::columnPixmapDeleted() return; c->pixmap = TQPixmap(); - colPreview->blockSignals( TRUE ); + colPreview->blockSignals( true ); if ( !c->pixmap.isNull() ) colPreview->changeItem( c->pixmap, c->text, colPreview->index( c->item ) ); else colPreview->changeItem( c->text, colPreview->index( c->item ) ); c->item = colPreview->item( colPreview->currentItem() ); colPixmap->setText( "" ); - colPreview->blockSignals( FALSE ); - colDeletePixmap->setEnabled( FALSE ); + colPreview->blockSignals( false ); + colDeletePixmap->setEnabled( false ); } void ListViewEditor::columnResizable( bool b ) @@ -224,13 +224,13 @@ void ListViewEditor::columnTextChanged( const TQString &txt ) return; c->text = txt; - colPreview->blockSignals( TRUE ); + colPreview->blockSignals( true ); if ( !c->pixmap.isNull() ) colPreview->changeItem( c->pixmap, c->text, colPreview->index( c->item ) ); else colPreview->changeItem( c->text, colPreview->index( c->item ) ); c->item = colPreview->item( colPreview->currentItem() ); - colPreview->blockSignals( FALSE ); + colPreview->blockSignals( false ); } void ListViewEditor::columnUpClicked() @@ -246,33 +246,33 @@ void ListViewEditor::columnUpClicked() colPreview->insertItem( above, i ); colPreview->setCurrentItem( i ); - colPreview->setSelected( i, TRUE ); + colPreview->setSelected( i, true ); } void ListViewEditor::currentColumnChanged( TQListBoxItem *i ) { Column *c = findColumn( i ); if ( !i || !c ) { - colText->setEnabled( FALSE ); - colPixmap->setEnabled( FALSE ); - colDeletePixmap->setEnabled( FALSE ); - colText->blockSignals( TRUE ); + colText->setEnabled( false ); + colPixmap->setEnabled( false ); + colDeletePixmap->setEnabled( false ); + colText->blockSignals( true ); colText->setText( "" ); - colText->blockSignals( FALSE ); - colClickable->setEnabled( FALSE ); - colResizable->setEnabled( FALSE ); + colText->blockSignals( false ); + colClickable->setEnabled( false ); + colResizable->setEnabled( false ); return; } - colText->setEnabled( TRUE ); - colPixmap->setEnabled( TRUE ); + colText->setEnabled( true ); + colPixmap->setEnabled( true ); colDeletePixmap->setEnabled( i->pixmap() && !i->pixmap()->isNull() ); - colClickable->setEnabled( TRUE ); - colResizable->setEnabled( TRUE ); + colClickable->setEnabled( true ); + colResizable->setEnabled( true ); - colText->blockSignals( TRUE ); + colText->blockSignals( true ); colText->setText( c->text ); - colText->blockSignals( FALSE ); + colText->blockSignals( false ); if ( !c->pixmap.isNull() ) colPixmap->setPixmap( c->pixmap ); else @@ -286,15 +286,15 @@ void ListViewEditor::newColumnClicked() Column col; col.text = i18n( "New Column" ); col.pixmap = TQPixmap(); - col.clickable = TRUE; - col.resizable = TRUE; + col.clickable = true; + col.resizable = true; if ( !col.pixmap.isNull() ) col.item = new TQListBoxPixmap( colPreview, col.pixmap, col.text ); else col.item = new TQListBoxText( colPreview, col.text ); columns.append( col ); colPreview->setCurrentItem( col.item ); - colPreview->setSelected( col.item, TRUE ); + colPreview->setSelected( col.item, true ); } void ListViewEditor::deleteColumnClicked() @@ -312,40 +312,40 @@ void ListViewEditor::deleteColumnClicked() } if ( colPreview->currentItem() != -1 ) - colPreview->setSelected( colPreview->currentItem(), TRUE ); + colPreview->setSelected( colPreview->currentItem(), true ); } void ListViewEditor::currentItemChanged( TQListViewItem *i ) { if ( !i ) { - itemText->setEnabled( FALSE ); - itemChoosePixmap->setEnabled( FALSE ); - itemDeletePixmap->setEnabled( FALSE ); - itemColumn->setEnabled( FALSE ); + itemText->setEnabled( false ); + itemChoosePixmap->setEnabled( false ); + itemDeletePixmap->setEnabled( false ); + itemColumn->setEnabled( false ); return; } - itemText->setEnabled( TRUE ); - itemChoosePixmap->setEnabled( TRUE ); + itemText->setEnabled( true ); + itemChoosePixmap->setEnabled( true ); itemDeletePixmap->setEnabled( i->pixmap( itemColumn->value() ) && !i->pixmap( itemColumn->value() )->isNull() ); - itemColumn->setEnabled( TRUE ); + itemColumn->setEnabled( true ); displayItem( i, itemColumn->value() ); } void ListViewEditor::displayItem( TQListViewItem *i, int col ) { - itemText->blockSignals( TRUE ); + itemText->blockSignals( true ); itemText->setText( i->text( col ) ); - itemText->blockSignals( FALSE ); + itemText->blockSignals( false ); - itemPixmap->blockSignals( TRUE ); + itemPixmap->blockSignals( true ); if ( i->pixmap( col ) ) itemPixmap->setPixmap( *i->pixmap( col ) ); else itemPixmap->setText( "" ); - itemPixmap->blockSignals( FALSE ); + itemPixmap->blockSignals( false ); } void ListViewEditor::itemColChanged( int col ) @@ -367,7 +367,7 @@ void ListViewEditor::itemDeleteClicked() delete i; if ( itemsPreview->firstChild() ) { itemsPreview->setCurrentItem( itemsPreview->firstChild() ); - itemsPreview->setSelected( itemsPreview->firstChild(), TRUE ); + itemsPreview->setSelected( itemsPreview->firstChild(), true ); } } @@ -397,9 +397,9 @@ void ListViewEditor::itemNewClicked() { TQListViewItem *item = new TQListViewItem( itemsPreview ); item->setText( 0, i18n( "Item" ) ); - item->setRenameEnabled( 0, TRUE ); + item->setRenameEnabled( 0, true ); itemsPreview->setCurrentItem( item ); - itemsPreview->setSelected( item, TRUE ); + itemsPreview->setSelected( item, true ); itemText->setFocus(); itemText->selectAll(); } @@ -410,14 +410,14 @@ void ListViewEditor::itemNewSubClicked() TQListViewItem *item = 0; if ( parent ) { item = new TQListViewItem( parent ); - parent->setOpen( TRUE ); + parent->setOpen( true ); } else { item = new TQListViewItem( itemsPreview ); } item->setText( 0, i18n( "Subitem" ) ); - item->setRenameEnabled( 0, TRUE ); + item->setRenameEnabled( 0, true ); itemsPreview->setCurrentItem( item ); - itemsPreview->setSelected( item, TRUE ); + itemsPreview->setSelected( item, true ); } void ListViewEditor::itemPixmapChoosen() @@ -437,7 +437,7 @@ void ListViewEditor::itemPixmapChoosen() i->setPixmap( itemColumn->value(), TQPixmap( pix ) ); itemPixmap->setPixmap( pix ); - itemDeletePixmap->setEnabled( TRUE ); + itemDeletePixmap->setEnabled( true ); } void ListViewEditor::itemPixmapDeleted() @@ -448,7 +448,7 @@ void ListViewEditor::itemPixmapDeleted() i->setPixmap( itemColumn->value(), TQPixmap() ); itemPixmap->setText( "" ); - itemDeletePixmap->setEnabled( FALSE ); + itemDeletePixmap->setEnabled( false ); } void ListViewEditor::itemTextChanged( const TQString &txt ) @@ -518,7 +518,7 @@ void ListViewEditor::itemRightClicked() } itemsPreview->setCurrentItem( other ); - itemsPreview->setSelected( other, TRUE ); + itemsPreview->setSelected( other, true ); } void ListViewEditor::itemLeftClicked() @@ -558,7 +558,7 @@ void ListViewEditor::itemLeftClicked() } itemsPreview->setCurrentItem( other ); - itemsPreview->setSelected( other, TRUE ); + itemsPreview->setSelected( other, true ); } void ListViewEditor::setupColumns() @@ -579,10 +579,10 @@ void ListViewEditor::setupColumns() columns.append( col ); } - colText->setEnabled( FALSE ); - colPixmap->setEnabled( FALSE ); - colClickable->setEnabled( FALSE ); - colResizable->setEnabled( FALSE ); + colText->setEnabled( false ); + colPixmap->setEnabled( false ); + colClickable->setEnabled( false ); + colResizable->setEnabled( false ); if ( colPreview->firstItem() ) colPreview->setCurrentItem( colPreview->firstItem() ); @@ -631,15 +631,15 @@ void ListViewEditor::initTabPage( const TQString &page ) if ( page == i18n( "&Items" ) ) { setupItems(); if ( numColumns == 0 ) { - itemNew->setEnabled( FALSE ); - itemNewSub->setEnabled( FALSE ); - itemText->setEnabled( FALSE ); - itemChoosePixmap->setEnabled( FALSE ); - itemDeletePixmap->setEnabled( FALSE ); - itemColumn->setEnabled( FALSE ); + itemNew->setEnabled( false ); + itemNewSub->setEnabled( false ); + itemText->setEnabled( false ); + itemChoosePixmap->setEnabled( false ); + itemDeletePixmap->setEnabled( false ); + itemColumn->setEnabled( false ); } else { - itemNew->setEnabled( TRUE ); - itemNewSub->setEnabled( TRUE ); + itemNew->setEnabled( true ); + itemNewSub->setEnabled( true ); } } } diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index af4c4b78..050fc1b2 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -119,7 +119,7 @@ #include "kdevdesigner_part.h" -static bool mblockNewForms = FALSE; +static bool mblockNewForms = false; extern TQMap<TQWidget*, TQString> *qwf_forms; extern TQString *qwf_language; extern bool qwf_execute_code; @@ -151,9 +151,9 @@ static TQString textNoAccel( const TQString& text) MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, const TQString &plgDir ) : TQMainWindow( 0, "designer_mainwindow"/*, WType_TopLevel | (single ? 0 : WDestructiveClose) | WGroupLeader*/ ), - grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ), + grd( 10, 10 ), sGrid( true ), snGrid( true ), restoreConfig( true ), splashScreen( true ), fileFilter( i18n( "TQt User-Interface Files (*.ui)" ) ), client( asClient ), - previewing( FALSE ), databaseAutoEdit( FALSE ), autoSaveEnabled( FALSE ), autoSaveInterval( 1800 ), m_part(part) + previewing( false ), databaseAutoEdit( false ), autoSaveEnabled( false ), autoSaveInterval( 1800 ), m_part(part) { // extern void qInitImages_designercore(); // qInitImages_designercore(); @@ -161,24 +161,24 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons self = this; setPluginDirectory( plgDir ); customWidgetToolBar = customWidgetToolBar2 = 0; - guiStuffVisible = TRUE; - editorsReadOnly = FALSE; - sSignalHandlers = TRUE; + guiStuffVisible = true; + editorsReadOnly = false; + sSignalHandlers = true; init_colors(); - shStartDialog = FALSE; + shStartDialog = false; desInterface = new DesignerInterfaceImpl( this ); desInterface->addRef(); - inDebugMode = FALSE; - savePluginPaths = FALSE; + inDebugMode = false; + savePluginPaths = false; updateFunctionsTimer = new TQTimer( this ); - connect( updateFunctionsTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( doFunctionsChanged() ) ); + connect( updateFunctionsTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doFunctionsChanged() ) ); autoSaveTimer = new TQTimer( this ); - connect( autoSaveTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( fileSaveAll() ) ); + connect( autoSaveTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( fileSaveAll() ) ); set_splash_status( "Loading Plugins..." ); setupPluginManagers(); @@ -234,11 +234,11 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons setupRMBMenus(); - connect( this, TQT_SIGNAL( projectChanged() ), this, TQT_SLOT( emitProjectSignals() ) ); - connect( this, TQT_SIGNAL( hasActiveWindow(bool) ), this, TQT_SLOT( emitProjectSignals() ) ); + connect( this, TQ_SIGNAL( projectChanged() ), this, TQ_SLOT( emitProjectSignals() ) ); + connect( this, TQ_SIGNAL( hasActiveWindow(bool) ), this, TQ_SLOT( emitProjectSignals() ) ); - emit hasActiveForm( FALSE ); - emit hasActiveWindow( FALSE ); + emit hasActiveForm( false ); + emit hasActiveWindow( false ); lastPressWidget = 0; tqApp->installEventFilter( this ); @@ -247,36 +247,36 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons as -= TQSize( 30, 30 ); resize( TQSize( 1200, 1000 ).boundedTo( as ) ); - connect( tqApp->clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( clipboardChanged() ) ); + connect( tqApp->clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( clipboardChanged() ) ); clipboardChanged(); - layoutChilds = FALSE; - layoutSelected = FALSE; - breakLayout = FALSE; - backPix = TRUE; + layoutChilds = false; + layoutSelected = false; + breakLayout = false; + backPix = true; set_splash_status( "Loading User Settings..." ); readConfig(); // hack to make WidgetFactory happy (so it knows TQWidget and TQDialog for resetting properties) - TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWidget" ), this, 0, FALSE ); + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWidget" ), this, 0, false ); delete w; - w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), this, 0, FALSE ); + w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), this, 0, false ); delete w; - w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLabel" ), this, 0, FALSE ); + w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLabel" ), this, 0, false ); delete w; - w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQTabWidget" ), this, 0, FALSE ); + w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQTabWidget" ), this, 0, false ); delete w; - w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this, 0, FALSE ); + w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this, 0, false ); delete w; - setAppropriate( (TQDockWindow*)actionEditor->parentWidget(), FALSE ); + setAppropriate( (TQDockWindow*)actionEditor->parentWidget(), false ); actionEditor->parentWidget()->hide(); - assistant = new TQAssistantClient( assistantPath(), TQT_TQOBJECT(this) ); + assistant = new TQAssistantClient( assistantPath(), this ); - statusBar()->setSizeGripEnabled( TRUE ); + statusBar()->setSizeGripEnabled( true ); set_splash_status( "Initialization Done." ); /* if ( shStartDialog ) - TQTimer::singleShot( 0, this, TQT_SLOT( showStartDialog() ));*/ + TQTimer::singleShot( 0, this, TQ_SLOT( showStartDialog() ));*/ if ( autoSaveEnabled ) autoSaveTimer->start( autoSaveInterval * 1000 ); @@ -332,11 +332,11 @@ void MainWindow::setupMDI() vbox->setLineWidth( 1 ); qworkspace = new TQWorkspace( vbox ); qworkspace->setPaletteBackgroundPixmap( UserIcon( "designer_background.png", KDevDesignerPartFactory::instance() ) ); - qworkspace->setScrollBarsEnabled( TRUE ); - connect( qworkspace, TQT_SIGNAL( windowActivated( TQWidget * ) ), - this, TQT_SLOT( activeWindowChanged( TQWidget * ) ) ); + qworkspace->setScrollBarsEnabled( true ); + connect( qworkspace, TQ_SIGNAL( windowActivated( TQWidget * ) ), + this, TQ_SLOT( activeWindowChanged( TQWidget * ) ) ); lastActiveFormWindow = 0; - qworkspace->setAcceptDrops( TRUE ); + qworkspace->setAcceptDrops( true ); } void MainWindow::setupMenuBar() @@ -347,7 +347,7 @@ void MainWindow::setupMenuBar() void MainWindow::setupPropertyEditor() { TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this ); - dw->setResizeEnabled( TRUE ); + dw->setResizeEnabled( true ); dw->setCloseMode( TQDockWindow::Always ); propertyEditor = new PropertyEditor( dw ); addToolBar( dw, TQt::DockRight ); @@ -376,7 +376,7 @@ void MainWindow::setupPropertyEditor() void MainWindow::setupOutputWindow() { TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this ); - dw->setResizeEnabled( TRUE ); + dw->setResizeEnabled( true ); dw->setCloseMode( TQDockWindow::Always ); addToolBar( dw, TQt::DockBottom ); oWindow = new OutputWindow( dw ); @@ -390,7 +390,7 @@ void MainWindow::setupHierarchyView() if ( hierarchyView ) return; TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this ); - dw->setResizeEnabled( TRUE ); + dw->setResizeEnabled( true ); dw->setCloseMode( TQDockWindow::Always ); hierarchyView = new HierarchyView( dw ); addToolBar( dw, TQt::DockRight ); @@ -412,13 +412,13 @@ void MainWindow::setupHierarchyView() void MainWindow::setupWorkspace() { TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this ); - dw->setResizeEnabled( TRUE ); + dw->setResizeEnabled( true ); dw->setCloseMode( TQDockWindow::Always ); TQVBox *vbox = new TQVBox( dw ); QCompletionEdit *edit = new QCompletionEdit( vbox ); TQToolTip::add( edit, i18n( "Start typing the buffer you want to switch to here (ALT+B)" ) ); TQAccel *a = new TQAccel( this ); - a->connectItem( a->insertItem( ALT + Key_B ), edit, TQT_SLOT( setFocus() ) ); + a->connectItem( a->insertItem( ALT + Key_B ), edit, TQ_SLOT( setFocus() ) ); wspace = new Workspace( vbox, this ); wspace->setBufferEdit( edit ); wspace->setCurrentProject( currentProject ); @@ -438,7 +438,7 @@ void MainWindow::setupActionEditor() { TQDockWindow *dw = new TQDockWindow( TQDockWindow::OutsideDock, this, 0 ); addDockWindow( dw, TQt::DockTornOff ); - dw->setResizeEnabled( TRUE ); + dw->setResizeEnabled( true ); dw->setCloseMode( TQDockWindow::Always ); actionEditor = new ActionEditor( dw ); dw->setWidget( actionEditor ); @@ -452,13 +452,13 @@ void MainWindow::setupActionEditor() "these are displayed on toolbar buttons and besides their names in " "menus.</p>" ) ); dw->hide(); - setAppropriate( dw, FALSE ); + setAppropriate( dw, false ); } void MainWindow::setupToolbox() { TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this ); - dw->setResizeEnabled( TRUE ); + dw->setResizeEnabled( true ); dw->setCloseMode( TQDockWindow::Always ); addToolBar( dw, TQt::DockLeft ); toolBox = new TQToolBox( dw ); @@ -466,9 +466,9 @@ void MainWindow::setupToolbox() dw->setFixedExtentWidth( 160 ); dw->setCaption( i18n( "Toolbox" ) ); dw->show(); - setDockEnabled( dw, TQt::DockTop, FALSE ); - setDockEnabled( dw, TQt::DockBottom, FALSE ); - commonWidgetsToolBar = new TQToolBar( "Common Widgets", 0, toolBox, FALSE, "Common Widgets" ); + setDockEnabled( dw, TQt::DockTop, false ); + setDockEnabled( dw, TQt::DockBottom, false ); + commonWidgetsToolBar = new TQToolBar( "Common Widgets", 0, toolBox, false, "Common Widgets" ); commonWidgetsToolBar->setFrameStyle( TQFrame::NoFrame ); commonWidgetsToolBar->setOrientation( TQt::Vertical ); commonWidgetsToolBar->setBackgroundMode(PaletteBase); @@ -548,14 +548,14 @@ void MainWindow::runProjectPrecondition() oWindow->clearErrorMessages(); oWindow->clearDebug(); oWindow->showDebugTab(); - previewing = TRUE; + previewing = true; } void MainWindow::runProjectPostcondition( TQObjectList *l ) { - inDebugMode = TRUE; + inDebugMode = true; debuggingForms = *l; - enableAll( FALSE ); + enableAll( false ); for ( SourceEditor *e2 = sourceEditors.first(); e2; e2 = sourceEditors.next() ) { if ( e2->project() == currentProject ) e2->editorInterface()->setMode( EditorInterface::Debugging ); @@ -564,7 +564,7 @@ void MainWindow::runProjectPostcondition( TQObjectList *l ) TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet ) { - qwf_execute_code = FALSE; + qwf_execute_code = false; for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) e->save(); if ( currentTool() == ORDER_TOOL ) @@ -577,7 +577,7 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet ) TQStringList databases; TQPtrDictIterator<TQWidget> wit( *fw->widgets() ); while ( wit.current() ) { - TQStringList lst = MetaDataBase::fakeProperty( TQT_TQOBJECT(wit.current()), "database" ).toStringList(); + TQStringList lst = MetaDataBase::fakeProperty( wit.current(), "database" ).toStringList(); if ( !lst.isEmpty() ) databases << lst [ 0 ]; ++wit; @@ -586,7 +586,7 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet ) if ( fw->project() ) { TQStringList::ConstIterator it; for ( it = databases.begin(); it != databases.end(); ++it ) - fw->project()->openDatabase( *it, FALSE ); + fw->project()->openDatabase( *it, false ); } TQApplication::setOverrideCursor( WaitCursor ); @@ -622,9 +622,9 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet ) w->move( fw->mapToGlobal( TQPoint(0,0) ) ); ((MainWindow*)w )->setWFlags( WDestructiveClose ); - previewing = TRUE; + previewing = true; w->show(); - previewing = FALSE; + previewing = false; TQApplication::restoreOverrideCursor(); return w; } @@ -724,17 +724,17 @@ void MainWindow::previewForm( const TQString & style ) if ( !w ) return; - w->insertChild( TQT_TQOBJECT(st) ); + w->insertChild( st ); w->show(); } void MainWindow::helpContents() { TQWidget *focusWidget = tqApp->focusWidget(); - bool showClassDocu = TRUE; + bool showClassDocu = true; while ( focusWidget ) { if ( focusWidget->isA( "PropertyList" ) ) { - showClassDocu = FALSE; + showClassDocu = false; break; } focusWidget = focusWidget->parentWidget(); @@ -808,7 +808,7 @@ void MainWindow::helpManual() void MainWindow::helpAbout() { - AboutDialog dlg( this, 0, TRUE ); + AboutDialog dlg( this, 0, true ); if ( singleProjectMode() ) { dlg.aboutPixmap->setText( "" ); dlg.aboutVersion->setText( "" ); @@ -881,14 +881,14 @@ void MainWindow::showProperties( TQObject *o ) if ( !o->isWidgetType() ) { propertyEditor->setWidget( o, lastActiveFormWindow ); if ( lastActiveFormWindow ) - hierarchyView->setFormWindow( lastActiveFormWindow, TQT_TQOBJECT(lastActiveFormWindow->mainContainer()) ); + hierarchyView->setFormWindow( lastActiveFormWindow, lastActiveFormWindow->mainContainer() ); else hierarchyView->setFormWindow( 0, 0 ); return; } TQWidget *w = (TQWidget*)o; setupHierarchyView(); - FormWindow *fw = (FormWindow*)isAFormWindowChild( TQT_TQOBJECT(w) ); + FormWindow *fw = (FormWindow*)isAFormWindowChild( w ); if ( fw ) { if ( fw->numSelectedWidgets() > 1 ) { TQWidgetList wl = fw->selectedWidgets(); @@ -898,9 +898,9 @@ void MainWindow::showProperties( TQObject *o ) } propertyEditor->setWidget( new PropertyObject( wl ), fw ); } else { - propertyEditor->setWidget( TQT_TQOBJECT(w), fw ); + propertyEditor->setWidget( w, fw ); } - hierarchyView->setFormWindow( fw, TQT_TQOBJECT(w) ); + hierarchyView->setFormWindow( fw, w ); } else { propertyEditor->setWidget( 0, 0 ); hierarchyView->setFormWindow( 0, 0 ); @@ -913,7 +913,7 @@ void MainWindow::showProperties( TQObject *o ) void MainWindow::resetTool() { - actionPointerTool->setOn( TRUE ); + actionPointerTool->setOn( true ); } void MainWindow::updateProperties( TQObject * ) @@ -930,7 +930,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ::tqt_cast<PopupMenuEditor*>(o->parent()) ) ) ) { if ( e->type() == TQEvent::Accel && ::tqt_cast<PopupMenuEditor*>(o) ) { - return TRUE; // consume accel events + return true; // consume accel events } else if ( e->type() == TQEvent::MouseButtonPress && ::tqt_cast<MenuBarEditor*>(o) ) { TQPoint pos = ((TQMouseEvent*)e)->pos(); MenuBarEditor *m = ::tqt_cast<MenuBarEditor*>(o); @@ -959,12 +959,12 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) while ( w ) { if ( ::tqt_cast<PropertyList*>(w) ) break; - w = w->parentWidget( TRUE ); + w = w->parentWidget( true ); } if ( w ) { propertyEditor->propertyList()->showCurrentWhatsThis(); ( (TQKeyEvent*)e )->accept(); - return TRUE; + return true; } } break; @@ -975,7 +975,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) if ( qWorkspace()->activeWindow() && ::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { ( (TQKeyEvent*)e )->ignore(); - return TRUE; + return true; } } break; @@ -1000,7 +1000,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) TQWidget *pw = w->parentWidget(); while ( pw ) { if ( ::tqt_cast<FormWindow*>(pw) ) { - ( (FormWindow*)pw )->emitShowProperties( TQT_TQOBJECT(w) ); + ( (FormWindow*)pw )->emitShowProperties( w ); if ( !::tqt_cast<QDesignerToolBar*>(o) ) return ( !::tqt_cast<TQToolButton*>(o) && !::tqt_cast<MenuBarEditor*>(o) && @@ -1028,7 +1028,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) if( e->type() == TQEvent::ContextMenu ) { ( (FormWindow*)w )->handleContextMenu( (TQContextMenuEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); - return TRUE; + return true; } else { ( (FormWindow*)w )->handleMousePress( (TQMouseEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); @@ -1036,9 +1036,9 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) } lastPressWidget = (TQWidget*)o; if ( passiveInteractor ) - TQTimer::singleShot( 0, formWindow(), TQT_SLOT( visibilityChanged() ) ); + TQTimer::singleShot( 0, formWindow(), TQ_SLOT( visibilityChanged() ) ); if ( currentTool() == CONNECT_TOOL || currentTool() == BUDDY_TOOL ) - return TRUE; + return true; return !passiveInteractor; case TQEvent::MouseButtonRelease: lastPressWidget = 0; @@ -1055,8 +1055,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ( (FormWindow*)w )->handleMouseRelease( (TQMouseEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); if ( passiveInteractor ) { - TQTimer::singleShot( 0, this, TQT_SLOT( selectionChanged() ) ); - TQTimer::singleShot( 0, formWindow(), TQT_SLOT( visibilityChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( selectionChanged() ) ); + TQTimer::singleShot( 0, formWindow(), TQ_SLOT( visibilityChanged() ) ); } return !passiveInteractor; case TQEvent::MouseMove: @@ -1067,7 +1067,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) !::tqt_cast<SizeHandle*>(o) && !::tqt_cast<OrderIndicator*>(o) && !::tqt_cast<PopupMenuEditor*>(o) && !::tqt_cast<TQMenuBar*>(o) && !::tqt_cast<TQSizeGrip*>(o) ) - return TRUE; + return true; if ( o && ::tqt_cast<TQSizeGrip*>(o) ) break; if ( lastPressWidget != (TQWidget*)o || @@ -1082,12 +1082,12 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) case TQEvent::KeyPress: if ( ( (TQKeyEvent*)e )->key() == Key_Escape && currentTool() != POINTER_TOOL ) { resetTool(); - return FALSE; + return false; } if ( ( (TQKeyEvent*)e )->key() == Key_Escape && incrementalSearch->hasFocus() ) { if ( ::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { qWorkspace()->activeWindow()->setFocus(); - return TRUE; + return true; } } if ( !( w = isAFormWindowChild( o ) ) || @@ -1096,7 +1096,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) break; ( (FormWindow*)w )->handleKeyPress( (TQKeyEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); if ( ((TQKeyEvent*)e)->isAccepted() ) - return TRUE; + return true; break; case TQEvent::MouseButtonDblClick: if ( !( w = isAFormWindowChild( o ) ) || @@ -1110,11 +1110,11 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) if ( currentTool() == ORDER_TOOL ) { ( (FormWindow*)w )->handleMouseDblClick( (TQMouseEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); - return TRUE; + return true; } if ( !WidgetFactory::isPassiveInteractor( o ) && ( (FormWindow*)w )->formFile() ) return openEditor( ( (FormWindow*)w )->designerWidget( o ), (FormWindow*)w ); - return TRUE; + return true; case TQEvent::KeyRelease: if ( !( w = isAFormWindowChild( o ) ) || ::tqt_cast<SizeHandle*>(o) || @@ -1122,15 +1122,15 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) break; ( (FormWindow*)w )->handleKeyRelease( (TQKeyEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); if ( ((TQKeyEvent*)e)->isAccepted() ) - return TRUE; + return true; break; case TQEvent::Hide: if ( !( w = isAFormWindowChild( o ) ) || ::tqt_cast<SizeHandle*>(o) || ::tqt_cast<OrderIndicator*>(o) ) break; - if ( ( (FormWindow*)w )->isWidgetSelected( TQT_TQOBJECT(o) ) ) - ( (FormWindow*)w )->selectWidget( TQT_TQOBJECT(o), FALSE ); + if ( ( (FormWindow*)w )->isWidgetSelected( o ) ) + ( (FormWindow*)w )->selectWidget( o, false ); break; case TQEvent::Enter: case TQEvent::Leave: @@ -1139,7 +1139,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ::tqt_cast<OrderIndicator*>(o) || ::tqt_cast<MenuBarEditor*>(o) ) break; - return TRUE; + return true; case TQEvent::Resize: case TQEvent::Move: if ( !( w = isAFormWindowChild( o ) ) || @@ -1156,7 +1156,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) if ( o->isWidgetType() && (TQWidget*)o == (TQWidget*)previewedForm ) { if ( lastActiveFormWindow && lastActiveFormWindow->project() ) { TQStringList lst = - MetaDataBase::fakeProperty( TQT_TQOBJECT(lastActiveFormWindow), "database" ).toStringList(); + MetaDataBase::fakeProperty( lastActiveFormWindow, "database" ).toStringList(); lastActiveFormWindow->project()->closeDatabase( lst[ 0 ] ); } } @@ -1164,19 +1164,19 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) case TQEvent::DragEnter: if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) { workspace()->contentsDragEnterEvent( (TQDragEnterEvent*)e ); - return TRUE; + return true; } break; case TQEvent::DragMove: if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) { workspace()->contentsDragMoveEvent( (TQDragMoveEvent*)e ); - return TRUE; + return true; } break; case TQEvent::Drop: if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) { workspace()->contentsDropEvent( (TQDropEvent*)e ); - return TRUE; + return true; } break; case TQEvent::Show: @@ -1187,16 +1187,16 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) TQApplication::sendPostedEvents( qworkspace, TQEvent::ChildInserted ); showEvent( (TQShowEvent*)e ); checkTempFiles(); - return TRUE; + return true; case TQEvent::Wheel: if ( !( w = isAFormWindowChild( o ) ) || ::tqt_cast<SizeHandle*>(o) || ::tqt_cast<OrderIndicator*>(o) ) break; - return TRUE; + return true; case TQEvent::FocusIn: if ( !::tqt_cast<FormWindow*>(o) && isAFormWindowChild( o ) ) - return TRUE; //FIXME + return true; //FIXME if ( hierarchyView->formDefinitionView()->isRenaming() && ( o->inherits( "Editor" ) || ::tqt_cast<FormWindow*>(o) ) ) TQApplication::sendPostedEvents(); @@ -1205,7 +1205,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) while ( w ) { if ( ::tqt_cast<SourceEditor*>(w) ) break; - w = w->parentWidget( TRUE ); + w = w->parentWidget( true ); } if ( ::tqt_cast<SourceEditor*>(w) ) ( (SourceEditor*)w )->checkTimeStamp(); @@ -1217,7 +1217,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) break; case TQEvent::FocusOut: if ( !::tqt_cast<FormWindow*>(o) && isAFormWindowChild( o ) ) - return TRUE; + return true; break; default: return TQMainWindow::eventFilter( o, e ); @@ -1285,16 +1285,16 @@ void MainWindow::insertFormWindow( FormWindow *fw ) "<p>You can have several forms open, and all open forms are listed " "in the <b>Form List</b>.") ); - connect( fw, TQT_SIGNAL( showProperties( TQObject * ) ), - this, TQT_SLOT( showProperties( TQObject * ) ) ); - connect( fw, TQT_SIGNAL( updateProperties( TQObject * ) ), - this, TQT_SLOT( updateProperties( TQObject * ) ) ); - connect( this, TQT_SIGNAL( currentToolChanged() ), - fw, TQT_SLOT( currentToolChanged() ) ); - connect( fw, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( selectionChanged() ) ); - connect( fw, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - this, TQT_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); + connect( fw, TQ_SIGNAL( showProperties( TQObject * ) ), + this, TQ_SLOT( showProperties( TQObject * ) ) ); + connect( fw, TQ_SIGNAL( updateProperties( TQObject * ) ), + this, TQ_SLOT( updateProperties( TQObject * ) ) ); + connect( this, TQ_SIGNAL( currentToolChanged() ), + fw, TQ_SLOT( currentToolChanged() ) ); + connect( fw, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( selectionChanged() ) ); + connect( fw, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + this, TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); if ( !mblockNewForms ) { } else { @@ -1305,9 +1305,9 @@ void MainWindow::insertFormWindow( FormWindow *fw ) if ( fw->caption().isEmpty() && tqstrlen( fw->name() ) ) fw->setCaption( fw->name() ); fw->mainContainer()->setCaption( fw->caption() ); - WidgetFactory::saveDefaultProperties( TQT_TQOBJECT(fw->mainContainer()), + WidgetFactory::saveDefaultProperties( fw->mainContainer(), WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(fw->mainContainer()) ) ) ); + idFromClassName( WidgetFactory::classNameOf( fw->mainContainer() ) ) ); activeWindowChanged( fw ); emit formWindowsChanged(); for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) { @@ -1334,7 +1334,7 @@ void MainWindow::createNewProject( const TQString &lang ) } TQAction *a = new TQAction( pro->makeRelative( pro->fileName() ), - pro->makeRelative( pro->fileName() ), 0, actionGroupProjects, 0, TRUE ); + pro->makeRelative( pro->fileName() ), 0, actionGroupProjects, 0, true ); projects.insert( a, pro ); addRecentlyOpened( pro->makeAbsolute( pro->fileName() ), recentlyProjects ); projectSelected( a ); @@ -1349,7 +1349,7 @@ bool MainWindow::unregisterClient( FormWindow *w ) lastActiveFormWindow = 0; TQPtrList<SourceEditor> waitingForDelete; - waitingForDelete.setAutoDelete( TRUE ); + waitingForDelete.setAutoDelete( true ); for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) { if ( e->object() == w ) waitingForDelete.append( e ); @@ -1360,7 +1360,7 @@ bool MainWindow::unregisterClient( FormWindow *w ) actionEditor->parentWidget()->hide(); } - return TRUE; + return true; } void MainWindow::activeWindowChanged( TQWidget *w ) @@ -1371,7 +1371,7 @@ void MainWindow::activeWindowChanged( TQWidget *w ) FormWindow *ofw = lastActiveFormWindow; lastActiveFormWindow = fw; lastActiveFormWindow->updateUndoInfo(); - emit hasActiveForm( TRUE ); + emit hasActiveForm( true ); if ( formWindow() ) { formWindow()->emitShowProperties(); emit formModified( formWindow()->commandHistory()->isModified() ); @@ -1406,17 +1406,17 @@ void MainWindow::activeWindowChanged( TQWidget *w ) propertyEditor->resetFocus(); } else if ( !lastActiveFormWindow ) { emit formWindowChanged(); - emit hasActiveForm( FALSE ); - actionEditUndo->setEnabled( FALSE ); - actionEditRedo->setEnabled( FALSE ); + emit hasActiveForm( false ); + actionEditUndo->setEnabled( false ); + actionEditRedo->setEnabled( false ); } if ( !w ) { emit formWindowChanged(); - emit hasActiveForm( FALSE ); + emit hasActiveForm( false ); propertyEditor->clear(); hierarchyView->clear(); - updateUndoRedo( FALSE, FALSE, TQString(), TQString() ); + updateUndoRedo( false, false, TQString(), TQString() ); } selectionChanged(); @@ -1428,18 +1428,18 @@ void MainWindow::activeWindowChanged( TQWidget *w ) lastActiveFormWindow != fw ) { activeWindowChanged( se->formWindow() ); } - actionSearchFind->setEnabled( TRUE ); - actionSearchIncremetal->setEnabled( TRUE ); - actionSearchReplace->setEnabled( TRUE ); - actionSearchGotoLine->setEnabled( TRUE ); - incrementalSearch->setEnabled( TRUE ); - - actionEditUndo->setEnabled( FALSE ); - actionEditRedo->setEnabled( FALSE ); - actionEditCut->setEnabled( TRUE ); - actionEditCopy->setEnabled( TRUE ); - actionEditPaste->setEnabled( TRUE ); - actionEditSelectAll->setEnabled( TRUE ); + actionSearchFind->setEnabled( true ); + actionSearchIncremetal->setEnabled( true ); + actionSearchReplace->setEnabled( true ); + actionSearchGotoLine->setEnabled( true ); + incrementalSearch->setEnabled( true ); + + actionEditUndo->setEnabled( false ); + actionEditRedo->setEnabled( false ); + actionEditCut->setEnabled( true ); + actionEditCopy->setEnabled( true ); + actionEditPaste->setEnabled( true ); + actionEditSelectAll->setEnabled( true ); actionEditUndo->setMenuText( i18n( "&Undo" ) ); actionEditUndo->setToolTip( textNoAccel( actionEditUndo->menuText()) ); actionEditRedo->setMenuText( i18n( "&Redo" ) ); @@ -1457,11 +1457,11 @@ void MainWindow::activeWindowChanged( TQWidget *w ) } workspace()->activeEditorChanged( se ); } else { - actionSearchFind->setEnabled( FALSE ); - actionSearchIncremetal->setEnabled( FALSE ); - actionSearchReplace->setEnabled( FALSE ); - actionSearchGotoLine->setEnabled( FALSE ); - incrementalSearch->setEnabled( FALSE ); + actionSearchFind->setEnabled( false ); + actionSearchIncremetal->setEnabled( false ); + actionSearchReplace->setEnabled( false ); + actionSearchGotoLine->setEnabled( false ); + incrementalSearch->setEnabled( false ); } if ( currentTool() == ORDER_TOOL && w != old ) @@ -1491,8 +1491,8 @@ void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable, actionEditRedo->setToolTip( textNoAccel( actionEditRedo->menuText()) ); if ( currentTool() == ORDER_TOOL ) { - actionEditUndo->setEnabled( FALSE ); - actionEditRedo->setEnabled( FALSE ); + actionEditUndo->setEnabled( false ); + actionEditRedo->setEnabled( false ); } } @@ -1549,18 +1549,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w ) { - const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE ); + const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", true ), true ); if ( text && qstrcmp( text->type(), "TQString") != 0 ) text = 0; - const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE ); + const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", true ), true ); if ( title && qstrcmp( title->type(), "TQString") != 0 ) title = 0; const TQMetaProperty* pagetitle = - w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE ); + w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", true ), true ); if ( pagetitle && qstrcmp( pagetitle->type(), "TQString") != 0 ) pagetitle = 0; const TQMetaProperty* pixmap = - w->metaObject()->property( w->metaObject()->findProperty( "pixmap", TRUE ), TRUE ); + w->metaObject()->property( w->metaObject()->findProperty( "pixmap", true ), true ); if ( pixmap && qstrcmp( pixmap->type(), "TQPixmap") != 0 ) pixmap = 0; @@ -1594,7 +1594,7 @@ void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int static TQWidgetContainerInterfacePrivate *containerWidgetInterface( TQWidget *w ) { WidgetInterface *iface = 0; - widgetManager()->queryInterface( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ), &iface ); + widgetManager()->queryInterface( WidgetFactory::classNameOf( w ), &iface ); if ( !iface ) return 0; TQWidgetContainerInterfacePrivate *iface2 = 0; @@ -1646,19 +1646,19 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids, #ifdef TQT_CONTAINER_CUSTOM_WIDGETS } else if ( WidgetDatabase:: isCustomPluginWidget( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) { + idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) { TQWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w ); - if ( iface && iface->supportsPages( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) { + if ( iface && iface->supportsPages( WidgetFactory::classNameOf( w ) ) ) { if ( ids.isEmpty() ) ids << rmbWidgets->insertSeparator( 0 ); - if ( iface->count( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ), w ) > 1 ) { + if ( iface->count( WidgetFactory::classNameOf( w ), w ) > 1 ) { ids << ( id = rmbWidgets->insertItem( i18n( "Delete Page" ), -1, 0 ) ); commands.insert( "remove", id ); } ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) ); commands.insert( "add", id ); - if ( iface->currentIndex( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ), w ) != -1 ) { + if ( iface->currentIndex( WidgetFactory::classNameOf( w ), w ) != -1 ) { ids << ( id = rmbWidgets->insertItem( i18n("Rename Current Page..."), -1, 0 ) ); commands.insert( "rename", id ); } @@ -1669,7 +1669,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids, } if ( WidgetFactory::hasSpecialEditor( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) { + idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) { if ( ids.isEmpty() ) ids << rmbWidgets->insertSeparator( 0 ); ids << ( id = rmbWidgets->insertItem( i18n("Edit..."), -1, 0 ) ); @@ -1713,12 +1713,12 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids, void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWidget *w ) { if ( id == props[ "text" ] ) { - bool ok = FALSE; - bool oldDoWrap = FALSE; + bool ok = false; + bool oldDoWrap = false; if ( ::tqt_cast<TQLabel*>(w) ) { int align = w->property( "alignment" ).toInt(); if ( align & WordBreak ) - oldDoWrap = TRUE; + oldDoWrap = true; } bool doWrap = oldDoWrap; @@ -1733,60 +1733,60 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid if ( ok ) { if ( oldDoWrap != doWrap ) { TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "wordwrap", TQVariant( oldDoWrap ), TQVariant( doWrap ), TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE ); + MetaDataBase::setPropertyChanged( w, "wordwrap", true ); } TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "text", w->property( "text" ), text, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "text", TRUE ); + MetaDataBase::setPropertyChanged( w, "text", true ); } } else if ( id == props[ "title" ] ) { - bool ok = FALSE; + bool ok = false; TQString title = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this ); if ( ok ) { TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "title", w->property( "title" ), title, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "title", TRUE ); + MetaDataBase::setPropertyChanged( w, "title", true ); } } else if ( id == props[ "pagetitle" ] ) { - bool ok = FALSE; + bool ok = false; TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), TQLineEdit::Normal, w->property("pageTitle").toString(), &ok, this ); if ( ok ) { TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "pageTitle", w->property( "pageTitle" ), text, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "pageTitle", TRUE ); + MetaDataBase::setPropertyChanged( w, "pageTitle", true ); } } else if ( id == props[ "pixmap" ] ) { TQPixmap oldPix = TQVariant(w->property( "pixmap" )).toPixmap(); TQPixmap pix = qChoosePixmap( this, formWindow(), oldPix ); if ( !pix.isNull() ) { TQString pn( i18n( "Set the 'pixmap' of '%2'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "pixmap", w->property( "pixmap" ), pix, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "pixmap", TRUE ); + MetaDataBase::setPropertyChanged( w, "pixmap", true ); } } } @@ -1853,27 +1853,27 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command int currentPage = w->property( "currentPage" ).toInt(); TQString pn( i18n( "Raise next page of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = - new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "currentPage", currentPage, currentPage + 1, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE ); + MetaDataBase::setPropertyChanged( w, "currentPage", true ); } else if ( id == commands[ "prevpage" ] ) { int currentPage = w->property( "currentPage" ).toInt(); TQString pn( i18n( "Raise previous page of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = - new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "currentPage", currentPage, currentPage -1, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE ); + MetaDataBase::setPropertyChanged( w, "currentPage", true ); } #ifdef TQT_CONTAINER_CUSTOM_WIDGETS } else if ( WidgetDatabase:: isCustomPluginWidget( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) { + idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) { if ( id == commands[ "add" ] ) { AddContainerPageCommand *cmd = new AddContainerPageCommand( i18n( "Add Page to %1" ).arg( w->name() ), @@ -1883,7 +1883,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command } else if ( id == commands[ "remove" ] ) { TQWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w ); if ( iface ) { - TQString wClassName = WidgetFactory::classNameOf( TQT_TQOBJECT(w) ); + TQString wClassName = WidgetFactory::classNameOf( w ); int index = iface->currentIndex( wClassName, w ); DeleteContainerPageCommand *cmd = new DeleteContainerPageCommand( i18n( "Delete Page %1 of %2" ). @@ -1898,8 +1898,8 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command } else if ( id == commands[ "rename" ] ) { TQWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w ); if ( iface ) { - bool ok = FALSE; - TQString wClassName = WidgetFactory::classNameOf( TQT_TQOBJECT(w) ); + bool ok = false; + TQString wClassName = WidgetFactory::classNameOf( w ); int index = iface->currentIndex( wClassName, w ); TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), TQLineEdit::Normal, @@ -1924,10 +1924,10 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command } if ( WidgetFactory::hasSpecialEditor( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) { + idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) { if ( id == commands[ "edit" ] ) WidgetFactory::editWidget( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), this, w, formWindow() ); + idFromClassName( WidgetFactory::classNameOf( w ) ), this, w, formWindow() ); } } @@ -1958,7 +1958,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command delete e; } else if ( id == commands[ "rename" ] ) { - bool ok = FALSE; + bool ok = false; QDesignerWizard *dw = (QDesignerWizard*)wiz; TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), TQLineEdit::Normal, dw->pageTitle(), &ok, this ); @@ -1998,23 +1998,23 @@ void MainWindow::clipboardChanged() void MainWindow::selectionChanged() { - layoutChilds = FALSE; - layoutSelected = FALSE; - breakLayout = FALSE; + layoutChilds = false; + layoutSelected = false; + breakLayout = false; if ( !formWindow() ) { - actionEditCut->setEnabled( FALSE ); - actionEditCopy->setEnabled( FALSE ); - actionEditDelete->setEnabled( FALSE ); - actionEditAdjustSize->setEnabled( FALSE ); - actionEditHLayout->setEnabled( FALSE ); - actionEditVLayout->setEnabled( FALSE ); - actionEditSplitHorizontal->setEnabled( FALSE ); - actionEditSplitVertical->setEnabled( FALSE ); - actionEditGridLayout->setEnabled( FALSE ); - actionEditBreakLayout->setEnabled( FALSE ); - actionEditLower->setEnabled( FALSE ); - actionEditRaise->setEnabled( FALSE ); - actionEditAdjustSize->setEnabled( FALSE ); + actionEditCut->setEnabled( false ); + actionEditCopy->setEnabled( false ); + actionEditDelete->setEnabled( false ); + actionEditAdjustSize->setEnabled( false ); + actionEditHLayout->setEnabled( false ); + actionEditVLayout->setEnabled( false ); + actionEditSplitHorizontal->setEnabled( false ); + actionEditSplitVertical->setEnabled( false ); + actionEditGridLayout->setEnabled( false ); + actionEditBreakLayout->setEnabled( false ); + actionEditLower->setEnabled( false ); + actionEditRaise->setEnabled( false ); + actionEditAdjustSize->setEnabled( false ); return; } @@ -2026,11 +2026,11 @@ void MainWindow::selectionChanged() actionEditLower->setEnabled( enable ); actionEditRaise->setEnabled( enable ); - actionEditAdjustSize->setEnabled( FALSE ); - actionEditSplitHorizontal->setEnabled( FALSE ); - actionEditSplitVertical->setEnabled( FALSE ); + actionEditAdjustSize->setEnabled( false ); + actionEditSplitHorizontal->setEnabled( false ); + actionEditSplitVertical->setEnabled( false ); - enable = FALSE; + enable = false; TQWidgetList widgets = formWindow()->selectedWidgets(); if ( selectedWidgets > 1 ) { int unlaidout = 0; @@ -2052,75 +2052,75 @@ void MainWindow::selectionChanged() breakLayout = laidout > 0; } else if ( selectedWidgets == 1 ) { TQWidget *w = widgets.first(); - bool isContainer = WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) || + bool isContainer = WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) || w == formWindow()->mainContainer(); actionEditAdjustSize->setEnabled( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ); if ( !isContainer ) { - actionEditHLayout->setEnabled( FALSE ); - actionEditVLayout->setEnabled( FALSE ); - actionEditGridLayout->setEnabled( FALSE ); + actionEditHLayout->setEnabled( false ); + actionEditVLayout->setEnabled( false ); + actionEditGridLayout->setEnabled( false ); if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) { - actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) ); - breakLayout = TRUE; + actionEditBreakLayout->setEnabled( !isAToolBarChild( w ) ); + breakLayout = true; } else { - actionEditBreakLayout->setEnabled( FALSE ); + actionEditBreakLayout->setEnabled( false ); } } else { if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) { if ( !formWindow()->hasInsertedChildren( w ) ) { - actionEditHLayout->setEnabled( FALSE ); - actionEditVLayout->setEnabled( FALSE ); - actionEditGridLayout->setEnabled( FALSE ); - actionEditBreakLayout->setEnabled( FALSE ); + actionEditHLayout->setEnabled( false ); + actionEditVLayout->setEnabled( false ); + actionEditGridLayout->setEnabled( false ); + actionEditBreakLayout->setEnabled( false ); } else { - actionEditHLayout->setEnabled( TRUE ); - actionEditVLayout->setEnabled( TRUE ); - actionEditGridLayout->setEnabled( TRUE ); - actionEditBreakLayout->setEnabled( FALSE ); - layoutChilds = TRUE; + actionEditHLayout->setEnabled( true ); + actionEditVLayout->setEnabled( true ); + actionEditGridLayout->setEnabled( true ); + actionEditBreakLayout->setEnabled( false ); + layoutChilds = true; } if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) { - actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) ); - breakLayout = TRUE; + actionEditBreakLayout->setEnabled( !isAToolBarChild( w ) ); + breakLayout = true; } } else { - actionEditHLayout->setEnabled( FALSE ); - actionEditVLayout->setEnabled( FALSE ); - actionEditGridLayout->setEnabled( FALSE ); - actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) ); - breakLayout = TRUE; + actionEditHLayout->setEnabled( false ); + actionEditVLayout->setEnabled( false ); + actionEditGridLayout->setEnabled( false ); + actionEditBreakLayout->setEnabled( !isAToolBarChild( w ) ); + breakLayout = true; } } } else if ( selectedWidgets == 0 ) { - actionEditAdjustSize->setEnabled( TRUE ); + actionEditAdjustSize->setEnabled( true ); TQWidget *w = formWindow()->mainContainer(); if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) { if ( !formWindow()->hasInsertedChildren( w ) ) { - actionEditHLayout->setEnabled( FALSE ); - actionEditVLayout->setEnabled( FALSE ); - actionEditGridLayout->setEnabled( FALSE ); - actionEditBreakLayout->setEnabled( FALSE ); + actionEditHLayout->setEnabled( false ); + actionEditVLayout->setEnabled( false ); + actionEditGridLayout->setEnabled( false ); + actionEditBreakLayout->setEnabled( false ); } else { - actionEditHLayout->setEnabled( TRUE ); - actionEditVLayout->setEnabled( TRUE ); - actionEditGridLayout->setEnabled( TRUE ); - actionEditBreakLayout->setEnabled( FALSE ); - layoutChilds = TRUE; + actionEditHLayout->setEnabled( true ); + actionEditVLayout->setEnabled( true ); + actionEditGridLayout->setEnabled( true ); + actionEditBreakLayout->setEnabled( false ); + layoutChilds = true; } } else { - actionEditHLayout->setEnabled( FALSE ); - actionEditVLayout->setEnabled( FALSE ); - actionEditGridLayout->setEnabled( FALSE ); - actionEditBreakLayout->setEnabled( TRUE ); - breakLayout = TRUE; + actionEditHLayout->setEnabled( false ); + actionEditVLayout->setEnabled( false ); + actionEditGridLayout->setEnabled( false ); + actionEditBreakLayout->setEnabled( true ); + breakLayout = true; } } else { - actionEditHLayout->setEnabled( FALSE ); - actionEditVLayout->setEnabled( FALSE ); - actionEditGridLayout->setEnabled( FALSE ); - actionEditBreakLayout->setEnabled( FALSE ); + actionEditHLayout->setEnabled( false ); + actionEditVLayout->setEnabled( false ); + actionEditGridLayout->setEnabled( false ); + actionEditBreakLayout->setEnabled( false ); } } @@ -2247,12 +2247,12 @@ void MainWindow::readConfig() config.insertSearchPath( TQSettings::Windows, "/Trolltech" ); bool ok; - bool readPreviousConfig = FALSE; + bool readPreviousConfig = false; TQString backPixName( TQDir::home().absPath() + "/.designer/" + "background.xpm" ); - restoreConfig = config.readBoolEntry( keybase + "RestoreWorkspace", TRUE, &ok ); + restoreConfig = config.readBoolEntry( keybase + "RestoreWorkspace", true, &ok ); if ( !ok ) { keybase = DesignerApplication::oldSettingsKey(); - restoreConfig = config.readBoolEntry( keybase + "RestoreWorkspace", TRUE, &ok ); + restoreConfig = config.readBoolEntry( keybase + "RestoreWorkspace", true, &ok ); if ( !ok ) { if ( oWindow ) { oWindow->shuttingDown(); @@ -2264,7 +2264,7 @@ void MainWindow::readConfig() qworkspace->setBackgroundPixmap( pix ); return; } - readPreviousConfig = TRUE; + readPreviousConfig = true; } if ( !readPreviousConfig ) { fileFilter = config.readEntry( keybase + "FileFilter", fileFilter ); @@ -2303,7 +2303,7 @@ void MainWindow::readConfig() recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects" ); } - backPix = config.readBoolEntry( keybase + "Background/UsePixmap", TRUE ) | readPreviousConfig; + backPix = config.readBoolEntry( keybase + "Background/UsePixmap", true ) | readPreviousConfig; if ( backPix ) { TQPixmap pix; pix.load( backPixName ); @@ -2314,14 +2314,14 @@ void MainWindow::readConfig() } if ( !readPreviousConfig ) { - splashScreen = config.readBoolEntry( keybase + "SplashScreen", TRUE ); + splashScreen = config.readBoolEntry( keybase + "SplashScreen", true ); - sGrid = config.readBoolEntry( keybase + "Grid/Show", TRUE ); - snGrid = config.readBoolEntry( keybase + "Grid/Snap", TRUE ); + sGrid = config.readBoolEntry( keybase + "Grid/Show", true ); + snGrid = config.readBoolEntry( keybase + "Grid/Snap", true ); grd.setX( config.readNumEntry( keybase + "Grid/x", 10 ) ); grd.setY( config.readNumEntry( keybase + "Grid/y", 10 ) ); - if ( !config.readBoolEntry( DesignerApplication::settingsKey() + "Geometries/MainwindowMaximized", FALSE ) ) { + if ( !config.readBoolEntry( DesignerApplication::settingsKey() + "Geometries/MainwindowMaximized", false ) ) { TQRect r( pos(), size() ); r.setX( config.readNumEntry( keybase + "Geometries/MainwindowX", r.x() ) ); r.setY( config.readNumEntry( keybase + "Geometries/MainwindowY", r.y() ) ); @@ -2335,8 +2335,8 @@ void MainWindow::readConfig() move( r.topLeft() ); } } - setUsesTextLabel( config.readBoolEntry( keybase + "View/TextLabels", FALSE ) ); - setUsesBigPixmaps( FALSE /*config.readBoolEntry( "BigIcons", FALSE )*/ ); // ### disabled for now + setUsesTextLabel( config.readBoolEntry( keybase + "View/TextLabels", false ) ); + setUsesBigPixmaps( false /*config.readBoolEntry( "BigIcons", false )*/ ); // ### disabled for now } } int num = config.readNumEntry( keybase + "CustomWidgets/num" ); @@ -2557,15 +2557,15 @@ ActionEditor *MainWindow::actioneditor() const bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) { - if ( f && !f->project()->isCpp() && !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) ) { - TQString defSignal = WidgetFactory::defaultSignal( TQT_TQOBJECT(w) ); + if ( f && !f->project()->isCpp() && !WidgetFactory::isPassiveInteractor( w ) ) { + TQString defSignal = WidgetFactory::defaultSignal( w ); if ( defSignal.isEmpty() ) { editSource(); } else { TQString s = TQString( w->name() ) + "_" + defSignal; LanguageInterface *iface = MetaDataBase::languageInterface( f->project()->language() ); if ( iface ) { - TQStrList sigs = iface->signalNames( TQT_TQOBJECT(w) ); + TQStrList sigs = iface->signalNames( w ); TQString fullSignal; for ( int i = 0; i < (int)sigs.count(); ++i ) { TQString sig = sigs.at( i ); @@ -2581,46 +2581,46 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) fullSignal.remove( (int)fullSignal.length() - 1, 1 ); fullSignal = iface->createArguments( fullSignal.simplifyWhiteSpace() ); s += "(" + fullSignal + ")"; - if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(f), s.latin1() ) ) - MetaDataBase::addFunction( TQT_TQOBJECT(f), s.latin1(), "", "public", "slot", + if ( !MetaDataBase::hasFunction( f, s.latin1() ) ) + MetaDataBase::addFunction( f, s.latin1(), "", "public", "slot", f->project()->language(), "void" ); s = s.left( s.find( '(' ) ).latin1(); - if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(f), TQT_TQOBJECT(w), defSignal.latin1(), TQT_TQOBJECT(f->mainContainer()), s.latin1() ) ) { + if ( !MetaDataBase::hasConnection( f, w, defSignal.latin1(), f->mainContainer(), s.latin1() ) ) { MetaDataBase::Connection conn; - conn.sender = TQT_TQOBJECT(w); - conn.receiver = TQT_TQOBJECT(f->mainContainer()); + conn.sender = w; + conn.receiver = f->mainContainer(); conn.signal = signl; conn.slot = s; AddConnectionCommand *cmd = new AddConnectionCommand( i18n( "Add Connection" ), f, conn ); f->commandHistory()->addCommand( cmd ); cmd->execute(); - f->formFile()->setModified( TRUE ); + f->formFile()->setModified( true ); } } } - editFunction( s, TRUE ); + editFunction( s, true ); } - return TRUE; + return true; } if ( WidgetFactory::hasSpecialEditor( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) { + idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) { statusMessage( i18n( "Edit %1..." ).arg( w->className() ) ); - WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), + WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ), this, w, formWindow() ); statusBar()->clear(); - return TRUE; + return true; } - const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE ); - const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE ); + const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", true ), true ); + const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", true ), true ); if ( text && text->designable(w) ) { - bool ok = FALSE; - bool oldDoWrap = FALSE; + bool ok = false; + bool oldDoWrap = false; if ( ::tqt_cast<TQLabel*>(w) ) { int align = w->property( "alignment" ).toInt(); if ( align & WordBreak ) - oldDoWrap = TRUE; + oldDoWrap = true; } bool doWrap = oldDoWrap; @@ -2636,44 +2636,44 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) if ( ok ) { if ( oldDoWrap != doWrap ) { TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "wordwrap", TQVariant( oldDoWrap ), TQVariant( doWrap ), TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE ); + MetaDataBase::setPropertyChanged( w, "wordwrap", true ); } TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "text", w->property( "text" ), text, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "text", TRUE ); + MetaDataBase::setPropertyChanged( w, "text", true ); } - return TRUE; + return true; } if ( title && title->designable(w) ) { - bool ok = FALSE; + bool ok = false; TQString text; text = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this ); if ( ok ) { TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "title", w->property( "title" ), text, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "title", TRUE ); + MetaDataBase::setPropertyChanged( w, "title", true ); } - return TRUE; + return true; } - if ( !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) ) + if ( !WidgetFactory::isPassiveInteractor( w ) ) editSource(); - return TRUE; + return true; } void MainWindow::rebuildCustomWidgetGUI() @@ -2698,7 +2698,7 @@ void MainWindow::rebuildCustomWidgetGUI() for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) { WidgetAction* a = new WidgetAction( "Custom Widgets", actionGroupTools, TQString::number( w->id ).latin1() ); - a->setToggleAction( TRUE ); + a->setToggleAction( true ); a->setText( w->className ); a->setIconSet( *w->pixmap ); a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).arg( w->className ) ); @@ -2725,16 +2725,16 @@ void MainWindow::rebuildCustomWidgetGUI() void MainWindow::rebuildCommonWidgetsToolBoxPage() { - toolBox->setUpdatesEnabled( FALSE ); - commonWidgetsToolBar->setUpdatesEnabled( FALSE ); + toolBox->setUpdatesEnabled( false ); + commonWidgetsToolBar->setUpdatesEnabled( false ); commonWidgetsToolBar->clear(); for ( TQAction *a = commonWidgetsPage.first(); a; a = commonWidgetsPage.next() ) a->addTo( commonWidgetsToolBar ); TQWidget *w; commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) ); w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() ); - toolBox->setUpdatesEnabled( TRUE ); - commonWidgetsToolBar->setUpdatesEnabled( TRUE ); + toolBox->setUpdatesEnabled( true ); + commonWidgetsToolBar->setUpdatesEnabled( true ); } bool MainWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *wid ) @@ -2743,10 +2743,10 @@ bool MainWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *wid ) for ( TQWidget *w = windows.first(); w; w = windows.next() ) { if ( ::tqt_cast<FormWindow*>(w) ) { if ( ( (FormWindow*)w )->isCustomWidgetUsed( wid ) ) - return TRUE; + return true; } } - return FALSE; + return false; } void MainWindow::setGrid( const TQPoint &p ) @@ -2796,11 +2796,11 @@ void MainWindow::windowsMenuActivated( int id ) void MainWindow::projectSelected( TQAction *a ) { - a->setOn( TRUE ); + a->setOn( true ); if ( currentProject ) - currentProject->setActive( FALSE ); + currentProject->setActive( false ); Project *p = *projects.find( a ); - p->setActive( TRUE ); + p->setActive( true ); if ( currentProject == p ) return; currentProject = p; @@ -2818,8 +2818,8 @@ void MainWindow::openProject( const TQString &fn ) } TQApplication::setOverrideCursor( waitCursor ); Project *pro = new Project( fn, "", projectSettingsPluginManager ); - pro->setModified( FALSE ); - TQAction *a = new TQAction( pro->projectName(), pro->projectName(), 0, actionGroupProjects, 0, TRUE ); + pro->setModified( false ); + TQAction *a = new TQAction( pro->projectName(), pro->projectName(), 0, actionGroupProjects, 0, true ); projects.insert( a, pro ); projectSelected( a ); TQApplication::restoreOverrideCursor(); @@ -2843,7 +2843,7 @@ void MainWindow::checkTempFiles() TQApplication::setOverrideCursor( waitCursor ); for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { if ( load ) - openFormWindow( s + "/" + *it, FALSE ); + openFormWindow( s + "/" + *it, false ); d.remove( *it ); } } @@ -2920,7 +2920,7 @@ void MainWindow::setupActionManager() continue; iface->connectTo( desInterface ); - TQAction *a = iface->create( *ait, TQT_TQOBJECT(this) ); + TQAction *a = iface->create( *ait, this ); if ( !a ) continue; @@ -2955,7 +2955,7 @@ void MainWindow::editFunction( const TQString &func, bool rereadSource ) return; if ( formWindow()->formFile()->codeFileState() != FormFile::Ok ) - if ( !formWindow()->formFile()->setupUihFile(FALSE) ) + if ( !formWindow()->formFile()->setupUihFile(false) ) return; TQString lang = currentProject->language(); @@ -2974,7 +2974,7 @@ void MainWindow::editFunction( const TQString &func, bool rereadSource ) } } - createSourceEditor( TQT_TQOBJECT(formWindow()), formWindow()->project(), lang, func, rereadSource ); + createSourceEditor( formWindow(), formWindow()->project(), lang, func, rereadSource ); } void MainWindow::setupRecentlyFilesMenu() @@ -3199,7 +3199,7 @@ void MainWindow::setModified( bool b, TQWidget *window ) } return; } - w = w->parentWidget( TRUE ); + w = w->parentWidget( true ); } } @@ -3210,13 +3210,13 @@ void MainWindow::editorClosed( SourceEditor *e ) void MainWindow::functionsChanged() { - updateFunctionsTimer->start( 0, TRUE ); + updateFunctionsTimer->start( 0, true ); } void MainWindow::doFunctionsChanged() { for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) - e->refresh( FALSE ); + e->refresh( false ); hierarchyView->formDefinitionView()->refresh(); } @@ -3233,7 +3233,7 @@ void MainWindow::updateFunctionList() return; TQValueList<LanguageInterface::Connection> conns; iface->connections( se->text(), &conns ); - MetaDataBase::setupConnections( TQT_TQOBJECT(se->formWindow()), conns ); + MetaDataBase::setupConnections( se->formWindow(), conns ); propertyEditor->eventList()->setup(); } } @@ -3271,17 +3271,17 @@ void MainWindow::showErrorMessage( TQObject *o, int errorLine, const TQString &e ol.append( o ); TQStringList ll; ll << currentProject->locationOfObject( o ); - oWindow->setErrorMessages( l2, l, TRUE, ll, ol ); + oWindow->setErrorMessages( l2, l, true, ll, ol ); showSourceLine( o, errorLine, Error ); } } void MainWindow::finishedRun() { - inDebugMode = FALSE; - previewing = FALSE; + inDebugMode = false; + previewing = false; debuggingForms.clear(); - enableAll( TRUE ); + enableAll( true ); for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) { if ( e->project() == currentProject ) e->editorInterface()->setMode( EditorInterface::Editing ); @@ -3415,11 +3415,11 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) return; } - mblockNewForms = TRUE; + mblockNewForms = true; if ( !fw ) openFormWindow( currentProject->makeAbsolute( *qwf_forms->find( (TQWidget*)o ) ) ); else - fw->formFile()->showEditor( FALSE ); + fw->formFile()->showEditor( false ); tqApp->processEvents(); // give all views the chance to get the formwindow SourceEditor *se = editSource(); if ( se ) { @@ -3435,7 +3435,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) break; } } - mblockNewForms = FALSE; + mblockNewForms = false; } @@ -3444,10 +3444,10 @@ TQObject *MainWindow::findRealObject( TQObject *o ) TQWidgetList windows = qWorkspace()->windowList(); for ( TQWidget *w = windows.first(); w; w = windows.next() ) { if ( ::tqt_cast<FormWindow*>(w) && TQString( w->name() ) == TQString( o->name() ) ) - return TQT_TQOBJECT(w); + return w; else if ( ::tqt_cast<SourceEditor*>(w) && ( (SourceEditor*)w )->formWindow() && TQString( ( (SourceEditor*)w )->formWindow()->name() ) == TQString( o->name() ) ) - return TQT_TQOBJECT(w); + return w; else if ( ::tqt_cast<SourceFile*>(w) && ( (SourceEditor*)w )->sourceFile() && ( (SourceEditor*)w )->sourceFile() == o ) return o; @@ -3459,7 +3459,7 @@ void MainWindow::formNameChanged( FormWindow *fw ) { for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) { if ( e->object() == fw ) - e->refresh( TRUE ); + e->refresh( true ); if ( e->project() == fw->project() ) e->resetContext(); } @@ -3553,7 +3553,7 @@ SourceFile *MainWindow::sourceFile() bool MainWindow::openProjectSettings( Project *pro ) { - ProjectSettings dia( pro, this, 0, TRUE ); + ProjectSettings dia( pro, this, 0, true ); SenderObject *senderObject = new SenderObject( designerInterface() ); TQValueList<Tab>::ConstIterator it; for ( it = projectTabs.begin(); it != projectTabs.end(); ++it ) { @@ -3562,16 +3562,16 @@ bool MainWindow::openProjectSettings( Project *pro ) continue; dia.tabWidget->addTab( t.w, t.title ); if ( t.receiver ) { - connect( dia.buttonOk, TQT_SIGNAL( clicked() ), senderObject, TQT_SLOT( emitAcceptSignal() ) ); - connect( senderObject, TQT_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); - connect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + connect( dia.buttonOk, TQ_SIGNAL( clicked() ), senderObject, TQ_SLOT( emitAcceptSignal() ) ); + connect( senderObject, TQ_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); + connect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); senderObject->emitInitSignal(); - disconnect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + disconnect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); } } if ( singleProject ) - dia.tabWidget->setTabEnabled( dia.tabSettings, FALSE ); + dia.tabWidget->setTabEnabled( dia.tabSettings, false ); int res = dia.exec(); @@ -3580,7 +3580,7 @@ bool MainWindow::openProjectSettings( Project *pro ) for ( it = projectTabs.begin(); it != projectTabs.end(); ++it ) { Tab t = *it; dia.tabWidget->removePage( t.w ); - t.w->reparent( 0, TQPoint(0,0), FALSE ); + t.w->reparent( 0, TQPoint(0,0), false ); } return res == TQDialog::Accepted; @@ -3631,7 +3631,7 @@ void MainWindow::setSingleProject( Project *pro ) Project *pro = eProject; pro->save(); TQWidgetList windows = qWorkspace()->windowList(); - qWorkspace()->blockSignals( TRUE ); + qWorkspace()->blockSignals( true ); TQWidgetListIt wit( windows ); while ( wit.current() ) { TQWidget *w = wit.current(); @@ -3648,18 +3648,18 @@ void MainWindow::setSingleProject( Project *pro ) } hierarchyView->clear(); windows = qWorkspace()->windowList(); - qWorkspace()->blockSignals( FALSE ); + qWorkspace()->blockSignals( false ); currentProject = 0; - updateUndoRedo( FALSE, FALSE, TQString(), TQString() ); + updateUndoRedo( false, false, TQString(), TQString() ); } - singleProject = TRUE; + singleProject = true; projects.clear(); TQAction *a = new TQAction( i18n( pro->name() ), i18n( pro->name() ), 0, - actionGroupProjects, 0, TRUE ); + actionGroupProjects, 0, true ); eProject = pro; projects.insert( a, eProject ); - a->setOn( TRUE ); + a->setOn( true ); actionGroupProjects->removeFrom( projectMenu ); actionGroupProjects->removeFrom( projectToolBar ); currentProject = eProject; @@ -3677,30 +3677,30 @@ void MainWindow::showGUIStuff( bool b ) return; guiStuffVisible = b; if ( !b ) { - setAppropriate( (TQDockWindow*)toolBox->parentWidget(), FALSE ); + setAppropriate( (TQDockWindow*)toolBox->parentWidget(), false ); toolBox->parentWidget()->hide(); for ( TQToolBar *tb = widgetToolBars.first(); tb; tb = widgetToolBars.next() ) { tb->hide(); - setAppropriate( tb, FALSE ); + setAppropriate( tb, false ); } - propertyEditor->setPropertyEditorEnabled( FALSE ); - setAppropriate( layoutToolBar, FALSE ); + propertyEditor->setPropertyEditorEnabled( false ); + setAppropriate( layoutToolBar, false ); layoutToolBar->hide(); - setAppropriate( toolsToolBar, FALSE ); + setAppropriate( toolsToolBar, false ); toolsToolBar->hide(); menubar->removeItem( toolsMenuId ); menubar->removeItem( toolsMenuId + 1 ); menubar->removeItem( toolsMenuId + 2 ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) ); - actionEditFormSettings->setEnabled( FALSE ); - actionEditSource->setEnabled( FALSE ); - actionEditConnections->setEnabled( FALSE ); - actionEditFunctions->setEnabled( FALSE ); - actionEditAccels->setEnabled( FALSE ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); + actionEditFormSettings->setEnabled( false ); + actionEditSource->setEnabled( false ); + actionEditConnections->setEnabled( false ); + actionEditFunctions->setEnabled( false ); + actionEditAccels->setEnabled( false ); ( (TQDockWindow*)propertyEditor->parentWidget() )-> setCaption( i18n( "Signal Handlers" ) ); actionGroupNew->removeFrom( fileMenu ); @@ -3714,30 +3714,30 @@ void MainWindow::showGUIStuff( bool b ) actionFileSave->addTo( projectToolBar ); actionFileExit->addTo( fileMenu ); } else { - setAppropriate( (TQDockWindow*)toolBox->parentWidget(), TRUE ); + setAppropriate( (TQDockWindow*)toolBox->parentWidget(), true ); toolBox->parentWidget()->show(); for ( TQToolBar *tb = widgetToolBars.first(); tb; tb = widgetToolBars.next() ) { - setAppropriate( tb, TRUE ); + setAppropriate( tb, true ); tb->hide(); } - propertyEditor->setPropertyEditorEnabled( TRUE ); - setAppropriate( layoutToolBar, TRUE ); + propertyEditor->setPropertyEditorEnabled( true ); + setAppropriate( layoutToolBar, true ); layoutToolBar->show(); - setAppropriate( toolsToolBar, TRUE ); + setAppropriate( toolsToolBar, true ); toolsToolBar->show(); menubar->insertItem( i18n( "&Tools" ), toolsMenu, toolsMenuId, toolsMenuIndex ); menubar->insertItem( i18n( "&Layout" ), layoutMenu, toolsMenuId + 1, toolsMenuIndex + 1 ); menubar->insertItem( i18n( "&Preview" ), previewMenu, toolsMenuId + 2, toolsMenuIndex + 2 ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) ); - actionEditFormSettings->setEnabled( TRUE ); - actionEditSource->setEnabled( TRUE ); - actionEditConnections->setEnabled( TRUE ); - actionEditFunctions->setEnabled( TRUE ); - actionEditAccels->setEnabled( TRUE ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); + actionEditFormSettings->setEnabled( true ); + actionEditSource->setEnabled( true ); + actionEditConnections->setEnabled( true ); + actionEditFunctions->setEnabled( true ); + actionEditAccels->setEnabled( true ); ( (TQDockWindow*)propertyEditor->parentWidget() )-> setCaption( i18n( "Property Editor/Signal Handlers" ) ); actionFileSave->removeFrom( fileMenu ); diff --git a/kdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h index 605aa578..47c4d710 100644 --- a/kdevdesigner/designer/mainwindow.h +++ b/kdevdesigner/designer/mainwindow.h @@ -43,7 +43,7 @@ #include <tqmainwindow.h> #include <tqmap.h> #include <tqguardedptr.h> -#include <tqpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include <tqobjectlist.h> class TQToolBox; @@ -85,7 +85,7 @@ class MainWindow : public TQMainWindow public: enum LineMode { Error, Step, StackFrame }; - MainWindow( KDevDesignerPart *part, bool asClient, bool single = FALSE, const TQString &plgDir = "/designer" ); + MainWindow( KDevDesignerPart *part, bool asClient, bool single = false, const TQString &plgDir = "/designer" ); ~MainWindow(); HierarchyView *objectHierarchy() const; @@ -112,7 +112,7 @@ public: TQPopupMenu *setupNormalHierarchyMenu( TQWidget *parent ); TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot ); - FormWindow *openFormWindow( const TQString &fn, bool validFileName = TRUE, FormFile *ff = 0 ); + FormWindow *openFormWindow( const TQString &fn, bool validFileName = true, FormFile *ff = 0 ); bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w ); void setGrid( const TQPoint &p ); @@ -128,7 +128,7 @@ public: TQString templatePath() const { return templPath; } - void editFunction( const TQString &func, bool rereadSource = FALSE ); + void editFunction( const TQString &func, bool rereadSource = false ); bool isPreviewing() const { return previewing; } @@ -230,7 +230,7 @@ public slots: void fileQuit(); void fileCloseProject(); // not visible in menu, called from fileClose void fileOpen(); - void fileOpen( const TQString &filter, const TQString &extension, const TQString &filename = "" , bool inProject = TRUE ); + void fileOpen( const TQString &filter, const TQString &extension, const TQString &filename = "" , bool inProject = true ); bool fileSave(); bool fileSaveForm(); // not visible in menu, called from fileSave bool fileSaveProject(); // not visible in menu, called from fileSaveProject @@ -267,7 +267,7 @@ public slots: SourceEditor *createSourceEditor( TQObject *object, Project *project, const TQString &lang = TQString(), const TQString &func = TQString(), - bool rereadSource = FALSE ); + bool rereadSource = false ); void editFormSettings(); void editProjectSettings(); void editPixmapCollection(); diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp index 9733097e..7e4f92e0 100644 --- a/kdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -124,104 +124,104 @@ static TQIconSet createIconSet( const TQString &name ) void MainWindow::setupEditActions() { - actionEditUndo = new DesignerAction( i18n("Undo"), createIconSet( "designer_undo.png" ),i18n("&Undo: Not Available"), CTRL + Key_Z, TQT_TQOBJECT(this), 0 ); + actionEditUndo = new DesignerAction( i18n("Undo"), createIconSet( "designer_undo.png" ),i18n("&Undo: Not Available"), CTRL + Key_Z, this, 0 ); actionEditUndo->setStatusTip( i18n( "Undoes the last action" ) ); actionEditUndo->setWhatsThis( whatsThisFrom( "Edit|Undo" ) ); - connect( actionEditUndo, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editUndo() ) ); - actionEditUndo->setEnabled( FALSE ); + connect( actionEditUndo, TQ_SIGNAL( activated() ), this, TQ_SLOT( editUndo() ) ); + actionEditUndo->setEnabled( false ); - actionEditRedo = new DesignerAction( i18n( "Redo" ), createIconSet("designer_redo.png"), i18n( "&Redo: Not Available" ), CTRL + Key_Y, TQT_TQOBJECT(this), 0 ); + actionEditRedo = new DesignerAction( i18n( "Redo" ), createIconSet("designer_redo.png"), i18n( "&Redo: Not Available" ), CTRL + Key_Y, this, 0 ); actionEditRedo->setStatusTip( i18n( "Redoes the last undone operation") ); actionEditRedo->setWhatsThis( whatsThisFrom( "Edit|Redo" ) ); - connect( actionEditRedo, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editRedo() ) ); - actionEditRedo->setEnabled( FALSE ); + connect( actionEditRedo, TQ_SIGNAL( activated() ), this, TQ_SLOT( editRedo() ) ); + actionEditRedo->setEnabled( false ); - actionEditCut = new DesignerAction( i18n( "Cut" ), createIconSet("designer_editcut.png"), i18n( "Cu&t" ), CTRL + Key_X, TQT_TQOBJECT(this), 0 ); + actionEditCut = new DesignerAction( i18n( "Cut" ), createIconSet("designer_editcut.png"), i18n( "Cu&t" ), CTRL + Key_X, this, 0 ); actionEditCut->setStatusTip( i18n( "Cuts the selected widgets and puts them on the clipboard" ) ); actionEditCut->setWhatsThis( whatsThisFrom( "Edit|Cut" ) ); - connect( actionEditCut, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editCut() ) ); - actionEditCut->setEnabled( FALSE ); + connect( actionEditCut, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCut() ) ); + actionEditCut->setEnabled( false ); - actionEditCopy = new DesignerAction( i18n( "Copy" ), createIconSet("designer_editcopy.png"), i18n( "&Copy" ), CTRL + Key_C, TQT_TQOBJECT(this), 0 ); + actionEditCopy = new DesignerAction( i18n( "Copy" ), createIconSet("designer_editcopy.png"), i18n( "&Copy" ), CTRL + Key_C, this, 0 ); actionEditCopy->setStatusTip( i18n( "Copies the selected widgets to the clipboard" ) ); actionEditCopy->setWhatsThis( whatsThisFrom( "Edit|Copy" ) ); - connect( actionEditCopy, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editCopy() ) ); - actionEditCopy->setEnabled( FALSE ); + connect( actionEditCopy, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCopy() ) ); + actionEditCopy->setEnabled( false ); - actionEditPaste = new DesignerAction( i18n( "Paste" ), createIconSet("designer_editpaste.png"), i18n( "&Paste" ), CTRL + Key_V, TQT_TQOBJECT(this), 0 ); + actionEditPaste = new DesignerAction( i18n( "Paste" ), createIconSet("designer_editpaste.png"), i18n( "&Paste" ), CTRL + Key_V, this, 0 ); actionEditPaste->setStatusTip( i18n( "Pastes the clipboard's contents" ) ); actionEditPaste->setWhatsThis( whatsThisFrom( "Edit|Paste" ) ); - connect( actionEditPaste, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editPaste() ) ); - actionEditPaste->setEnabled( FALSE ); + connect( actionEditPaste, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPaste() ) ); + actionEditPaste->setEnabled( false ); - actionEditDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Delete, TQT_TQOBJECT(this), 0 ); + actionEditDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Delete, this, 0 ); actionEditDelete->setStatusTip( i18n( "Deletes the selected widgets" ) ); actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) ); - connect( actionEditDelete, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editDelete() ) ); - actionEditDelete->setEnabled( FALSE ); + connect( actionEditDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) ); + actionEditDelete->setEnabled( false ); #ifdef TQ_WS_MAC - TQAction *macDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Backspace, TQT_TQOBJECT(this), 0 ); - connect( macDelete, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editDelete() ) ); + TQAction *macDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Backspace, this, 0 ); + connect( macDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) ); #endif - actionEditSelectAll = new DesignerAction( i18n( "Select All" ), TQPixmap(), i18n( "Select &All" ), CTRL + Key_A, TQT_TQOBJECT(this), 0 ); + actionEditSelectAll = new DesignerAction( i18n( "Select All" ), TQPixmap(), i18n( "Select &All" ), CTRL + Key_A, this, 0 ); actionEditSelectAll->setStatusTip( i18n( "Selects all widgets" ) ); actionEditSelectAll->setWhatsThis( whatsThisFrom( "Edit|Select All" ) ); - connect( actionEditSelectAll, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ) ); - actionEditSelectAll->setEnabled( TRUE ); + connect( actionEditSelectAll, TQ_SIGNAL( activated() ), this, TQ_SLOT( editSelectAll() ) ); + actionEditSelectAll->setEnabled( true ); - actionEditRaise = new DesignerAction( i18n( "Bring to Front" ), createIconSet("designer_editraise.png"), i18n( "Bring to &Front" ), 0, TQT_TQOBJECT(this), 0 ); + actionEditRaise = new DesignerAction( i18n( "Bring to Front" ), createIconSet("designer_editraise.png"), i18n( "Bring to &Front" ), 0, this, 0 ); actionEditRaise->setStatusTip( i18n( "Raises the selected widgets" ) ); actionEditRaise->setWhatsThis( i18n( "Raises the selected widgets" ) ); - connect( actionEditRaise, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editRaise() ) ); - actionEditRaise->setEnabled( FALSE ); + connect( actionEditRaise, TQ_SIGNAL( activated() ), this, TQ_SLOT( editRaise() ) ); + actionEditRaise->setEnabled( false ); - actionEditLower = new DesignerAction( i18n( "Send to Back" ), createIconSet("designer_editlower.png"), i18n( "Send to &Back" ), 0, TQT_TQOBJECT(this), 0 ); + actionEditLower = new DesignerAction( i18n( "Send to Back" ), createIconSet("designer_editlower.png"), i18n( "Send to &Back" ), 0, this, 0 ); actionEditLower->setStatusTip( i18n( "Lowers the selected widgets" ) ); actionEditLower->setWhatsThis( i18n( "Lowers the selected widgets" ) ); - connect( actionEditLower, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLower() ) ); - actionEditLower->setEnabled( FALSE ); + connect( actionEditLower, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLower() ) ); + actionEditLower->setEnabled( false ); actionEditAccels = new DesignerAction( i18n( "Check Accelerators" ), TQPixmap(), - i18n( "Chec&k Accelerators" ), ALT + Key_R, TQT_TQOBJECT(this), 0 ); + i18n( "Chec&k Accelerators" ), ALT + Key_R, this, 0 ); actionEditAccels->setStatusTip( i18n("Checks if the accelerators used in the form are unique") ); actionEditAccels->setWhatsThis( whatsThisFrom( "Edit|Check Accelerator" ) ); - connect( actionEditAccels, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAccels() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditAccels, TQ_SIGNAL( activated() ), this, TQ_SLOT( editAccels() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); actionEditFunctions = new DesignerAction( i18n( "Slots" ), createIconSet("designer_editslots.png"), - i18n( "S&lots..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "S&lots..." ), 0, this, 0 ); actionEditFunctions->setStatusTip( i18n("Opens a dialog for editing slots") ); actionEditFunctions->setWhatsThis( whatsThisFrom( "Edit|Slots" ) ); - connect( actionEditFunctions, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editFunctions() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditFunctions, TQ_SIGNAL( activated() ), this, TQ_SLOT( editFunctions() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); actionEditConnections = new DesignerAction( i18n( "Connections" ), createIconSet("designer_connecttool.png"), - i18n( "Co&nnections..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "Co&nnections..." ), 0, this, 0 ); actionEditConnections->setStatusTip( i18n("Opens a dialog for editing connections") ); actionEditConnections->setWhatsThis( whatsThisFrom( "Edit|Connections" ) ); - connect( actionEditConnections, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editConnections() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditConnections, TQ_SIGNAL( activated() ), this, TQ_SLOT( editConnections() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); actionEditSource = new DesignerAction( i18n( "Source" ), TQIconSet(), - i18n( "&Source..." ), CTRL + Key_E, TQT_TQOBJECT(this), 0 ); + i18n( "&Source..." ), CTRL + Key_E, this, 0 ); actionEditSource->setStatusTip( i18n("Opens an editor to edit the form's source code") ); actionEditSource->setWhatsThis( whatsThisFrom( "Edit|Source" ) ); - connect( actionEditSource, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editSource() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditSource, TQ_SIGNAL( activated() ), this, TQ_SLOT( editSource() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings = new DesignerAction( i18n( "Form Settings" ), TQPixmap(), - i18n( "&Form Settings..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "&Form Settings..." ), 0, this, 0 ); actionEditFormSettings->setStatusTip( i18n("Opens a dialog to change the form's settings") ); actionEditFormSettings->setWhatsThis( whatsThisFrom( "Edit|Form Settings" ) ); - connect( actionEditFormSettings, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editFormSettings() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditFormSettings, TQ_SIGNAL( activated() ), this, TQ_SLOT( editFormSettings() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditPreferences = new DesignerAction( i18n( "Preferences" ), TQPixmap(), - i18n( "Preferences..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "Preferences..." ), 0, this, 0 ); actionEditPreferences->setStatusTip( i18n("Opens a dialog to change preferences") ); actionEditPreferences->setWhatsThis( whatsThisFrom( "Edit|Preferences" ) ); - connect( actionEditPreferences, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editPreferences() ) ); + connect( actionEditPreferences, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPreferences() ) ); /* TQToolBar *tb = new TQToolBar( this, "Edit" ); tb->setCloseMode( TQDockWindow::Undocked ); @@ -240,7 +240,7 @@ void MainWindow::setupEditActions() #endif TQPopupMenu *menu = new TQPopupMenu( this, "Edit" ); - connect( menu, TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( updateEditorUndoRedo() ) ); + connect( menu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( updateEditorUndoRedo() ) ); menubar->insertItem( i18n( "&Edit" ), menu ); actionEditUndo->addTo( menu ); actionEditRedo->addTo( menu ); @@ -269,27 +269,27 @@ void MainWindow::setupEditActions() void MainWindow::setupSearchActions() { actionSearchFind = new DesignerAction( i18n( "Find" ), createIconSet( "designer_searchfind.png" ), - i18n( "&Find..." ), CTRL + Key_F, TQT_TQOBJECT(this), 0 ); - connect( actionSearchFind, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchFind() ) ); - actionSearchFind->setEnabled( FALSE ); + i18n( "&Find..." ), CTRL + Key_F, this, 0 ); + connect( actionSearchFind, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchFind() ) ); + actionSearchFind->setEnabled( false ); actionSearchFind->setWhatsThis( whatsThisFrom( "Search|Find" ) ); actionSearchIncremetal = new DesignerAction( i18n( "Find Incremental" ), TQIconSet(), - i18n( "Find &Incremental" ), ALT + Key_I, TQT_TQOBJECT(this), 0 ); - connect( actionSearchIncremetal, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchIncremetalFindMenu() ) ); - actionSearchIncremetal->setEnabled( FALSE ); + i18n( "Find &Incremental" ), ALT + Key_I, this, 0 ); + connect( actionSearchIncremetal, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchIncremetalFindMenu() ) ); + actionSearchIncremetal->setEnabled( false ); actionSearchIncremetal->setWhatsThis( whatsThisFrom( "Search|Find Incremental" ) ); actionSearchReplace = new DesignerAction( i18n( "Replace" ), TQIconSet(), - i18n( "&Replace..." ), CTRL + Key_R, TQT_TQOBJECT(this), 0 ); - connect( actionSearchReplace, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchReplace() ) ); - actionSearchReplace->setEnabled( FALSE ); + i18n( "&Replace..." ), CTRL + Key_R, this, 0 ); + connect( actionSearchReplace, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchReplace() ) ); + actionSearchReplace->setEnabled( false ); actionSearchReplace->setWhatsThis( whatsThisFrom( "Search|Replace" ) ); actionSearchGotoLine = new DesignerAction( i18n( "Goto Line" ), TQIconSet(), - i18n( "&Goto Line..." ), ALT + Key_G, TQT_TQOBJECT(this), 0 ); - connect( actionSearchGotoLine, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchGotoLine() ) ); - actionSearchGotoLine->setEnabled( FALSE ); + i18n( "&Goto Line..." ), ALT + Key_G, this, 0 ); + connect( actionSearchGotoLine, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchGotoLine() ) ); + actionSearchGotoLine->setEnabled( false ); actionSearchGotoLine->setWhatsThis( whatsThisFrom( "Search|Goto line" ) ); /* TQToolBar *tb = new TQToolBar( this, "Search" ); @@ -300,11 +300,11 @@ void MainWindow::setupSearchActions() incrementalSearch = new TQLineEdit( 0 ); incrementalSearch->hide(); TQToolTip::add( incrementalSearch, i18n( "Incremental search (Alt+I)" ) ); - connect( incrementalSearch, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( searchIncremetalFind() ) ); - connect( incrementalSearch, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( searchIncremetalFindNext() ) ); - incrementalSearch->setEnabled( FALSE ); + connect( incrementalSearch, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( searchIncremetalFind() ) ); + connect( incrementalSearch, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( searchIncremetalFindNext() ) ); + incrementalSearch->setEnabled( false ); TQPopupMenu *menu = new TQPopupMenu( this, "Search" ); menubar->insertItem( i18n( "&Search" ), menu ); @@ -319,62 +319,62 @@ void MainWindow::setupLayoutActions() { if ( !actionGroupTools ) { actionGroupTools = new TQActionGroup( this ); - actionGroupTools->setExclusive( TRUE ); - connect( actionGroupTools, TQT_SIGNAL( selected(TQAction*) ), TQT_TQOBJECT(this), TQT_SLOT( toolSelected(TQAction*) ) ); + actionGroupTools->setExclusive( true ); + connect( actionGroupTools, TQ_SIGNAL( selected(TQAction*) ), this, TQ_SLOT( toolSelected(TQAction*) ) ); } actionEditAdjustSize = new DesignerAction( i18n( "Adjust Size" ), createIconSet("designer_adjustsize.png"), - i18n( "Adjust &Size" ), CTRL + Key_J, TQT_TQOBJECT(this), 0 ); + i18n( "Adjust &Size" ), CTRL + Key_J, this, 0 ); actionEditAdjustSize->setStatusTip(i18n("Adjusts the size of the selected widget") ); actionEditAdjustSize->setWhatsThis( whatsThisFrom( "Layout|Adjust Size" ) ); - connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAdjustSize() ) ); - actionEditAdjustSize->setEnabled( FALSE ); + connect( actionEditAdjustSize, TQ_SIGNAL( activated() ), this, TQ_SLOT( editAdjustSize() ) ); + actionEditAdjustSize->setEnabled( false ); actionEditHLayout = new DesignerAction( i18n( "Lay Out Horizontally" ), createIconSet("designer_edithlayout.png"), - i18n( "Lay Out &Horizontally" ), CTRL + Key_H, TQT_TQOBJECT(this), 0 ); + i18n( "Lay Out &Horizontally" ), CTRL + Key_H, this, 0 ); actionEditHLayout->setStatusTip(i18n("Lays out the selected widgets horizontally") ); actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally" ) ); - connect( actionEditHLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontal() ) ); - actionEditHLayout->setEnabled( FALSE ); + connect( actionEditHLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutHorizontal() ) ); + actionEditHLayout->setEnabled( false ); actionEditVLayout = new DesignerAction( i18n( "Lay Out Vertically" ), createIconSet("designer_editvlayout.png"), - i18n( "Lay Out &Vertically" ), CTRL + Key_L, TQT_TQOBJECT(this), 0 ); + i18n( "Lay Out &Vertically" ), CTRL + Key_L, this, 0 ); actionEditVLayout->setStatusTip(i18n("Lays out the selected widgets vertically") ); actionEditVLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically" ) ); - connect( actionEditVLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutVertical() ) ); - actionEditVLayout->setEnabled( FALSE ); + connect( actionEditVLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutVertical() ) ); + actionEditVLayout->setEnabled( false ); actionEditGridLayout = new DesignerAction( i18n( "Lay Out in a Grid" ), createIconSet("designer_editgrid.png"), - i18n( "Lay Out in a &Grid" ), CTRL + Key_G, TQT_TQOBJECT(this), 0 ); + i18n( "Lay Out in a &Grid" ), CTRL + Key_G, this, 0 ); actionEditGridLayout->setStatusTip(i18n("Lays out the selected widgets in a grid") ); actionEditGridLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out in a Grid" ) ); - connect( actionEditGridLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutGrid() ) ); - actionEditGridLayout->setEnabled( FALSE ); + connect( actionEditGridLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutGrid() ) ); + actionEditGridLayout->setEnabled( false ); actionEditSplitHorizontal = new DesignerAction( i18n( "Lay Out Horizontally (in Splitter)" ), createIconSet("designer_editvlayoutsplit.png"), - i18n( "Lay Out Horizontally (in S&plitter)" ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "Lay Out Horizontally (in S&plitter)" ), 0, this, 0 ); actionEditSplitHorizontal->setStatusTip(i18n("Lays out the selected widgets horizontally in a splitter") ); actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally (in Splitter)" ) ); - connect( actionEditSplitHorizontal, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontalSplit() ) ); - actionEditSplitHorizontal->setEnabled( FALSE ); + connect( actionEditSplitHorizontal, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutHorizontalSplit() ) ); + actionEditSplitHorizontal->setEnabled( false ); actionEditSplitVertical = new DesignerAction( i18n( "Lay Out Vertically (in Splitter)" ), createIconSet("designer_edithlayoutsplit.png"), - i18n( "Lay Out Vertically (in Sp&litter)" ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "Lay Out Vertically (in Sp&litter)" ), 0, this, 0 ); actionEditSplitVertical->setStatusTip(i18n("Lays out the selected widgets vertically in a splitter") ); actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically (in Splitter)" ) ); - connect( actionEditSplitVertical, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutVerticalSplit() ) ); - actionEditSplitVertical->setEnabled( FALSE ); + connect( actionEditSplitVertical, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutVerticalSplit() ) ); + actionEditSplitVertical->setEnabled( false ); actionEditBreakLayout = new DesignerAction( i18n( "Break Layout" ), createIconSet("designer_editbreaklayout.png"), - i18n( "&Break Layout" ), CTRL + Key_B, TQT_TQOBJECT(this), 0 ); + i18n( "&Break Layout" ), CTRL + Key_B, this, 0 ); actionEditBreakLayout->setStatusTip(i18n("Breaks the selected layout") ); actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) ); - connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editBreakLayout() ) ); - actionEditBreakLayout->setEnabled( FALSE ); + connect( actionEditBreakLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editBreakLayout() ) ); + actionEditBreakLayout->setEnabled( false ); int id = WidgetDatabase::idFromClassName( "Spacer" ); actionInsertSpacer = new WidgetAction( i18n( "Layout" ), actionGroupTools, TQString::number( id ).latin1() ); - actionInsertSpacer->setToggleAction( TRUE ); + actionInsertSpacer->setToggleAction( true ); actionInsertSpacer->setText( WidgetDatabase::className( id ) ); actionInsertSpacer->setMenuText( i18n( "Add %1").arg( WidgetDatabase::className( id ) ) ); actionInsertSpacer->setIconSet( WidgetDatabase::iconSet( id ) ); @@ -423,15 +423,15 @@ void MainWindow::setupToolActions() { if ( !actionGroupTools ) { actionGroupTools = new TQActionGroup( this ); - actionGroupTools->setExclusive( TRUE ); - connect( actionGroupTools, TQT_SIGNAL( selected(TQAction*) ), - this, TQT_SLOT( toolSelected(TQAction*) ) ); + actionGroupTools->setExclusive( true ); + connect( actionGroupTools, TQ_SIGNAL( selected(TQAction*) ), + this, TQ_SLOT( toolSelected(TQAction*) ) ); } actionPointerTool = new DesignerAction( i18n("Pointer"), createIconSet("designer_pointer.png"), i18n("&Pointer"), Key_F2, actionGroupTools, - TQString::number(POINTER_TOOL).latin1(), TRUE ); + TQString::number(POINTER_TOOL).latin1(), true ); actionPointerTool->setStatusTip( i18n("Selects the pointer tool") ); actionPointerTool->setWhatsThis( whatsThisFrom( "Tools|Pointer" ) ); @@ -440,21 +440,21 @@ void MainWindow::setupToolActions() i18n("&Connect Signal/Slots"), singleProjectMode() ? 0 : Key_F3, actionGroupTools, - TQString::number(CONNECT_TOOL).latin1(), TRUE ); + TQString::number(CONNECT_TOOL).latin1(), true ); actionConnectTool->setStatusTip( i18n("Selects the connection tool") ); actionConnectTool->setWhatsThis( whatsThisFrom( "Tools|Connect Signals and Slots" ) ); actionOrderTool = new DesignerAction( i18n("Tab Order"), createIconSet("designer_ordertool.png"), i18n("Tab &Order"), Key_F4, actionGroupTools, - TQString::number(ORDER_TOOL).latin1(), TRUE ); + TQString::number(ORDER_TOOL).latin1(), true ); actionOrderTool->setStatusTip( i18n("Selects the tab order tool") ); actionOrderTool->setWhatsThis( whatsThisFrom( "Tools|Tab Order" ) ); actionBuddyTool = new DesignerAction( i18n( "Set Buddy" ), createIconSet( "designer_setbuddy.png" ), i18n( "Set &Buddy" ), Key_F12, actionGroupTools, TQString::number( BUDDY_TOOL ).latin1(), - TRUE ); + true ); actionBuddyTool->setStatusTip( i18n( "Sets a buddy to a label" ) ); actionBuddyTool->setWhatsThis( whatsThisFrom( "Tools|Set Buddy" ) ); @@ -463,7 +463,7 @@ void MainWindow::setupToolActions() toolsToolBar = tb; TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) ); - addToolBar( tb, i18n( "Tools" ), TQMainWindow::DockTop, FALSE ); + addToolBar( tb, i18n( "Tools" ), TQMainWindow::DockTop, false ); actionPointerTool->addTo( tb ); if ( !singleProjectMode() ) actionConnectTool->addTo( tb ); @@ -487,13 +487,13 @@ void MainWindow::setupToolActions() actionToolsCustomWidget = new DesignerAction( i18n("Custom Widgets"), createIconSet( "designer_customwidget.png" ), - i18n("Edit &Custom Widgets..."), 0, TQT_TQOBJECT(this), 0 ); + i18n("Edit &Custom Widgets..."), 0, this, 0 ); actionToolsCustomWidget->setStatusTip( i18n("Opens a dialog to add and change " "custom widgets") ); actionToolsCustomWidget->setWhatsThis( whatsThisFrom( "Tools|Custom|Edit Custom" "Widgets" ) ); - connect( actionToolsCustomWidget, TQT_SIGNAL( activated() ), - this, TQT_SLOT( toolsCustomWidget() ) ); + connect( actionToolsCustomWidget, TQ_SIGNAL( activated() ), + this, TQ_SLOT( toolsCustomWidget() ) ); for ( int j = 0; j < WidgetDatabase::numWidgetGroups(); ++j ) { TQString grp = WidgetDatabase::widgetGroup( j ); @@ -518,7 +518,7 @@ void MainWindow::setupToolActions() TQPopupMenu *menu = new TQPopupMenu( this, grp.latin1() ); mmenu->insertItem( grp, menu ); - TQToolBar *tb2 = new TQToolBar( grp, 0, toolBox, FALSE, grp.latin1() ); + TQToolBar *tb2 = new TQToolBar( grp, 0, toolBox, false, grp.latin1() ); tb2->setFrameStyle( TQFrame::NoFrame ); tb2->setOrientation( TQt::Vertical ); tb2->setBackgroundMode( PaletteBase ); @@ -538,7 +538,7 @@ void MainWindow::setupToolActions() continue; // only widgets, i.e. not forms and temp stuff WidgetAction* a = new WidgetAction( grp, actionGroupTools, TQString::number( i ).latin1() ); - a->setToggleAction( TRUE ); + a->setToggleAction( true ); TQString atext = WidgetDatabase::className( i ); if ( atext[0] == 'Q' ) atext = atext.mid(1); @@ -594,7 +594,7 @@ void MainWindow::setupToolActions() actionToolsCustomWidget->addTo( customWidgetMenu ); customWidgetMenu->insertSeparator(); TQToolBar *tb2 = new TQToolBar( "Custom Widgets", 0, - toolBox, FALSE, "Custom Widgets" ); + toolBox, false, "Custom Widgets" ); tb2->setBackgroundMode(PaletteBase); tb2->setOrientation( TQt::Vertical ); tb2->setFrameStyle( TQFrame::NoFrame ); @@ -602,10 +602,10 @@ void MainWindow::setupToolActions() customWidgetToolBar2 = tb2; } - TQAction *a = new DesignerAction( i18n( "Configure Toolbox" ), i18n( "Configure Toolbox..." ), 0, TQT_TQOBJECT(this) ); + TQAction *a = new DesignerAction( i18n( "Configure Toolbox" ), i18n( "Configure Toolbox..." ), 0, this ); a->setStatusTip( i18n( "Opens a dialog to configure the common " "widgets page of the toolbox") ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( toolsConfigure() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( toolsConfigure() ) ); mmenu->insertSeparator(); a->addTo( mmenu ); resetTool(); @@ -625,7 +625,7 @@ void MainWindow::setupFileActions() DesignerAction *a = 0; if ( !singleProject ) { - DesignerAction *a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + DesignerAction *a = new DesignerAction( this, 0 ); a->setText( i18n( "New" ) ); a->setToolTip( i18n( "New dialog or file" ) ); a->setMenuText( i18n( "&New..." ) ); @@ -633,14 +633,14 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_N ); a->setStatusTip( i18n( "Creates a new project, form or source file." ) ); a->setWhatsThis( whatsThisFrom( "File|New" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileNew() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNew() ) ); a->addTo( tb ); a->addTo( fileMenu ); actionNewFile = a; } else { - actionGroupNew = new TQActionGroup( this, 0, FALSE ); + actionGroupNew = new TQActionGroup( this, 0, false ); TQActionGroup* a = actionGroupNew; - ( (TQActionGroup*)a )->setUsesDropDown( TRUE ); + ( (TQActionGroup*)a )->setUsesDropDown( true ); a->setText( i18n( "New" ) ); a->setMenuText( i18n( "&New..." ) ); a->setIconSet( createIconSet("designer_form.png") ); @@ -653,15 +653,15 @@ void MainWindow::setupFileActions() newForm->setIconSet( createIconSet("designer_form.png") ); newForm->setAccel( CTRL + Key_N ); newForm->setStatusTip( i18n( "Creates a new dialog." ) ); - connect( newForm, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileNewDialog() ) ); + connect( newForm, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNewDialog() ) ); - DesignerAction *newFile = new DesignerAction( TQT_TQOBJECT(a), 0 ); + DesignerAction *newFile = new DesignerAction( a, 0 ); newFile->setText( i18n( "New File" ) ); newFile->setMenuText( i18n( "&File..." ) ); newFile->setIconSet( createIconSet("designer_filenew.png") ); newFile->setAccel( ALT + Key_N ); newFile->setStatusTip( i18n( "Creates a new file." ) ); - connect( newFile, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileNewFile() ) ); + connect( newFile, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNewFile() ) ); actionNewFile = newFile; a->addTo( tb ); @@ -670,14 +670,14 @@ void MainWindow::setupFileActions() fileMenu->insertSeparator(); } - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); a->setText( i18n( "Open" ) ); a->setMenuText( i18n( "&Open..." ) ); a->setIconSet( createIconSet("designer_fileopen.png") ); a->setAccel( CTRL + Key_O ); a->setStatusTip( i18n( "Opens an existing project, form or source file ") ); a->setWhatsThis( whatsThisFrom( "File|Open" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileOpen() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileOpen() ) ); if ( !singleProject ) { a->addTo( tb ); a->addTo( fileMenu ); @@ -685,20 +685,20 @@ void MainWindow::setupFileActions() } - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); actionFileClose = a; a->setText( i18n( "Close" ) ); a->setMenuText( i18n( "&Close" ) ); a->setStatusTip( i18n( "Closes the current project or document" ) ); a->setWhatsThis(whatsThisFrom( "File|Close" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileClose() ) ); - connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileClose() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) { a->addTo( fileMenu ); fileMenu->insertSeparator(); } - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); actionFileSave = a; a->setText( i18n( "Save" ) ); a->setMenuText( i18n( "&Save" ) ); @@ -706,41 +706,41 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_S ); a->setStatusTip( i18n( "Saves the current project or document" ) ); a->setWhatsThis(whatsThisFrom( "File|Save" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileSave() ) ); - connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSave() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( tb ); a->addTo( fileMenu ); - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); actionFileSaveAs = a; a->setText( i18n( "Save As" ) ); a->setMenuText( i18n( "Save &As..." ) ); a->setStatusTip( i18n( "Saves the current form with a new filename" ) ); a->setWhatsThis( whatsThisFrom( "File|Save As" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileSaveAs() ) ); - connect( this, TQT_SIGNAL( hasActiveWindow(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSaveAs() ) ); + connect( this, TQ_SIGNAL( hasActiveWindow(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) a->addTo( fileMenu ); - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); actionFileSaveAll = a; a->setText( i18n( "Save All" ) ); a->setMenuText( i18n( "Sa&ve All" ) ); a->setStatusTip( i18n( "Saves all open documents" ) ); a->setWhatsThis( whatsThisFrom( "File|Save All" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileSaveAll() ) ); - connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSaveAll() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) { a->addTo( fileMenu ); fileMenu->insertSeparator(); } - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); a->setText( i18n( "Create Template" ) ); a->setMenuText( i18n( "Create &Template..." ) ); a->setStatusTip( i18n( "Creates a new template" ) ); a->setWhatsThis( whatsThisFrom( "File|Create Template" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileCreateTemplate() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileCreateTemplate() ) ); if ( !singleProject ) a->addTo( fileMenu ); @@ -755,19 +755,19 @@ void MainWindow::setupFileActions() fileMenu->insertItem( i18n( "Recently Opened Projects" ), recentlyProjectsMenu ); } - connect( recentlyFilesMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( setupRecentlyFilesMenu() ) ); - connect( recentlyProjectsMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( setupRecentlyProjectsMenu() ) ); - connect( recentlyFilesMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( recentlyFilesMenuActivated( int ) ) ); - connect( recentlyProjectsMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( recentlyProjectsMenuActivated( int ) ) ); + connect( recentlyFilesMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupRecentlyFilesMenu() ) ); + connect( recentlyProjectsMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupRecentlyProjectsMenu() ) ); + connect( recentlyFilesMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( recentlyFilesMenuActivated( int ) ) ); + connect( recentlyProjectsMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( recentlyProjectsMenuActivated( int ) ) ); if ( !singleProject ) fileMenu->insertSeparator(); - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); actionFileExit = a; if ( !singleProjectMode() ) { a->setText( i18n( "Exit" ) ); @@ -778,7 +778,7 @@ void MainWindow::setupFileActions() a->setText( i18n( "Close" ) ); a->setMenuText( i18n( "&Close" ) ); } - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileQuit() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileQuit() ) ); a->addTo( fileMenu ); } @@ -790,14 +790,14 @@ void MainWindow::setupProjectActions() TQActionGroup *ag = new TQActionGroup( this, 0 ); ag->setText( i18n( "Active Project" ) ); ag->setMenuText( i18n( "Active Project" ) ); - ag->setExclusive( TRUE ); - ag->setUsesDropDown( TRUE ); - connect( ag, TQT_SIGNAL( selected( TQAction * ) ), TQT_TQOBJECT(this), TQT_SLOT( projectSelected( TQAction * ) ) ); - connect( ag, TQT_SIGNAL( selected( TQAction * ) ), TQT_TQOBJECT(this), TQT_SIGNAL( projectChanged() ) ); - DesignerAction *a = new DesignerAction( i18n( "<No Project>" ), i18n( "<No Project>" ), 0, ag, 0, TRUE ); - eProject = new Project( "", i18n( "<No Project>" ), projectSettingsPluginManager, TRUE ); + ag->setExclusive( true ); + ag->setUsesDropDown( true ); + connect( ag, TQ_SIGNAL( selected( TQAction * ) ), this, TQ_SLOT( projectSelected( TQAction * ) ) ); + connect( ag, TQ_SIGNAL( selected( TQAction * ) ), this, TQ_SIGNAL( projectChanged() ) ); + DesignerAction *a = new DesignerAction( i18n( "<No Project>" ), i18n( "<No Project>" ), 0, ag, 0, true ); + eProject = new Project( "", i18n( "<No Project>" ), projectSettingsPluginManager, true ); projects.insert( a, eProject ); - a->setOn( TRUE ); + a->setOn( true ); ag->addTo( projectMenu ); ag->addTo( projectToolBar ); actionGroupProjects = ag; @@ -805,44 +805,44 @@ void MainWindow::setupProjectActions() if ( !singleProject ) projectMenu->insertSeparator(); - a = new DesignerAction( i18n( "Add File" ), TQPixmap(), i18n( "&Add File..." ), 0, TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( i18n( "Add File" ), TQPixmap(), i18n( "&Add File..." ), 0, this, 0 ); actionProjectAddFile = a; a->setStatusTip( i18n("Adds a file to the current project") ); a->setWhatsThis( whatsThisFrom( "Project|Add File" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( projectInsertFile() ) ); - a->setEnabled( FALSE ); - connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( projectInsertFile() ) ); + a->setEnabled( false ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) a->addTo( projectMenu ); actionEditPixmapCollection = new DesignerAction( i18n( "Image Collection..." ), TQPixmap(), - i18n( "&Image Collection..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "&Image Collection..." ), 0, this, 0 ); actionEditPixmapCollection->setStatusTip( i18n("Opens a dialog for editing the current project's image collection") ); actionEditPixmapCollection->setWhatsThis( whatsThisFrom( "Project|Image Collection" ) ); - connect( actionEditPixmapCollection, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editPixmapCollection() ) ); - actionEditPixmapCollection->setEnabled( FALSE ); - connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditPixmapCollection, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPixmapCollection() ) ); + actionEditPixmapCollection->setEnabled( false ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, TQ_SLOT( setEnabled(bool) ) ); actionEditPixmapCollection->addTo( projectMenu ); #ifndef TQT_NO_SQL actionEditDatabaseConnections = new DesignerAction( i18n( "Database Connections..." ), TQPixmap(), - i18n( "&Database Connections..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "&Database Connections..." ), 0, this, 0 ); actionEditDatabaseConnections->setStatusTip( i18n("Opens a dialog for editing the current project's database connections") ); actionEditDatabaseConnections->setWhatsThis( whatsThisFrom( "Project|Database Connections" ) ); - connect( actionEditDatabaseConnections, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editDatabaseConnections() ) ); - //actionEditDatabaseConnections->setEnabled( FALSE ); - //connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditDatabaseConnections, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDatabaseConnections() ) ); + //actionEditDatabaseConnections->setEnabled( false ); + //connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) actionEditDatabaseConnections->addTo( projectMenu ); #endif actionEditProjectSettings = new DesignerAction( i18n( "Project Settings..." ), TQPixmap(), - i18n( "&Project Settings..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "&Project Settings..." ), 0, this, 0 ); actionEditProjectSettings->setStatusTip( i18n("Opens a dialog to change the project's settings") ); actionEditProjectSettings->setWhatsThis( whatsThisFrom( "Project|Project Settings" ) ); - connect( actionEditProjectSettings, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editProjectSettings() ) ); - actionEditProjectSettings->setEnabled( FALSE ); - connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditProjectSettings, TQ_SIGNAL( activated() ), this, TQ_SLOT( editProjectSettings() ) ); + actionEditProjectSettings->setEnabled( false ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditProjectSettings->addTo( projectMenu ); } @@ -854,19 +854,19 @@ void MainWindow::setupPreviewActions() layoutMenu = menu; menubar->insertItem( i18n( "&Preview" ), menu, toolsMenuId + 2 ); - a = new DesignerAction( i18n( "Preview Form" ), TQPixmap(), i18n( "Preview &Form" ), 0, TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( i18n( "Preview Form" ), TQPixmap(), i18n( "Preview &Form" ), 0, this, 0 ); actionPreview = a; a->setAccel( CTRL + Key_T ); a->setStatusTip( i18n("Opens a preview") ); a->setWhatsThis( whatsThisFrom( "Preview|Preview Form" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( previewForm() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( previewForm() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( menu ); menu->insertSeparator(); - TQSignalMapper *mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mapper, TQT_SIGNAL(mapped(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(previewForm(const TQString&)) ); + TQSignalMapper *mapper = new TQSignalMapper( this ); + connect( mapper, TQ_SIGNAL(mapped(const TQString&)), this, TQ_SLOT(previewForm(const TQString&)) ); TQStringList styles = TQStyleFactory::keys(); for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { TQString info; @@ -884,59 +884,59 @@ void MainWindow::setupPreviewActions() info = i18n( "The preview will use the advanced Motif look and feel used by the GIMP toolkit (GTK) on Linux." ); a = new DesignerAction( i18n( "Preview Form in %1 Style" ).arg( *it ), TQPixmap(), - i18n( "... in %1 Style" ).arg( *it ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "... in %1 Style" ).arg( *it ), 0, this, 0 ); a->setStatusTip( i18n("Opens a preview in %1 style").arg( *it ) ); a->setWhatsThis( i18n("<b>Open a preview in %1 style.</b>" "<p>Use the preview to test the design and " "signal-slot connections of the current form. %2</p>").arg( *it ).arg( info ) ); mapper->setMapping( a, *it ); - connect( a, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map()) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL(activated()), mapper, TQ_SLOT(map()) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( menu ); } } void MainWindow::setupWindowActions() { -/* static bool windowActionsSetup = FALSE; +/* static bool windowActionsSetup = false; if ( !windowActionsSetup ) { - windowActionsSetup = TRUE; + windowActionsSetup = true; */ - actionWindowTile = new DesignerAction( i18n( "Tile" ), i18n( "&Tile" ), 0, TQT_TQOBJECT(this) ); + actionWindowTile = new DesignerAction( i18n( "Tile" ), i18n( "&Tile" ), 0, this ); actionWindowTile->setStatusTip( i18n("Tiles the windows so that they are all visible") ); actionWindowTile->setWhatsThis( whatsThisFrom( "Window|Tile" ) ); - connect( actionWindowTile, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( tile() ) ); - actionWindowCascade = new DesignerAction( i18n( "Cascade" ), i18n( "&Cascade" ), 0, TQT_TQOBJECT(this) ); + connect( actionWindowTile, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( tile() ) ); + actionWindowCascade = new DesignerAction( i18n( "Cascade" ), i18n( "&Cascade" ), 0, this ); actionWindowCascade->setStatusTip( i18n("Cascades the windows so that all their title bars are visible") ); actionWindowCascade->setWhatsThis( whatsThisFrom( "Window|Cascade" ) ); - connect( actionWindowCascade, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( cascade() ) ); + connect( actionWindowCascade, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( cascade() ) ); - actionWindowClose = new DesignerAction( i18n( "Close" ), i18n( "Cl&ose" ), CTRL + Key_F4, TQT_TQOBJECT(this) ); + actionWindowClose = new DesignerAction( i18n( "Close" ), i18n( "Cl&ose" ), CTRL + Key_F4, this ); actionWindowClose->setStatusTip( i18n( "Closes the active window") ); actionWindowClose->setWhatsThis( whatsThisFrom( "Window|Close" ) ); - connect( actionWindowClose, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( closeActiveWindow() ) ); + connect( actionWindowClose, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( closeActiveWindow() ) ); - actionWindowCloseAll = new DesignerAction( i18n( "Close All" ), i18n( "Close Al&l" ), 0, TQT_TQOBJECT(this) ); + actionWindowCloseAll = new DesignerAction( i18n( "Close All" ), i18n( "Close Al&l" ), 0, this ); actionWindowCloseAll->setStatusTip( i18n( "Closes all form windows") ); actionWindowCloseAll->setWhatsThis( whatsThisFrom( "Window|Close All" ) ); - connect( actionWindowCloseAll, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( closeAllWindows() ) ); + connect( actionWindowCloseAll, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( closeAllWindows() ) ); - actionWindowNext = new DesignerAction( i18n( "Next" ), i18n( "Ne&xt" ), CTRL + Key_F6, TQT_TQOBJECT(this) ); + actionWindowNext = new DesignerAction( i18n( "Next" ), i18n( "Ne&xt" ), CTRL + Key_F6, this ); actionWindowNext->setStatusTip( i18n( "Activates the next window" ) ); actionWindowNext->setWhatsThis( whatsThisFrom( "Window|Next" ) ); - connect( actionWindowNext, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( activateNextWindow() ) ); + connect( actionWindowNext, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( activateNextWindow() ) ); - actionWindowPrevious = new DesignerAction( i18n( "Previous" ), i18n( "Pre&vious" ), CTRL + SHIFT + Key_F6, TQT_TQOBJECT(this) ); + actionWindowPrevious = new DesignerAction( i18n( "Previous" ), i18n( "Pre&vious" ), CTRL + SHIFT + Key_F6, this ); actionWindowPrevious->setStatusTip( i18n( "Activates the previous window" ) ); actionWindowPrevious->setWhatsThis( whatsThisFrom( "Window|Previous" ) ); - connect( actionWindowPrevious, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( activatePreviousWindow() ) ); + connect( actionWindowPrevious, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( activatePreviousWindow() ) ); // } if ( !windowMenu ) { windowMenu = new TQPopupMenu( this, "Window" ); menubar->insertItem( i18n( "&Window" ), windowMenu ); - connect( windowMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( setupWindowActions() ) ); + connect( windowMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupWindowActions() ) ); } else { windowMenu->clear(); } @@ -971,7 +971,7 @@ void MainWindow::setupWindowActions() else itemText += w->caption(); - int id = windowMenu->insertItem( itemText, TQT_TQOBJECT(this), TQT_SLOT( windowsMenuActivated( int ) ) ); + int id = windowMenu->insertItem( itemText, this, TQ_SLOT( windowsMenuActivated( int ) ) ); windowMenu->setItemParameter( id, i ); windowMenu->setItemChecked( id, qworkspace->activeWindow() == windows.at( i ) ); } @@ -979,31 +979,31 @@ void MainWindow::setupWindowActions() void MainWindow::setupHelpActions() { - actionHelpContents = new DesignerAction( i18n( "Contents" ), i18n( "&Contents" ), Key_F1, TQT_TQOBJECT(this), 0 ); + actionHelpContents = new DesignerAction( i18n( "Contents" ), i18n( "&Contents" ), Key_F1, this, 0 ); actionHelpContents->setStatusTip( i18n("Opens the online help") ); actionHelpContents->setWhatsThis( whatsThisFrom( "Help|Contents" ) ); - connect( actionHelpContents, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpContents() ) ); + connect( actionHelpContents, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpContents() ) ); - actionHelpManual = new DesignerAction( i18n( "Manual" ), i18n( "&Manual" ), CTRL + Key_M, TQT_TQOBJECT(this), 0 ); + actionHelpManual = new DesignerAction( i18n( "Manual" ), i18n( "&Manual" ), CTRL + Key_M, this, 0 ); actionHelpManual->setStatusTip( i18n("Opens the TQt Designer manual") ); actionHelpManual->setWhatsThis( whatsThisFrom( "Help|Manual" ) ); - connect( actionHelpManual, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpManual() ) ); + connect( actionHelpManual, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpManual() ) ); - actionHelpAbout = new DesignerAction( i18n("About"), TQPixmap(), i18n("&About"), 0, TQT_TQOBJECT(this), 0 ); + actionHelpAbout = new DesignerAction( i18n("About"), TQPixmap(), i18n("&About"), 0, this, 0 ); actionHelpAbout->setStatusTip( i18n("Displays information about TQt Designer") ); actionHelpAbout->setWhatsThis( whatsThisFrom( "Help|About" ) ); - connect( actionHelpAbout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpAbout() ) ); + connect( actionHelpAbout, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpAbout() ) ); - actionHelpAboutTQt = new DesignerAction( i18n("About TQt"), TQPixmap(), i18n("About &TQt"), 0, TQT_TQOBJECT(this), 0 ); + actionHelpAboutTQt = new DesignerAction( i18n("About TQt"), TQPixmap(), i18n("About &TQt"), 0, this, 0 ); actionHelpAboutTQt->setStatusTip( i18n("Displays information about the TQt Toolkit") ); actionHelpAboutTQt->setWhatsThis( whatsThisFrom( "Help|About TQt" ) ); - connect( actionHelpAboutTQt, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpAboutTQt() ) ); + connect( actionHelpAboutTQt, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpAboutTQt() ) ); actionHelpWhatsThis = new DesignerAction( i18n("What's This?"), TQIconSet( whatsthis_image, whatsthis_image ), - i18n("What's This?"), SHIFT + Key_F1, TQT_TQOBJECT(this), 0 ); + i18n("What's This?"), SHIFT + Key_F1, this, 0 ); actionHelpWhatsThis->setStatusTip( i18n("\"What's This?\" context sensitive help") ); actionHelpWhatsThis->setWhatsThis( whatsThisFrom( "Help|What's This?" ) ); - connect( actionHelpWhatsThis, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( whatsThis() ) ); + connect( actionHelpWhatsThis, TQ_SIGNAL( activated() ), this, TQ_SLOT( whatsThis() ) ); /* TQToolBar *tb = new TQToolBar( this, "Help" ); tb->setCloseMode( TQDockWindow::Undocked ); @@ -1038,23 +1038,23 @@ void MainWindow::fileNewDialog() while ( currentProject->findFormFile( n + ".ui" ) ) n = "Dialog" + TQString::number( ++forms ); FormWindow *fw = 0; - FormFile *ff = new FormFile( n + ".ui", FALSE, currentProject ); + FormFile *ff = new FormFile( n + ".ui", false, currentProject ); fw = new FormWindow( ff, MainWindow::self, MainWindow::self->qWorkspace(), n ); - ff->setModified( TRUE ); - currentProject->setModified( TRUE ); + ff->setModified( true ); + currentProject->setModified( true ); workspace()->update(); fw->setProject( currentProject ); - MetaDataBase::addEntry( TQT_TQOBJECT(fw) ); + MetaDataBase::addEntry( fw ); TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), fw, n.latin1() ); fw->setMainContainer( w ); fw->setCaption( n ); fw->resize( 600, 480 ); insertFormWindow( fw ); - fw->killAccels( TQT_TQOBJECT(fw) ); - fw->project()->setModified( TRUE ); + fw->killAccels( fw ); + fw->project()->setModified( true ); fw->setFocus(); - fw->setSavePixmapInProject( TRUE ); - fw->setSavePixmapInline( FALSE ); + fw->setSavePixmapInProject( true ); + fw->setSavePixmapInline( false ); } void MainWindow::fileNewFile() @@ -1064,10 +1064,10 @@ void MainWindow::fileNewFile() return; if ( name.right( 3 ) != ".qs" ) name += ".qs"; - SourceFile *f = new SourceFile( name, FALSE, currentProject ); + SourceFile *f = new SourceFile( name, false, currentProject ); MainWindow::self->editSource( f ); - f->setModified( TRUE ); - currentProject->setModified( TRUE ); + f->setModified( true ); + currentProject->setModified( true ); workspace()->update(); } @@ -1127,7 +1127,7 @@ void MainWindow::fileCloseProject() } TQWidgetList windows = qWorkspace()->windowList(); - qWorkspace()->blockSignals( TRUE ); + qWorkspace()->blockSignals( true ); TQWidgetListIt wit( windows ); while ( wit.current() ) { TQWidget *w = wit.current(); @@ -1146,7 +1146,7 @@ void MainWindow::fileCloseProject() } hierarchyView->clear(); windows = qWorkspace()->windowList(); - qWorkspace()->blockSignals( FALSE ); + qWorkspace()->blockSignals( false ); actionGroupProjects->removeChild( a ); projects.remove( a ); delete a; @@ -1164,16 +1164,16 @@ void MainWindow::fileCloseProject() break; } } else { - emit hasActiveWindow( FALSE ); - emit hasActiveForm( FALSE ); - updateUndoRedo( FALSE, FALSE, TQString(), TQString() ); + emit hasActiveWindow( false ); + emit hasActiveForm( false ); + updateUndoRedo( false, false, TQString(), TQString() ); } } } void MainWindow::fileOpen() // as called by the menu { - fileOpen( "", "", "", FALSE ); + fileOpen( "", "", "", false ); } void MainWindow::projectInsertFile() @@ -1233,24 +1233,24 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co if ( !filename.isEmpty() ) { TQFileInfo fi( filename ); - if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.find( ";pro" ) != -1 ) ) { + if ( fi.extension( false ) == "pro" && ( extension.isEmpty() || extension.find( ";pro" ) != -1 ) ) { addRecentlyOpened( filename, recentlyProjects ); openProject( filename ); - } else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.find( ";ui" ) != -1 ) ) { + } else if ( fi.extension( false ) == "ui" && ( extension.isEmpty() || extension.find( ";ui" ) != -1 ) ) { if ( !inProject ) setCurrentProject( eProject ); openFormWindow( filename ); addRecentlyOpened( filename, recentlyFiles ); - } else if ( !extension.isEmpty() && extension.find( ";" + fi.extension( FALSE ) ) != -1 || - additionalSources.find( fi.extension( FALSE ) ) != additionalSources.end() ) { + } else if ( !extension.isEmpty() && extension.find( ";" + fi.extension( false ) ) != -1 || + additionalSources.find( fi.extension( false ) ) != additionalSources.end() ) { SourceFile *sf = project->findSourceFile( project->makeRelative( filename ) ); if ( !sf ) - sf = new SourceFile( project->makeRelative( filename ), FALSE, project ); + sf = new SourceFile( project->makeRelative( filename ), false, project ); editSource( sf ); } else if ( extension.isEmpty() ) { TQString filter; for ( TQStringList::Iterator it2 = filterlist.begin(); it2 != filterlist.end(); ++it2 ) { - if ( (*it2).contains( "." + fi.extension( FALSE ), FALSE ) ) { + if ( (*it2).contains( "." + fi.extension( false ), false ) ) { filter = *it2; break; } @@ -1274,7 +1274,7 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co setCurrentProject( eProject ); addRecentlyOpened( filename, recentlyFiles ); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - openFormWindow( *it, FALSE ); + openFormWindow( *it, false ); TQFile::remove( *it ); } statusBar()->clear(); @@ -1289,10 +1289,10 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile if ( filename.isEmpty() ) return 0; - bool makeNew = FALSE; + bool makeNew = false; if ( !TQFile::exists( filename ) ) { - makeNew = TRUE; + makeNew = true; } else { TQFile f( filename ); f.open( IO_ReadOnly ); @@ -1318,7 +1318,7 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile TQApplication::setOverrideCursor( WaitCursor ); Resource resource( this ); if ( !ff ) - ff = new FormFile( currentProject->makeRelative( filename ), FALSE, currentProject ); + ff = new FormFile( currentProject->makeRelative( filename ), false, currentProject ); bool b = resource.load( ff ) && (FormWindow*)resource.widget(); if ( !validFileName && resource.widget() ) ( (FormWindow*)resource.widget() )->setFileName( TQString() ); @@ -1360,7 +1360,7 @@ bool MainWindow::fileSaveForm() fw = se->formWindow(); else if ( se->sourceFile() ) { se->sourceFile()->save(); - return TRUE; + return true; } } } @@ -1368,16 +1368,16 @@ bool MainWindow::fileSaveForm() if ( !fw ) fw = formWindow(); if ( !fw || !fw->formFile()->save() ) - return FALSE; + return false; TQApplication::restoreOverrideCursor(); - return TRUE; + return true; } bool MainWindow::fileSaveProject() { currentProject->save(); statusMessage( i18n( "Project '%1' saved.").arg( currentProject->projectName() )/*, 3000 */); - return TRUE; + return true; } bool MainWindow::fileSaveAs() @@ -1386,12 +1386,12 @@ bool MainWindow::fileSaveAs() TQWidget *w = qworkspace->activeWindow(); if ( !w ) - return TRUE; + return true; if ( ::tqt_cast<FormWindow*>(w) ) return ( (FormWindow*)w )->formFile()->saveAs(); else if ( ::tqt_cast<SourceEditor*>(w) ) return ( (SourceEditor*)w )->saveAs(); - return FALSE; + return false; } void MainWindow::fileSaveAll() @@ -1402,7 +1402,7 @@ void MainWindow::fileSaveAll() void MainWindow::fileCreateTemplate() { - CreateTemplate dia( this, 0, TRUE ); + CreateTemplate dia( this, 0, true ); int i = 0; for ( i = 0; i < WidgetDatabase::count(); ++i ) { @@ -1424,8 +1424,8 @@ void MainWindow::fileCreateTemplate() } dia.editName->setText( i18n( "NewTemplate" ) ); - connect( dia.buttonCreate, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( createNewTemplate() ) ); + connect( dia.buttonCreate, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( createNewTemplate() ) ); dia.exec(); } @@ -1542,7 +1542,7 @@ void MainWindow::editPaste() if ( l.count() == 1 ) { w = l.first(); if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout || - ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) && + ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) && w != formWindow()->mainContainer() ) ) w = formWindow()->mainContainer(); } @@ -1550,7 +1550,7 @@ void MainWindow::editPaste() if ( w && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) { formWindow()->paste( tqApp->clipboard()->text(), WidgetFactory::containerOfWidget( w ) ); hierarchyView->widgetInserted( 0 ); - formWindow()->commandHistory()->setModified( TRUE ); + formWindow()->commandHistory()->setModified( true ); } else { TQMessageBox::information( this, i18n( "Paste Error" ), i18n( "Cannot paste widgets. Designer could not find a container\n" @@ -1715,7 +1715,7 @@ void MainWindow::editFunctions() return; statusMessage( i18n( "Edit the current form's slots..." ) ); - EditFunctions dlg( this, formWindow(), TRUE ); + EditFunctions dlg( this, formWindow(), true ); dlg.exec(); statusBar()->clear(); } @@ -1761,7 +1761,7 @@ SourceEditor *MainWindow::openSourceEditor() } if ( !editor ) -editor = createSourceEditor( TQT_TQOBJECT(formWindow()), formWindow()->project(), lang ); +editor = createSourceEditor( formWindow(), formWindow()->project(), lang ); return editor; } @@ -1809,7 +1809,7 @@ SourceEditor *MainWindow::createSourceEditor( TQObject *object, Project *project if ( editor->object() != object ) editor->setObject( object, project ); else if ( rereadSource ) - editor->refresh( FALSE ); + editor->refresh( false ); editor->show(); editor->setFocus(); @@ -1839,7 +1839,7 @@ void MainWindow::editProjectSettings() void MainWindow::editPixmapCollection() { - PixmapCollectionEditor dia( this, 0, TRUE ); + PixmapCollectionEditor dia( this, 0, true ); dia.setProject( currentProject ); dia.exec(); } @@ -1847,7 +1847,7 @@ void MainWindow::editPixmapCollection() void MainWindow::editDatabaseConnections() { #ifndef TQT_NO_SQL - DatabaseConnectionsEditor dia( currentProject, this, 0, TRUE ); + DatabaseConnectionsEditor dia( currentProject, this, 0, true ); dia.exec(); #endif } @@ -1855,9 +1855,9 @@ void MainWindow::editDatabaseConnections() void MainWindow::editPreferences() { statusMessage( i18n( "Edit preferences..." ) ); - Preferences *dia = new Preferences( this, 0, TRUE ); + Preferences *dia = new Preferences( this, 0, true ); prefDia = dia; - connect( dia->helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( dia->helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia->buttonColor->setEditor( StyledButton::ColorEditor ); dia->buttonPixmap->setEditor( StyledButton::PixmapEditor ); dia->groupBoxGrid->setChecked( sGrid ); @@ -1872,9 +1872,9 @@ void MainWindow::editPreferences() if ( qworkspace->backgroundPixmap() ) dia->buttonPixmap->setPixmap( *qworkspace->backgroundPixmap() ); if ( backPix ) - dia->radioPixmap->setChecked( TRUE ); + dia->radioPixmap->setChecked( true ); else - dia->radioColor->setChecked( TRUE ); + dia->radioColor->setChecked( true ); dia->checkBoxSplash->setChecked( splashScreen ); dia->checkAutoEdit->setChecked( !databaseAutoEdit ); dia->checkBoxStartDialog->setChecked( shStartDialog ); @@ -1891,11 +1891,11 @@ void MainWindow::editPreferences() Tab t = *it; dia->tabWidget->addTab( t.w, t.title ); if ( t.receiver ) { - connect( dia->buttonOk, TQT_SIGNAL( clicked() ), senderObject, TQT_SLOT( emitAcceptSignal() ) ); - connect( senderObject, TQT_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); - connect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + connect( dia->buttonOk, TQ_SIGNAL( clicked() ), senderObject, TQ_SLOT( emitAcceptSignal() ) ); + connect( senderObject, TQ_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); + connect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); senderObject->emitInitSignal(); - disconnect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + disconnect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); } } @@ -1909,15 +1909,15 @@ void MainWindow::editPreferences() if (dia->textEditPluginPaths->isModified()) { pluginPaths = dia->textEditPluginPaths->text(); TQApplication::setLibraryPaths(TQStringList::split("\n", pluginPaths)); - savePluginPaths = TRUE; + savePluginPaths = true; } if ( dia->radioPixmap->isChecked() && dia->buttonPixmap->pixmap() ) { qworkspace->setBackgroundPixmap( *dia->buttonPixmap->pixmap() ); - backPix = TRUE; + backPix = true; } else { qworkspace->setBackgroundColor( dia->buttonColor->color() ); - backPix = FALSE; + backPix = false; } splashScreen = dia->checkBoxSplash->isChecked(); databaseAutoEdit = !dia->checkAutoEdit->isChecked(); @@ -1934,7 +1934,7 @@ void MainWindow::editPreferences() for ( it = preferenceTabs.begin(); it != preferenceTabs.end(); ++it ) { Tab t = *it; dia->tabWidget->removePage( t.w ); - t.w->reparent( 0, TQPoint(0,0), FALSE ); + t.w->reparent( 0, TQPoint(0,0), false ); } for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) @@ -1952,7 +1952,7 @@ void MainWindow::searchFind() return; if ( !findDialog ) - findDialog = new FindDialog( this, 0, FALSE ); + findDialog = new FindDialog( this, 0, false ); findDialog->show(); findDialog->raise(); findDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), @@ -1974,7 +1974,7 @@ void MainWindow::searchIncremetalFind() return; ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(), - FALSE, FALSE, TRUE, FALSE ); + false, false, true, false ); } void MainWindow::searchIncremetalFindNext() @@ -1984,7 +1984,7 @@ void MainWindow::searchIncremetalFindNext() return; ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(), - FALSE, FALSE, TRUE, TRUE ); + false, false, true, true ); } void MainWindow::searchReplace() @@ -1994,7 +1994,7 @@ void MainWindow::searchReplace() return; if ( !replaceDialog ) - replaceDialog = new ReplaceDialog( this, 0, FALSE ); + replaceDialog = new ReplaceDialog( this, 0, false ); replaceDialog->show(); replaceDialog->raise(); replaceDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), @@ -2010,7 +2010,7 @@ void MainWindow::searchGotoLine() return; if ( !gotoLineDialog ) - gotoLineDialog = new GotoLineDialog( this, 0, FALSE ); + gotoLineDialog = new GotoLineDialog( this, 0, false ); gotoLineDialog->show(); gotoLineDialog->raise(); gotoLineDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface() ); diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp index a3e53973..6941c05b 100644 --- a/kdevdesigner/designer/menubareditor.cpp +++ b/kdevdesigner/designer/menubareditor.cpp @@ -78,13 +78,13 @@ bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i ) TQDataStream stream( data, IO_ReadOnly ); if ( !data.size() ) - return FALSE; + return false; TQ_LONG p = 0; stream >> p; *i = ( MenuBarEditorItem *) p; - return TRUE; + return true; } // MenuBarEditorItem --------------------------------------------------- @@ -93,9 +93,9 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * parent, co : TQObject( parent, name ), menuBar( bar ), popupMenu( 0 ), - visible( TRUE ), - separator( FALSE ), - removable( FALSE ) + visible( true ), + separator( false ), + removable( false ) { } MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar, @@ -103,9 +103,9 @@ MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * ba : TQObject( parent, name ), menuBar( bar ), popupMenu( menu ), - visible( TRUE ), - separator( FALSE ), - removable( TRUE ) + visible( true ), + separator( false ), + removable( true ) { text = menu->name(); } @@ -115,9 +115,9 @@ MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor : TQObject( parent, name ), menuBar( bar ), popupMenu( 0 ), - visible( TRUE ), - separator( FALSE ), - removable( TRUE ) + visible( true ), + separator( false ), + removable( true ) { text = actionGroup->menuText(); popupMenu = new PopupMenuEditor( menuBar->formWindow(), menuBar ); @@ -148,10 +148,10 @@ MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * n currentIndex( 0 ), itemHeight( 0 ), separatorWidth( 32 ), - hideWhenEmpty( TRUE ), - hasSeparator( FALSE ) + hideWhenEmpty( true ), + hasSeparator( false ) { - setAcceptDrops( TRUE ); + setAcceptDrops( true ); setFocusPolicy( TQWidget::StrongFocus ); addItem.setMenuText( i18n("new menu") ); @@ -174,7 +174,7 @@ MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * n MenuBarEditor::~MenuBarEditor() { - itemList.setAutoDelete( TRUE ); + itemList.setAutoDelete( true ); } FormWindow * MenuBarEditor::formWindow() @@ -238,9 +238,9 @@ void MenuBarEditor::insertSeparator( int index ) return; MenuBarEditorItem * i = createItem( index ); - i->setSeparator( TRUE ); + i->setSeparator( true ); i->setMenuText( i18n( "separator" ) ); - hasSeparator = TRUE; + hasSeparator = true; } void MenuBarEditor::removeItemAt( int index ) @@ -255,7 +255,7 @@ void MenuBarEditor::removeItem( MenuBarEditorItem * item ) itemList.removeRef( item ) ) { if ( item->isSeparator() ) - hasSeparator = FALSE; + hasSeparator = false; if ( hideWhenEmpty && itemList.count() == 0 ) hide(); @@ -618,20 +618,20 @@ void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) { if ( e->state() & TQt::LeftButton ) { if ( ( e->pos() - mousePressPos ).manhattanLength() > 3 ) { - bool itemCreated = FALSE; - bool isSeparator = FALSE; + bool itemCreated = false; + bool isSeparator = false; draggedItem = item( findItem( mousePressPos ) ); if ( draggedItem == &addItem ) { draggedItem = createItem(); - itemCreated = TRUE; + itemCreated = true; } else if ( draggedItem == &addSeparator ) { if (hasSeparator) // we can only have one separator return; draggedItem = createItem(); - draggedItem->setSeparator( TRUE ); + draggedItem->setSeparator( true ); draggedItem->setMenuText( "separator" ); - isSeparator = TRUE; - itemCreated = TRUE; + isSeparator = true; + itemCreated = true; } else { isSeparator = draggedItem->isSeparator(); } @@ -640,7 +640,7 @@ void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) new MenuBarEditorItemPtrDrag( draggedItem, this ); d->setPixmap( createTextPixmap( draggedItem->menuText() ) ); hideItem(); - draggedItem->setVisible( FALSE ); + draggedItem->setVisible( false ); update(); // If the item is dropped in the same list, @@ -648,21 +648,21 @@ void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) // in the list. itemList.find( draggedItem ); TQLNode * node = itemList.currentNode(); - dropConfirmed = FALSE; + dropConfirmed = false; d->dragCopy(); // dragevents and stuff happens if ( draggedItem ) { // item was not dropped if ( itemCreated ) { removeItem( draggedItem ); } else { hideItem(); - draggedItem->setVisible( TRUE ); + draggedItem->setVisible( true ); draggedItem = 0; showItem(); } } else if ( dropConfirmed ) { // item was dropped - dropConfirmed = FALSE; + dropConfirmed = false; hideItem(); - itemList.takeNode( node )->setVisible( TRUE ); + itemList.takeNode( node )->setVisible( true ); hasSeparator = isSeparator || hasSeparator; showItem(); } else { @@ -1007,10 +1007,10 @@ void MenuBarEditor::dropInPlace( MenuBarEditorItem * i, const TQPoint & pos ) int iidx = itemList.findRef( i ); if ( iidx != -1 ) { // internal dnd cmd = new MoveMenuCommand( i18n( "Item Dragged" ), formWnd, this, iidx, idx ); - item( iidx )->setVisible( TRUE ); + item( iidx )->setVisible( true ); } else { cmd = new AddMenuCommand( i18n( "Add Menu" ), formWnd, this, i, idx ); - dropConfirmed = TRUE; // let mouseMoveEvent set the item visible + dropConfirmed = true; // let mouseMoveEvent set the item visible } formWnd->commandHistory()->addCommand( cmd ); cmd->execute(); diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h index 11277258..72d7968a 100644 --- a/kdevdesigner/designer/menubareditor.h +++ b/kdevdesigner/designer/menubareditor.h @@ -90,7 +90,7 @@ public: FormWindow * formWindow(); - MenuBarEditorItem * createItem( int index = -1, bool addToCmdStack = TRUE ); + MenuBarEditorItem * createItem( int index = -1, bool addToCmdStack = true ); void insertItem( MenuBarEditorItem * item, int index = -1 ); void insertItem( TQString text, PopupMenuEditor * menu, int index = -1 ); void insertItem( TQString text, TQActionGroup * group, int index = -1 ); diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp index 32fdcd62..67c9338d 100644 --- a/kdevdesigner/designer/metadatabase.cpp +++ b/kdevdesigner/designer/metadatabase.cpp @@ -38,7 +38,7 @@ #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqapplication.h> #include <tqobject.h> @@ -50,7 +50,7 @@ #include <tqwidgetlist.h> #include <tqmainwindow.h> #include <tqregexp.h> -#include <tqpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include <tqdatetime.h> #include <tqfile.h> #include <tqfileinfo.h> @@ -85,7 +85,7 @@ public: static TQPtrDict<MetaDataBaseRecord> *db = 0; static TQPtrList<MetaDataBase::CustomWidget> *cWidgets = 0; -static bool doUpdate = TRUE; +static bool doUpdate = true; static TQStringList langList; static TQStringList editorLangList; static TQPluginManager<LanguageInterface> *languageInterfaceManager = 0; @@ -107,9 +107,9 @@ inline void setupDataBase() { if ( !db || !cWidgets ) { db = new TQPtrDict<MetaDataBaseRecord>( 1481 ); - db->setAutoDelete( TRUE ); + db->setAutoDelete( true ); cWidgets = new TQPtrList<MetaDataBase::CustomWidget>; - cWidgets->setAutoDelete( TRUE ); + cWidgets->setAutoDelete( true ); } } @@ -166,20 +166,20 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo if ( doUpdate && ( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) { - doUpdate = FALSE; + doUpdate = false; setPropertyChanged( o, "alignment", changed || isPropertyChanged( o, "hAlign" ) || isPropertyChanged( o, "vAlign" ) || isPropertyChanged( o, "wordwrap" ) ); - doUpdate = TRUE; + doUpdate = true; } if ( doUpdate && property == "alignment" ) { - doUpdate = FALSE; + doUpdate = false; setPropertyChanged( o, "hAlign", changed ); setPropertyChanged( o, "vAlign", changed ); setPropertyChanged( o, "wordwrap", changed ); - doUpdate = TRUE; + doUpdate = true; } } @@ -192,7 +192,7 @@ bool MetaDataBase::isPropertyChanged( TQObject *o, const TQString &property ) if ( !r ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return FALSE; + return false; } return r->changedProperties.findIndex( property ) != -1; @@ -322,7 +322,7 @@ int MetaDataBase::spacing( TQObject *o ) return -1; setupDataBase(); if ( ::tqt_cast<TQMainWindow*>(o) ) - o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", @@ -349,13 +349,13 @@ void MetaDataBase::setMargin( TQObject *o, int margin ) TQLayout * layout = 0; WidgetFactory::layoutType( (TQWidget*)o, layout ); - bool isInnerLayout = TRUE; + bool isInnerLayout = true; TQWidget *widget = (TQWidget*)o; if ( widget && !::tqt_cast<TQLayoutWidget*>(widget) && - ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) || + ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) || widget && widget->parentWidget() && ::tqt_cast<FormWindow*>(widget->parentWidget()) ) ) - isInnerLayout = FALSE; + isInnerLayout = false; if ( layout ) { @@ -379,7 +379,7 @@ int MetaDataBase::margin( TQObject *o ) return -1; setupDataBase(); if ( ::tqt_cast<TQMainWindow*>(o) ) - o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", @@ -410,7 +410,7 @@ TQString MetaDataBase::resizeMode( TQObject *o ) return TQString(); setupDataBase(); if ( ::tqt_cast<TQMainWindow*>(o) ) - o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", @@ -514,8 +514,8 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte sender = formfile->project()->objectForFakeFormFile( formfile ); if ( !sender && senderName == "this" ) sender = formfile->formWindow() ? - TQT_TQOBJECT(formfile->formWindow()->mainContainer()) : - TQT_TQOBJECT(formfile->project()->objectForFakeFormFile( formfile )); + formfile->formWindow()->mainContainer() : + formfile->project()->objectForFakeFormFile( formfile ); if ( !sender ) continue; MetaDataBase::addConnection( formfile->formWindow() ? @@ -524,10 +524,10 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte sender, (*cit).signal.latin1(), formfile->formWindow() ? - TQT_TQOBJECT(formfile->formWindow()->mainContainer()) : - TQT_TQOBJECT(formfile->project()->objectForFakeFormFile( formfile )), + formfile->formWindow()->mainContainer() : + formfile->project()->objectForFakeFormFile( formfile ), (*cit).slot.latin1(), - FALSE ); + false ); } } @@ -539,7 +539,7 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString if ( !r ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return FALSE; + return false; } for ( TQValueList<Connection>::Iterator it = r->connections.begin(); it != r->connections.end(); ++it ) { @@ -548,9 +548,9 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString conn.signal == signal && conn.receiver ==receiver && conn.slot == slot ) - return TRUE; + return true; } - return FALSE; + return false; } @@ -628,7 +628,7 @@ void MetaDataBase::doConnections( TQObject *o ) if ( qstrcmp( conn.sender->name(), o->name() ) == 0 ) { sender = o; } else { - l = o->queryList( 0, conn.sender->name(), FALSE ); + l = o->queryList( 0, conn.sender->name(), false ); if ( !l || !l->first() ) { delete l; continue; @@ -639,7 +639,7 @@ void MetaDataBase::doConnections( TQObject *o ) if ( qstrcmp( conn.receiver->name(), o->name() ) == 0 ) { receiver = o; } else { - l = o->queryList( 0, conn.receiver->name(), FALSE ); + l = o->queryList( 0, conn.receiver->name(), false ); if ( !l || !l->first() ) { delete l; continue; @@ -652,8 +652,8 @@ void MetaDataBase::doConnections( TQObject *o ) TQString s2 = "1""%1"; s2 = s2.arg( conn.slot.data() ); - TQStrList signalList = sender->metaObject()->signalNames( TRUE ); - TQStrList slotList = receiver->metaObject()->slotNames( TRUE ); + TQStrList signalList = sender->metaObject()->signalNames( true ); + TQStrList slotList = receiver->metaObject()->slotNames( true ); // avoid warnings if ( signalList.find( conn.signal ) == -1 || @@ -671,19 +671,19 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom if ( !r ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return FALSE; + return false; } if ( !onlyCustom ) { - TQStrList slotList = o->metaObject()->slotNames( TRUE ); + TQStrList slotList = o->metaObject()->slotNames( true ); if ( slotList.find( slot ) != -1 ) - return TRUE; + return true; if ( ::tqt_cast<FormWindow*>(o) ) { - o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); - slotList = o->metaObject()->slotNames( TRUE ); + o = ( (FormWindow*)o )->mainContainer(); + slotList = o->metaObject()->slotNames( true ); if ( slotList.find( slot ) != -1 ) - return TRUE; + return true; } //if ( ::tqt_cast<CustomWidget*>(o) ) { @@ -694,7 +694,7 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom if ( !s.data() ) continue; if ( s == slot ) - return TRUE; + return true; } } } @@ -702,10 +702,10 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom for ( TQValueList<Function>::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { Function f = *it; if ( normalizeFunction( f.function ) == normalizeFunction( slot ) && f.type == "slot" ) - return TRUE; + return true; } - return FALSE; + return false; } bool MetaDataBase::isSlotUsed( TQObject *o, const TQCString &slot ) @@ -715,15 +715,15 @@ bool MetaDataBase::isSlotUsed( TQObject *o, const TQCString &slot ) if ( !r ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return FALSE; + return false; } TQValueList<Connection> conns = connections( o ); for ( TQValueList<Connection>::Iterator it = conns.begin(); it != conns.end(); ++it ) { if ( (*it).slot == slot ) - return TRUE; + return true; } - return FALSE; + return false; } @@ -901,19 +901,19 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl if ( !r ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return FALSE; + return false; } if ( !onlyCustom ) { - TQStrList functionList = o->metaObject()->slotNames( TRUE ); + TQStrList functionList = o->metaObject()->slotNames( true ); if ( functionList.find( function ) != -1 ) - return TRUE; + return true; if ( ::tqt_cast<FormWindow*>(o) ) { - o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); - functionList = o->metaObject()->slotNames( TRUE ); + o = ( (FormWindow*)o )->mainContainer(); + functionList = o->metaObject()->slotNames( true ); if ( functionList.find( function ) != -1 ) - return TRUE; + return true; } //if ( ::tqt_cast<CustomWidget*>(o) ) { @@ -924,7 +924,7 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl if ( !s.data() ) continue; if ( s == function ) - return TRUE; + return true; } } } @@ -932,10 +932,10 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl for ( TQValueList<Function>::Iterator it = r->functionList.begin(); it != r->functionList.end(); ++it ) { Function f = *it; if ( normalizeFunction( f.function ) == normalizeFunction( function ) ) - return TRUE; + return true; } - return FALSE; + return false; } TQString MetaDataBase::languageOfFunction( TQObject *o, const TQCString &function ) @@ -975,7 +975,7 @@ bool MetaDataBase::addCustomWidget( CustomWidget *wid ) w->lstProperties.append( *it3 ); } delete wid; - return FALSE; + return false; } } @@ -988,7 +988,7 @@ bool MetaDataBase::addCustomWidget( CustomWidget *wid ) r->isContainer = wid->isContainer; wid->id = WidgetDatabase::addCustomWidget( r ); cWidgets->append( wid ); - return TRUE; + return true; } void MetaDataBase::removeCustomWidget( CustomWidget *w ) @@ -1017,18 +1017,18 @@ bool MetaDataBase::isWidgetNameUsed( CustomWidget *wid ) if ( w == wid ) continue; if ( wid->className == w->className ) - return TRUE; + return true; } - return FALSE; + return false; } bool MetaDataBase::hasCustomWidget( const TQString &className ) { for ( CustomWidget *w = cWidgets->first(); w; w = cWidgets->next() ) { if ( w->className == className ) - return TRUE; + return true; } - return FALSE; + return false; } void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order ) @@ -1175,15 +1175,15 @@ bool MetaDataBase::hasVariable( TQObject *o, const TQString &name ) if ( !r ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); - return FALSE; + return false; } TQValueList<Variable>::Iterator it = r->variables.begin(); for ( ; it != r->variables.end(); ++it ) { if ( extractVariableName( name ) == extractVariableName( (*it).varName ) ) - return TRUE; + return true; } - return FALSE; + return false; } TQString MetaDataBase::extractVariableName( const TQString &name ) @@ -1280,7 +1280,7 @@ MetaDataBase::CustomWidget::CustomWidget() pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", KDevDesignerPartFactory::instance() ) ); id = -1; sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); - isContainer = FALSE; + isContainer = false; } MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w ) @@ -1354,40 +1354,40 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const { - TQStrList sigList = TQWidget::staticMetaObject()->signalNames( TRUE ); + TQStrList sigList = TQWidget::staticMetaObject()->signalNames( true ); if ( sigList.find( signal ) != -1 ) - return TRUE; + return true; for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) { if ( normalizeFunction( *it ) == normalizeFunction( signal ) ) - return TRUE; + return true; } - return FALSE; + return false; } bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const { - TQStrList slotList = TQWidget::staticMetaObject()->slotNames( TRUE ); + TQStrList slotList = TQWidget::staticMetaObject()->slotNames( true ); if ( slotList.find( normalizeFunction( slot ) ) != -1 ) - return TRUE; + return true; for ( TQValueList<MetaDataBase::Function>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) { if ( normalizeFunction( (*it).function ) == normalizeFunction( slot ) ) - return TRUE; + return true; } - return FALSE; + return false; } bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const { - TQStrList propList = TQWidget::staticMetaObject()->propertyNames( TRUE ); + TQStrList propList = TQWidget::staticMetaObject()->propertyNames( true ); if ( propList.find( prop ) != -1 ) - return TRUE; + return true; for ( TQValueList<MetaDataBase::Property>::ConstIterator it = lstProperties.begin(); it != lstProperties.end(); ++it ) { if ( (*it).property == prop ) - return TRUE; + return true; } - return FALSE; + return false; } void MetaDataBase::setPixmapArgument( TQObject *o, int pixmap, const TQString &arg ) diff --git a/kdevdesigner/designer/metadatabase.h b/kdevdesigner/designer/metadatabase.h index e9535945..c76475c5 100644 --- a/kdevdesigner/designer/metadatabase.h +++ b/kdevdesigner/designer/metadatabase.h @@ -135,7 +135,7 @@ public: struct MetaInfo { - MetaInfo() : classNameChanged( FALSE ) { } + MetaInfo() : classNameChanged( false ) { } TQString className; bool classNameChanged; TQString comment; @@ -166,7 +166,7 @@ public: static TQString resizeMode( TQObject *o ); static void addConnection( TQObject *o, TQObject *sender, const TQCString &signal, - TQObject *receiver, const TQCString &slot, bool addCode = TRUE ); + TQObject *receiver, const TQCString &slot, bool addCode = true ); static void removeConnection( TQObject *o, TQObject *sender, const TQCString &signal, TQObject *receiver, const TQCString &slot ); static bool hasConnection( TQObject *o, TQObject *sender, const TQCString &signal, @@ -184,11 +184,11 @@ public: const TQString &access, const TQString &type, const TQString &language, const TQString &returnType ); static void removeFunction( TQObject *o, const TQString &function ); - static TQValueList<Function> functionList( TQObject *o, bool onlyFunctions = FALSE ); + static TQValueList<Function> functionList( TQObject *o, bool onlyFunctions = false ); static TQValueList<Function> slotList( TQObject *o ); static bool isSlotUsed( TQObject *o, const TQCString &slot ); - static bool hasFunction( TQObject *o, const TQCString &function, bool onlyCustom = FALSE ); - static bool hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom = FALSE ); + static bool hasFunction( TQObject *o, const TQCString &function, bool onlyCustom = false ); + static bool hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom = false ); static void changeFunction( TQObject *o, const TQString &function, const TQString &newName, const TQString &returnType ); static void changeFunctionAttributes( TQObject *o, const TQString &oldName, const TQString &newName, diff --git a/kdevdesigner/designer/multilineeditor.ui b/kdevdesigner/designer/multilineeditor.ui index f0ff2129..83579b04 100644 --- a/kdevdesigner/designer/multilineeditor.ui +++ b/kdevdesigner/designer/multilineeditor.ui @@ -172,10 +172,10 @@ <slot>cancelClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>applyClicked()</slot> <slot>okClicked()</slot> <slot>cancelClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp index d2b3d158..702e1ca8 100644 --- a/kdevdesigner/designer/multilineeditorimpl.cpp +++ b/kdevdesigner/designer/multilineeditorimpl.cpp @@ -36,7 +36,7 @@ #include "kdevdesigner_part.h" #include <tqtextedit.h> -#include <tqrichtext_p.h> +#include <private/tqrichtext_p.h> #include <tqpushbutton.h> #include <tqlayout.h> #include <tqtoolbutton.h> @@ -56,7 +56,7 @@ ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar, setAccel( key ); addTo( toolBar ); tag = tagstr; - connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( wasActivated() ) ); + connect( this, TQ_SIGNAL( activated() ), this, TQ_SLOT( wasActivated() ) ); } ToolBarItem::~ToolBarItem() @@ -84,7 +84,7 @@ TQTextParagraph* TextEdit::paragraph() MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget, FormWindow *fw, const TQString &text ) - : MultiLineEditorBase( parent, 0, WType_Dialog | WShowModal ), formwindow( fw ), doWrap( FALSE ) + : MultiLineEditorBase( parent, 0, WType_Dialog | WShowModal ), formwindow( fw ), doWrap( false ) { callStatic = call_static; @@ -103,26 +103,26 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget ToolBarItem *it = new ToolBarItem( this, basicToolBar, i18n( "Italic" ), "i", BarIcon( "designer_textitalic.png", KDevDesignerPartFactory::instance() ), CTRL+Key_I ); it->addTo( stylesMenu ); - connect( it, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( it, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *b = new ToolBarItem( this, basicToolBar, i18n( "Bold" ), "b", BarIcon( "designer_textbold.png", KDevDesignerPartFactory::instance() ), CTRL+Key_B ); b->addTo( stylesMenu ); - connect( b, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( b, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ul = new ToolBarItem( this, basicToolBar, i18n( "Underline" ), "u", BarIcon( "designer_textunderline.png" , KDevDesignerPartFactory::instance()), CTRL+Key_U ); ul->addTo( stylesMenu ); - connect( ul, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( ul, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *tt = new ToolBarItem( this, basicToolBar, i18n( "Typewriter" ), "tt", BarIcon( "designer_textteletext.png", KDevDesignerPartFactory::instance() ) ); tt->addTo( stylesMenu ); - connect( tt, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( tt, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); basicToolBar->addSeparator(); @@ -134,39 +134,39 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget brAction->setText( i18n("Break" ) ); brAction->addTo( basicToolBar ); brAction->addTo( layoutMenu ); - connect( brAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( insertBR() ) ); + connect( brAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( insertBR() ) ); ToolBarItem *p = new ToolBarItem( this, basicToolBar, i18n( "Paragraph" ), "p", BarIcon( "designer_textparagraph.png", KDevDesignerPartFactory::instance() ) ); p->addTo( layoutMenu ); - connect( p, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( p, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); layoutMenu->insertSeparator(); basicToolBar->addSeparator(); ToolBarItem *al = new ToolBarItem( this, basicToolBar, i18n( "Align left" ), "p align=\"left\"", BarIcon( "designer_textleft.png", KDevDesignerPartFactory::instance() ) ); al->addTo( layoutMenu ); - connect( al, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( al, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ac = new ToolBarItem( this, basicToolBar, i18n( "Align center" ), "p align=\"center\"", BarIcon( "designer_textcenter.png", KDevDesignerPartFactory::instance() ) ); ac->addTo( layoutMenu ); - connect( ac, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( ac, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ar = new ToolBarItem( this, basicToolBar, i18n( "Align right" ), "p align=\"right\"", BarIcon( "designer_textright.png", KDevDesignerPartFactory::instance() ) ); ar->addTo( layoutMenu ); - connect( ar, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( ar, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *block = new ToolBarItem( this, basicToolBar, i18n( "Blockquote" ), "blockquote", BarIcon( "designer_textjustify.png", KDevDesignerPartFactory::instance() ) ); block->addTo( layoutMenu ); - connect( block, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( block, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); TQPopupMenu *fontMenu = new TQPopupMenu( this ); @@ -179,67 +179,67 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget fontAction->setText( i18n("Font" ) ); fontAction->addTo( fontToolBar ); fontAction->addTo( fontMenu ); - connect( fontAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( showFontDialog() ) ); + connect( fontAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( showFontDialog() ) ); ToolBarItem *fp1 = new ToolBarItem( this, fontToolBar, i18n( "Fontsize +1" ), "font size=\"+1\"", BarIcon( "designer_textlarger.png", KDevDesignerPartFactory::instance() ) ); - connect( fp1, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( fp1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *fm1 = new ToolBarItem( this, fontToolBar, i18n( "Fontsize -1" ), "font size=\"-1\"", BarIcon( "designer_textsmaller.png", KDevDesignerPartFactory::instance() ) ); - connect( fm1, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( fm1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h1 = new ToolBarItem( this, fontToolBar, i18n( "Headline 1" ), "h1", BarIcon( "designer_texth1.png", KDevDesignerPartFactory::instance() ) ); - connect( h1, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( h1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h2 = new ToolBarItem( this, fontToolBar, i18n( "Headline 2" ), "h2", BarIcon( "designer_texth2.png", KDevDesignerPartFactory::instance() ) ); - connect( h2, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( h2, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h3 = new ToolBarItem( this, fontToolBar, i18n( "Headline 3" ), "h3", BarIcon( "designer_texth3.png", KDevDesignerPartFactory::instance() ) ); - connect( h3, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( h3, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); TQPopupMenu *optionsMenu = new TQPopupMenu( this ); menuBar->insertItem( i18n( "O&ptions" ), optionsMenu ); optionsToolBar = new TQToolBar( "Options", this, DockTop ); wrapAction = new TQAction( this ); - wrapAction->setToggleAction( TRUE ); + wrapAction->setToggleAction( true ); wrapAction->setIconSet( BarIcon( "designer_wordwrap.png", KDevDesignerPartFactory::instance() ) ); wrapAction->setText( i18n( "Word Wrapping" ) ); wrapAction->addTo( optionsToolBar ); wrapAction->addTo( optionsMenu ); - connect( wrapAction, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( changeWrapMode( bool ) ) ); + connect( wrapAction, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( changeWrapMode( bool ) ) ); oldDoWrap = doWrap; wrapAction->setOn( doWrap ); - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); textEdit->document()->setFormatter( new TQTextFormatterBreakInWords ); - textEdit->document()->setUseFormatCollection( FALSE ); + textEdit->document()->setUseFormatCollection( false ); textEdit->document()->setPreProcessor( new SyntaxHighlighter_HTML ); if ( !callStatic && ::tqt_cast<TQTextEdit*>(editWidget) ) { mlined = (TQTextEdit*)editWidget; - mlined->setReadOnly( TRUE ); + mlined->setReadOnly( true ); const TQMetaProperty *wordWrap = mlined->metaObject()->property( - mlined->metaObject()->findProperty( "wordWrap", TRUE ), TRUE ); + mlined->metaObject()->findProperty( "wordWrap", true ), true ); oldWrapMode = 0; oldWrapString = "NoWrap"; if ( wordWrap ) { oldWrapMode = mlined->property( "wordWrap" ); oldWrapString = TQString( wordWrap->valueToKey( oldWrapMode.toInt() ) ); if ( oldWrapString != "NoWrap" ) - doWrap = TRUE; + doWrap = true; } textEdit->setAlignment( mlined->alignment() ); textEdit->setWordWrap( mlined->wordWrap() ); @@ -286,17 +286,17 @@ void MultiLineEditor::applyClicked() SetPropertyCommand *propcmd; if ( doWrap ) propcmd = new SetPropertyCommand( pn, formwindow, - TQT_TQOBJECT(mlined), MainWindow::self->propertyeditor(), - "wordWrap", WidgetFactory::property( TQT_TQOBJECT(mlined), "wordWrap" ), + mlined, MainWindow::self->propertyeditor(), + "wordWrap", WidgetFactory::property( mlined, "wordWrap" ), TQVariant( 1 ), "WidgetWidth", oldWrapString ); else propcmd = new SetPropertyCommand( pn, formwindow, - TQT_TQOBJECT(mlined), MainWindow::self->propertyeditor(), - "wordWrap", WidgetFactory::property( TQT_TQOBJECT(mlined), "wordWrap" ), + mlined, MainWindow::self->propertyeditor(), + "wordWrap", WidgetFactory::property( mlined, "wordWrap" ), TQVariant( 0 ), "NoWrap", oldWrapString ); propcmd->execute(); - formwindow->commandHistory()->addCommand( propcmd, TRUE ); + formwindow->commandHistory()->addCommand( propcmd, true ); } textEdit->setFocus(); } @@ -346,11 +346,11 @@ void MultiLineEditor::insertBR() void MultiLineEditor::showFontDialog() { - bool selText = FALSE; + bool selText = false; int pfrom, pto, ifrom, ito; if ( textEdit->hasSelectedText() ) { textEdit->getSelection( &pfrom, &ifrom, &pto, &ito ); - selText = TRUE; + selText = true; } RichTextFontDialog *fd = new RichTextFontDialog( this ); if ( fd->exec() == TQDialog::Accepted ) { @@ -380,7 +380,7 @@ TQString MultiLineEditor::getStaticText() TQString MultiLineEditor::getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap ) { - MultiLineEditor medit( TRUE, richtextMode, parent, 0, 0, text ); + MultiLineEditor medit( true, richtextMode, parent, 0, 0, text ); if ( richtextMode ) medit.setUseWrapping( *useWrap ); if ( medit.exec() == TQDialog::Accepted ) { diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h index 75ac330f..895a397a 100644 --- a/kdevdesigner/designer/multilineeditorimpl.h +++ b/kdevdesigner/designer/multilineeditorimpl.h @@ -29,7 +29,7 @@ #include <tqaction.h> #include <tqtextedit.h> -#include <tqrichtext_p.h> +#include <private/tqrichtext_p.h> #include "multilineeditor.h" class FormWindow; diff --git a/kdevdesigner/designer/newform.ui b/kdevdesigner/designer/newform.ui index 81cb4fa5..7b95ee55 100644 --- a/kdevdesigner/designer/newform.ui +++ b/kdevdesigner/designer/newform.ui @@ -230,9 +230,9 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">itemChanged( TQIconViewItem * )</slot> <slot access="protected">projectChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp index 738c8a55..72c8323e 100644 --- a/kdevdesigner/designer/newformimpl.cpp +++ b/kdevdesigner/designer/newformimpl.cpp @@ -74,10 +74,10 @@ void FormItem::insert( Project *pro ) { TQString n = "Form" + TQString::number( ++forms ); FormWindow *fw = 0; - FormFile *ff = new FormFile( FormFile::createUnnamedFileName(), TRUE, pro ); + FormFile *ff = new FormFile( FormFile::createUnnamedFileName(), true, pro ); fw = new FormWindow( ff, MainWindow::self, MainWindow::self->qWorkspace(), n ); fw->setProject( pro ); - MetaDataBase::addEntry( TQT_TQOBJECT(fw) ); + MetaDataBase::addEntry( fw ); if ( fType == Widget ) { TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWidget" ), fw, n.latin1() ); @@ -109,15 +109,15 @@ void FormItem::insert( Project *pro ) // the wizard might have changed a lot, lets update everything MainWindow::self->actioneditor()->setFormWindow( fw ); - MainWindow::self->objectHierarchy()->setFormWindow( fw, TQT_TQOBJECT(fw) ); + MainWindow::self->objectHierarchy()->setFormWindow( fw, fw ); MainWindow::self->objectHierarchy()->formDefinitionView()->refresh(); MainWindow::self->objectHierarchy()->rebuild(); - fw->killAccels( TQT_TQOBJECT(fw) ); - fw->project()->setModified( TRUE ); + fw->killAccels( fw ); + fw->project()->setModified( true ); fw->setFocus(); if ( !pro->isDummy() ) { - fw->setSavePixmapInProject( TRUE ); - fw->setSavePixmapInline( FALSE ); + fw->setSavePixmapInProject( true ); + fw->setSavePixmapInline( false ); } } @@ -155,7 +155,7 @@ void CustomFormItem::insert( Project *pro ) TQString filename = templateFileName(); if ( !filename.isEmpty() && TQFile::exists( filename ) ) { Resource resource( MainWindow::self ); - FormFile *ff = new FormFile( filename, TRUE, pro ); + FormFile *ff = new FormFile( filename, true, pro ); if ( !resource.load( ff ) ) { TQMessageBox::information( MainWindow::self, i18n("Load Template"), i18n("Could not load form description from template '%1'" ).arg( filename ) ); @@ -167,8 +167,8 @@ void CustomFormItem::insert( Project *pro ) MainWindow::self->formWindow()->setFileName( TQString() ); unifyFormName( MainWindow::self->formWindow(), MainWindow::self->qWorkspace() ); if ( !pro->isDummy() ) { - MainWindow::self->formWindow()->setSavePixmapInProject( TRUE ); - MainWindow::self->formWindow()->setSavePixmapInline( FALSE ); + MainWindow::self->formWindow()->setSavePixmapInProject( true ); + MainWindow::self->formWindow()->setSavePixmapInline( false ); } } } @@ -177,13 +177,13 @@ void CustomFormItem::insert( Project *pro ) SourceFileItem::SourceFileItem( TQIconView *view, const TQString &text ) - : NewItem( view, text ), visible( TRUE ) + : NewItem( view, text ), visible( true ) { } void SourceFileItem::insert( Project *pro ) { - SourceFile *f = new SourceFile( SourceFile::createUnnamedFileName( ext ), TRUE, pro ); + SourceFile *f = new SourceFile( SourceFile::createUnnamedFileName( ext ), true, pro ); MainWindow::self->editSource( f ); } @@ -203,7 +203,7 @@ void SourceFileItem::setProject( Project *pro ) SourceTemplateItem::SourceTemplateItem( TQIconView *view, const TQString &text ) - : NewItem( view, text ), visible( TRUE ) + : NewItem( view, text ), visible( true ) { } @@ -217,13 +217,13 @@ void SourceTemplateItem::insert( Project *pro ) if ( src.type == SourceTemplateInterface::Source::Invalid ) return; if ( src.type == SourceTemplateInterface::Source::FileName ) - f = new SourceFile( src.filename, FALSE, pro ); + f = new SourceFile( src.filename, false, pro ); else - f = new SourceFile( SourceFile::createUnnamedFileName( src.extension ), TRUE, pro ); + f = new SourceFile( SourceFile::createUnnamedFileName( src.extension ), true, pro ); if ( f->isAccepted()) { f->setText( src.code ); MainWindow::self->editSource( f ); - f->setModified( TRUE ); + f->setModified( true ); } else { delete f; } @@ -253,7 +253,7 @@ void NewForm::insertTemplates( TQIconView *tView, allItems.append( pi ); pi->setLanguage( *it ); pi->setPixmap( BarIcon( "designer_project.png" , KDevDesignerPartFactory::instance()) ); - pi->setDragEnabled( FALSE ); + pi->setDragEnabled( false ); } } TQIconViewItem *cur = 0; @@ -261,24 +261,24 @@ void NewForm::insertTemplates( TQIconView *tView, allItems.append( fi ); fi->setFormType( FormItem::Dialog ); fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) ); - fi->setDragEnabled( FALSE ); + fi->setDragEnabled( false ); cur = fi; if ( !MainWindow::self->singleProjectMode() ) { fi = new FormItem( tView,i18n( "Wizard" ) ); allItems.append( fi ); fi->setFormType( FormItem::Wizard ); fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) ); - fi->setDragEnabled( FALSE ); + fi->setDragEnabled( false ); fi = new FormItem( tView, i18n( "Widget" ) ); allItems.append( fi ); fi->setFormType( FormItem::Widget ); fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) ); - fi->setDragEnabled( FALSE ); + fi->setDragEnabled( false ); fi = new FormItem( tView, i18n( "Main Window" ) ); allItems.append( fi ); fi->setFormType( FormItem::MainWindow ); fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) ); - fi->setDragEnabled( FALSE ); + fi->setDragEnabled( false ); TQString templPath = templatePath; TQStringList templRoots; @@ -309,7 +309,7 @@ void NewForm::insertTemplates( TQIconView *tView, name = name.replace( '_', ' ' ); CustomFormItem *ci = new CustomFormItem( tView, name ); allItems.append( ci ); - ci->setDragEnabled( FALSE ); + ci->setDragEnabled( false ); ci->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) ); ci->setTemplateFile( fi->absFilePath() ); } @@ -329,7 +329,7 @@ void NewForm::insertTemplates( TQIconView *tView, si->setExtension( eit.key() ); si->setLanguage( *it ); si->setPixmap( BarIcon( "designer_filenew.png", KDevDesignerPartFactory::instance() ) ); - si->setDragEnabled( FALSE ); + si->setDragEnabled( false ); } iface->release(); } @@ -346,7 +346,7 @@ void NewForm::insertTemplates( TQIconView *tView, si->setTemplate( *sit ); si->setLanguage( siface->language( *sit ) ); si->setPixmap( BarIcon( "designer_filenew.png", KDevDesignerPartFactory::instance() ) ); - si->setDragEnabled( FALSE ); + si->setDragEnabled( false ); siface->release(); } } @@ -366,9 +366,9 @@ NewForm::NewForm( TQIconView *templateView, const TQString &templatePath ) NewForm::NewForm( TQWidget *parent, const TQStringList& projects, const TQString& currentProject, const TQString &templatePath ) - : NewFormBase( parent, 0, TRUE ) + : NewFormBase( parent, 0, true ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); projectCombo->insertStringList( projects ); projectCombo->setCurrentText( currentProject ); @@ -399,7 +399,7 @@ void NewForm::projectChanged( const TQString &project ) for ( i = allItems.first(); i; i = allItems.next() ) ( (NewItem*)i )->setProject( pro ); templateView->setCurrentItem( templateView->firstItem() ); - templateView->arrangeItemsInGrid( TRUE ); + templateView->arrangeItemsInGrid( true ); } void NewForm::itemChanged( TQIconViewItem *item ) diff --git a/kdevdesigner/designer/orderindicator.cpp b/kdevdesigner/designer/orderindicator.cpp index 2904cfbf..445e835f 100644 --- a/kdevdesigner/designer/orderindicator.cpp +++ b/kdevdesigner/designer/orderindicator.cpp @@ -39,7 +39,7 @@ OrderIndicator::OrderIndicator( int i, TQWidget* w, FormWindow *fw ) order = -1; widget = w; setBackgroundMode( NoBackground ); - setAutoMask( TRUE ); + setAutoMask( true ); setOrder( i, w ); } @@ -67,7 +67,7 @@ void OrderIndicator::setOrder( int i, TQWidget* wid ) int w = fontMetrics().width( TQString::number( i ) ) + 10; int h = fontMetrics().lineSpacing() * 3 / 2; TQFont f( font() ); - f.setBold( TRUE ); + f.setBold( true ); setFont( f ); resize( TQMAX( w, h ), h ); update(); // in case the size didn't change diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp index 8dcf7ba5..60604d97 100644 --- a/kdevdesigner/designer/outputwindow.cpp +++ b/kdevdesigner/designer/outputwindow.cpp @@ -40,7 +40,7 @@ #include <tdelocale.h> static TQTextEdit *debugoutput = 0; -bool debugToStderr = FALSE; +bool debugToStderr = false; TQtMsgHandler OutputWindow::oldMsgHandler = 0; @@ -71,10 +71,10 @@ void OutputWindow::setupError() { errorView = new TQListView( this, "OutputWindow::errorView" ); errorView->setSorting( -1 ); - connect( errorView, TQT_SIGNAL( currentChanged( TQListViewItem* ) ), - this, TQT_SLOT( currentErrorChanged( TQListViewItem* ) ) ); - connect( errorView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( currentErrorChanged( TQListViewItem* ) ) ); + connect( errorView, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), + this, TQ_SLOT( currentErrorChanged( TQListViewItem* ) ) ); + connect( errorView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( currentErrorChanged( TQListViewItem* ) ) ); if ( MetaDataBase::languages().count() > 1 ) addTab( errorView, i18n( "Warnings/Errors" ) ); @@ -89,7 +89,7 @@ void OutputWindow::setupError() errorView->setColumnWidth( 1, errorView->fontMetrics().width( "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOP" ) ); errorView->setColumnWidth( 2, errorView->fontMetrics().width( "9999999" ) ); errorView->setColumnAlignment( 2, TQt::AlignRight ); - errorView->setAllColumnsShowFocus( TRUE ); + errorView->setAllColumnsShowFocus( true ); } static void debugMessageOutput( TQtMsgType type, const char *msg ) @@ -115,7 +115,7 @@ static void debugMessageOutput( TQtMsgType type, const char *msg ) void OutputWindow::setupDebug() { debugoutput = debugView = new TQTextEdit( this, "OutputWindow::debugView" ); - //debugView->setReadOnly( TRUE ); + //debugView->setReadOnly( true ); addTab( debugView, "Debug Output" ); if ( !debugToStderr ) @@ -169,7 +169,7 @@ void OutputWindow::currentErrorChanged( TQListViewItem *i ) if ( !i ) return; ErrorItem *ei = (ErrorItem*)i; - ei->setRead( TRUE ); + ei->setRead( true ); MainWindow::self->showSourceLine( ei->location(), ei->line() - 1, MainWindow::Error ); } @@ -179,7 +179,7 @@ ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString const TQString &locationString, TQObject *locationObject ) : TQListViewItem( parent, after ) { - setMultiLinesEnabled( TRUE ); + setMultiLinesEnabled( true ); TQString m( message ); type = m.startsWith( "Warning: " ) ? Warning : Error; m = m.mid( m.find( ':' ) + 1 ); @@ -190,7 +190,7 @@ ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString object = locationObject; read = !after; if ( !after ) { - parent->setSelected( this, TRUE ); + parent->setSelected( this, true ); parent->setCurrentItem( this ); } } @@ -202,7 +202,7 @@ void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg, g.setColor( TQColorGroup::Text, type == Error ? TQt::red : TQt::darkYellow ); if ( !read ) { TQFont f( p->font() ); - f.setBold( TRUE ); + f.setBold( true ); p->setFont( f ); } TQListViewItem::paintCell( p, g, column, width, alignment ); diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp index 903c1a4f..219abaec 100644 --- a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp +++ b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp @@ -59,7 +59,7 @@ BoldListBoxText::BoldListBoxText( TQString text, TQListBox* lb ) void BoldListBoxText::paint( TQPainter* painter ) { TQFont f = painter->font(); - f.setBold( TRUE ); + f.setBold( true ); painter->setFont( f ); TQListBoxText::paint( painter ); @@ -69,7 +69,7 @@ PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); buttonPixmap->setEditor( StyledButton::PixmapEditor ); @@ -79,8 +79,8 @@ PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, buttonPixmap->setFormWindow( formWindow ); // force toggle event - checkBuildEffect->setChecked(FALSE); - checkBuildEffect->setChecked(TRUE); + checkBuildEffect->setChecked(false); + checkBuildEffect->setChecked(true); } PaletteEditorAdvanced::~PaletteEditorAdvanced() @@ -126,8 +126,8 @@ void PaletteEditorAdvanced::paletteSelected(int p) groupEffect->setDisabled(checkBuildDisabled->isChecked()); } else { - groupCentral->setEnabled(TRUE); - groupEffect->setEnabled(TRUE); + groupCentral->setEnabled(true); + groupEffect->setEnabled(true); } updateStyledButtons(); } @@ -622,7 +622,7 @@ TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init, BackgroundMode mode, TQWidget* parent, const char* name, FormWindow *fw ) { - PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, parent, name, TRUE ); + PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, parent, name, true ); dlg->setupBackgroundMode( mode ); if ( init != TQPalette() ) @@ -632,11 +632,11 @@ TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init, TQPalette result = init; if ( resultCode == TQDialog::Accepted ) { if ( ok ) - *ok = TRUE; + *ok = true; result = dlg->pal(); } else { if ( ok ) - *ok = FALSE; + *ok = false; } delete dlg; return result; diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.h b/kdevdesigner/designer/paletteeditoradvancedimpl.h index 70d0baa4..4a86abb6 100644 --- a/kdevdesigner/designer/paletteeditoradvancedimpl.h +++ b/kdevdesigner/designer/paletteeditoradvancedimpl.h @@ -37,7 +37,7 @@ class PaletteEditorAdvanced : public PaletteEditorAdvancedBase public: PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0, - bool modal=FALSE, WFlags f=0 ); + bool modal=false, WFlags f=0 ); ~PaletteEditorAdvanced(); static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground, diff --git a/kdevdesigner/designer/paletteeditorimpl.cpp b/kdevdesigner/designer/paletteeditorimpl.cpp index ae0cf7fd..bacfb70a 100644 --- a/kdevdesigner/designer/paletteeditorimpl.cpp +++ b/kdevdesigner/designer/paletteeditorimpl.cpp @@ -39,7 +39,7 @@ PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); @@ -283,7 +283,7 @@ TQPalette PaletteEditor::pal() const TQPalette PaletteEditor::getPalette( bool *ok, const TQPalette &init, BackgroundMode mode, TQWidget* parent, const char* name, FormWindow *fw ) { - PaletteEditor* dlg = new PaletteEditor( fw, parent, name, TRUE ); + PaletteEditor* dlg = new PaletteEditor( fw, parent, name, true ); dlg->setupBackgroundMode( mode ); if ( init != TQPalette() ) @@ -293,11 +293,11 @@ TQPalette PaletteEditor::getPalette( bool *ok, const TQPalette &init, Background TQPalette result = init; if ( resultCode == TQDialog::Accepted ) { if ( ok ) - *ok = TRUE; + *ok = true; result = dlg->pal(); } else { if ( ok ) - *ok = FALSE; + *ok = false; } delete dlg; return result; diff --git a/kdevdesigner/designer/paletteeditorimpl.h b/kdevdesigner/designer/paletteeditorimpl.h index ac1cf229..83a598c3 100644 --- a/kdevdesigner/designer/paletteeditorimpl.h +++ b/kdevdesigner/designer/paletteeditorimpl.h @@ -37,7 +37,7 @@ class PaletteEditor : public PaletteEditorBase public: - PaletteEditor( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); + PaletteEditor( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=false, WFlags f=0 ); ~PaletteEditor(); static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground, diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp index 92d68ac1..79cb0cab 100644 --- a/kdevdesigner/designer/pixmapchooser.cpp +++ b/kdevdesigner/designer/pixmapchooser.cpp @@ -66,7 +66,7 @@ void PixmapView::setPixmap( const TQPixmap &pix ) { pixmap = pix; resizeContents( pixmap.size().width(), pixmap.size().height() ); - viewport()->repaint( FALSE ); + viewport()->repaint( false ); } void PixmapView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch ) @@ -114,9 +114,9 @@ TQStringList qChoosePixmaps( TQWidget *parent ) TQString all; buildImageFormatList( filter, all ); - TQFileDialog fd( TQString(), filter, parent, 0, TRUE ); + TQFileDialog fd( TQString(), filter, parent, 0, true ); fd.setMode( TQFileDialog::ExistingFiles ); - fd.setContentsPreviewEnabled( TRUE ); + fd.setContentsPreviewEnabled( true ); PixmapView *pw = new PixmapView( &fd ); fd.setContentsPreview( pw, pw ); fd.setViewMode( TQFileDialog::List ); @@ -148,8 +148,8 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T TQString all; buildImageFormatList( filter, all ); - TQFileDialog fd( TQString(), filter, parent, 0, TRUE ); - fd.setContentsPreviewEnabled( TRUE ); + TQFileDialog fd( TQString(), filter, parent, 0, true ); + fd.setContentsPreviewEnabled( true ); PixmapView *pw = new PixmapView( &fd ); fd.setContentsPreview( pw, pw ); fd.setViewMode( TQFileDialog::List ); @@ -174,31 +174,31 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T TQPixmap pix( dlg.selectedURL().path() ); if ( fn ) *fn = dlg.selectedURL().path(); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), dlg.selectedURL().path() ); + MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), dlg.selectedURL().path() ); return pix; } } else if ( fw && fw->savePixmapInProject() ) { - PixmapCollectionEditor dia( parent, 0, TRUE ); + PixmapCollectionEditor dia( parent, 0, true ); dia.setProject( fw->project() ); - dia.setChooserMode( TRUE ); - dia.setCurrentItem( MetaDataBase::pixmapKey( TQT_TQOBJECT(fw), old.serialNumber() ) ); + dia.setChooserMode( true ); + dia.setCurrentItem( MetaDataBase::pixmapKey( fw, old.serialNumber() ) ); if ( dia.exec() == TQDialog::Accepted ) { TQPixmap pix( fw->project()->pixmapCollection()->pixmap( dia.viewPixmaps->currentItem()->text() ) ); - MetaDataBase::setPixmapKey( TQT_TQOBJECT(fw), pix.serialNumber(), dia.viewPixmaps->currentItem()->text() ); + MetaDataBase::setPixmapKey( fw, pix.serialNumber(), dia.viewPixmaps->currentItem()->text() ); return pix; } } else { - PixmapFunction dia( parent, 0, TRUE ); - TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + PixmapFunction dia( parent, 0, true ); + TQObject::connect( dia.helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); - dia.editArguments->setText( MetaDataBase::pixmapArgument( TQT_TQOBJECT(fw), old.serialNumber() ) ); + dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) ); dia.editArguments->setFocus(); if ( dia.exec() == TQDialog::Accepted ) { TQPixmap pix; // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that pix.convertFromImage( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ).convertToImage() ); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), dia.editArguments->text() ); + MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), dia.editArguments->text() ); return pix; } } @@ -211,7 +211,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T } ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name ) - : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) ) + : TQFileIconProvider( parent, name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) ) { fmts = TQImage::inputFormats(); } diff --git a/kdevdesigner/designer/pixmapcollection.cpp b/kdevdesigner/designer/pixmapcollection.cpp index 880423a3..4b14bf8d 100644 --- a/kdevdesigner/designer/pixmapcollection.cpp +++ b/kdevdesigner/designer/pixmapcollection.cpp @@ -54,14 +54,14 @@ bool PixmapCollection::addPixmap( const Pixmap &pix, bool force ) if ( !force ) { for ( TQValueList<Pixmap>::Iterator it = pixList.begin(); it != pixList.end(); ++it ) { if ( (*it).name == pixmap.name ) - return FALSE; + return false; } } pixList.append( pixmap ); mimeSourceFactory->setPixmap( pixmap.name, pixmap.pix ); - project->setModified( TRUE ); - return TRUE; + project->setModified( true ); + return true; } void PixmapCollection::removePixmap( const TQString &name ) @@ -72,7 +72,7 @@ void PixmapCollection::removePixmap( const TQString &name ) break; } } - project->setModified( TRUE ); + project->setModified( true ); } TQValueList<PixmapCollection::Pixmap> PixmapCollection::pixmaps() const @@ -83,18 +83,18 @@ TQValueList<PixmapCollection::Pixmap> PixmapCollection::pixmaps() const TQString PixmapCollection::unifyName( const TQString &n ) { TQString name = n; - bool restart = FALSE; + bool restart = false; int added = 1; for ( TQValueList<Pixmap>::Iterator it = pixList.begin(); it != pixList.end(); ++it ) { if ( restart ) it = pixList.begin(); - restart = FALSE; + restart = false; if ( name == (*it).name ) { name = n; name += "_" + TQString::number( added ); ++added; - restart = TRUE; + restart = true; } } @@ -138,13 +138,13 @@ void PixmapCollection::savePixmap( Pixmap &pix ) TQString PixmapCollection::imageDir() const { - return TQFileInfo( project->fileName() ).dirPath( TRUE ) + "/images"; + return TQFileInfo( project->fileName() ).dirPath( true ) + "/images"; } void PixmapCollection::mkdir() { TQString f = project->fileName(); - TQDir d( TQFileInfo( f ).dirPath( TRUE ) ); + TQDir d( TQFileInfo( f ).dirPath( true ) ); d.mkdir( "images" ); } @@ -156,7 +156,7 @@ void PixmapCollection::load( const TQString& filename ) if ( filename[0] == '/' ) absfile = filename; else - absfile = TQFileInfo( project->fileName() ).dirPath( TRUE ) + "/" + filename; + absfile = TQFileInfo( project->fileName() ).dirPath( true ) + "/" + filename; TQPixmap pm( absfile ); if ( pm.isNull() ) @@ -166,7 +166,7 @@ void PixmapCollection::load( const TQString& filename ) pix.name = TQFileInfo( absfile ).fileName(); pix.absname = absfile; pix.pix = pm; - addPixmap( pix, TRUE ); + addPixmap( pix, true ); } DesignerPixmapCollection *PixmapCollection::iFace() diff --git a/kdevdesigner/designer/pixmapcollection.h b/kdevdesigner/designer/pixmapcollection.h index 10d630fc..87e68bad 100644 --- a/kdevdesigner/designer/pixmapcollection.h +++ b/kdevdesigner/designer/pixmapcollection.h @@ -49,7 +49,7 @@ public: PixmapCollection( Project *pro ); ~PixmapCollection(); - bool addPixmap( const Pixmap &pix, bool force = TRUE ); + bool addPixmap( const Pixmap &pix, bool force = true ); void removePixmap( const TQString &name ); TQPixmap pixmap( const TQString &name ); diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui b/kdevdesigner/designer/pixmapcollectioneditor.ui index 30f74183..e939397f 100644 --- a/kdevdesigner/designer/pixmapcollectioneditor.ui +++ b/kdevdesigner/designer/pixmapcollectioneditor.ui @@ -202,7 +202,7 @@ <variable>Project *project;</variable> <variable>bool chooser;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>addPixmap()</slot> @@ -213,6 +213,6 @@ <slot>setCurrentItem(const TQString & name)</slot> <slot>setProject(Project * pro)</slot> <slot returnType="TQPixmap">scaledPixmap(const TQPixmap & p)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui.h b/kdevdesigner/designer/pixmapcollectioneditor.ui.h index 82bd7929..d644ad38 100644 --- a/kdevdesigner/designer/pixmapcollectioneditor.ui.h +++ b/kdevdesigner/designer/pixmapcollectioneditor.ui.h @@ -28,7 +28,7 @@ void PixmapCollectionEditor::init() { project = 0; - setChooserMode( FALSE ); + setChooserMode( false ); } void PixmapCollectionEditor::destroy() @@ -55,7 +55,7 @@ void PixmapCollectionEditor::addPixmap() TQFileInfo fi ( *it ); pixmap.name = fi.fileName(); pixmap.absname = fi.filePath(); - if ( !project->pixmapCollection()->addPixmap( pixmap, FALSE ) ) + if ( !project->pixmapCollection()->addPixmap( pixmap, false ) ) continue; lastName = pixmap.name; } @@ -88,9 +88,9 @@ void PixmapCollectionEditor::updateView() for ( TQValueList<PixmapCollection::Pixmap>::Iterator it = pixmaps.begin(); it != pixmaps.end(); ++it ) { // #### might need to scale down the pixmap TQIconViewItem *item = new TQIconViewItem( viewPixmaps, (*it).name, scaledPixmap( (*it).pix ) ); - //item->setRenameEnabled( TRUE ); // this will be a bit harder to implement - item->setDragEnabled( FALSE ); - item->setDropEnabled( FALSE ); + //item->setRenameEnabled( true ); // this will be a bit harder to implement + item->setDragEnabled( false ); + item->setDropEnabled( false ); } viewPixmaps->setCurrentItem( viewPixmaps->firstItem() ); currentChanged( viewPixmaps->firstItem() ); @@ -108,16 +108,16 @@ void PixmapCollectionEditor::setChooserMode( bool c ) buttonClose->hide(); buttonOk->show(); buttonCancel->show(); - buttonOk->setEnabled( FALSE ); - buttonOk->setDefault( TRUE ); - connect( viewPixmaps, TQT_SIGNAL( doubleClicked( TQIconViewItem * ) ), buttonOk, TQT_SIGNAL( clicked() ) ); - connect( viewPixmaps, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ), buttonOk, TQT_SIGNAL( clicked() ) ); + buttonOk->setEnabled( false ); + buttonOk->setDefault( true ); + connect( viewPixmaps, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ), buttonOk, TQ_SIGNAL( clicked() ) ); + connect( viewPixmaps, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ), buttonOk, TQ_SIGNAL( clicked() ) ); setCaption( i18n( "Choose Image" ) ); } else { buttonClose->show(); buttonOk->hide(); buttonCancel->hide(); - buttonClose->setDefault( TRUE ); + buttonClose->setDefault( true ); } updateView(); } diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp index e33fa239..629d40fe 100644 --- a/kdevdesigner/designer/popupmenueditor.cpp +++ b/kdevdesigner/designer/popupmenueditor.cpp @@ -84,13 +84,13 @@ bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem ** TQDataStream stream( data, IO_ReadOnly ); if ( !data.size() ) - return FALSE; + return false; TQ_LONG p = 0; stream >> p; *i = ( PopupMenuEditorItem *) p; - return TRUE; + return true; } // PopupMenuEditorItem Implementation ----------------------------------- @@ -100,12 +100,12 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * par a( 0 ), s( 0 ), m( menu ), - separator( FALSE ), - removable( FALSE ) + separator( false ), + removable( false ) { init(); a = new TQAction( this ); - TQObject::connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( selfDestruct() ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( selfDestruct() ) ); } @@ -115,12 +115,12 @@ PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * m a( action ), s( 0 ), m( menu ), - separator( FALSE ), - removable( TRUE ) + separator( false ), + removable( true ) { init(); if ( /*a->name() == "qt_separator_action" ||*/ ::tqt_cast<QSeparatorAction*>(a) ) - separator = TRUE; + separator = true; if ( a && !a->childrenListObject().isEmpty() ) a->installEventFilter( this ); } @@ -147,13 +147,13 @@ PopupMenuEditorItem::~PopupMenuEditorItem() void PopupMenuEditorItem::init() { if ( a ) { - TQObject::connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( selfDestruct() ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( selfDestruct() ) ); if ( m && !isSeparator() ) { s = new PopupMenuEditor( m->formWindow(), m ); TQString n = "PopupMenuEditor"; - m->formWindow()->unify( TQT_TQOBJECT(s), n, TRUE ); + m->formWindow()->unify( s, n, true ); s->setName( n ); - MetaDataBase::addEntry( TQT_TQOBJECT(s) ); + MetaDataBase::addEntry( s ); } } } @@ -180,7 +180,7 @@ bool PopupMenuEditorItem::isVisible() const return ( g->isVisible() && g->usesDropDown() ); else if ( a ) return a->isVisible(); - return FALSE; + return false; } void PopupMenuEditorItem::showMenu( int x, int y ) @@ -223,20 +223,20 @@ int PopupMenuEditorItem::count() const bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event ) { if ( ! ::tqt_cast<TQActionGroup*>( o ) ) - return FALSE; + return false; if ( event->type() == TQEvent::ChildInserted ) { TQChildEvent * ce = ( TQChildEvent * ) event; - TQObject * c = TQT_TQOBJECT(ce->child()); + TQObject * c = ce->child(); TQAction * action = ::tqt_cast<TQAction*>( c ); if ( s->find( action ) != -1 ) // avoid duplicates - return FALSE; + return false; TQActionGroup * actionGroup = ::tqt_cast<TQActionGroup*>( c ); if ( actionGroup ) s->insert( actionGroup ); else if ( action ) s->insert( action ); } - return FALSE; + return false; } void PopupMenuEditorItem::selfDestruct() @@ -293,7 +293,7 @@ PopupMenuEditor::PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, PopupMenuEditor::~PopupMenuEditor() { - itemList.setAutoDelete( TRUE ); + itemList.setAutoDelete( true ); } void PopupMenuEditor::init() @@ -303,7 +303,7 @@ void PopupMenuEditor::init() addItem.action()->setMenuText( i18n("new item") ); addSeparator.action()->setMenuText( i18n("new separator") ); - setAcceptDrops( TRUE ); + setAcceptDrops( true ); setFocusPolicy( TQWidget::StrongFocus ); lineEdit = new TQLineEdit( this ); @@ -357,7 +357,7 @@ void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index ) PopupMenuEditorItem *i = new PopupMenuEditorItem( (TQAction *)actionGroup, this, 0, TQString( actionGroup->name() ) + "Menu" ); TQActionGroup *g = 0; - TQObjectList *l = actionGroup->queryList( "TQAction", 0, FALSE, FALSE ); + TQObjectList *l = actionGroup->queryList( "TQAction", 0, false, false ); TQObjectListIterator it( *l ); insert( i, index ); for ( ; it.current(); ++it ) { @@ -566,7 +566,7 @@ void PopupMenuEditor::setAccelerator( int key, TQt::ButtonState state, int index if ( n < 4 ) keys[n] = key | shift | ctrl | alt | meta; a->setAccel( TQKeySequence( keys[0], keys[1], keys[2], keys[3] ) ); - MetaDataBase::setPropertyChanged( a, "accel", TRUE ); + MetaDataBase::setPropertyChanged( a, "accel", true ); resizeToContents(); } @@ -625,7 +625,7 @@ PopupMenuEditorItem * PopupMenuEditor::createItem( TQAction * a ) a = ae->newActionEx(); PopupMenuEditorItem * i = new PopupMenuEditorItem( a, this ); TQString n = TQString( a->name() ) + "Item"; - formWindow()->unify( i, n, FALSE ); + formWindow()->unify( i, n, false ); i->setName( n ); AddActionToPopupCommand * cmd = new AddActionToPopupCommand( i18n( "Add Item" ), formWnd, this, i ); @@ -748,7 +748,7 @@ void PopupMenuEditor::mouseDoubleClickEvent( TQMouseEvent * ) setFocusAt( mousePressPos ); if ( currentItem() == &addSeparator ) { PopupMenuEditorItem * i = createItem( new QSeparatorAction( 0 ) ); - i->setSeparator( TRUE ); + i->setSeparator( true ); return; } if ( currentField == 0 ) { @@ -772,7 +772,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e ) // FIXME: start rename after drop } else if ( draggedItem == &addSeparator ) { draggedItem = createItem( new QSeparatorAction( 0 ) ); - draggedItem->setSeparator( TRUE ); + draggedItem->setSeparator( true ); } PopupMenuEditorItemPtrDrag * d = @@ -780,7 +780,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e ) hideSubMenu(); - draggedItem->setVisible( FALSE ); + draggedItem->setVisible( false ); resizeToContents(); // If the item is dropped in the same list, @@ -792,7 +792,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e ) d->dragCopy(); // dragevents and stuff happens if ( draggedItem ) { // item was not dropped - draggedItem->setVisible( TRUE ); + draggedItem->setVisible( true ); draggedItem = 0; if ( hasFocus() ) { hideSubMenu(); @@ -800,7 +800,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e ) showSubMenu(); } } else { // item was dropped - itemList.takeNode( node )->setVisible( TRUE ); + itemList.takeNode( node )->setVisible( true ); if ( currentIndex > 0 && currentIndex > idx ) --currentIndex; // the drop might happen in another menu, so we'll resize @@ -847,7 +847,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) // Hide the sub menu of the current item, but do it later if ( currentIndex < (int)itemList.count() ) { PopupMenuEditor *s = itemList.at( currentIndex )->s; - TQTimer::singleShot( 0, s, TQT_SLOT( hide() ) ); + TQTimer::singleShot( 0, s, TQ_SLOT( hide() ) ); } draggedItem = 0; @@ -861,9 +861,9 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) if ( g->usesDropDown() ) { i = new PopupMenuEditorItem( g, this ); TQString n = TQString( g->name() ) + "Item"; - formWindow()->unify( i, n, FALSE ); + formWindow()->unify( i, n, false ); i->setName( n ); - TQObjectList *l = g->queryList( "TQAction", 0, FALSE, FALSE ); + TQObjectList *l = g->queryList( "TQAction", 0, false, false ); TQObjectListIterator it( *l ); for ( ; it.current(); ++it ) { g = ::tqt_cast<TQActionGroup*>(it.current()); @@ -884,11 +884,11 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) if ( i ) { dropInPlace( i, e->pos().y() ); - TQTimer::singleShot( 0, this, TQT_SLOT( resizeToContents() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( resizeToContents() ) ); } - TQTimer::singleShot( 0, this, TQT_SLOT( showSubMenu() ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( setFocus() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( showSubMenu() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( setFocus() ) ); dropLine->hide(); e->accept(); } @@ -1416,10 +1416,10 @@ void PopupMenuEditor::leaveEditMode( TQKeyEvent * e ) a->setMenuText( menuText ); i = createItem( a ); TQString n = constructName( i ); - formWindow()->unify( a, n, TRUE ); + formWindow()->unify( a, n, true ); a->setName( n ); MetaDataBase::addEntry( a ); - MetaDataBase::setPropertyChanged( a, "menuText", TRUE ); + MetaDataBase::setPropertyChanged( a, "menuText", true ); ActionEditor *ae = (ActionEditor*)formWindow()->mainWindow()->child( 0, "ActionEditor" ); if ( ae ) ae->updateActionName( a ); diff --git a/kdevdesigner/designer/preferences.ui b/kdevdesigner/designer/preferences.ui index c00cf82a..c5ee2847 100644 --- a/kdevdesigner/designer/preferences.ui +++ b/kdevdesigner/designer/preferences.ui @@ -636,9 +636,9 @@ <tabstop>checkBoxTextLabels</tabstop> <tabstop>helpButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/previewwidgetimpl.cpp b/kdevdesigner/designer/previewwidgetimpl.cpp index c3c16e32..d703959f 100644 --- a/kdevdesigner/designer/previewwidgetimpl.cpp +++ b/kdevdesigner/designer/previewwidgetimpl.cpp @@ -57,9 +57,9 @@ bool PreviewWidget::eventFilter(TQObject *, TQEvent *e) case TQEvent::KeyRelease: case TQEvent::Enter: case TQEvent::Leave: - return TRUE; // ignore; + return true; // ignore; default: break; } - return FALSE; + return false; } diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp index f8535a25..974259bf 100644 --- a/kdevdesigner/designer/project.cpp +++ b/kdevdesigner/designer/project.cpp @@ -71,9 +71,9 @@ bool DatabaseConnection::refreshCatalog() { #ifndef TQT_NO_SQL if ( loaded ) - return TRUE; + return true; if ( !open() ) - return FALSE; + return false; tbls = conn->tables( TQSql::TableType( TQSql::Tables | TQSql::Views ) ); flds.clear(); for ( TQStringList::Iterator it = tbls.begin(); it != tbls.end(); ++it ) { @@ -83,11 +83,11 @@ bool DatabaseConnection::refreshCatalog() lst << fil.field( j )->name(); flds.insert( *it, lst ); } - loaded = TRUE; + loaded = true; conn->close(); return loaded; #else - return FALSE; + return false; #endif } @@ -124,16 +124,16 @@ bool DatabaseConnection::open( bool suppressDialog ) conn->setHostName( hname ); conn->setPort( prt ); bool success = conn->open(); - for( ; suppressDialog == FALSE ; ) { - bool done = FALSE; + for( ; !suppressDialog ; ) { + bool done = false; if ( !success ) { - DatabaseConnectionEditor dia( this, 0 , 0 , TRUE ); + DatabaseConnectionEditor dia( this, 0 , 0 , true ); switch( dia.exec() ) { case TQDialog::Accepted: - done = FALSE; + done = false; break; case TQDialog::Rejected: - done = TRUE; + done = true; break; } } @@ -156,7 +156,7 @@ bool DatabaseConnection::open( bool suppressDialog ) case 0: // OK or Enter continue; case 1: // Cancel or Escape - done = TRUE; + done = true; break; } } else @@ -170,7 +170,7 @@ bool DatabaseConnection::open( bool suppressDialog ) } return success; #else - return FALSE; + return false; #endif } @@ -206,7 +206,7 @@ Project::Project( const TQString &fn, const TQString &pName, const TQString &l ) : proName( pName ), projectSettingsPluginManager( pm ), isDummyProject( isDummy ) { - modified = TRUE; + modified = true; pixCollection = new PixmapCollection( this ); iface = 0; lang = l; @@ -216,10 +216,10 @@ Project::Project( const TQString &fn, const TQString &pName, setFileName( fn ); if ( !pName.isEmpty() ) proName = pName; - sourcefiles.setAutoDelete( TRUE ); - modified = FALSE; - objs.setAutoDelete( FALSE ); - fakeFormFiles.setAutoDelete( FALSE ); + sourcefiles.setAutoDelete( true ); + modified = false; + objs.setAutoDelete( false ); + fakeFormFiles.setAutoDelete( false ); } Project::~Project() @@ -315,13 +315,13 @@ TQString Project::projectName() const static TQString parse_part( const TQString &part ) { TQString res; - bool inName = FALSE; + bool inName = false; TQString currName; for ( int i = 0; i < (int)part.length(); ++i ) { TQChar c = part[ i ]; if ( !inName ) { if ( c != ' ' && c != '\t' && c != '\n' && c != '=' && c != '\\' && c != '+' ) - inName = TRUE; + inName = true; else continue; } @@ -373,15 +373,15 @@ TQStringList parse_multiline_part( const TQString &contents, const TQString &key if ( start ) *start = i - lastWord.length() - extraWhiteSpaceCount + 1; TQStringList lst; - bool inName = FALSE; + bool inName = false; TQString currName; - bool hadEqual = FALSE; + bool hadEqual = false; for ( ; i < (int)contents.length(); ++i ) { c = contents[ i ]; if ( !hadEqual && c != '=' ) continue; if ( !hadEqual ) { - hadEqual = TRUE; + hadEqual = true; continue; } if ( ( c.isLetter() || c.isDigit() || c == '.' || c == '/' || c == '_' || c == '\\' || @@ -392,11 +392,11 @@ TQStringList parse_multiline_part( const TQString &contents, const TQString &key currName = TQString(); if ( c != '\\' || contents[i+1] != '\n' ) { currName += c; - inName = TRUE; + inName = true; } } else { if ( inName ) { - inName = FALSE; + inName = false; if ( currName.simplifyWhiteSpace() != "\\" ) lst.append( currName ); } @@ -427,7 +427,7 @@ void Project::parse() int i = contents.find( "LANGUAGE" ); if ( i != -1 ) { lang = ""; - is_cpp = FALSE; + is_cpp = false; TQString part = contents.mid( i + TQString( "LANGUAGE" ).length() ); lang = parse_part( part ); is_cpp = lang == "C++"; @@ -445,7 +445,7 @@ void Project::parse() for ( it = uifiles.begin(); it != uifiles.end(); ++it ) { if ( (*it).startsWith( "__APPOBJ" ) ) continue; - (void) new FormFile( *it, FALSE, this ); + (void) new FormFile( *it, false, this ); } @@ -470,7 +470,7 @@ void Project::parse() for ( TQStringList::Iterator it = sourceKeys.begin(); it != sourceKeys.end(); ++it ) { TQStringList lst = parse_multiline_part( contents, *it ); for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) - (void) new SourceFile( *it, FALSE, this ); + (void) new SourceFile( *it, false, this ); } } @@ -491,11 +491,11 @@ void Project::parse() TQStringList images = parse_multiline_part( contents, "IMAGES" ); // ### remove that for the final - this is beta-compatibility - if ( images.isEmpty() && TQDir( TQFileInfo( filename ).dirPath( TRUE ) + "/images" ).exists() ) { - images = TQDir( TQFileInfo( filename ).dirPath( TRUE ) + "/images" ).entryList(); + if ( images.isEmpty() && TQDir( TQFileInfo( filename ).dirPath( true ) + "/images" ).exists() ) { + images = TQDir( TQFileInfo( filename ).dirPath( true ) + "/images" ).entryList(); for ( int i = 0; i < (int)images.count(); ++i ) images[ i ].prepend( "images/" ); - modified = TRUE; + modified = true; } for ( TQStringList::ConstIterator pit = images.begin(); pit != images.end(); ++pit ) @@ -512,13 +512,13 @@ void Project::clear() bool Project::removeSourceFile( SourceFile *sf ) { if ( !sourcefiles.containsRef( sf ) ) - return FALSE; + return false; if ( !sf->close() ) - return FALSE; + return false; sourcefiles.removeRef( sf ); - modified = TRUE; + modified = true; emit sourceFileRemoved( sf ); - return TRUE; + return true; } void Project::setDatabaseDescription( const TQString &db ) @@ -541,16 +541,16 @@ bool Project::isValid() const { // #### do more checking here? if ( filename.isEmpty() || proName.isEmpty() ) - return FALSE; + return false; - return TRUE; + return true; } TQString Project::makeAbsolute( const TQString &f ) { if ( isDummy() ) return f; - TQString encodedUrl = TQFileInfo( filename ).dirPath( TRUE ); + TQString encodedUrl = TQFileInfo( filename ).dirPath( true ); TQUrl::encode( encodedUrl ); TQUrl u( encodedUrl, f ); return u.path(); @@ -560,7 +560,7 @@ TQString Project::makeRelative( const TQString &f ) { if ( isDummy() ) return f; - TQString p = TQFileInfo( filename ).dirPath( TRUE ); + TQString p = TQFileInfo( filename ).dirPath( true ); TQString f2 = f; if ( f2.left( p.length() ) == p ) f2.remove( 0, p.length() + 1 ); @@ -585,7 +585,7 @@ static void remove_multiline_contents( TQString &contents, const TQString &s, in if ( strt ) *strt = i; int start = i; - bool lastWasBackspash = FALSE; + bool lastWasBackspash = false; if ( i != -1 && ( i == 0 || contents[ i - 1 ] != '{' || contents[ i - 1 ] != ':' ) ) { for ( ; i < (int)contents.length(); ++i ) { if ( contents[ i ] == '\n' && !lastWasBackspash ) @@ -599,7 +599,7 @@ static void remove_multiline_contents( TQString &contents, const TQString &s, in void Project::save( bool onlyProjectFile ) { - bool anythingModified = FALSE; + bool anythingModified = false; // save sources and forms if ( !onlyProjectFile ) { @@ -635,12 +635,12 @@ void Project::save( bool onlyProjectFile ) TQString original = ""; // read the existing file - bool hasPreviousContents = FALSE; + bool hasPreviousContents = false; if ( f.open( IO_ReadOnly ) ) { TQTextStream ts( &f ); original = ts.read(); f.close(); - hasPreviousContents = TRUE; + hasPreviousContents = true; remove_contents( original, "{SOURCES+=" ); // ### compatibility with early 3.0 betas remove_contents( original, "DBFILE" ); remove_contents( original, "LANGUAGE" ); @@ -769,12 +769,12 @@ void Project::save( bool onlyProjectFile ) f.close(); - setModified( FALSE ); + setModified( false ); if ( singleProjectMode() ) { LanguageInterface *iface = MetaDataBase::languageInterface( language() ); if ( iface && iface->supports( LanguageInterface::CompressProject ) ) - iface->compressProject( makeAbsolute( filename ), singleProFileName, TRUE ); + iface->compressProject( makeAbsolute( filename ), singleProFileName, true ); } } @@ -796,7 +796,7 @@ void Project::setDatabaseConnections( const TQPtrList<DatabaseConnection> &lst ) void Project::addDatabaseConnection( DatabaseConnection *conn ) { dbConnections.append( conn ); - modified = TRUE; + modified = true; } #endif @@ -879,7 +879,7 @@ void Project::saveConnections() if ( f.exists() ) f.remove(); setDatabaseDescription( "" ); - modified = TRUE; + modified = true; return; } @@ -1026,13 +1026,13 @@ bool Project::openDatabase( const TQString &connection, bool suppressDialog ) if ( connection.isEmpty() && !conn ) conn = databaseConnection( "(default)" ); if ( !conn ) - return FALSE; + return false; bool b = conn->open( suppressDialog ); return b; #else Q_UNUSED( connection ); Q_UNUSED( suppressDialog ); - return FALSE; + return false; #endif } @@ -1088,7 +1088,7 @@ void Project::setLanguage( const TQString &l ) lang = l; is_cpp = lang == "C++"; updateCustomSettings(); - modified = TRUE; + modified = true; } TQString Project::language() const @@ -1100,7 +1100,7 @@ void Project::setCustomSetting( const TQString &key, const TQString &value ) { customSettings.remove( key ); customSettings.insert( key, value ); - modified = TRUE; + modified = true; } TQString Project::customSetting( const TQString &key ) const @@ -1139,7 +1139,7 @@ void Project::setActive( bool b ) void Project::addSourceFile( SourceFile *sf ) { sourcefiles.append( sf ); - modified = TRUE; + modified = true; emit sourceFileAdded( sf ); } @@ -1171,7 +1171,7 @@ void Project::setIncludePath( const TQString &platform, const TQString &path ) if ( inclPath[platform] == path ) return; inclPath.replace( platform, path ); - modified = TRUE; + modified = true; } void Project::setLibs( const TQString &platform, const TQString &path ) @@ -1275,27 +1275,27 @@ void Project::writePlatformSettings( TQString &contents, const TQString &setting void Project::addFormFile( FormFile *ff ) { formfiles.append( ff ); - modified = TRUE; + modified = true; emit formFileAdded( ff ); } bool Project::removeFormFile( FormFile *ff ) { if ( !formfiles.containsRef( ff ) ) - return FALSE; + return false; if ( !ff->close() ) - return FALSE; + return false; formfiles.removeRef( ff ); - modified = TRUE; + modified = true; emit formFileRemoved( ff ); - return TRUE; + return true; } void Project::addObject( TQObject *o ) { bool wasModified = modified; objs.append( o ); - FormFile *ff = new FormFile( "", FALSE, this, "qt_fakewindow" ); + FormFile *ff = new FormFile( "", false, this, "qt_fakewindow" ); ff->setFileName( "__APPOBJ" + TQString( o->name() ) + ".ui" ); fakeFormFiles.insert( (void*)o, ff ); MetaDataBase::addEntry( o ); @@ -1305,15 +1305,15 @@ void Project::addObject( TQObject *o ) fw->setProject( this ); if ( TQFile::exists( ff->absFileName() ) ) Resource::loadExtraSource( ff, ff->absFileName(), - MetaDataBase::languageInterface( language() ), FALSE ); + MetaDataBase::languageInterface( language() ), false ); if ( MainWindow::self ) fw->setMainWindow( MainWindow::self ); if ( MainWindow::self ) { TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(), TQEvent::ChildInserted ); connect( fw, - TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), MainWindow::self, - TQT_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) + TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); } if ( fw->parentWidget() ) { @@ -1323,7 +1323,7 @@ void Project::addObject( TQObject *o ) } else { if ( TQFile::exists( ff->absFileName() ) ) Resource::loadExtraSource( ff, ff->absFileName(), - MetaDataBase::languageInterface( language() ), FALSE ); + MetaDataBase::languageInterface( language() ), false ); } emit objectAdded( o ); modified = wasModified; @@ -1415,11 +1415,11 @@ void Project::addAndEditFunction( const TQString &function, const TQString &func if ( i != -1 ) func = func.left( i ); - bool found = FALSE; + bool found = false; for ( TQValueList<LanguageInterface::Function>::Iterator it = funcs.begin(); it != funcs.end(); ++it ) { if ( (*it).name.left( (*it).name.find( '(' ) ) == func ) { - found = TRUE; + found = true; break; } } @@ -1433,7 +1433,7 @@ void Project::addAndEditFunction( const TQString &function, const TQString &func "()\n" + functionBody + "\n"; f->setText( code ); if ( f->editor() ) - f->editor()->refresh( FALSE ); + f->editor()->refresh( false ); } if ( openDeveloper ) { @@ -1452,9 +1452,9 @@ bool Project::hasParentObject( TQObject *o ) for ( TQObject *p = objs.first(); p; p = objs.next() ) { TQObject *c = p->child( o->name(), o->className() ); if ( c ) - return TRUE; + return true; } - return FALSE; + return false; } TQString Project::qualifiedName( TQObject *o ) @@ -1487,11 +1487,11 @@ void Project::designerCreated() if ( !fw || fw->mainWindow() ) continue; fw->setMainWindow( MainWindow::self ); - connect( fw, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, + connect( fw, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - MainWindow::self, TQT_SLOT( updateUndoRedo( bool, bool, + MainWindow::self, TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); - fw->reparent( MainWindow::self->qWorkspace(), TQPoint( 0, 0 ), FALSE ); + fw->reparent( MainWindow::self->qWorkspace(), TQPoint( 0, 0 ), false ); TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(), TQEvent::ChildInserted ); fw->parentWidget()->setFixedSize( 1, 1 ); diff --git a/kdevdesigner/designer/project.h b/kdevdesigner/designer/project.h index e2d4ef2d..032ee0aa 100644 --- a/kdevdesigner/designer/project.h +++ b/kdevdesigner/designer/project.h @@ -33,7 +33,7 @@ #include <tqstringlist.h> #include <tqptrlist.h> #include <tqmap.h> -#include <tqpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include "../interfaces/projectsettingsiface.h" #include "sourcefile.h" #include "formfile.h" @@ -57,11 +57,11 @@ public: #ifndef TQT_NO_SQL conn( 0 ), #endif - project( p ), loaded( FALSE ), iface( 0 ) {} + project( p ), loaded( false ), iface( 0 ) {} ~DatabaseConnection(); bool refreshCatalog(); - bool open( bool suppressDialog = TRUE ); + bool open( bool suppressDialog = true ); void close(); DesignerDatabase *iFace(); @@ -116,12 +116,12 @@ class Project : public TQObject public: Project( const TQString &fn, const TQString &pName = TQString(), - TQPluginManager<ProjectSettingsInterface> *pm = 0, bool isDummy = FALSE, + TQPluginManager<ProjectSettingsInterface> *pm = 0, bool isDummy = false, const TQString &l = "C++" ); ~Project(); - void setFileName( const TQString &fn, bool doClear = TRUE ); - TQString fileName( bool singlePro = FALSE ) const; + void setFileName( const TQString &fn, bool doClear = true ); + TQString fileName( bool singlePro = false ) const; TQString projectName() const; void setDatabaseDescription( const TQString &db ); @@ -136,13 +136,13 @@ public: bool isValid() const; - // returns TRUE if this project is the <No Project> project + // returns true if this project is the <No Project> project bool isDummy() const; TQString makeAbsolute( const TQString &f ); TQString makeRelative( const TQString &f ); - void save( bool onlyProjectFile = FALSE ); + void save( bool onlyProjectFile = false ); #ifndef TQT_NO_SQL TQPtrList<DatabaseConnection> databaseConnections() const; @@ -157,10 +157,10 @@ public: void saveConnections(); void loadConnections(); - bool openDatabase( const TQString &connection, bool suppressDialog = TRUE ); + bool openDatabase( const TQString &connection, bool suppressDialog = true ); void closeDatabase( const TQString &connection ); - TQObjectList *formList( bool resolveFakeObjects = FALSE ) const; + TQObjectList *formList( bool resolveFakeObjects = false ) const; DesignerProject *iFace(); diff --git a/kdevdesigner/designer/projectsettings.ui b/kdevdesigner/designer/projectsettings.ui index 2e03d928..cac4e813 100644 --- a/kdevdesigner/designer/projectsettings.ui +++ b/kdevdesigner/designer/projectsettings.ui @@ -288,7 +288,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">chooseDatabaseFile()</slot> <slot access="protected">chooseProjectFile()</slot> <slot access="protected">destroy()</slot> @@ -296,7 +296,7 @@ <slot access="protected">init()</slot> <slot access="protected">languageChanged( const TQString & )</slot> <slot access="protected">okClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp index 99bb800d..0aeae976 100644 --- a/kdevdesigner/designer/projectsettingsimpl.cpp +++ b/kdevdesigner/designer/projectsettingsimpl.cpp @@ -52,17 +52,17 @@ * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ ProjectSettings::ProjectSettings( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) : ProjectSettingsBase( parent, name, modal, fl ), project( pro ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editProjectFile->setFocus(); if ( project->isDummy() ) { - editProjectFile->setEnabled( FALSE ); + editProjectFile->setEnabled( false ); editProjectFile->setText( project->projectName() ); } else { if ( project->fileName().isEmpty() || project->fileName() == ".pro" ) { @@ -114,10 +114,10 @@ void ProjectSettings::helpClicked() void ProjectSettings::okClicked() { // ### check for validity - project->setFileName( editProjectFile->text(), FALSE ); + project->setFileName( editProjectFile->text(), false ); project->setDatabaseDescription( editDatabaseFile->text() ); project->setLanguage( comboLanguage->text( comboLanguage->currentItem() ) ); - project->setModified( TRUE ); + project->setModified( true ); accept(); } diff --git a/kdevdesigner/designer/projectsettingsimpl.h b/kdevdesigner/designer/projectsettingsimpl.h index ad784a3c..6609d506 100644 --- a/kdevdesigner/designer/projectsettingsimpl.h +++ b/kdevdesigner/designer/projectsettingsimpl.h @@ -40,7 +40,7 @@ class ProjectSettings : public ProjectSettingsBase public: - ProjectSettings( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ProjectSettings( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~ProjectSettings(); protected slots: diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index 68fe21f1..41d21a02 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -151,7 +151,7 @@ bool PropertyWhatsThis::clicked( const TQString& href ) TQAssistantClient *ac = MainWindow::self->assistantClient(); ac->showPage( TQString( tqInstallPathDocs() ) + "/html/" + href ); } - return FALSE; // do not hide window + return false; // do not hide window } @@ -173,10 +173,10 @@ bool PropertyWhatsThis::clicked( const TQString& href ) PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ) : TQListViewItem( l, after ), listview( l ), property( prop ), propertyName( propName ) { - setSelectable( FALSE ); - open = FALSE; + setSelectable( false ); + open = false; setText( 0, propertyName ); - changed = FALSE; + changed = false; setText( 1, "" ); resetButton = 0; } @@ -247,7 +247,7 @@ void PropertyItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, if ( isChanged() && column == 0 ) { p->save(); TQFont f = p->font(); - f.setBold( TRUE ); + f.setBold( true ); p->setFont( f ); } @@ -299,13 +299,13 @@ void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRec p->restore(); } -/*! Subclasses which are expandable items have to return TRUE - here. Default is FALSE. +/*! Subclasses which are expandable items have to return true + here. Default is false. */ bool PropertyItem::hasSubItems() const { - return FALSE; + return false; } /*! Returns the parent property item here if this is a child or 0 @@ -329,9 +329,9 @@ void PropertyItem::setOpen( bool b ) open = b; if ( !open ) { - children.setAutoDelete( TRUE ); + children.setAutoDelete( true ); children.clear(); - children.setAutoDelete( FALSE ); + children.setAutoDelete( false ); tqApp->processEvents(); listview->updateEditorSize(); return; @@ -417,8 +417,8 @@ void PropertyItem::createResetButton() hbox->layout()->setAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); - TQObject::connect( resetButton, TQT_SIGNAL( clicked() ), - listview, TQT_SLOT( resetProperty() ) ); + TQObject::connect( resetButton, TQ_SIGNAL( clicked() ), + listview, TQ_SLOT( resetProperty() ) ); TQToolTip::add( resetButton, i18n( "Reset the property to its default value" ) ); TQWhatsThis::add( resetButton, i18n( "Click this button to reset the property to its default value" ) ); updateResetButtonState(); @@ -429,7 +429,7 @@ void PropertyItem::updateResetButtonState() if ( !resetButton ) return; if ( propertyParent() || !WidgetFactory::canResetProperty( listview->propertyEditor()->widget(), name() ) ) - resetButton->setEnabled( FALSE ); + resetButton->setEnabled( false ); else resetButton->setEnabled( isChanged() ); } @@ -445,7 +445,7 @@ void PropertyItem::placeEditor( TQWidget *w ) if ( !r.size().isValid() ) { listview->ensureItemVisible( this ); #if defined(TQ_WS_WIN) - listview->repaintContents( FALSE ); + listview->repaintContents( false ); #endif r = listview->itemRect( this ); } @@ -468,12 +468,12 @@ void PropertyItem::notifyValueChange() { if ( !propertyParent() ) { listview->valueChanged( this ); - setChanged( TRUE ); + setChanged( true ); if ( hasSubItems() ) initChildren(); } else { propertyParent()->childValueChanged( this ); - setChanged( TRUE ); + setChanged( true ); } } @@ -507,12 +507,12 @@ PropertyItem *PropertyItem::child( int i ) const /*! If the contents of the item is not displayable with a text, but you want to draw it yourself (using drawCustomContents()), return - TRUE here. + true here. */ bool PropertyItem::hasCustomContents() const { - return FALSE; + return false; } /*! @@ -555,7 +555,7 @@ void PropertyItem::setFocus( TQWidget *w ) { if ( !tqApp->focusWidget() || listview->propertyEditor()->formWindow() && - ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) && + ( !MainWindow::self->isAFormWindowChild( tqApp->focusWidget() ) && !tqApp->focusWidget()->inherits( "Editor" ) ) ) w->setFocus(); } @@ -598,15 +598,15 @@ TQLineEdit *PropertyTextItem::lined() if ( asciiOnly ) { if ( PropertyItem::name() == "name" ) { - lin->setValidator( new AsciiValidator( TQString(":"), TQT_TQOBJECT(lin), "ascii_validator" ) ); + lin->setValidator( new AsciiValidator( TQString(":"), lin, "ascii_validator" ) ); if ( listview->propertyEditor()->formWindow()->isFake() ) - lin->setEnabled( FALSE ); + lin->setEnabled( false ); } else { lin->setValidator( new AsciiValidator( TQString("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9" "\xaa\xab\xac\xad\xae\xaf\xb1\xb2\xb3" "\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc" - "\xbd\xbe\xbf"), TQT_TQOBJECT(lin), "ascii_validator" ) ); + "\xbd\xbe\xbf"), lin, "ascii_validator" ) ); } } if ( !hasMultiLines ) { lin->hide(); @@ -614,18 +614,18 @@ TQLineEdit *PropertyTextItem::lined() button = new TQPushButton( "...", box ); setupStyle( button ); button->setFixedWidth( 20 ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getText() ) ); - lin->setFrame( FALSE ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getText() ) ); + lin->setFrame( false ); } - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); if ( PropertyItem::name() == "name" || PropertyItem::name() == "itemName" ) - connect( lin, TQT_SIGNAL( returnPressed() ), + connect( lin, TQ_SIGNAL( returnPressed() ), listview->propertyEditor()->formWindow()->commandHistory(), - TQT_SLOT( checkCompressedCommand() ) ); + TQ_SLOT( checkCompressedCommand() ) ); lin->installEventFilter( listview ); return lin; } @@ -657,16 +657,16 @@ void PropertyTextItem::childValueChanged( PropertyItem *child ) PropertyItem::name(), child->value().toString() ); else MetaDataBase::setExportMacro( listview->propertyEditor()->widget(), child->value().toString() ); - listview->propertyEditor()->formWindow()->commandHistory()->setModified( TRUE ); + listview->propertyEditor()->formWindow()->commandHistory()->setModified( true ); } void PropertyTextItem::showEditor() { PropertyItem::showEditor(); if ( !lin || lin->text().length() == 0 ) { - lined()->blockSignals( TRUE ); + lined()->blockSignals( true ); lined()->setText( value().toString() ); - lined()->blockSignals( FALSE ); + lined()->blockSignals( false ); } TQWidget* w; @@ -686,7 +686,7 @@ void PropertyTextItem::createChildren() { PropertyTextItem *i = new PropertyTextItem( listview, this, this, PropertyItem::name() == "name" ? - "export macro" : "comment", FALSE, FALSE, + "export macro" : "comment", false, false, PropertyItem::name() == "name" ); i->lined()->setEnabled( isChanged() ); addChild( i ); @@ -724,13 +724,13 @@ void PropertyTextItem::setValue( const TQVariant &v ) && value() == v ) return; if ( lin ) { - lined()->blockSignals( TRUE ); + lined()->blockSignals( true ); int oldCursorPos; oldCursorPos = lin->cursorPosition(); lined()->setText( v.toString() ); if ( oldCursorPos < (int)lin->text().length() ) lin->setCursorPosition( oldCursorPos ); - lined()->blockSignals( FALSE ); + lined()->blockSignals( false ); } setText( 1, v.toString() ); PropertyItem::setValue( v ); @@ -755,15 +755,15 @@ void PropertyTextItem::getText() { bool richText = !::tqt_cast<TQButton*>(listview->propertyEditor()->widget()) || ( text( 0 ) == "whatsThis" ); - bool doWrap = FALSE; + bool doWrap = false; TQString txt = MultiLineEditor::getText( listview, value().toString(), richText, &doWrap ); if ( !txt.isEmpty() ) { setText( 1, txt ); PropertyItem::setValue( txt ); notifyValueChange(); - lined()->blockSignals( TRUE ); + lined()->blockSignals( true ); lined()->setText( txt ); - lined()->blockSignals( FALSE ); + lined()->blockSignals( false ); } } @@ -781,12 +781,12 @@ TQLineEdit *PropertyDoubleItem::lined() if ( lin ) return lin; lin = new TQLineEdit( listview->viewport() ); - lin->setValidator( new TQDoubleValidator( TQT_TQOBJECT(lin), "double_validator" ) ); + lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) ); - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); lin->installEventFilter( listview ); return lin; } @@ -801,9 +801,9 @@ void PropertyDoubleItem::showEditor() { PropertyItem::showEditor(); if ( !lin ) { - lined()->blockSignals( TRUE ); + lined()->blockSignals( true ); lined()->setText( TQString::number( value().toDouble() ) ); - lined()->blockSignals( FALSE ); + lined()->blockSignals( false ); } TQWidget* w = lined(); @@ -827,13 +827,13 @@ void PropertyDoubleItem::setValue( const TQVariant &v ) if ( value() == v ) return; if ( lin ) { - lined()->blockSignals( TRUE ); + lined()->blockSignals( true ); int oldCursorPos; oldCursorPos = lin->cursorPosition(); lined()->setText( TQString::number( v.toDouble() ) ); if ( oldCursorPos < (int)lin->text().length() ) lin->setCursorPosition( oldCursorPos ); - lined()->blockSignals( FALSE ); + lined()->blockSignals( false ); } setText( 1, TQString::number( v.toDouble() ) ); PropertyItem::setValue( v ); @@ -865,8 +865,8 @@ TQDateEdit *PropertyDateItem::lined() for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; - connect( lin, TQT_SIGNAL( valueChanged( const TQDate & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDate & ) ), + this, TQ_SLOT( setValue() ) ); return lin; } @@ -880,9 +880,9 @@ void PropertyDateItem::showEditor() { PropertyItem::showEditor(); if ( !lin ) { - lined()->blockSignals( TRUE ); + lined()->blockSignals( true ); lined()->setDate( value().toDate() ); - lined()->blockSignals( FALSE ); + lined()->blockSignals( false ); } placeEditor( lin ); if ( !lin->isVisible() ) { @@ -905,10 +905,10 @@ void PropertyDateItem::setValue( const TQVariant &v ) return; if ( lin ) { - lined()->blockSignals( TRUE ); + lined()->blockSignals( true ); if ( lined()->date() != v.toDate() ) lined()->setDate( v.toDate() ); - lined()->blockSignals( FALSE ); + lined()->blockSignals( false ); } setText( 1, v.toDate().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); @@ -936,8 +936,8 @@ TQTimeEdit *PropertyTimeItem::lined() if ( lin ) return lin; lin = new TQTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -955,9 +955,9 @@ void PropertyTimeItem::showEditor() { PropertyItem::showEditor(); if ( !lin ) { - lined()->blockSignals( TRUE ); + lined()->blockSignals( true ); lined()->setTime( value().toTime() ); - lined()->blockSignals( FALSE ); + lined()->blockSignals( false ); } placeEditor( lin ); if ( !lin->isVisible() ) { @@ -980,10 +980,10 @@ void PropertyTimeItem::setValue( const TQVariant &v ) return; if ( lin ) { - lined()->blockSignals( TRUE ); + lined()->blockSignals( true ); if ( lined()->time() != v.toTime() ) lined()->setTime( v.toTime() ); - lined()->blockSignals( FALSE ); + lined()->blockSignals( false ); } setText( 1, v.toTime().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); @@ -1011,8 +1011,8 @@ TQDateTimeEdit *PropertyDateTimeItem::lined() if ( lin ) return lin; lin = new TQDateTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDateTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -1030,9 +1030,9 @@ void PropertyDateTimeItem::showEditor() { PropertyItem::showEditor(); if ( !lin ) { - lined()->blockSignals( TRUE ); + lined()->blockSignals( true ); lined()->setDateTime( value().toDateTime() ); - lined()->blockSignals( FALSE ); + lined()->blockSignals( false ); } placeEditor( lin ); if ( !lin->isVisible() ) { @@ -1055,10 +1055,10 @@ void PropertyDateTimeItem::setValue( const TQVariant &v ) return; if ( lin ) { - lined()->blockSignals( TRUE ); + lined()->blockSignals( true ); if ( lined()->dateTime() != v.toDateTime() ) lined()->setDateTime( v.toDateTime() ); - lined()->blockSignals( FALSE ); + lined()->blockSignals( false ); } setText( 1, v.toDateTime().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); @@ -1085,12 +1085,12 @@ TQComboBox *PropertyBoolItem::combo() { if ( comb ) return comb; - comb = new TQComboBox( FALSE, listview->viewport() ); + comb = new TQComboBox( false, listview->viewport() ); comb->hide(); comb->insertItem( i18n( "False" ) ); comb->insertItem( i18n( "True" ) ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -1112,12 +1112,12 @@ void PropertyBoolItem::showEditor() { PropertyItem::showEditor(); if ( !comb ) { - combo()->blockSignals( TRUE ); + combo()->blockSignals( true ); if ( value().toBool() ) combo()->setCurrentItem( 1 ); else combo()->setCurrentItem( 0 ); - combo()->blockSignals( FALSE ); + combo()->blockSignals( false ); } placeEditor( combo() ); if ( !combo()->isVisible() || !combo()->hasFocus() ) { @@ -1139,12 +1139,12 @@ void PropertyBoolItem::setValue( const TQVariant &v ) return; if ( comb ) { - combo()->blockSignals( TRUE ); + combo()->blockSignals( true ); if ( v.toBool() ) combo()->setCurrentItem( 1 ); else combo()->setCurrentItem( 0 ); - combo()->blockSignals( FALSE ); + combo()->blockSignals( false ); } TQString tmp = i18n( "True" ); if ( !v.toBool() ) @@ -1158,7 +1158,7 @@ void PropertyBoolItem::setValue() if ( !comb ) return; setText( 1, combo()->currentText() ); - bool b = combo()->currentItem() == 0 ? (bool)FALSE : (bool)TRUE; + bool b = combo()->currentItem() != 0; PropertyItem::setValue( TQVariant( b ) ); notifyValueChange(); } @@ -1186,8 +1186,8 @@ TQSpinBox *PropertyIntItem::spinBox() if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1201,12 +1201,12 @@ void PropertyIntItem::showEditor() { PropertyItem::showEditor(); if ( !spinBx ) { - spinBox()->blockSignals( TRUE ); + spinBox()->blockSignals( true ); if ( signedValue ) spinBox()->setValue( value().toInt() ); else spinBox()->setValue( value().toUInt() ); - spinBox()->blockSignals( FALSE ); + spinBox()->blockSignals( false ); } placeEditor( spinBox() ); if ( !spinBox()->isVisible() || !spinBox()->hasFocus() ) { @@ -1228,12 +1228,12 @@ void PropertyIntItem::setValue( const TQVariant &v ) return; if ( spinBx ) { - spinBox()->blockSignals( TRUE ); + spinBox()->blockSignals( true ); if ( signedValue ) spinBox()->setValue( v.toInt() ); else spinBox()->setValue( v.toUInt() ); - spinBox()->blockSignals( FALSE ); + spinBox()->blockSignals( false ); } if ( signedValue ) @@ -1282,8 +1282,8 @@ TQSpinBox* PropertyLayoutItem::spinBox() if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1291,9 +1291,9 @@ void PropertyLayoutItem::showEditor() { PropertyItem::showEditor(); if ( !spinBx ) { - spinBox()->blockSignals( TRUE ); + spinBox()->blockSignals( true ); spinBox()->setValue( value().toInt() ); - spinBox()->blockSignals( TRUE ); + spinBox()->blockSignals( true ); } placeEditor( spinBox() ); if ( !spinBox()->isVisible() || !spinBox()->hasFocus() ) { @@ -1311,9 +1311,9 @@ void PropertyLayoutItem::hideEditor() void PropertyLayoutItem::setValue( const TQVariant &v ) { if ( spinBx ) { - spinBox()->blockSignals( TRUE ); + spinBox()->blockSignals( true ); spinBox()->setValue( v.toInt() ); - spinBox()->blockSignals( FALSE ); + spinBox()->blockSignals( false ); } TQString s = v.toString(); if ( v.toInt() == -1 ) @@ -1347,8 +1347,8 @@ TQComboBox *PropertyListItem::combo() return comb; comb = new TQComboBox( editable, listview->viewport() ); comb->hide(); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); if ( editable ) { TQObjectList *ol = comb->queryList( "TQLineEdit" ); @@ -1369,10 +1369,10 @@ void PropertyListItem::showEditor() { PropertyItem::showEditor(); if ( !comb ) { - combo()->blockSignals( TRUE ); + combo()->blockSignals( true ); combo()->clear(); combo()->insertStringList( value().toStringList() ); - combo()->blockSignals( FALSE ); + combo()->blockSignals( false ); } placeEditor( combo() ); if ( !combo()->isVisible() || !combo()->hasFocus() ) { @@ -1390,10 +1390,10 @@ void PropertyListItem::hideEditor() void PropertyListItem::setValue( const TQVariant &v ) { if ( comb ) { - combo()->blockSignals( TRUE ); + combo()->blockSignals( true ); combo()->clear(); combo()->insertStringList( v.toStringList() ); - combo()->blockSignals( FALSE ); + combo()->blockSignals( false ); } setText( 1, v.toStringList().first() ); PropertyItem::setValue( v ); @@ -1424,10 +1424,10 @@ void PropertyListItem::setCurrentItem( const TQString &s ) return; if ( !comb ) { - combo()->blockSignals( TRUE ); + combo()->blockSignals( true ); combo()->clear(); combo()->insertStringList( value().toStringList() ); - combo()->blockSignals( FALSE ); + combo()->blockSignals( false ); } for ( uint i = 0; i < combo()->listBox()->count(); ++i ) { if ( combo()->listBox()->item( i )->text().lower() == s.lower() ) { @@ -1451,10 +1451,10 @@ void PropertyListItem::setCurrentItem( int i ) return; if ( !comb ) { - combo()->blockSignals( TRUE ); + combo()->blockSignals( true ); combo()->clear(); combo()->insertStringList( value().toStringList() ); - combo()->blockSignals( FALSE ); + combo()->blockSignals( false ); } combo()->setCurrentItem( i ); setText( 1, combo()->currentText() ); @@ -1492,7 +1492,7 @@ TQLineEdit *PropertyCoordItem::lined() if ( lin ) return lin; lin = new TQLineEdit( listview->viewport() ); - lin->setReadOnly( TRUE ); + lin->setReadOnly( true ); lin->installEventFilter( listview ); lin->hide(); return lin; @@ -1502,15 +1502,15 @@ void PropertyCoordItem::createChildren() { PropertyItem *i = this; if ( typ == Rect || typ == Point ) { - i = new PropertyIntItem( listview, i, this, i18n( "x" ), TRUE ); + i = new PropertyIntItem( listview, i, this, i18n( "x" ), true ); addChild( i ); - i = new PropertyIntItem( listview, i, this, i18n( "y" ), TRUE ); + i = new PropertyIntItem( listview, i, this, i18n( "y" ), true ); addChild( i ); } if ( typ == Rect || typ == Size ) { - i = new PropertyIntItem( listview, i, this, i18n( "width" ), TRUE ); + i = new PropertyIntItem( listview, i, this, i18n( "width" ), true ); addChild( i ); - i = new PropertyIntItem( listview, i, this, i18n( "height" ), TRUE ); + i = new PropertyIntItem( listview, i, this, i18n( "height" ), true ); addChild( i ); } } @@ -1592,7 +1592,7 @@ void PropertyCoordItem::setValue( const TQVariant &v ) bool PropertyCoordItem::hasSubItems() const { - return TRUE; + return true; } void PropertyCoordItem::childValueChanged( PropertyItem *child ) @@ -1644,8 +1644,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr box->setLineWidth( 2 ); pixPrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPixmap() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPixmap() ) ); } PropertyPixmapItem::~PropertyPixmapItem() @@ -1699,7 +1699,7 @@ void PropertyPixmapItem::getPixmap() bool PropertyPixmapItem::hasCustomContents() const { - return TRUE; + return true; } void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r ) @@ -1747,18 +1747,18 @@ PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, Prop pal.setDisabled( cg ); colorPrev->setPalette( pal ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getColor() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getColor() ) ); } void PropertyColorItem::createChildren() { PropertyItem *i = this; - i = new PropertyIntItem( listview, i, this, i18n( "Red" ), TRUE ); + i = new PropertyIntItem( listview, i, this, i18n( "Red" ), true ); addChild( i ); - i = new PropertyIntItem( listview, i, this, i18n( "Green" ), TRUE ); + i = new PropertyIntItem( listview, i, this, i18n( "Green" ), true ); addChild( i ); - i = new PropertyIntItem( listview, i, this, i18n( "Blue" ), TRUE ); + i = new PropertyIntItem( listview, i, this, i18n( "Blue" ), true ); addChild( i ); } @@ -1838,7 +1838,7 @@ void PropertyColorItem::getColor() bool PropertyColorItem::hasCustomContents() const { - return TRUE; + return true; } void PropertyColorItem::drawCustomContents( TQPainter *p, const TQRect &r ) @@ -1863,22 +1863,22 @@ PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, Proper button->setFixedWidth( 20 ); box->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); box->setLineWidth( 2 ); - lined->setFrame( FALSE ); - lined->setReadOnly( TRUE ); + lined->setFrame( false ); + lined->setReadOnly( true ); box->setFocusProxy( lined ); box->installEventFilter( listview ); lined->installEventFilter( listview ); button->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getFont() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getFont() ) ); } void PropertyFontItem::createChildren() { PropertyItem *i = this; - i = new PropertyListItem( listview, i, this, i18n( "Family" ), FALSE ); + i = new PropertyListItem( listview, i, this, i18n( "Family" ), false ); addChild( i ); - i = new PropertyIntItem( listview, i, this, i18n( "Point Size" ), TRUE ); + i = new PropertyIntItem( listview, i, this, i18n( "Point Size" ), true ); addChild( i ); i = new PropertyBoolItem( listview, i, this, i18n( "Bold" ) ); addChild( i ); @@ -1944,7 +1944,7 @@ void PropertyFontItem::setValue( const TQVariant &v ) void PropertyFontItem::getFont() { - bool ok = FALSE; + bool ok = false; TQFont f = TQFontDialog::getFont( &ok, val.toFont(), listview ); if ( ok && f != val.toFont() ) { setValue( f ); @@ -1954,7 +1954,7 @@ void PropertyFontItem::getFont() bool PropertyFontItem::hasSubItems() const { - return TRUE; + return true; } void PropertyFontItem::childValueChanged( PropertyItem *child ) @@ -1990,8 +1990,8 @@ PropertyDatabaseItem::PropertyDatabaseItem( PropertyList *l, PropertyItem *after button->setFixedWidth( 20 ); box->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); box->setLineWidth( 2 ); - lined->setFrame( FALSE ); - lined->setReadOnly( TRUE ); + lined->setFrame( false ); + lined->setReadOnly( true ); box->setFocusProxy( lined ); box->installEventFilter( listview ); lined->installEventFilter( listview ); @@ -2001,12 +2001,12 @@ PropertyDatabaseItem::PropertyDatabaseItem( PropertyList *l, PropertyItem *after void PropertyDatabaseItem::createChildren() { PropertyItem *i = this; - i = new PropertyListItem( listview, i, this, i18n( "Connection" ), TRUE ); + i = new PropertyListItem( listview, i, this, i18n( "Connection" ), true ); addChild( i ); - i = new PropertyListItem( listview, i, this, i18n( "Table" ), TRUE ); + i = new PropertyListItem( listview, i, this, i18n( "Table" ), true ); addChild( i ); if ( withField ) { - i = new PropertyListItem( listview, i, this, i18n( "Field" ), TRUE ); + i = new PropertyListItem( listview, i, this, i18n( "Field" ), true ); addChild( i ); } } @@ -2026,13 +2026,13 @@ void PropertyDatabaseItem::initChildren() else if ( lst.count() > 0 ) item->setValue( TQStringList( lst[ 0 ] ) ); else if ( withField ) - item->setValue( TQStringList( MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), + item->setValue( TQStringList( MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList()[ 0 ] ) ); if ( lst.count() > 0 && !lst[ 0 ].isEmpty() ) item->setCurrentItem( lst[ 0 ] ); else if ( !isChanged() && withField ) - item->setCurrentItem( MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), + item->setCurrentItem( MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList()[ 0 ] ); else item->setCurrentItem( 0 ); @@ -2044,7 +2044,7 @@ void PropertyDatabaseItem::initChildren() else if ( lst.count() > 1 ) item->setValue( TQStringList( lst[ 1 ] ) ); else if ( withField ) { - TQStringList fakeLst = MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), "database" ).toStringList(); + TQStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList(); if ( fakeLst.count() > 1 ) item->setValue( fakeLst[ 1 ] ); } @@ -2052,7 +2052,7 @@ void PropertyDatabaseItem::initChildren() if ( lst.count() > 1 && !lst[ 1 ].isEmpty() ) item->setCurrentItem( lst[ 1 ] ); else if ( !isChanged() && withField ) { - TQStringList fakeLst = MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), "database" ).toStringList(); + TQStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList(); if ( fakeLst.count() > 1 ) item->setCurrentItem( fakeLst[ 1 ] ); else @@ -2110,7 +2110,7 @@ void PropertyDatabaseItem::setValue( const TQVariant &v ) bool PropertyDatabaseItem::hasSubItems() const { - return TRUE; + return true; } void PropertyDatabaseItem::childValueChanged( PropertyItem *c ) @@ -2158,7 +2158,7 @@ TQLineEdit *PropertySizePolicyItem::lined() return lin; lin = new TQLineEdit( listview->viewport() ); lin->hide(); - lin->setReadOnly( TRUE ); + lin->setReadOnly( true ); return lin; } @@ -2168,15 +2168,15 @@ void PropertySizePolicyItem::createChildren() lst << "Fixed" << "Minimum" << "Maximum" << "Preferred" << "MinimumExpanding" << "Expanding" << "Ignored"; PropertyItem *i = this; - i = new PropertyListItem( listview, i, this, i18n( "hSizeType" ), FALSE ); + i = new PropertyListItem( listview, i, this, i18n( "hSizeType" ), false ); i->setValue( lst ); addChild( i ); - i = new PropertyListItem( listview, i, this, i18n( "vSizeType" ), FALSE ); + i = new PropertyListItem( listview, i, this, i18n( "vSizeType" ), false ); i->setValue( lst ); addChild( i ); - i = new PropertyIntItem( listview, i, this, i18n( "horizontalStretch" ), TRUE ); + i = new PropertyIntItem( listview, i, this, i18n( "horizontalStretch" ), true ); addChild( i ); - i = new PropertyIntItem( listview, i, this, i18n( "verticalStretch" ), TRUE ); + i = new PropertyIntItem( listview, i, this, i18n( "verticalStretch" ), true ); addChild( i ); } @@ -2250,7 +2250,7 @@ void PropertySizePolicyItem::childValueChanged( PropertyItem *child ) bool PropertySizePolicyItem::hasSubItems() const { - return TRUE; + return true; } // -------------------------------------------------------------- @@ -2269,8 +2269,8 @@ PropertyPaletteItem::PropertyPaletteItem( PropertyList *l, PropertyItem *after, box->setLineWidth( 2 ); palettePrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPalette() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPalette() ) ); } PropertyPaletteItem::~PropertyPaletteItem() { @@ -2305,7 +2305,7 @@ void PropertyPaletteItem::getPalette() { if ( !listview->propertyEditor()->widget()->isWidgetType() ) return; - bool ok = FALSE; + bool ok = false; TQWidget *w = (TQWidget*)listview->propertyEditor()->widget(); if ( ::tqt_cast<TQScrollView*>(w) ) w = ( (TQScrollView*)w )->viewport(); @@ -2320,7 +2320,7 @@ void PropertyPaletteItem::getPalette() bool PropertyPaletteItem::hasCustomContents() const { - return TRUE; + return true; } void PropertyPaletteItem::drawCustomContents( TQPainter *p, const TQRect &r ) @@ -2354,7 +2354,7 @@ TQComboBox *PropertyCursorItem::combo() { if ( comb ) return comb; - comb = new TQComboBox( FALSE, listview->viewport() ); + comb = new TQComboBox( false, listview->viewport() ); comb->hide(); TQBitmap cur; @@ -2391,8 +2391,8 @@ TQComboBox *PropertyCursorItem::combo() comb->insertItem( HandPix, i18n("Pointing Hand"), TQObject::PointingHandCursor ); comb->insertItem( NoPix, i18n("Forbidden"), TQObject::ForbiddenCursor ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -2406,9 +2406,9 @@ void PropertyCursorItem::showEditor() { PropertyItem::showEditor(); if ( !comb ) { - combo()->blockSignals( TRUE ); + combo()->blockSignals( true ); combo()->setCurrentItem( (int)value().toCursor().shape() ); - combo()->blockSignals( FALSE ); + combo()->blockSignals( false ); } placeEditor( combo() ); if ( !combo()->isVisible() || !combo()->hasFocus() ) { @@ -2429,9 +2429,9 @@ void PropertyCursorItem::setValue( const TQVariant &v ) && value() == v ) return; - combo()->blockSignals( TRUE ); + combo()->blockSignals( true ); combo()->setCurrentItem( (int)v.toCursor().shape() ); - combo()->blockSignals( FALSE ); + combo()->blockSignals( false ); setText( 1, combo()->currentText() ); PropertyItem::setValue( v ); } @@ -2454,13 +2454,13 @@ PropertyKeysequenceItem::PropertyKeysequenceItem( PropertyList *l, PropertyItem *prop, const TQString &propName ) : PropertyItem( l, after, prop, propName ), - k1( 0 ), k2( 0 ), k3( 0 ), k4( 0 ), num( 0 ), mouseEnter( FALSE ) + k1( 0 ), k2( 0 ), k3( 0 ), k4( 0 ), num( 0 ), mouseEnter( false ) { box = new TQHBox( listview->viewport() ); box->hide(); sequence = new TQLineEdit( box ); - connect( sequence, TQT_SIGNAL(textChanged( const TQString & )), - this, TQT_SLOT(setValue()) ); + connect( sequence, TQ_SIGNAL(textChanged( const TQString & )), + this, TQ_SLOT(setValue()) ); sequence->installEventFilter( this ); } @@ -2493,22 +2493,22 @@ bool PropertyKeysequenceItem::eventFilter( TQObject *o, TQEvent *e ) if ( !mouseEnter && (k->key() == TQObject::Key_Up || k->key() == TQObject::Key_Down) ) - return FALSE; + return false; handleKeyEvent( k ); - return TRUE; + return true; } else if ( (e->type() == TQEvent::FocusIn) || (e->type() == TQEvent::MouseButtonPress) ) { mouseEnter = ( listview->lastEvent() == PropertyList::MouseEvent ) || (e->type() == TQEvent::MouseButtonPress); - return TRUE; + return true; } // Lets eat accelerators now.. if ( e->type() == TQEvent::Accel || e->type() == TQEvent::AccelOverride || e->type() == TQEvent::KeyRelease ) - return TRUE; - return FALSE; + return true; + return false; } void PropertyKeysequenceItem::handleKeyEvent( TQKeyEvent *e ) @@ -2568,7 +2568,7 @@ void PropertyKeysequenceItem::setValue() PropertyItem::setValue( v ); if ( sequence->hasFocus() ) notifyValueChange(); - setChanged( TRUE ); + setChanged( true ); } void PropertyKeysequenceItem::setValue( const TQVariant &v ) @@ -2595,7 +2595,7 @@ EnumPopup::EnumPopup( TQWidget *parent, const char *name, WFlags f ) setFrameStyle( Panel | Plain ); setPaletteBackgroundColor( TQt::white ); popLayout = new TQVBoxLayout( this, 3 ); - checkBoxList.setAutoDelete( TRUE ); + checkBoxList.setAutoDelete( true ); } EnumPopup::~EnumPopup() @@ -2654,20 +2654,20 @@ EnumBox::EnumBox( TQWidget *parent, const char *name ) : TQComboBox( parent, name ) { pop = new EnumPopup( this, "popup", TQObject::WType_Popup ); - connect( pop, TQT_SIGNAL( hidden() ), this, TQT_SLOT( popupHidden() ) ); - connect( pop, TQT_SIGNAL( closed() ), this, TQT_SLOT( popupClosed() ) ); - popupShown = FALSE; - arrowDown = FALSE; + connect( pop, TQ_SIGNAL( hidden() ), this, TQ_SLOT( popupHidden() ) ); + connect( pop, TQ_SIGNAL( closed() ), this, TQ_SLOT( popupClosed() ) ); + popupShown = false; + arrowDown = false; } void EnumBox::popupHidden() { - popupShown = FALSE; + popupShown = false; } void EnumBox::popupClosed() { - popupShown = FALSE; + popupShown = false; emit valueChanged(); } @@ -2684,7 +2684,7 @@ void EnumBox::paintEvent( TQPaintEvent * ) flags |= TQStyle::Style_HasFocus; if ( width() < 5 || height() < 5 ) { - qDrawShadePanel( &p, rect().x(), rect().y(), rect().width(), rect().height(), g, FALSE, 2, + qDrawShadePanel( &p, rect().x(), rect().y(), rect().width(), rect().height(), g, false, 2, &g.brush( TQColorGroup::Button ) ); return; } @@ -2723,14 +2723,14 @@ void EnumBox::popup() { if ( popupShown ) { pop->closeWidget(); - popupShown = FALSE; + popupShown = false; return; } pop->move( ((TQWidget*)parent())->mapToGlobal( geometry().bottomLeft() ) ); pop->setMinimumWidth( width() ); emit aboutToShowPopup(); pop->show(); - popupShown = TRUE; + popupShown = true; } void EnumBox::mousePressEvent( TQMouseEvent *e ) @@ -2745,19 +2745,19 @@ void EnumBox::mousePressEvent( TQMouseEvent *e ) arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); if ( arrowRect.contains( e->pos() ) ) { - arrowDown = TRUE; - repaint( FALSE ); + arrowDown = true; + repaint( false ); } popup(); - TQTimer::singleShot( 100, this, TQT_SLOT( restoreArrow() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( restoreArrow() ) ); } void EnumBox::keyPressEvent( TQKeyEvent *e ) { if ( e->key() == Key_Space ) { popup(); - TQTimer::singleShot( 100, this, TQT_SLOT( restoreArrow() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( restoreArrow() ) ); } else if ( e->key() == Key_Enter || e->key() == Key_Return ) { popup(); } @@ -2765,14 +2765,14 @@ void EnumBox::keyPressEvent( TQKeyEvent *e ) void EnumBox::restoreArrow() { - arrowDown = FALSE; - repaint( FALSE ); + arrowDown = false; + repaint( false ); } void EnumBox::setText( const TQString &text ) { str = text; - repaint( FALSE ); + repaint( false ); } @@ -2786,8 +2786,8 @@ PropertyEnumItem::PropertyEnumItem( PropertyList *l, box = new EnumBox( listview->viewport() ); box->hide(); box->installEventFilter( listview ); - connect( box, TQT_SIGNAL( aboutToShowPopup() ), this, TQT_SLOT( insertEnums() ) ); - connect( box, TQT_SIGNAL( valueChanged() ), this, TQT_SLOT( setValue() ) ); + connect( box, TQ_SIGNAL( aboutToShowPopup() ), this, TQ_SLOT( insertEnums() ) ); + connect( box, TQ_SIGNAL( valueChanged() ), this, TQ_SLOT( setValue() ) ); } PropertyEnumItem::~PropertyEnumItem() @@ -2820,8 +2820,8 @@ void PropertyEnumItem::setValue( const TQVariant &v ) TQStringList lst = v.toStringList(); TQValueListConstIterator<TQString> it = lst.begin(); for ( ; it != lst.end(); ++it ) - enumList.append( EnumItem( *it, FALSE ) ); - enumList.first().selected = TRUE; + enumList.append( EnumItem( *it, false ) ); + enumList.first().selected = true; enumString = enumList.first().key; box->setText( enumString ); setText( 1, enumString ); @@ -2856,10 +2856,10 @@ void PropertyEnumItem::setCurrentValues( TQStrList lst ) TQStrList::ConstIterator it = lst.begin(); TQValueList<EnumItem>::Iterator eit = enumList.begin(); for ( ; eit != enumList.end(); ++eit ) { - (*eit).selected = FALSE; + (*eit).selected = false; for ( it = lst.begin(); it != lst.end(); ++it ) { if ( TQString( *it ) == (*eit).key ) { - (*eit).selected = TRUE; + (*eit).selected = true; enumString += "|" + (*eit).key; break; } @@ -2909,29 +2909,29 @@ PropertyList::PropertyList( PropertyEditor *e ) init_colors(); whatsThis = new PropertyWhatsThis( this ); - showSorted = FALSE; - header()->setMovingEnabled( FALSE ); - header()->setStretchEnabled( TRUE ); + showSorted = false; + header()->setMovingEnabled( false ); + header()->setStretchEnabled( true ); setResizePolicy( TQScrollView::Manual ); - viewport()->setAcceptDrops( TRUE ); + viewport()->setAcceptDrops( true ); viewport()->installEventFilter( this ); addColumn( i18n( "Property" ) ); addColumn( i18n( "Value" ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( updateEditorSize() ) ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); - connect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( toggleSort() ) ); - connect( this, TQT_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( toggleOpen( TQListViewItem * ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( updateEditorSize() ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); + connect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( toggleSort() ) ); + connect( this, TQ_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( toggleOpen( TQListViewItem * ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); setColumnWidthMode( 1, Manual ); - mousePressed = FALSE; + mousePressed = false; pressItem = 0; theLastEvent = MouseEvent; header()->installEventFilter( this ); @@ -3020,10 +3020,10 @@ static bool parent_is_data_aware( TQWidget *w ) TQWidget *p = w ? w->parentWidget() : 0; while ( p && !p->isTopLevel() ) { if ( ::tqt_cast<QDesignerDataBrowser*>(p) || ::tqt_cast<QDesignerDataView*>(p) ) - return TRUE; + return true; p = p->parentWidget(); } - return FALSE; + return false; } #endif @@ -3043,7 +3043,7 @@ void PropertyList::setupProperties() TQStringList valueSet; bool parentHasLayout = w->isWidgetType() && - !editor->formWindow()->isMainContainer( TQT_TQOBJECT(w) ) && ( (TQWidget*)w )->parentWidget() && + !editor->formWindow()->isMainContainer( w ) && ( (TQWidget*)w )->parentWidget() && WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { const TQMetaProperty* p = @@ -3072,9 +3072,9 @@ void PropertyList::setupProperties() if ( qstrcmp( p->name(), "maximumSize" ) == 0 ) continue; } - unique.insert( TQString::fromLatin1( it.current() ), TRUE ); + unique.insert( TQString::fromLatin1( it.current() ), true ); if ( editor->widget()->isWidgetType() && - editor->formWindow()->isMainContainer( TQT_TQOBJECT(editor->widget()) ) ) { + editor->formWindow()->isMainContainer( editor->widget() ) ) { if ( qstrcmp( p->name(), "geometry" ) == 0 ) continue; } else { // hide some toplevel-only stuff @@ -3167,27 +3167,27 @@ void PropertyList::setupProperties() << p->valueToKey( AlignHCenter ) << p->valueToKey( AlignRight ) << p->valueToKey( AlignJustify ); - item = new PropertyListItem( this, item, 0, "hAlign", FALSE ); + item = new PropertyListItem( this, item, 0, "hAlign", false ); item->setValue( lst ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "hAlign" ) ) - item->setChanged( TRUE, FALSE ); + item->setChanged( true, false ); if ( !::tqt_cast<TQMultiLineEdit*>(editor->widget()) ) { lst.clear(); lst << p->valueToKey( AlignTop ) << p->valueToKey( AlignVCenter ) << p->valueToKey( AlignBottom ); - item = new PropertyListItem( this, item, 0, "vAlign", FALSE ); + item = new PropertyListItem( this, item, 0, "vAlign", false ); item->setValue( lst ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "vAlign" ) ) - item->setChanged( TRUE, FALSE ); + item->setChanged( true, false ); item = new PropertyBoolItem( this, item, 0, "wordwrap" ); if ( ::tqt_cast<TQGroupBox*>(w) ) - item->setVisible( FALSE ); + item->setVisible( false ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "wordwrap" ) ) - item->setChanged( TRUE, FALSE ); + item->setChanged( true, false ); } } else { TQStrList lst( p->enumKeys() ); @@ -3201,7 +3201,7 @@ void PropertyList::setupProperties() item->setValue( l ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), p->name() ) ) - item->setChanged( TRUE, FALSE ); + item->setChanged( true, false ); } } else if ( p->isEnumType() ) { TQStrList l = p->enumKeys(); @@ -3213,7 +3213,7 @@ void PropertyList::setupProperties() continue; lst << k; } - item = new PropertyListItem( this, item, 0, p->name(), FALSE ); + item = new PropertyListItem( this, item, 0, p->name(), false ); item->setValue( lst ); } else { TQVariant::Type t = TQVariant::nameToType( p->type() ); @@ -3227,7 +3227,7 @@ void PropertyList::setupProperties() valueSet << item->name(); } if ( MetaDataBase::isPropertyChanged( editor->widget(), p->name() ) ) - item->setChanged( TRUE, FALSE ); + item->setChanged( true, false ); } } @@ -3237,20 +3237,20 @@ void PropertyList::setupProperties() setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "layoutSpacing" ) || MetaDataBase::spacing( editor->widget() ) != -1 ) - layoutInitValue( item, TRUE ); + layoutInitValue( item, true ); else layoutInitValue( item ); item = new PropertyLayoutItem( this, item, 0, "layoutMargin" ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "layoutMargin" ) || MetaDataBase::margin( editor->widget() ) != -1 ) - layoutInitValue( item, TRUE ); + layoutInitValue( item, true ); else layoutInitValue( item ); TQWidget *widget = (TQWidget*)w; if ( ( !::tqt_cast<TQLayoutWidget*>(widget) && widget->parentWidget() && ::tqt_cast<FormWindow*>(widget->parentWidget()) ) ) { - item = new PropertyListItem( this, item, 0, "resizeMode", FALSE ); + item = new PropertyListItem( this, item, 0, "resizeMode", false ); TQStringList lst; lst << "Auto" << "FreeResize" << "Minimum" << "Fixed"; item->setValue( lst ); @@ -3258,22 +3258,22 @@ void PropertyList::setupProperties() TQString resizeMod = MetaDataBase::resizeMode( editor->widget() ); if ( !resizeMod.isEmpty() && resizeMod != WidgetFactory::defaultCurrentItem( editor->widget(), "resizeMode" ) ) { - item->setChanged( TRUE, FALSE ); - MetaDataBase::setPropertyChanged( editor->widget(), "resizeMode", TRUE ); + item->setChanged( true, false ); + MetaDataBase::setPropertyChanged( editor->widget(), "resizeMode", true ); } } } if ( !::tqt_cast<Spacer*>(w) && !::tqt_cast<TQLayoutWidget*>(w) && !::tqt_cast<MenuBarEditor*>(w) && !::tqt_cast<QDesignerToolBar*>(w) ) { - item = new PropertyTextItem( this, item, 0, "toolTip", TRUE, FALSE ); + item = new PropertyTextItem( this, item, 0, "toolTip", true, false ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "toolTip" ) ) - item->setChanged( TRUE, FALSE ); - item = new PropertyTextItem( this, item, 0, "whatsThis", TRUE, TRUE ); + item->setChanged( true, false ); + item = new PropertyTextItem( this, item, 0, "whatsThis", true, true ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "whatsThis" ) ) - item->setChanged( TRUE, FALSE ); + item->setChanged( true, false ); } #ifndef TQT_NO_SQL @@ -3282,19 +3282,19 @@ void PropertyList::setupProperties() item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) - item->setChanged( TRUE, FALSE ); + item->setChanged( true, false ); } if ( ::tqt_cast<TQDataTable*>(editor->widget()) || ::tqt_cast<TQDataBrowser*>(editor->widget()) || ::tqt_cast<TQDataView*>(editor->widget()) ) { - item = new PropertyDatabaseItem( this, item, 0, "database", FALSE ); + item = new PropertyDatabaseItem( this, item, 0, "database", false ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) - item->setChanged( TRUE, FALSE ); + item->setChanged( true, false ); item = new PropertyBoolItem( this, item, 0, "frameworkCode" ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "frameworkCode" ) ) - item->setChanged( TRUE, FALSE ); + item->setChanged( true, false ); } #endif @@ -3337,18 +3337,18 @@ void PropertyList::setupCusWidgetProperties( MetaDataBase::CustomWidget *cw, cw->lstProperties.begin(); it != cw->lstProperties.end(); ++it ) { if ( unique.contains( TQString( (*it).property ) ) ) continue; - unique.insert( TQString( (*it).property ), TRUE ); + unique.insert( TQString( (*it).property ), true ); addPropertyItem( item, (*it).property, type_to_variant( (*it).type ) ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), (*it).property ) ) - item->setChanged( TRUE, FALSE ); + item->setChanged( true, false ); } } bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, TQVariant::Type t ) { if ( name == "buddy" ) { - PropertyListItem *itm = new PropertyListItem( this, item, 0, name, TRUE ); + PropertyListItem *itm = new PropertyListItem( this, item, 0, name, true ); TQPtrDict<TQWidget> *widgets = editor->formWindow()->widgets(); TQPtrDictIterator<TQWidget> it( *widgets ); TQStringList l; @@ -3363,12 +3363,12 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, l.sort(); itm->setValue( l ); item = itm; - return TRUE; + return true; } switch ( t ) { case TQVariant::String: - item = new PropertyTextItem( this, item, 0, name, TRUE, + item = new PropertyTextItem( this, item, 0, name, true, ::tqt_cast<TQLabel*>(editor->widget()) || ::tqt_cast<TQTextView*>(editor->widget()) || ::tqt_cast<TQButton*>(editor->widget()) ); @@ -3377,7 +3377,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, item = new PropertyTextItem( this, item, 0, name, name == "name" && editor->widget() == editor->formWindow()->mainContainer(), - FALSE, TRUE ); + false, true ); break; case TQVariant::Bool: item = new PropertyBoolItem( this, item, 0, name ); @@ -3387,13 +3387,13 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, break; case TQVariant::Int: if ( name == "accel" ) - item = new PropertyTextItem( this, item, 0, name, FALSE, FALSE, FALSE, TRUE ); + item = new PropertyTextItem( this, item, 0, name, false, false, false, true ); else if ( name == "layoutSpacing" || name == "layoutMargin" ) item = new PropertyLayoutItem( this, item, 0, name ); else if ( name == "resizeMode" ) - item = new PropertyListItem( this, item, 0, name, TRUE ); + item = new PropertyListItem( this, item, 0, name, true ); else - item = new PropertyIntItem( this, item, 0, name, TRUE ); + item = new PropertyIntItem( this, item, 0, name, true ); break; case TQVariant::Double: item = new PropertyDoubleItem( this, item, 0, name ); @@ -3402,10 +3402,10 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, item = new PropertyKeysequenceItem( this, item, 0, name ); break; case TQVariant::UInt: - item = new PropertyIntItem( this, item, 0, name, FALSE ); + item = new PropertyIntItem( this, item, 0, name, false ); break; case TQVariant::StringList: - item = new PropertyListItem( this, item, 0, name, TRUE ); + item = new PropertyListItem( this, item, 0, name, true ); break; case TQVariant::Rect: item = new PropertyCoordItem( this, item, 0, name, PropertyCoordItem::Rect ); @@ -3417,7 +3417,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, item = new PropertyCoordItem( this, item, 0, name, PropertyCoordItem::Size ); break; case TQVariant::Color: - item = new PropertyColorItem( this, item, 0, name, TRUE ); + item = new PropertyColorItem( this, item, 0, name, true ); break; case TQVariant::Pixmap: item = new PropertyPixmapItem( this, item, 0, name, PropertyPixmapItem::Pixmap ); @@ -3447,9 +3447,9 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, item = new PropertyDateTimeItem( this, item, 0, name ); break; default: - return FALSE; + return false; } - return TRUE; + return true; } void PropertyList::paintEmptyArea( TQPainter *p, const TQRect &r ) @@ -3489,7 +3489,7 @@ void PropertyList::valueChanged( PropertyItem *i ) i->value(), i->currentItem(), i->currentItemFromObject() ); cmd->execute(); - editor->formWindow()->commandHistory()->addCommand( cmd, TRUE ); + editor->formWindow()->commandHistory()->addCommand( cmd, true ); } void PropertyList::layoutInitValue( PropertyItem *i, bool changed ) @@ -3503,7 +3503,7 @@ void PropertyList::layoutInitValue( PropertyItem *i, bool changed ) i->value(), i->currentItem(), i->currentItemFromObject() ); cmd->execute(); if ( i->value().toString() != "-1" ) - changed = TRUE; + changed = true; i->setChanged( changed ); } @@ -3534,7 +3534,7 @@ void PropertyList::toggleOpen( TQListViewItem *i ) bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) { if ( !o || !e ) - return TRUE; + return true; PropertyItem *i = (PropertyItem*)currentItem(); if ( e->type() == TQEvent::KeyPress ) @@ -3548,25 +3548,25 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) ( o != this || o != viewport() ) && !( ke->state() & ControlButton ) ) { TQApplication::sendEvent( this, (TQKeyEvent*)e ); - return TRUE; + return true; } else if ( ( !::tqt_cast<TQLineEdit*>(o) || ( ::tqt_cast<TQLineEdit*>(o) && ( (TQLineEdit*)o )->isReadOnly() ) ) && i && i->hasSubItems() ) { if ( !i->isOpen() && ( ke->key() == Key_Plus || ke->key() == Key_Right )) - i->setOpen( TRUE ); + i->setOpen( true ); else if ( i->isOpen() && ( ke->key() == Key_Minus || ke->key() == Key_Left ) ) - i->setOpen( FALSE ); + i->setOpen( false ); } else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && ::tqt_cast<TQComboBox*>(o) ) { TQKeyEvent ke2( TQEvent::KeyPress, Key_Space, 0, 0 ); TQApplication::sendEvent( o, &ke2 ); - return TRUE; + return true; } } else if ( e->type() == TQEvent::FocusOut && ::tqt_cast<TQLineEdit*>(o) && editor->formWindow() ) { - TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) ); + TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQ_SLOT( checkCompressedCommand() ) ); } else if ( o == viewport() ) { TQMouseEvent *me; PropertyListItem* i; @@ -3577,7 +3577,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) if ( i && ( ::tqt_cast<PropertyColorItem*>(i) || ::tqt_cast<PropertyPixmapItem*>(i) ) ) { pressItem = i; pressPos = me->pos(); - mousePressed = TRUE; + mousePressed = true; } break; case TQEvent::MouseMove: @@ -3597,7 +3597,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) p.drawRect( 0, 0, pix.width(), pix.height() ); p.end(); drg->setPixmap( pix ); - mousePressed = FALSE; + mousePressed = false; drg->dragCopy(); } else if ( ::tqt_cast<PropertyPixmapItem*>(i) ) { @@ -3606,7 +3606,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) TQImage img = pix.convertToImage(); TQImageDrag *drg = new TQImageDrag( img, this ); drg->setPixmap( pix ); - mousePressed = FALSE; + mousePressed = false; drg->dragCopy(); } } @@ -3621,15 +3621,15 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) if ( e->type() == TQEvent::ContextMenu ) { ((TQContextMenuEvent *)e)->accept(); TQPopupMenu menu( 0 ); - menu.setCheckable( TRUE ); + menu.setCheckable( true ); const int cat_id = 1; const int alpha_id = 2; menu.insertItem( i18n( "Sort &Categorized" ), cat_id ); int alpha = menu.insertItem( i18n( "Sort &Alphabetically" ), alpha_id ); if ( showSorted ) - menu.setItemChecked( alpha_id, TRUE ); + menu.setItemChecked( alpha_id, true ); else - menu.setItemChecked( cat_id, TRUE ); + menu.setItemChecked( cat_id, true ); int res = menu.exec( ( (TQContextMenuEvent*)e )->globalPos() ); if ( res != -1 ) { bool newShowSorted = ( res == alpha ); @@ -3639,7 +3639,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) editor->setup(); } } - return TRUE; + return true; } } @@ -3661,12 +3661,12 @@ void PropertyList::refetchData() bool changed = MetaDataBase::isPropertyChanged( editor->widget(), i->name() ); if ( ( i->name() == "layoutSpacing" || i->name() == "layoutMargin" ) ) { if ( i->value().toString() != "-1" ) - i->setChanged( TRUE, FALSE ); + i->setChanged( true, false ); else - i->setChanged( FALSE, FALSE ); + i->setChanged( false, false ); } else if ( changed != i->isChanged() ) - i->setChanged( changed, FALSE ); + i->setChanged( changed, false ); } updateEditorSize(); } @@ -3689,12 +3689,12 @@ void PropertyList::setPropertyValue( PropertyItem *i ) { const TQMetaProperty *p = editor->widget()->metaObject()-> - property( editor->widget()->metaObject()->findProperty( i->name(), TRUE), TRUE ); + property( editor->widget()->metaObject()->findProperty( i->name(), true), true ); if ( !p ) { if ( i->name() == "hAlign" ) { int align = editor->widget()->property( "alignment" ).toInt(); p = editor->widget()->metaObject()-> - property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE ); + property( editor->widget()->metaObject()->findProperty( "alignment", true ), true ); align &= ~AlignVertical_Mask; TQStrList l = p->valueToKeys( align ); clearAlignList( l ); @@ -3702,7 +3702,7 @@ void PropertyList::setPropertyValue( PropertyItem *i ) } else if ( i->name() == "vAlign" ) { int align = editor->widget()->property( "alignment" ).toInt(); p = editor->widget()->metaObject()-> - property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE ); + property( editor->widget()->metaObject()->findProperty( "alignment", true ), true ); align &= ~AlignHorizontal_Mask; ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() ); } else if ( i->name() == "wordwrap" ) { @@ -3712,11 +3712,11 @@ void PropertyList::setPropertyValue( PropertyItem *i ) else i->setValue( TQVariant( false ) ); } else if ( i->name() == "layoutSpacing" ) { - ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) )); + ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ) )); } else if ( i->name() == "layoutMargin" ) { - ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) )); + ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ) )); } else if ( i->name() == "resizeMode" ) { - ( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) )) ); + ( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ) ) ); } else if ( i->name() == "toolTip" || i->name() == "whatsThis" || i->name() == "database" || i->name() == "frameworkCode" ) { i->setValue( MetaDataBase::fakeProperty( editor->widget(), i->name() ) ); } else if ( editor->widget()->inherits( "CustomWidget" ) ) { @@ -3771,9 +3771,9 @@ void PropertyList::resetProperty() i->name(), i->value(), WidgetFactory::defaultValue( editor->widget(), i->name() ), WidgetFactory::defaultCurrentItem( editor->widget(), i->name() ), - i->currentItem(), TRUE ); + i->currentItem(), true ); cmd->execute(); - editor->formWindow()->commandHistory()->addCommand( cmd, FALSE ); + editor->formWindow()->commandHistory()->addCommand( cmd, false ); if ( i->hasSubItems() ) i->initChildren(); } @@ -3913,13 +3913,13 @@ PropertyList::LastEventType PropertyList::lastEvent() // ------------------------------------------------------------ EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) - : HierarchyList( parent, fw, TRUE ), editor( e ) + : HierarchyList( parent, fw, true ), editor( e ) { header()->hide(); removeColumn( 1 ); - setRootIsDecorated( TRUE ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, TQT_SLOT( renamed( TQListViewItem * ) ) ); + setRootIsDecorated( true ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); } TQString clean_arguments( const TQString &s ) @@ -3964,9 +3964,9 @@ void EventList::setup() while ( it.current() ) { HierarchyItem *eventItem = new HierarchyItem( HierarchyItem::Event, this, (HierarchyItem*)0, it.current(), TQString(), TQString() ); - eventItem->setOpen( TRUE ); + eventItem->setOpen( true ); TQValueList<MetaDataBase::Connection> conns = - MetaDataBase::connections( TQT_TQOBJECT(formWindow), TQT_TQOBJECT(editor->widget()), TQT_TQOBJECT(formWindow->mainContainer()) ); + MetaDataBase::connections( formWindow, editor->widget(), formWindow->mainContainer() ); HierarchyItem *item = 0; for ( TQValueList<MetaDataBase::Connection>::Iterator cit = conns.begin(); cit != conns.end(); ++cit ) { @@ -4042,7 +4042,7 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) } else if ( res == DEL_ITEM && i->parent() ) { MetaDataBase::Connection conn; conn.sender = editor->widget(); - conn.receiver = TQT_TQOBJECT(formWindow->mainContainer()); + conn.receiver = formWindow->mainContainer(); conn.signal = i->parent()->text( 0 ); conn.slot = i->text( 0 ); delete i; @@ -4062,21 +4062,21 @@ void EventList::renamed( TQListViewItem *i ) if ( !i->parent() ) return; TQListViewItem *itm = i->parent()->firstChild(); - bool del = FALSE; + bool del = false; while ( itm ) { if ( itm != i && itm->text( 0 ) == i->text( 0 ) ) { - del = TRUE; + del = true; break; } itm = itm->nextSibling(); } - i->setRenameEnabled( 0, FALSE ); + i->setRenameEnabled( 0, false ); if ( del ) { delete i; } else { MetaDataBase::Connection conn; conn.sender = editor->widget(); - conn.receiver = TQT_TQOBJECT(formWindow->mainContainer()); + conn.receiver = formWindow->mainContainer(); conn.signal = i->parent()->text( 0 ); conn.slot = i->text( 0 ); AddConnectionCommand *cmd = new AddConnectionCommand( i18n( "Add Connection" ), @@ -4106,11 +4106,11 @@ void EventList::renamed( TQListViewItem *i ) /* MetaDataBase::addFunction( formWindow, funcname.latin1(), "virtual", "public", "slot", formWindow->project()->language(), "void" ); editor->formWindow()->mainWindow()-> - editFunction( i->text( 0 ).left( i->text( 0 ).find( "(" ) ), TRUE );*/ + editFunction( i->text( 0 ).left( i->text( 0 ).find( "(" ) ), true );*/ cmd->execute(); cmd2->execute(); editor->formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); - editor->formWindow()->formFile()->setModified( TRUE ); + editor->formWindow()->formFile()->setModified( true ); } } @@ -4160,13 +4160,13 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw ) if ( w && w == wid ) { // if there is no properties displayed then we really should show them. // to do this check the number of properties in the list. - bool ret = (listview->childCount() > 0) ? TRUE : FALSE; + bool ret = listview->childCount() > 0; if ( wid->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) { TQListViewItemIterator it( listview ); - ret = FALSE; + ret = false; while ( it.current() ) { if ( it.current()->text( 0 ) == "layoutSpacing" || it.current()->text( 0 ) == "layoutMargin" ) { - ret = TRUE; + ret = true; break; } ++it; @@ -4187,11 +4187,11 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw ) wid = w; formwindow = fw; setCaption( i18n( "Property Editor (%1)" ).arg( formwindow->name() ) ); - listview->viewport()->setUpdatesEnabled( FALSE ); - listview->setUpdatesEnabled( FALSE ); + listview->viewport()->setUpdatesEnabled( false ); + listview->setUpdatesEnabled( false ); clear(); - listview->viewport()->setUpdatesEnabled( TRUE ); - listview->setUpdatesEnabled( TRUE ); + listview->viewport()->setUpdatesEnabled( true ); + listview->setUpdatesEnabled( true ); setup(); } @@ -4207,15 +4207,15 @@ void PropertyEditor::setup() { if ( !formwindow || !wid ) return; - listview->viewport()->setUpdatesEnabled( FALSE ); + listview->viewport()->setUpdatesEnabled( false ); listview->setupProperties(); - listview->viewport()->setUpdatesEnabled( TRUE ); + listview->viewport()->setUpdatesEnabled( true ); listview->updateEditorSize(); if ( !wid->isA( "PropertyObject" ) ) { - eList->viewport()->setUpdatesEnabled( FALSE ); + eList->viewport()->setUpdatesEnabled( false ); eList->setup(); - eList->viewport()->setUpdatesEnabled( TRUE ); + eList->viewport()->setUpdatesEnabled( true ); } } @@ -4272,7 +4272,7 @@ TQString PropertyEditor::classOfCurrentProperty() const TQString curr = currentProperty(); TQMetaObject *mo = o->metaObject(); while ( mo ) { - TQStrList props = mo->propertyNames( FALSE ); + TQStrList props = mo->propertyNames( false ); if ( props.find( curr.latin1() ) != -1 ) return mo->className(); mo = mo->superClass(); @@ -4320,9 +4320,9 @@ void PropertyEditor::updateWindow() { if ( isHidden() && count() ) { parentWidget()->show(); - MainWindow::self->setAppropriate( (TQDockWindow*)parentWidget(), TRUE ); + MainWindow::self->setAppropriate( (TQDockWindow*)parentWidget(), true ); } else if ( isShown() && !count() ) { parentWidget()->hide(); - MainWindow::self->setAppropriate( (TQDockWindow*)parentWidget(), FALSE ); + MainWindow::self->setAppropriate( (TQDockWindow*)parentWidget(), false ); } } diff --git a/kdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h index 93d8c71b..8326fa8d 100644 --- a/kdevdesigner/designer/propertyeditor.h +++ b/kdevdesigner/designer/propertyeditor.h @@ -85,7 +85,7 @@ public: TQString name() const; virtual void notifyValueChange(); - virtual void setChanged( bool b, bool updateDb = TRUE ); + virtual void setChanged( bool b, bool updateDb = true ); bool isChanged() const; virtual void placeEditor( TQWidget *w ); @@ -143,7 +143,7 @@ class PropertyTextItem : public TQObject, public: PropertyTextItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const TQString &propName, bool comment, bool multiLine, bool ascii = FALSE, bool a = FALSE ); + const TQString &propName, bool comment, bool multiLine, bool ascii = false, bool a = false ); ~PropertyTextItem(); virtual void createChildren(); @@ -156,7 +156,7 @@ public: virtual bool hasSubItems() const; virtual void childValueChanged( PropertyItem *child ); - virtual void setChanged( bool b, bool updateDb = TRUE ); + virtual void setChanged( bool b, bool updateDb = true ); private slots: void setValue(); @@ -579,7 +579,7 @@ private: struct EnumItem { EnumItem( const TQString &k, bool s ) : key( k ), selected( s ) {} - EnumItem() : key( TQString() ), selected( FALSE ) {} + EnumItem() : key( TQString() ), selected( false ) {} bool operator==( const EnumItem &item ) const { return key == item.key; } @@ -690,7 +690,7 @@ public: virtual void setPropertyValue( PropertyItem *i ); virtual void setCurrentProperty( const TQString &n ); - void layoutInitValue( PropertyItem *i, bool changed = FALSE ); + void layoutInitValue( PropertyItem *i, bool changed = false ); PropertyEditor *propertyEditor() const; TQString whatsThisAt( const TQPoint &p ); void showCurrentWhatsThis(); diff --git a/kdevdesigner/designer/propertyobject.cpp b/kdevdesigner/designer/propertyobject.cpp index 1bd1883f..c9ac7680 100644 --- a/kdevdesigner/designer/propertyobject.cpp +++ b/kdevdesigner/designer/propertyobject.cpp @@ -36,9 +36,9 @@ PropertyObject::PropertyObject( const TQWidgetList &objs ) { TQPtrVector<TQPtrList<TQMetaObject> > v; v.resize( objects.count() ); - v.setAutoDelete( TRUE ); + v.setAutoDelete( true ); - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) { + for ( TQObject *o = objects.first(); o; o = objects.next() ) { const TQMetaObject *m = o->metaObject(); TQPtrList<TQMetaObject> *mol = new TQPtrList<TQMetaObject>; while ( m ) { @@ -74,10 +74,10 @@ PropertyObject::PropertyObject( const TQWidgetList &objs ) bool PropertyObject::setProperty( const char *name, const TQVariant& value ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) o->setProperty( name, value ); - return TRUE; + return true; } TQVariant PropertyObject::property( const char *name ) const @@ -87,44 +87,44 @@ TQVariant PropertyObject::property( const char *name ) const void PropertyObject::mdPropertyChanged( const TQString &property, bool changed ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setPropertyChanged( o, property, changed ); } bool PropertyObject::mdIsPropertyChanged( const TQString &property ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) { + for ( TQObject *o = objects.first(); o; o = objects.next() ) { if ( MetaDataBase::isPropertyChanged( o, property ) ) - return TRUE; + return true; } - return FALSE; + return false; } void PropertyObject::mdSetPropertyComment( const TQString &property, const TQString &comment ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setPropertyComment( o, property, comment ); } TQString PropertyObject::mdPropertyComment( const TQString &property ) { - return MetaDataBase::propertyComment( TQT_TQOBJECT(objects.first()), property ); + return MetaDataBase::propertyComment( objects.first(), property ); } void PropertyObject::mdSetFakeProperty( const TQString &property, const TQVariant &value ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setFakeProperty( o, property, value ); } TQVariant PropertyObject::mdFakeProperty( const TQString &property ) { - return MetaDataBase::fakeProperty( TQT_TQOBJECT(objects.first()), property ); + return MetaDataBase::fakeProperty( objects.first(), property ); } void PropertyObject::mdSetCursor( const TQCursor &c ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) { + for ( TQObject *o = objects.first(); o; o = objects.next() ) { if ( o->isWidgetType() ) MetaDataBase::setCursor( (TQWidget*)o, c ); } @@ -137,22 +137,22 @@ TQCursor PropertyObject::mdCursor() void PropertyObject::mdSetPixmapKey( int pixmap, const TQString &arg ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setPixmapKey( o, pixmap, arg ); } TQString PropertyObject::mdPixmapKey( int pixmap ) { - return MetaDataBase::pixmapKey( TQT_TQOBJECT(objects.first()), pixmap ); + return MetaDataBase::pixmapKey( objects.first(), pixmap ); } void PropertyObject::mdSetExportMacro( const TQString ¯o ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setExportMacro( o, macro ); } TQString PropertyObject::mdExportMacro() { - return MetaDataBase::exportMacro( TQT_TQOBJECT(objects.first()) ); + return MetaDataBase::exportMacro( objects.first() ); } diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp index 4c773351..25ba5f47 100644 --- a/kdevdesigner/designer/qcompletionedit.cpp +++ b/kdevdesigner/designer/qcompletionedit.cpp @@ -31,7 +31,7 @@ #include <tqvbox.h> QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name ) - : TQLineEdit( parent, name ), aAdd( FALSE ), caseSensitive( FALSE ) + : TQLineEdit( parent, name ), aAdd( false ), caseSensitive( false ) { popup = new TQVBox( 0, 0, WType_Popup ); popup->setFrameStyle( TQFrame::Box | TQFrame::Plain ); @@ -45,8 +45,8 @@ QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name ) listbox->setHScrollBarMode( TQScrollView::AlwaysOn ); listbox->setVScrollBarMode( TQScrollView::AlwaysOn ); listbox->setCornerWidget( new TQSizeGrip( listbox, "completion sizegrip" ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( textDidChange( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( textDidChange( const TQString & ) ) ); popup->setFocusProxy( listbox ); installEventFilter( this ); } @@ -98,7 +98,7 @@ void QCompletionEdit::placeListBox() popup->move( p.x(), p.y() - listbox->height() ); popup->show(); listbox->setCurrentItem( 0 ); - listbox->setSelected( 0, TRUE ); + listbox->setSelected( 0, true ); setFocus(); } @@ -123,20 +123,20 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) if ( ke->key() == Key_Tab && listbox->count() > 1 && listbox->currentItem() < (int)listbox->count() - 1 ) { listbox->setCurrentItem( listbox->currentItem() + 1 ); - return TRUE; + return true; } popup->close(); setFocus(); - blockSignals( TRUE ); + blockSignals( true ); setText( listbox->currentText() ); - blockSignals( FALSE ); + blockSignals( false ); emit chosen( text() ); - return TRUE; + return true; } else if ( ke->key() == Key_Left || ke->key() == Key_Right || ke->key() == Key_Up || ke->key() == Key_Down || ke->key() == Key_Home || ke->key() == Key_End || ke->key() == Key_Prior || ke->key() == Key_Next ) { - return FALSE; + return false; } else if ( ke->key() == Key_Escape ) { popup->close(); setFocus(); @@ -148,16 +148,16 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) setFocus(); } TQApplication::sendEvent( this, e ); - return TRUE; + return true; } } else if ( e->type() == TQEvent::MouseButtonDblClick ) { popup->close(); setFocus(); - blockSignals( TRUE ); + blockSignals( true ); setText( listbox->currentText() ); - blockSignals( FALSE ); + blockSignals( false ); emit chosen( text() ); - return TRUE; + return true; } } else if ( o == this ) { if ( e->type() == TQEvent::KeyPress ) { @@ -171,7 +171,7 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) ke->key() == Key_Tab || ke->key() == Key_Escape ) { TQApplication::sendEvent( listbox, e ); - return TRUE; + return true; } } } diff --git a/kdevdesigner/designer/replacedialog.ui b/kdevdesigner/designer/replacedialog.ui index 27d01a58..e983e9d3 100644 --- a/kdevdesigner/designer/replacedialog.ui +++ b/kdevdesigner/designer/replacedialog.ui @@ -307,12 +307,12 @@ <variable>EditorInterface *editor;</variable> <variable>TQObject *formWindow;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>doReplace()</slot> <slot>doReplaceAll()</slot> <slot>setEditor( EditorInterface * e, TQObject * fw )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/replacedialog.ui.h b/kdevdesigner/designer/replacedialog.ui.h index 63946525..bec17c38 100644 --- a/kdevdesigner/designer/replacedialog.ui.h +++ b/kdevdesigner/designer/replacedialog.ui.h @@ -45,10 +45,10 @@ void ReplaceDialog::doReplace() return; if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), - checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), FALSE ) ) - checkBegin->setChecked( TRUE ); + checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), false ) ) + checkBegin->setChecked( true ); else - checkBegin->setChecked( FALSE ); + checkBegin->setChecked( false ); } void ReplaceDialog::doReplaceAll() @@ -57,16 +57,16 @@ void ReplaceDialog::doReplaceAll() return; if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), - checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), TRUE ) ) - checkBegin->setChecked( TRUE ); + checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), true ) ) + checkBegin->setChecked( true ); else - checkBegin->setChecked( FALSE ); + checkBegin->setChecked( false ); } void ReplaceDialog::setEditor( EditorInterface * e, TQObject * fw ) { if ( fw != formWindow ) - checkBegin->setChecked( TRUE ); + checkBegin->setChecked( true ); formWindow = fw; if ( editor ) editor->release(); diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index 48da59b4..b6a9e234 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -79,7 +79,7 @@ #include <tqworkspace.h> #include <tqworkspace.h> #include <tqsplitter.h> -#include <tqucom_p.h> +#include <private/tqucom_p.h> #include <kiconloader.h> #include <tdefiledialog.h> @@ -94,7 +94,7 @@ static TQString makeIndent( int indent ) return s; } -static TQString entitize( const TQString &s, bool attribute = FALSE ) +static TQString entitize( const TQString &s, bool attribute = false ) { TQString s2 = s; s2 = s2.replace( "&", "&" ); @@ -273,11 +273,11 @@ Resource::Resource() mainwindow = 0; formwindow = 0; toplevel = 0; - copying = FALSE; - pasting = FALSE; - hadGeometry = FALSE; + copying = false; + pasting = false; + hadGeometry = false; langIface = 0; - hasFunctions = FALSE; + hasFunctions = false; } Resource::Resource( MainWindow* mw ) @@ -285,11 +285,11 @@ Resource::Resource( MainWindow* mw ) { formwindow = 0; toplevel = 0; - copying = FALSE; - pasting = FALSE; - hadGeometry = FALSE; + copying = false; + pasting = false; + hadGeometry = false; langIface = 0; - hasFunctions = FALSE; + hasFunctions = false; } Resource::~Resource() @@ -312,9 +312,9 @@ TQWidget *Resource::widget() const bool Resource::load( FormFile *ff, Project *defProject ) { if ( !ff || ff->absFileName().isEmpty() ) - return FALSE; + return false; currFileName = ff->absFileName(); - mainContainerSet = FALSE; + mainContainerSet = false; TQFile f( ff->absFileName() ); f.open( IO_ReadOnly | IO_Translate ); @@ -334,7 +334,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) TQString errMsg; int errLine; if ( !doc.setContent( dev, &errMsg, &errLine ) ) { - return FALSE; + return false; } DomTool::fixDocument( doc ); @@ -347,7 +347,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) formwindow->setProject( MainWindow::self->currProject() ); if ( mainwindow ) formwindow->setMainWindow( mainwindow ); - MetaDataBase::addEntry( TQT_TQOBJECT(formwindow) ); + MetaDataBase::addEntry( formwindow ); if ( !langIface ) { TQString lang = "TQt Script"; @@ -462,14 +462,14 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) metaInfo.className = e.firstChild().toText().data(); } else if ( e.tagName() == "pixmapfunction" ) { if ( formwindow ) { - formwindow->setSavePixmapInline( FALSE ); - formwindow->setSavePixmapInProject( FALSE ); + formwindow->setSavePixmapInline( false ); + formwindow->setSavePixmapInProject( false ); formwindow->setPixmapLoaderFunction( e.firstChild().toText().data() ); } } else if ( e.tagName() == "pixmapinproject" ) { if ( formwindow ) { - formwindow->setSavePixmapInline( FALSE ); - formwindow->setSavePixmapInProject( TRUE ); + formwindow->setSavePixmapInline( false ); + formwindow->setSavePixmapInProject( true ); } } else if ( e.tagName() == "exportmacro" ) { exportMacro = e.firstChild().toText().data(); @@ -480,7 +480,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) formwindow->setSpacingFunction( e.attribute( "spacing" ) ); formwindow->setMarginFunction( e.attribute( "margin" ) ); if ( !formwindow->marginFunction().isEmpty() || !formwindow->spacingFunction().isEmpty() ) - formwindow->hasLayoutFunctions( TRUE ); + formwindow->hasLayoutFunctions( true ); } e = e.nextSibling().toElement(); @@ -492,7 +492,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) loadCustomWidgets( customWidgets, this ); if ( !createObject( widget, formwindow) ) - return FALSE; + return false; if ( !forwards.isNull() ) { for ( TQDomElement n = forwards.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) @@ -569,11 +569,11 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) function.returnType = "void"; function.type = "slot"; function.function = n.firstChild().toText().data(); - if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(formwindow), function.function, TRUE ) ) - MetaDataBase::addFunction( TQT_TQOBJECT(formwindow), function.function, function.specifier, + if ( !MetaDataBase::hasFunction( formwindow, function.function, true ) ) + MetaDataBase::addFunction( formwindow, function.function, function.specifier, function.access, "slot", function.language, function.returnType ); else - MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formwindow), function.function, function.function, + MetaDataBase::changeFunctionAttributes( formwindow, function.function, function.function, function.specifier, function.access, "slot", function.language, function.returnType ); @@ -597,12 +597,12 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) if ( function.returnType.isEmpty() ) function.returnType = "void"; function.function = n.firstChild().toText().data(); - if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(formwindow), function.function, TRUE ) ) - MetaDataBase::addFunction( TQT_TQOBJECT(formwindow), function.function, function.specifier, + if ( !MetaDataBase::hasFunction( formwindow, function.function, true ) ) + MetaDataBase::addFunction( formwindow, function.function, function.specifier, function.access, function.type, function.language, function.returnType ); else - MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formwindow), function.function, function.function, + MetaDataBase::changeFunctionAttributes( formwindow, function.function, function.function, function.specifier, function.access, function.type, function.language, function.returnType ); } @@ -623,13 +623,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) loadTabOrder( tabOrder ); if ( formwindow ) { - MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), metaIncludes ); - MetaDataBase::setForwards( TQT_TQOBJECT(formwindow), metaForwards ); - MetaDataBase::setVariables( TQT_TQOBJECT(formwindow), metaVariables ); - MetaDataBase::setSignalList( TQT_TQOBJECT(formwindow), metaSignals ); + MetaDataBase::setIncludes( formwindow, metaIncludes ); + MetaDataBase::setForwards( formwindow, metaForwards ); + MetaDataBase::setVariables( formwindow, metaVariables ); + MetaDataBase::setSignalList( formwindow, metaSignals ); metaInfo.classNameChanged = metaInfo.className != TQString( formwindow->name() ); - MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), metaInfo ); - MetaDataBase::setExportMacro( TQT_TQOBJECT(formwindow->mainContainer()), exportMacro ); + MetaDataBase::setMetaInfo( formwindow, metaInfo ); + MetaDataBase::setExportMacro( formwindow->mainContainer(), exportMacro ); } loadExtraSource( formwindow->formFile(), currFileName, langIface, hasFunctions ); @@ -638,7 +638,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) mainwindow->insertFormWindow( formwindow ); if ( formwindow ) { - formwindow->killAccels( TQT_TQOBJECT(formwindow) ); + formwindow->killAccels( formwindow ); if ( formwindow->layout() ) formwindow->layout()->activate(); if ( hadGeometry ) @@ -648,7 +648,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) ); } - return TRUE; + return true; } static bool saveCode( const TQString &filename, const TQString &code ) @@ -657,15 +657,15 @@ static bool saveCode( const TQString &filename, const TQString &code ) if ( f.open(IO_WriteOnly | IO_Translate) ) { TQTextStream ts( &f ); ts << code; - return TRUE; + return true; } - return FALSE; + return false; } bool Resource::save( const TQString& filename, bool formCodeOnly ) { if ( !formwindow || filename.isEmpty() ) - return FALSE; + return false; if (!langIface) { TQString lang = "TQt Script"; if ( mainwindow ) @@ -676,8 +676,8 @@ bool Resource::save( const TQString& filename, bool formCodeOnly ) } if ( formCodeOnly && langIface ) { if ( saveFormCode(formwindow->formFile(), langIface) ) - return TRUE; - bool breakout = FALSE; + return true; + bool breakout = false; FormFile *ff = formwindow->formFile(); TQString codeFile = ff->project()->makeAbsolute( ff->codeFile() ); TQString filter = langIface->fileFilterList().join("\n"); @@ -686,7 +686,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly ) breakout = fn.isEmpty(); if ( !breakout ) { if ( saveCode(fn, ff->code()) ) - return TRUE; + return true; } } } @@ -694,7 +694,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly ) TQFile f( filename ); if ( !f.open( IO_WriteOnly | IO_Translate ) ) - return FALSE; + return false; bool b = save( &f ); f.close(); return b; @@ -703,7 +703,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly ) bool Resource::save( TQIODevice* dev ) { if ( !formwindow ) - return FALSE; + return false; if ( !langIface ) { TQString lang = "C++"; @@ -719,7 +719,7 @@ bool Resource::save( TQIODevice* dev ) ts << "<!DOCTYPE UI><UI version=\"3.3\" stdsetdef=\"1\">" << endl; saveMetaInfoBefore( ts, 0 ); - saveObject( TQT_TQOBJECT(formwindow->mainContainer()), 0, ts, 0 ); + saveObject( formwindow->mainContainer(), 0, ts, 0 ); if ( ::tqt_cast<TQMainWindow*>(formwindow->mainContainer()) ) { saveMenuBar( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); saveToolBars( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); @@ -730,8 +730,8 @@ bool Resource::save( TQIODevice* dev ) saveActions( formwindow->actionList(), ts, 0 ); if ( !images.isEmpty() ) saveImageCollection( ts, 0 ); - if ( !MetaDataBase::connections( TQT_TQOBJECT(formwindow) ).isEmpty() || - !MetaDataBase::slotList( TQT_TQOBJECT(formwindow) ).isEmpty() ) + if ( !MetaDataBase::connections( formwindow ).isEmpty() || + !MetaDataBase::slotList( formwindow ).isEmpty() ) saveConnections( ts, 0 ); saveTabOrder( ts, 0 ); saveMetaInfoAfter( ts, 0 ); @@ -747,7 +747,7 @@ TQString Resource::copy() if ( !formwindow ) return TQString(); - copying = TRUE; + copying = true; TQString s; TQTextOStream ts( &s ); @@ -756,16 +756,16 @@ TQString Resource::copy() TQWidgetList tmp( widgets ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { TQWidget *p = w->parentWidget(); - bool save = TRUE; + bool save = true; while ( p ) { if ( tmp.findRef( p ) != -1 ) { - save = FALSE; + save = false; break; } p = p->parentWidget(); } if ( save ) - saveObject( TQT_TQOBJECT(w), 0, ts, 0 ); + saveObject( w, 0, ts, 0 ); } if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() ) saveCustomWidgets( ts, 0 ); @@ -781,9 +781,9 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) { if ( !formwindow ) return; - mainContainerSet = TRUE; + mainContainerSet = true; - pasting = TRUE; + pasting = true; TQDomDocument doc; TQString errMsg; int errLine; @@ -806,9 +806,9 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) loadCustomWidgets( customWidgets, this ); TQWidgetList widgets; - formwindow->clearSelection( FALSE ); - formwindow->setPropertyShowingBlocked( TRUE ); - formwindow->clearSelection( FALSE ); + formwindow->clearSelection( false ); + formwindow->setPropertyShowingBlocked( true ); + formwindow->clearSelection( false ); while ( !firstWidget.isNull() ) { if ( firstWidget.tagName() == "widget" ) { TQWidget *w = (TQWidget*)createObject( firstWidget, parent, 0 ); @@ -823,7 +823,7 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); - formwindow->selectWidget( TQT_TQOBJECT(w) ); + formwindow->selectWidget( w ); } else if ( firstWidget.tagName() == "spacer" ) { TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? TQt::Vertical : TQt::Horizontal ); if ( !w ) @@ -837,11 +837,11 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); - formwindow->selectWidget( TQT_TQOBJECT(w) ); + formwindow->selectWidget( w ); } firstWidget = firstWidget.nextSibling().toElement(); } - formwindow->setPropertyShowingBlocked( FALSE ); + formwindow->setPropertyShowingBlocked( false ); formwindow->emitShowProperties(); PasteCommand *cmd = new PasteCommand( i18n( "Paste" ), formwindow, widgets ); @@ -864,7 +864,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea inc.implDecl = "in implementation"; inc.header = WidgetDatabase::includeFile( classID ); bool found = false; - TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formwindow ); TQValueList<MetaDataBase::Include>::Iterator it; for ( it = includes.begin(); it != includes.end(); ++it ) { MetaDataBase::Include currInc = *it; @@ -878,7 +878,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea { includes << inc; } - MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), includes ); + MetaDataBase::setIncludes( formwindow, includes ); } if ( obj != formwindow && !formwindow->widgets()->find( (TQWidget*)obj ) ) @@ -926,7 +926,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea TQWidget *w = ws->widget( t->identifier() ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) ) == -1 ) + if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) ) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -941,7 +941,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( t->text() ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } @@ -951,7 +951,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea TQWidget *w = ws->page( i ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 ) + if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -965,7 +965,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<number>" << TQString::number(i) << "</number>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } @@ -975,7 +975,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea TQWidget *w = tb->item( i ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 ) + if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -986,7 +986,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "</property>" << endl; ts << makeIndent( indent ) << "<property name=\"backgroundMode\">" << endl; indent++; - saveEnumProperty( TQT_TQOBJECT(w), "backgroundMode", TQVariant::Invalid, ts, indent ); + saveEnumProperty( w, "backgroundMode", TQVariant::Invalid, ts, indent ); indent--; ts << makeIndent( indent ) << "</property>" << endl; ts << makeIndent( indent ) << "<attribute name=\"label\">" << endl; @@ -994,7 +994,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( tb->itemLabel( tb->indexOf(w) ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } @@ -1004,7 +1004,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea TQWidget *w = wiz->page( i ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 ) + if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -1019,14 +1019,14 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( wiz->title( w ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } } else if ( ::tqt_cast<TQMainWindow*>(obj) ) { - saveChildrenOf( TQT_TQOBJECT(( (TQMainWindow*)obj )->centralWidget()), ts, indent ); + saveChildrenOf( ( (TQMainWindow*)obj )->centralWidget(), ts, indent ); } else { - bool saved = FALSE; + bool saved = false; #ifdef TQT_CONTAINER_CUSTOM_WIDGETS if ( isPlugin ) { WidgetInterface *iface = 0; @@ -1038,14 +1038,14 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea if ( iface2->supportsPages( className ) ) { TQWidgetList containers = iface2->pages( className, (TQWidget*)obj ); if ( !containers.isEmpty() ) { - saved = TRUE; + saved = true; int i = 0; for ( TQWidget *w = containers.first(); w; w = containers.next(), ++i ) { if ( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) == -1 ) + idFromClassName( WidgetFactory::classNameOf( w ) ) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"" - << WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) + << WidgetFactory::classNameOf( w ) << "\">" << endl; ++indent; ts << makeIndent( indent ) << "<property name=\"name\">" << endl; @@ -1067,11 +1067,11 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea } } } else { - saved = TRUE; + saved = true; TQWidget *w = iface2->containerOfWidget( className, (TQWidget*)obj ); if ( obj != w ) { ts << makeIndent( indent ) << "<widget class=\"" - << WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) + << WidgetFactory::classNameOf( w ) << "\">" << endl; ++indent; ts << makeIndent( indent ) << "<property name=\"name\">" << endl; @@ -1089,14 +1089,14 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea MetaDataBase::CustomWidget *cw = new MetaDataBase::CustomWidget; cw->className = className; cw->includeFile = WidgetDatabase::includeFile( classID ); - TQStrList lst = w->metaObject()->signalNames( TRUE ); + TQStrList lst = w->metaObject()->signalNames( true ); for ( TQPtrListIterator<char> it(lst); it.current(); ++it ) cw->lstSignals.append(it.current()); int i; - int total = w->metaObject()->numProperties( TRUE ); + int total = w->metaObject()->numProperties( true ); for ( i = 0; i < total; i++ ) { - const TQMetaProperty *p = w->metaObject()->property( i, TRUE ); + const TQMetaProperty *p = w->metaObject()->property( i, true ); if ( p->designable(w) ) { MetaDataBase::Property prop; prop.property = p->name(); @@ -1114,9 +1114,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea } } - total = w->metaObject()->numSlots( TRUE ); + total = w->metaObject()->numSlots( true ); for ( i = 0; i < total; i++ ) { - const TQMetaData *md = w->metaObject()->slot( i, TRUE ); + const TQMetaData *md = w->metaObject()->slot( i, true ); MetaDataBase::Function funky; // Find out if we have a return type. if ( md->method->count > 0 ) { @@ -1203,7 +1203,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) TQStringList l; l << lv->header()->label( i ); TQPtrList<TQPixmap> pix; - pix.setAutoDelete( TRUE ); + pix.setAutoDelete( true ); if ( lv->header()->iconSet( i ) ) pix.append( new TQPixmap( lv->header()->iconSet( i )->pixmap() ) ); saveItem( l, pix, ts, indent ); @@ -1220,13 +1220,16 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</column>" << endl; } - saveItem( lv->firstChild(), ts, indent - 1 ); + if (lv->firstChild()) + { + saveItem( lv->firstChild(), ts, indent - 1 ); + } } #if !defined (TQT_NO_TABLE) else if ( ::tqt_cast<TQTable*>(obj) ) { TQTable *table = (TQTable*)obj; int i; - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table ); # ifndef TQT_NO_SQL bool isDataTable = ::tqt_cast<TQDataTable*>(table); # else @@ -1242,7 +1245,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) TQStringList l; l << table->horizontalHeader()->label( i ); TQPtrList<TQPixmap> pix; - pix.setAutoDelete( TRUE ); + pix.setAutoDelete( true ); if ( table->horizontalHeader()->iconSet( i ) ) pix.append( new TQPixmap( table->horizontalHeader()->iconSet( i )->pixmap() ) ); saveItem( l, pix, ts, indent ); @@ -1266,7 +1269,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) TQStringList l; l << table->verticalHeader()->label( i ); TQPtrList<TQPixmap> pix; - pix.setAutoDelete( TRUE ); + pix.setAutoDelete( true ); if ( table->verticalHeader()->iconSet( i ) ) pix.append( new TQPixmap( table->verticalHeader()->iconSet( i )->pixmap() ) ); saveItem( l, pix, ts, indent ); @@ -1280,6 +1283,10 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) void Resource::saveItem( TQListViewItem *i, TQTextStream &ts, int indent ) { + if (!i) + { + return; + } TQListView *lv = i->listView(); while ( i ) { ts << makeIndent( indent ) << "<item>" << endl; @@ -1312,10 +1319,10 @@ void Resource::savePixmap( const TQPixmap &p, TQTextStream &ts, int indent, cons if ( formwindow && formwindow->savePixmapInline() ) ts << makeIndent( indent ) << "<" << tagname << ">" << saveInCollection( p ) << "</" << tagname << ">" << endl; else if ( formwindow && formwindow->savePixmapInProject() ) - ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapKey( TQT_TQOBJECT(formwindow), p.serialNumber() ) + ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapKey( formwindow, p.serialNumber() ) << "</" << tagname << ">" << endl; else - ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapArgument( TQT_TQOBJECT(formwindow), p.serialNumber() ) + ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapArgument( formwindow, p.serialNumber() ) << "</" << tagname << ">" << endl; } @@ -1327,7 +1334,7 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname* TQImage img = loadFromCollection( arg ); TQPixmap pix; pix.convertFromImage( img ); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); + MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg ); return pix; } else if ( formwindow && formwindow->savePixmapInProject() ) { TQPixmap pix; @@ -1339,13 +1346,13 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname* pix.convertFromImage( pix.convertToImage() ); } - MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); + MetaDataBase::setPixmapKey( formwindow, pix.serialNumber(), arg ); return pix; } TQPixmap pix = BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ); // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that pix.convertFromImage( pix.convertToImage() ); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); + MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg ); return pix; } @@ -1413,7 +1420,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) // save properties of layout if ( lay != WidgetFactory::NoLayout ) - saveObjectProperties( TQT_TQOBJECT(layout), ts, indent ); + saveObjectProperties( layout, ts, indent ); } @@ -1445,12 +1452,12 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) } } } else if ( ::tqt_cast<TQLayout*>(w) ) { - if ( MetaDataBase::spacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ) > -1 ) + if ( MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) > -1 ) changed << "spacing"; - if ( MetaDataBase::margin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ) > -1 ) + if ( MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) > -1 ) changed << "margin"; - if ( MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ) != "Auto" - && !MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ).isEmpty() ) + if ( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) != "Auto" + && !MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ).isEmpty() ) changed << "resizeMode"; } @@ -1475,7 +1482,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) continue; saved << TQString::fromLatin1( it.current() ); const TQMetaProperty* p = w->metaObject()-> - property( w->metaObject()->findProperty( it.current(), TRUE ), TRUE ); + property( w->metaObject()->findProperty( it.current(), true ), true ); if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) ) continue; if ( ::tqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 && @@ -1531,7 +1538,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true ); TQStrList l( p->valueToKeys( w->property( name ).toInt() ) ); TQString v; for ( uint i = 0; i < l.count(); ++i ) { @@ -1544,7 +1551,7 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true ); ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl; } @@ -1562,7 +1569,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant switch ( t ) { case TQVariant::String: if ( name == "resizeMode" ) { - TQString resmod = MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ); + TQString resmod = MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ); if ( !resmod.isNull() && resmod != "Auto" ) { ts << makeIndent( indent ) << "<enum>"; ts << resmod; @@ -1585,9 +1592,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant if ( ::tqt_cast<TQLayout*>(w) ) { num = -1; if ( name == "spacing" ) - num = MetaDataBase::spacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ); + num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ); else if ( name == "margin" ) - num = MetaDataBase::margin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ); + num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ); if ( num != -1 ) ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl; } else { @@ -1817,7 +1824,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay // ### TODO loading for custom container widgets without pages #endif if ( !className.isNull() ) { - obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, FALSE )); + obj = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, false ); if ( !obj ) { TQMessageBox::critical( MainWindow::self, i18n( "Loading File" ), i18n( "Error loading %1.\n" @@ -1828,7 +1835,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay if ( !mainContainerSet ) { if ( formwindow ) formwindow->setMainContainer( (TQWidget*)obj ); - mainContainerSet = TRUE; + mainContainerSet = true; } w = (TQWidget*)obj; if ( ::tqt_cast<TQMainWindow*>(w) ) @@ -1874,7 +1881,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay || isPlugin #endif ) ) - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( w ); } } @@ -1888,17 +1895,17 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay createObject( n, w, layout ); } else if ( n.tagName() == "hbox" ) { layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "grid" ) { layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "vbox" ) { layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "property" && obj ) { @@ -1961,7 +1968,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay if ( w->isWidgetType() ) widgets.insert( w->name(), w ); - return TQT_TQOBJECT(w); + return w; } void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) @@ -1973,9 +1980,9 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) TQListView *lv = (TQListView*)widget; TQDomElement n = e.firstChild().toElement(); TQPixmap pix; - bool hasPixmap = FALSE; + bool hasPixmap = false; TQString txt; - bool clickable = TRUE, resizable = TRUE; + bool clickable = true, resizable = true; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { TQString attrib = n.attribute( "name" ); @@ -2013,10 +2020,10 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) TQDomElement n = e.firstChild().toElement(); TQPixmap pix; - bool hasPixmap = FALSE; + bool hasPixmap = false; TQString txt; TQString field; - TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); + TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( table ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) { TQString attrib = n.attribute( "name" ); @@ -2041,7 +2048,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) h->setLabel( i, txt ); if ( !isRow && !field.isEmpty() ) fieldMap.insert( txt, field ); - MetaDataBase::setColumnFields( TQT_TQOBJECT(table), fieldMap ); + MetaDataBase::setColumnFields( table, fieldMap ); } #endif } @@ -2049,7 +2056,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) void Resource::loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap ) { TQDomElement n = e; - hasPixmap = FALSE; + hasPixmap = false; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { TQString attrib = n.attribute( "name" ); @@ -2067,13 +2074,13 @@ void Resource::loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bo void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i ) { - if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ), TQT_TQOBJECT(widget) ) ) + if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ), widget ) ) return; if ( ::tqt_cast<TQListBox*>(widget) || ::tqt_cast<TQComboBox*>(widget) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; - bool hasPixmap = FALSE; + bool hasPixmap = false; TQString txt; loadItem( n, pix, txt, hasPixmap ); TQListBox *lb = 0; @@ -2089,7 +2096,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } else if ( ::tqt_cast<TQIconView*>(widget) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; - bool hasPixmap = FALSE; + bool hasPixmap = false; TQString txt; loadItem( n, pix, txt, hasPixmap ); TQIconView *iv = (TQIconView*)widget; @@ -2124,7 +2131,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } } } else if ( n.tagName() == "item" ) { - item->setOpen( TRUE ); + item->setOpen( true ); createItem( n, widget, item ); } @@ -2152,15 +2159,15 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay colspan = 1; Spacer *spacer = (Spacer*) WidgetFactory::create( WidgetDatabase::idFromClassName("Spacer"), - parent, "spacer", FALSE); + parent, "spacer", false); spacer->setOrientation( o ); - spacer->setInteraciveMode( FALSE ); + spacer->setInteraciveMode( false ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) - setObjectProperty( TQT_TQOBJECT(spacer), n.attribute( "name" ), n.firstChild().toElement() ); + setObjectProperty( spacer, n.attribute( "name" ), n.firstChild().toElement() ); n = n.nextSibling().toElement(); } - spacer->setInteraciveMode( TRUE ); + spacer->setInteraciveMode( true ); if ( formwindow ) formwindow->insertWidget( spacer, pasting ); if ( layout ) { @@ -2178,7 +2185,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay */ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e ) { - const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, TRUE ), TRUE ); + const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true ); if ( !::tqt_cast<TQLayout*>(obj) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { @@ -2186,7 +2193,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" ) return; } - MetaDataBase::setPropertyChanged( obj, prop, TRUE ); + MetaDataBase::setPropertyChanged( obj, prop, true ); } TQVariant defVarient; @@ -2222,7 +2229,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( !p ) { MetaDataBase::setFakeProperty( obj, prop, v ); if ( obj->isWidgetType() ) { - if ( prop == "database" && TQT_TQOBJECT(obj) != TQT_TQOBJECT(toplevel) ) { + if ( prop == "database" && obj != toplevel ) { TQStringList lst = MetaDataBase::fakeProperty( obj, "database" ).toStringList(); if ( lst.count() > 2 ) dbControls.insert( obj->name(), lst[ 2 ] ); @@ -2276,18 +2283,18 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD } if ( prop == "icon" ) { formwindow->setIcon( v.toPixmap() ); - TQString pmk = MetaDataBase::pixmapKey( TQT_TQOBJECT(formwindow), v.toPixmap().serialNumber() ); - MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow), + TQString pmk = MetaDataBase::pixmapKey( formwindow, v.toPixmap().serialNumber() ); + MetaDataBase::setPixmapKey( formwindow, formwindow->icon()->serialNumber(), pmk ); } if ( prop == "geometry" ) { if ( obj == toplevel ) { - hadGeometry = TRUE; + hadGeometry = true; toplevel->resize( v.toRect().size() ); return; } else if ( obj == formwindow->mainContainer() ) { - hadGeometry = TRUE; + hadGeometry = true; formwindow->resize( v.toRect().size() ); return; } @@ -2295,13 +2302,13 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( ::tqt_cast<TQLayout*>(obj) ) { if ( prop == "spacing" ) { - MetaDataBase::setSpacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) ), v.toInt() ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) , v.toInt() ); return; } else if ( prop == "margin" ) { - MetaDataBase::setMargin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) ), v.toInt() ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) , v.toInt() ); return; } else if ( e.tagName() == "enum" && prop == "resizeMode" ) { - MetaDataBase::setResizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) ), v.toString() ); + MetaDataBase::setResizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) , v.toString() ); return; } } @@ -2309,7 +2316,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( prop == "name" ) { if ( pasting ) { TQString s = v.toString(); - formwindow->unify( TQT_TQOBJECT(obj), s, TRUE ); + formwindow->unify( obj, s, true ); obj->setName( s ); return; } else if ( formwindow && obj == formwindow->mainContainer() ) { @@ -2356,12 +2363,12 @@ void Resource::saveImageData( const TQImage &img, TQTextStream &ts, int indent ) TQBuffer buf( ba ); buf.open( IO_WriteOnly | IO_Translate ); TQString format; - bool compress = FALSE; + bool compress = false; if (img.hasAlphaBuffer()) { format = "PNG"; } else { format = img.depth() > 1 ? "XPM" : "XBM"; - compress = TRUE; + compress = true; } TQImageIO iio( &buf, format ); iio.setImage( img ); @@ -2478,7 +2485,7 @@ TQImage Resource::loadFromCollection( const TQString &name ) void Resource::saveConnections( TQTextStream &ts, int indent ) { - TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( formwindow ); if ( connections.isEmpty() ) return; ts << makeIndent( indent ) << "<connections>" << endl; @@ -2491,8 +2498,8 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) ( knownNames.findIndex( TQString( conn.receiver->name() ) ) == -1 && qstrcmp( conn.receiver->name(), "this" ) != 0 ) ) continue; - if ( formwindow->isMainContainer( TQT_TQOBJECT((*it).receiver) ) && - !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), MetaDataBase::normalizeFunction( (*it).slot ).latin1() ) ) + if ( formwindow->isMainContainer( (*it).receiver ) && + !MetaDataBase::hasSlot( formwindow, MetaDataBase::normalizeFunction( (*it).slot ).latin1() ) ) continue; if ( conn.sender->inherits( "CustomWidget" ) ) { @@ -2535,11 +2542,11 @@ void Resource::loadConnections( const TQDomElement &e ) conn.sender = 0; TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { - conn.sender = TQT_TQOBJECT(toplevel); + conn.sender = toplevel; } else { if ( name == "this" ) name = toplevel->name(); - TQObjectList *l = toplevel->queryList( 0, name, FALSE ); + TQObjectList *l = toplevel->queryList( 0, name, false ); if ( l ) { if ( l->first() ) conn.sender = l->first(); @@ -2555,9 +2562,9 @@ void Resource::loadConnections( const TQDomElement &e ) conn.receiver = 0; TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { - conn.receiver = TQT_TQOBJECT(toplevel); + conn.receiver = toplevel; } else { - TQObjectList *l = toplevel->queryList( 0, name, FALSE ); + TQObjectList *l = toplevel->queryList( 0, name, false ); if ( l ) { if ( l->first() ) conn.receiver = l->first(); @@ -2574,13 +2581,13 @@ void Resource::loadConnections( const TQDomElement &e ) } if ( formwindow ) { if ( conn.sender == formwindow ) - conn.sender = TQT_TQOBJECT(formwindow->mainContainer()); + conn.sender = formwindow->mainContainer(); if ( conn.receiver == formwindow ) - conn.receiver = TQT_TQOBJECT(formwindow->mainContainer()); + conn.receiver = formwindow->mainContainer(); } if ( conn.sender && conn.receiver ) { if ( lang == "C++" ) { - MetaDataBase::addConnection( TQT_TQOBJECT(formwindow ? formwindow : toplevel), + MetaDataBase::addConnection( formwindow ? formwindow : toplevel, conn.sender, conn.signal, conn.receiver, conn.slot ); } } @@ -2597,11 +2604,11 @@ void Resource::loadConnections( const TQDomElement &e ) if ( slot.returnType.isEmpty() ) slot.returnType = "void"; slot.function = n.firstChild().toText().data(); - if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(formwindow), slot.function, TRUE ) ) - MetaDataBase::addFunction( TQT_TQOBJECT(formwindow), slot.function, slot.specifier, + if ( !MetaDataBase::hasFunction( formwindow, slot.function, true ) ) + MetaDataBase::addFunction( formwindow, slot.function, slot.specifier, slot.access, "slot", slot.language, slot.returnType ); else - MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formwindow), slot.function, slot.function, + MetaDataBase::changeFunctionAttributes( formwindow, slot.function, slot.function, slot.specifier, slot.access, "slot", slot.language, slot.returnType ); } @@ -2770,7 +2777,7 @@ void Resource::loadTabOrder( const TQDomElement &e ) TQString name = n.firstChild().toText().data(); if ( name.isEmpty() ) continue; - TQObjectList *l = toplevel->queryList( 0, name, FALSE ); + TQObjectList *l = toplevel->queryList( 0, name, false ); if ( l ) { if ( l->first() ) { TQWidget *w = (TQWidget*)l->first(); @@ -2791,7 +2798,7 @@ void Resource::loadTabOrder( const TQDomElement &e ) void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent ) { - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(formwindow) ); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow ); TQString cn; if ( info.classNameChanged && !info.className.isEmpty() ) cn = info.className; @@ -2806,16 +2813,16 @@ void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent ) void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) { - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(formwindow) ); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow ); if ( !langIface || formwindow->project()->isCpp() ) { - TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formwindow ); TQString extensionInclude; - bool needExtensionInclude = FALSE; + bool needExtensionInclude = false; if ( langIface && formwindow->formFile()->hasFormCode() && formwindow->formFile()->codeFileState() != FormFile::Deleted ) { extensionInclude = TQFileInfo( currFileName ).fileName() + langIface->formCodeExtension(); - needExtensionInclude = TRUE; + needExtensionInclude = true; } if ( !includes.isEmpty() || needExtensionInclude ) { ts << makeIndent( indent ) << "<includes>" << endl; @@ -2835,7 +2842,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ts << makeIndent( indent ) << "</includes>" << endl; } - TQStringList forwards = MetaDataBase::forwards( TQT_TQOBJECT(formwindow) ); + TQStringList forwards = MetaDataBase::forwards( formwindow ); if ( !forwards.isEmpty() ) { ts << makeIndent( indent ) << "<forwards>" << endl; indent++; @@ -2844,7 +2851,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</forwards>" << endl; } - TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( formwindow ); if ( !varLst.isEmpty() ) { ts << makeIndent( indent ) << "<variables>" << endl; indent++; @@ -2860,7 +2867,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</variables>" << endl; } - TQStringList sigs = MetaDataBase::signalList( TQT_TQOBJECT(formwindow) ); + TQStringList sigs = MetaDataBase::signalList( formwindow ); if ( !sigs.isEmpty() ) { ts << makeIndent( indent ) << "<signals>" << endl; indent++; @@ -2870,7 +2877,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ts << makeIndent( indent ) << "</signals>" << endl; } - TQValueList<MetaDataBase::Function> slotList = MetaDataBase::slotList( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Function> slotList = MetaDataBase::slotList( formwindow ); if ( !slotList.isEmpty() ) { ts << makeIndent( indent ) << "<slots>" << endl; indent++; @@ -2893,7 +2900,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ts << makeIndent( indent ) << "</slots>" << endl; } - TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formwindow), TRUE ); + TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formwindow, true ); if ( !functionList.isEmpty() ) { ts << makeIndent( indent ) << "<functions>" << endl; indent++; @@ -2923,7 +2930,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ts << makeIndent( indent ) << "<pixmapinproject/>" << endl; else ts << makeIndent( indent ) << "<pixmapfunction>" << formwindow->pixmapLoaderFunction() << "</pixmapfunction>" << endl; - if ( !( exportMacro = MetaDataBase::exportMacro( TQT_TQOBJECT(formwindow->mainContainer()) ) ).isEmpty() ) + if ( !( exportMacro = MetaDataBase::exportMacro( formwindow->mainContainer() ) ).isEmpty() ) ts << makeIndent( indent ) << "<exportmacro>" << exportMacro << "</exportmacro>" << endl; if ( formwindow ) { ts << makeIndent( indent ) << "<layoutdefaults spacing=\"" << formwindow->layoutDefaultSpacing() @@ -3031,13 +3038,13 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) a = new QDesignerAction( parent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); - bool hasMenuText = FALSE; + bool hasMenuText = false; while ( !n2.isNull() ) { if ( n2.tagName() == "property" ) { TQDomElement n3(n2); // don't modify n2 TQString prop = n3.attribute( "name" ); if (prop == "menuText") - hasMenuText = TRUE; + hasMenuText = true; TQDomElement value(n3.firstChild().toElement()); setObjectProperty( a, prop, value ); if (!hasMenuText && uiFileVersion < "3.3" && prop == "text") @@ -3051,13 +3058,13 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) a = new QDesignerActionGroup( parent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); - bool hasMenuText = FALSE; + bool hasMenuText = false; while ( !n2.isNull() ) { if ( n2.tagName() == "property" ) { TQDomElement n3(n2); // don't modify n2 TQString prop = n3.attribute( "name" ); if (prop == "menuText") - hasMenuText = TRUE; + hasMenuText = true; TQDomElement value = n3.firstChild().toElement(); setObjectProperty( a, prop, value ); if (!hasMenuText && uiFileVersion < "3.3" && prop == "text") @@ -3078,9 +3085,9 @@ void Resource::loadActions( const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { - loadChildAction( TQT_TQOBJECT(formwindow), n ); + loadChildAction( formwindow, n ); } else if ( n.tagName() == "actiongroup" ) { - loadChildAction( TQT_TQOBJECT(formwindow), n ); + loadChildAction( formwindow, n ); } n = n.nextSibling().toElement(); } @@ -3101,7 +3108,7 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) continue; ts << makeIndent( indent ) << "<toolbar dock=\"" << i << "\">" << endl; indent++; - saveObjectProperties( TQT_TQOBJECT(tb), ts, indent ); + saveObjectProperties( tb, ts, indent ); TQPtrList<TQAction> actionList = ( (QDesignerToolBar*)tb )->insertedActions(); for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { if ( ::tqt_cast<QSeparatorAction*>(a) ) { @@ -3110,14 +3117,14 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) if ( ::tqt_cast<QDesignerAction*>(a) && !( (QDesignerAction*)a )->supportsMenu() ) { TQWidget *w = ( (QDesignerAction*)a )->widget(); ts << makeIndent( indent ) << "<widget class=\"" - << WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) << "\">" << endl; + << WidgetFactory::classNameOf( w ) << "\">" << endl; indent++; - const char *className = WidgetFactory::classNameOf( TQT_TQOBJECT(w) ); + const char *className = WidgetFactory::classNameOf( w ); if ( w->isA( "CustomWidget" ) ) usedCustomWidgets << TQString( className ); - if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) - saveItems( TQT_TQOBJECT(w), ts, indent ); - saveObjectProperties( TQT_TQOBJECT(w), ts, indent ); + if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) + saveItems( w, ts, indent ); + saveObjectProperties( w, ts, indent ); indent--; ts << makeIndent( indent ) << "</widget>" << endl; } else { @@ -3140,8 +3147,8 @@ void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ) return; ts << makeIndent( indent ) << "<menubar>" << endl; indent++; - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mb), "name", TRUE ); // FIXME: remove - saveObjectProperties( TQT_TQOBJECT(mb), ts, indent ); + MetaDataBase::setPropertyChanged( mb, "name", true ); // FIXME: remove + saveObjectProperties( mb, ts, indent ); for ( int i = 0; i < (int)mb->count(); ++i ) { MenuBarEditorItem *m = mb->item( i ); @@ -3210,12 +3217,12 @@ void Resource::loadToolBars( const TQDomElement &e ) tb->addAction( a ); } else if ( n2.tagName() == "widget" ) { TQWidget *w = (TQWidget*)createObject( n2, tb ); - QDesignerAction *a = new QDesignerAction( w, TQT_TQOBJECT(tb) ); + QDesignerAction *a = new QDesignerAction( w, tb ); a->addTo( tb ); tb->addAction( a ); tb->installEventFilters( w ); } else if ( n2.tagName() == "property" ) { - setObjectProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() ); + setObjectProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() ); } n2 = n2.nextSibling().toElement(); } @@ -3229,16 +3236,16 @@ void Resource::loadMenuBar( const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); TQMainWindow *mw = (TQMainWindow*)formwindow->mainContainer(); MenuBarEditor *mb = new MenuBarEditor( formwindow, mw ); - MetaDataBase::addEntry( TQT_TQOBJECT(mb) ); + MetaDataBase::addEntry( mb ); while ( !n.isNull() ) { if ( n.tagName() == "item" ) { PopupMenuEditor * popup = new PopupMenuEditor( formwindow, mw ); loadPopupMenu( popup, n ); popup->setName( n.attribute( "name" ) ); mb->insertItem( n.attribute( "text" ), popup ); - MetaDataBase::addEntry( TQT_TQOBJECT(popup) ); + MetaDataBase::addEntry( popup ); } else if ( n.tagName() == "property" ) { - setObjectProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() ); + setObjectProperty( mb, n.attribute( "name" ), n.firstChild().toElement() ); } else if ( n.tagName() == "separator" ) { mb->insertSeparator(); } @@ -3248,7 +3255,7 @@ void Resource::loadMenuBar( const TQDomElement &e ) void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e ) { - MetaDataBase::addEntry( TQT_TQOBJECT(p) ); + MetaDataBase::addEntry( p ); TQDomElement n = e.firstChild().toElement(); TQAction *a = 0; while ( !n.isNull() ) { @@ -3261,7 +3268,7 @@ void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e ) PopupMenuEditorItem *i = p->at( p->find( a ) ); if ( i ) { TQString name = n.attribute( "name" ); - formwindow->unify( i, name, TRUE ); + formwindow->unify( i, name, true ); i->setName( name ); MetaDataBase::addEntry( i ); loadPopupMenu( i->subMenu(), n ); @@ -3281,7 +3288,7 @@ bool Resource::saveFormCode( FormFile *formfile, LanguageInterface * /*langIface formfile->code().isEmpty() || !formfile->hasFormCode() || !formfile->isModified(FormFile::WFormCode) ) - return TRUE; // There is no code to be saved. + return true; // There is no code to be saved. return saveCode( formfile->project()->makeAbsolute(formfile->codeFile()), formfile->code() ); } diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h index 7d32cf65..d3de2923 100644 --- a/kdevdesigner/designer/resource.h +++ b/kdevdesigner/designer/resource.h @@ -75,7 +75,7 @@ public: bool load( FormFile *ff, TQIODevice*, Project *defProject = 0 ); TQString copy(); - bool save( const TQString& filename, bool formCodeOnly = FALSE); + bool save( const TQString& filename, bool formCodeOnly = false); bool save( TQIODevice* ); void paste( const TQString &cb, TQWidget *parent ); diff --git a/kdevdesigner/designer/richtextfontdialog.ui b/kdevdesigner/designer/richtextfontdialog.ui index 0f53fed5..bebb31f5 100644 --- a/kdevdesigner/designer/richtextfontdialog.ui +++ b/kdevdesigner/designer/richtextfontdialog.ui @@ -334,7 +334,7 @@ <variable>TQColor color</variable> <variable>TQString size</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>selectColor()</slot> <slot>accept()</slot> @@ -342,6 +342,6 @@ <slot returnType="TQString">getSize()</slot> <slot returnType="TQString">getColor()</slot> <slot returnType="TQString">getFont()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp index 62d95bc7..a0e971bc 100644 --- a/kdevdesigner/designer/sizehandle.cpp +++ b/kdevdesigner/designer/sizehandle.cpp @@ -38,12 +38,12 @@ SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s ) : TQWidget( parent ) { - active = TRUE; + active = true; setBackgroundMode( active ? PaletteText : PaletteDark ); setFixedSize( 6, 6 ); widget = 0; dir =d ; - setMouseTracking( FALSE ); + setMouseTracking( false ); formWindow = parent; sel = s; updateCursor(); @@ -236,7 +236,7 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) formWindow, widget, origGeom, widget->geometry() ) ); - formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) ); + formWindow->emitUpdateProperties( widget ); } void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height ) diff --git a/kdevdesigner/designer/sizehandle.h b/kdevdesigner/designer/sizehandle.h index d022c4e5..0d71fc99 100644 --- a/kdevdesigner/designer/sizehandle.h +++ b/kdevdesigner/designer/sizehandle.h @@ -77,7 +77,7 @@ class WidgetSelection public: WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict ); - void setWidget( TQWidget *w, bool updateDict = TRUE ); + void setWidget( TQWidget *w, bool updateDict = true ); bool isUsed() const; void updateGeometry(); diff --git a/kdevdesigner/designer/sourceeditor.cpp b/kdevdesigner/designer/sourceeditor.cpp index 1efbe164..b7db3d2c 100644 --- a/kdevdesigner/designer/sourceeditor.cpp +++ b/kdevdesigner/designer/sourceeditor.cpp @@ -47,7 +47,7 @@ SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageIn lIface->addRef(); editor = iFace->editor( MainWindow::self->areEditorsReadOnly(), this, MainWindow::self->designerInterface() ); - iFace->onBreakPointChange( TQT_TQOBJECT(MainWindow::self), TQT_SLOT( breakPointsChanged() ) ); + iFace->onBreakPointChange( MainWindow::self, TQ_SLOT( breakPointsChanged() ) ); resize( 600, 400 ); setIcon( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) ); } @@ -57,7 +57,7 @@ SourceEditor::~SourceEditor() saveBreakPoints(); editor = 0; if ( formWindow() ) { - formWindow()->formFile()->setCodeEdited( FALSE ); + formWindow()->formFile()->setCodeEdited( false ); formWindow()->formFile()->setEditor( 0 ); } else if ( sourceFile() ) { sourceFile()->setEditor( 0 ); @@ -74,16 +74,16 @@ void SourceEditor::setObject( TQObject *o, Project *p ) if ( sourceFile() ) sourceFile()->setEditor( 0 ); if ( formWindow() ) { - formWindow()->formFile()->setCodeEdited( FALSE ); + formWindow()->formFile()->setCodeEdited( false ); formWindow()->formFile()->setEditor( 0 ); } if ( ::tqt_cast<FormWindow*>(o) ) - ( (FormWindow*)o )->formFile()->setCodeEdited( TRUE ); + ( (FormWindow*)o )->formFile()->setCodeEdited( true ); save(); - bool changed = FALSE; + bool changed = false; if ( &(*obj) != o ) { saveBreakPoints(); - changed = TRUE; + changed = true; } obj = o; pro = p; @@ -104,7 +104,7 @@ void SourceEditor::setObject( TQObject *o, Project *p ) if ( formWindow()->isFake() ) iFace->setContext( pro->objectForFakeFormFile( formWindow()->formFile() ) ); else - iFace->setContext( TQT_TQOBJECT(formWindow()->mainContainer()) ); + iFace->setContext( formWindow()->mainContainer() ); } else { iFace->setContext( 0 ); } @@ -235,7 +235,7 @@ void SourceEditor::resetContext() if ( formWindow()->isFake() ) iFace->setContext( pro->objectForFakeFormFile( formWindow()->formFile() ) ); else - iFace->setContext( TQT_TQOBJECT(formWindow()->mainContainer()) ); + iFace->setContext( formWindow()->mainContainer() ); } else { iFace->setContext( 0 ); } @@ -244,7 +244,7 @@ void SourceEditor::resetContext() void SourceEditor::setFocus() { if ( formWindow() ) - formWindow()->formFile()->setCodeEdited( TRUE ); + formWindow()->formFile()->setCodeEdited( true ); if ( editor ) editor->setFocus(); } @@ -302,7 +302,7 @@ bool SourceEditor::saveAs() return formWindow()->formFile()->saveAs(); else if ( sourceFile() ) return sourceFile()->saveAs(); - return FALSE; + return false; } SourceFile *SourceEditor::sourceFile() const diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp index 3d848bbf..b1d7b488 100644 --- a/kdevdesigner/designer/sourcefile.cpp +++ b/kdevdesigner/designer/sourcefile.cpp @@ -42,13 +42,13 @@ SourceFile::SourceFile( const TQString &fn, bool temp, Project *p ) : filename( fn ), ed( 0 ), fileNameTemp( temp ), - timeStamp( 0, p->makeAbsolute( fn ) ), pro( p ), pkg( FALSE ) - , accepted( TRUE ) + timeStamp( 0, p->makeAbsolute( fn ) ), pro( p ), pkg( false ) + , accepted( true ) { iface = 0; if ( !temp ) - accepted = checkFileName( TRUE ); + accepted = checkFileName( true ); if (accepted) { load(); @@ -79,7 +79,7 @@ bool SourceFile::save( bool ignoreModified ) if ( fileNameTemp ) return saveAs(); if ( !ignoreModified && !isModified() ) - return TRUE; + return true; if ( ed ) ed->save(); @@ -108,8 +108,8 @@ bool SourceFile::save( bool ignoreModified ) TQTextStream ts( &f ); ts << txt; timeStamp.update(); - setModified( FALSE ); - return TRUE; + setModified( false ); + return true; } bool SourceFile::saveAs( bool ignoreModified ) @@ -128,18 +128,18 @@ bool SourceFile::saveAs( bool ignoreModified ) } TQString fn = KFileDialog::getSaveFileName( initFn, filter ); if ( fn.isEmpty() ) - return FALSE; - fileNameTemp = FALSE; + return false; + fileNameTemp = false; filename = pro->makeRelative( fn ); - if ( !checkFileName( TRUE ) ) { + if ( !checkFileName( true ) ) { filename = old; - return FALSE; + return false; } - pro->setModified( TRUE ); + pro->setModified( true ); timeStamp.setFileName( pro->makeAbsolute( filename ) ); if ( ed ) ed->setCaption( i18n( "Edit %1" ).arg( filename ) ); - setModified( TRUE ); + setModified( true ); if ( pro->isDummy() ) { TQObject *o = ed->parent(); while ( o && !o->isA( "MainWindow" ) ) @@ -154,11 +154,11 @@ bool SourceFile::load() { TQFile f( pro->makeAbsolute( filename ) ); if ( !f.open( IO_ReadOnly ) ) - return FALSE; + return false; TQTextStream ts( &f ); txt = ts.read(); timeStamp.update(); - return TRUE; + return true; } DesignerSourceFile *SourceFile::iFace() @@ -176,7 +176,7 @@ void SourceFile::setEditor( SourceEditor *e ) bool SourceFile::isModified() const { if ( !ed ) - return FALSE; + return false; return ed->isModified(); } @@ -210,11 +210,11 @@ bool SourceFile::closeEvent() { if ( !isModified() && fileNameTemp ) { pro->removeSourceFile( this ); - return TRUE; + return true; } if ( !isModified() ) - return TRUE; + return true; if ( ed ) ed->save(); @@ -224,7 +224,7 @@ bool SourceFile::closeEvent() i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save if ( !save() ) - return FALSE; + return false; break; case 1: // don't save load(); @@ -232,24 +232,24 @@ bool SourceFile::closeEvent() ed->editorInterface()->setText( txt ); if ( fileNameTemp ) { pro->removeSourceFile( this ); - return TRUE; + return true; } if ( MainWindow::self ) MainWindow::self->workspace()->update(); break; case 2: // cancel - return FALSE; + return false; default: break; } - setModified( FALSE ); - return TRUE; + setModified( false ); + return true; } bool SourceFile::close() { if ( !ed ) - return TRUE; + return true; return ed->close(); } @@ -289,10 +289,10 @@ bool SourceFile::checkFileName( bool allowBreak ) while ( fn.isEmpty() ) { fn = KFileDialog::getSaveFileName( pro->makeAbsolute( filename ), filter ); if ( allowBreak && fn.isEmpty() ) - return FALSE; + return false; } filename = pro->makeRelative( fn ); sf = pro->findSourceFile( filename, this ); } - return TRUE; + return true; } diff --git a/kdevdesigner/designer/sourcefile.h b/kdevdesigner/designer/sourcefile.h index 81fe540a..004c8898 100644 --- a/kdevdesigner/designer/sourcefile.h +++ b/kdevdesigner/designer/sourcefile.h @@ -46,8 +46,8 @@ public: void setText( const TQString &s ); void setModified( bool m ); - bool save( bool ignoreModified = FALSE ); - bool saveAs( bool ignoreModified = FALSE ); + bool save( bool ignoreModified = false ); + bool saveAs( bool ignoreModified = false ); bool load(); bool close(); bool closeEvent(); diff --git a/kdevdesigner/designer/startdialog.ui b/kdevdesigner/designer/startdialog.ui index 5f36d6db..ef1d96f3 100644 --- a/kdevdesigner/designer/startdialog.ui +++ b/kdevdesigner/designer/startdialog.ui @@ -305,11 +305,11 @@ <slot>recentItemChanged(TQIconViewItem*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>recentItemChanged( TQIconViewItem * )</slot> <slot>clearFileInfo()</slot> <slot>accept()</slot> <slot>reject()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp index 1b21432f..b74c3ae5 100644 --- a/kdevdesigner/designer/startdialogimpl.cpp +++ b/kdevdesigner/designer/startdialogimpl.cpp @@ -43,15 +43,15 @@ StartDialog::StartDialog( TQWidget *parent, const TQString &templatePath ) newForm = new NewForm( templateView, templatePath ); recentFiles.clear(); initFileOpen(); - showInFuture = TRUE; - - connect( buttonHelp, TQT_SIGNAL( clicked() ), - MainWindow::self, TQT_SLOT( showDialogHelp() ) ); - connect( recentView, TQT_SIGNAL( doubleClicked(TQIconViewItem*) ), - this, TQT_SLOT( accept() ) ); - connect( recentView, TQT_SIGNAL( returnPressed(TQIconViewItem*) ), - this, TQT_SLOT( accept() ) ); - connect( fd, TQT_SIGNAL( fileSelected() ), this, TQT_SLOT( accept() ) ); + showInFuture = true; + + connect( buttonHelp, TQ_SIGNAL( clicked() ), + MainWindow::self, TQ_SLOT( showDialogHelp() ) ); + connect( recentView, TQ_SIGNAL( doubleClicked(TQIconViewItem*) ), + this, TQ_SLOT( accept() ) ); + connect( recentView, TQ_SIGNAL( returnPressed(TQIconViewItem*) ), + this, TQ_SLOT( accept() ) ); + connect( fd, TQ_SIGNAL( fileSelected() ), this, TQ_SLOT( accept() ) ); } void StartDialog::accept() @@ -119,12 +119,12 @@ void StartDialog::clearFileInfo() void StartDialog::setRecentlyFiles( TQStringList &files ) { - insertRecentItems( files, FALSE ); + insertRecentItems( files, false ); } void StartDialog::setRecentlyProjects( TQStringList &projects ) { - insertRecentItems( projects, TRUE ); + insertRecentItems( projects, true ); } void StartDialog::insertRecentItems( TQStringList &files, bool isProject ) @@ -139,7 +139,7 @@ void StartDialog::insertRecentItems( TQStringList &files, bool isProject ) item = new TQIconViewItem( recentView, fi.fileName() ); recentFiles[recentView->index( item )] = *it; item->setPixmap( BarIcon( iconName, KDevDesignerPartFactory::instance() ) ); - item->setDragEnabled( FALSE ); + item->setDragEnabled( false ); } } @@ -160,7 +160,7 @@ void StartDialog::initFileOpen() } delete l; - fd->setSizeGripEnabled ( FALSE ); + fd->setSizeGripEnabled ( false ); tabLayout->addWidget( fd ); TQPluginManager<ImportFilterInterface> manager( IID_ImportFilter, TQApplication::libraryPaths(), diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp index 798e0a09..2976be3b 100644 --- a/kdevdesigner/designer/styledbutton.cpp +++ b/kdevdesigner/designer/styledbutton.cpp @@ -39,12 +39,12 @@ #include <tqstyle.h> StyledButton::StyledButton(TQWidget* parent, const char* name) - : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE ) + : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( false ) { setMinimumSize( minimumSizeHint() ); - setAcceptDrops( TRUE ); + setAcceptDrops( true ); - connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor())); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(onEditor())); setEditor( ColorEditor ); } @@ -209,7 +209,7 @@ void StyledButton::onEditor() void StyledButton::mousePressEvent(TQMouseEvent* e) { TQButton::mousePressEvent(e); - mousePressed = TRUE; + mousePressed = true; pressPos = e->pos(); } @@ -228,7 +228,7 @@ void StyledButton::mouseMoveEvent(TQMouseEvent* e) p.drawRect( 0, 0, pix.width(), pix.height() ); p.end(); drg->setPixmap( pix ); - mousePressed = FALSE; + mousePressed = false; drg->dragCopy(); } else if ( edit == PixmapEditor && pix && !pix->isNull() ) { @@ -236,7 +236,7 @@ void StyledButton::mouseMoveEvent(TQMouseEvent* e) TQImageDrag *drg = new TQImageDrag( img, this ); if(spix) drg->setPixmap( *spix ); - mousePressed = FALSE; + mousePressed = false; drg->dragCopy(); } } diff --git a/kdevdesigner/designer/syntaxhighlighter_html.cpp b/kdevdesigner/designer/syntaxhighlighter_html.cpp index 5bb681f9..ddc6f649 100644 --- a/kdevdesigner/designer/syntaxhighlighter_html.cpp +++ b/kdevdesigner/designer/syntaxhighlighter_html.cpp @@ -66,7 +66,7 @@ void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *stri if ( string->prev() ) { if ( string->prev()->endState() == -1 ) - process( doc, string->prev(), 0, FALSE ); + process( doc, string->prev(), 0, false ); state = string->prev()->endState(); } @@ -77,50 +77,50 @@ void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *stri if ( c == '<' ) { if ( state != StateStandard ) - string->setFormat( i - buffer.length(), buffer.length(), formatStandard, FALSE ); + string->setFormat( i - buffer.length(), buffer.length(), formatStandard, false ); buffer = c; state = StateTag; - string->setFormat( i, 1, formatKeyword, FALSE ); + string->setFormat( i, 1, formatKeyword, false ); } else if ( c == '>' && ( state != StateStandard ) ) { - string->setFormat( i, 1, formatKeyword, FALSE ); + string->setFormat( i, 1, formatKeyword, false ); buffer = ""; state = StateStandard; } else if ( c == ' ' && state == StateTag ) { buffer += c; - string->setFormat( i, 1, formatStandard, FALSE ); + string->setFormat( i, 1, formatStandard, false ); state = StateAttribute; } else if ( c == '=' && state == StateAttribute ) { buffer += c; - string->setFormat( i, 1, formatStandard, FALSE ); + string->setFormat( i, 1, formatStandard, false ); state = StateAttribute; } else if ( c == '\"' && state == StateAttribute ) { buffer += c; - string->setFormat( i, 1, formatStandard, FALSE ); + string->setFormat( i, 1, formatStandard, false ); state = StateAttribVal; } else if ( c == '\"' && state == StateAttribVal ) { buffer += c; - string->setFormat( i, 1, formatStandard, FALSE ); + string->setFormat( i, 1, formatStandard, false ); state = StateAttribute; } else if ( state == StateAttribute ) { buffer += c; - string->setFormat( i, 1, formatAttribute, FALSE ); + string->setFormat( i, 1, formatAttribute, false ); } else if ( state == StateAttribVal ) { buffer += c; - string->setFormat( i, 1, formatAttribValue, FALSE ); + string->setFormat( i, 1, formatAttribValue, false ); } else if ( state == StateTag ) { - string->setFormat( i, 1, formatKeyword, FALSE ); + string->setFormat( i, 1, formatKeyword, false ); buffer += c; } else if ( state == StateStandard ) { - string->setFormat( i, 1, formatStandard, FALSE ); + string->setFormat( i, 1, formatStandard, false ); } i++; @@ -129,7 +129,7 @@ void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *stri } string->setEndState( state ); - string->setFirstPreProcess( FALSE ); + string->setFirstPreProcess( false ); if ( invalidate && string->next() && !string->next()->firstPreProcess() && string->next()->endState() != -1 ) { diff --git a/kdevdesigner/designer/syntaxhighlighter_html.h b/kdevdesigner/designer/syntaxhighlighter_html.h index efd1a616..4de3fba8 100644 --- a/kdevdesigner/designer/syntaxhighlighter_html.h +++ b/kdevdesigner/designer/syntaxhighlighter_html.h @@ -27,7 +27,7 @@ #ifndef SYNTAXHIGHLIGHTER_HTML_H #define SYNTAXHIGHLIGHTER_HTML_H -#include <tqrichtext_p.h> +#include <private/tqrichtext_p.h> class SyntaxHighlighter_HTML : public TQTextPreProcessor { @@ -42,7 +42,7 @@ public: SyntaxHighlighter_HTML(); virtual ~SyntaxHighlighter_HTML(); - void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool invalidate = TRUE ); + void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool invalidate = true ); TQTextFormat *format( int id ); private: diff --git a/kdevdesigner/designer/tableeditor.ui b/kdevdesigner/designer/tableeditor.ui index 21874754..86995ec0 100644 --- a/kdevdesigner/designer/tableeditor.ui +++ b/kdevdesigner/designer/tableeditor.ui @@ -793,7 +793,7 @@ <tabstop>buttonRowDown</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">applyClicked()</slot> @@ -815,7 +815,7 @@ <slot access="protected">rowTextChanged( const TQString & )</slot> <slot access="protected">rowUpClicked()</slot> <slot access="protected">columnDownClicked()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>BarIcon2</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <includes> diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp index 1bde6758..e6c12039 100644 --- a/kdevdesigner/designer/tableeditorimpl.cpp +++ b/kdevdesigner/designer/tableeditorimpl.cpp @@ -53,7 +53,7 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f #endif formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); #ifndef TQT_NO_TABLE labelColumnPixmap->setText( "" ); labelRowPixmap->setText( "" ); @@ -73,11 +73,11 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f // TabWidget->removePage( rows_tab ); // rows_tab->hide(); // ## do this in the meantime... - TabWidget->setTabEnabled( rows_tab, FALSE ); + TabWidget->setTabEnabled( rows_tab, false ); } if ( formWindow->project() && ::tqt_cast<TQDataTable*>(editTable) ) { - TQStringList lst = MetaDataBase::fakeProperty( TQT_TQOBJECT(editTable), "database" ).toStringList(); + TQStringList lst = MetaDataBase::fakeProperty( editTable, "database" ).toStringList(); if ( lst.count() == 2 && !lst[ 0 ].isEmpty() && !lst[ 1 ].isEmpty() ) { TQStringList fields; fields << "<no field>"; @@ -118,9 +118,9 @@ void TableEditor::columnTextChanged( const TQString &s ) { if ( listColumns->currentItem() == -1 ) return; - listColumns->blockSignals( TRUE ); + listColumns->blockSignals( true ); listColumns->changeItem( s, listColumns->currentItem() ); - listColumns->blockSignals( FALSE ); + listColumns->blockSignals( false ); #ifndef TQT_NO_TABLE if ( table->horizontalHeader()->iconSet( listColumns->currentItem() ) ) table->horizontalHeader()->setLabel( listColumns->currentItem(), @@ -150,13 +150,13 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i ) { if ( !i ) return; - editColumnText->blockSignals( TRUE ); + editColumnText->blockSignals( true ); editColumnText->setText( i->text() ); if ( i->pixmap() ) labelColumnPixmap->setPixmap( *i->pixmap() ); else labelColumnPixmap->setText( "" ); - editColumnText->blockSignals( FALSE ); + editColumnText->blockSignals( false ); #ifndef TQT_NO_SQL if ( ::tqt_cast<TQDataTable*>(editTable) ) { @@ -177,24 +177,24 @@ void TableEditor::currentFieldChanged( const TQString &s ) return; fieldMap.remove( listColumns->currentItem() ); fieldMap.insert( listColumns->currentItem(), s ); - editColumnText->blockSignals( TRUE ); //## necessary + editColumnText->blockSignals( true ); //## necessary TQString newColText = s.mid(0,1).upper() + s.mid(1); editColumnText->setText( newColText ); columnTextChanged( newColText ); - editColumnText->blockSignals( FALSE ); + editColumnText->blockSignals( false ); } void TableEditor::currentRowChanged( TQListBoxItem *i ) { if ( !i ) return; - editRowText->blockSignals( TRUE ); + editRowText->blockSignals( true ); editRowText->setText( i->text() ); if ( i->pixmap() ) labelRowPixmap->setPixmap( *i->pixmap() ); else labelRowPixmap->setText( "" ); - editRowText->blockSignals( FALSE ); + editRowText->blockSignals( false ); } void TableEditor::deleteColumnClicked() @@ -207,7 +207,7 @@ void TableEditor::deleteColumnClicked() readColumns(); if ( listColumns->firstItem() ) { listColumns->setCurrentItem( listColumns->firstItem() ); - listColumns->setSelected( listColumns->firstItem(), TRUE ); + listColumns->setSelected( listColumns->firstItem(), true ); } #endif } @@ -222,7 +222,7 @@ void TableEditor::deleteRowClicked() readRows(); if ( listRows->firstItem() ) { listRows->setCurrentItem( listRows->firstItem() ); - listRows->setSelected( listRows->firstItem(), TRUE ); + listRows->setSelected( listRows->firstItem(), true ); } #endif } @@ -233,7 +233,7 @@ void TableEditor::newColumnClicked() table->setNumCols( table->numCols() + 1 ); TQMap<TQString, bool> m; for ( int i = 0; i < table->numCols() - 1; ++i ) - m.insert( table->horizontalHeader()->label( i ), TRUE ); + m.insert( table->horizontalHeader()->label( i ), true ); int n = table->numCols() - 1; TQString t = TQString::number( n ); while ( m.find( t ) != m.end() ) @@ -242,7 +242,7 @@ void TableEditor::newColumnClicked() listColumns->insertItem( t ); TQListBoxItem *item = listColumns->item( listColumns->count() - 1 ); listColumns->setCurrentItem( item ); - listColumns->setSelected( item, TRUE ); + listColumns->setSelected( item, true ); #ifndef TQT_NO_SQL if ( ::tqt_cast<TQDataTable*>(editTable) ) { comboFields->setFocus(); @@ -261,7 +261,7 @@ void TableEditor::newRowClicked() table->setNumRows( table->numRows() + 1 ); TQMap<TQString, bool> m; for ( int i = 0; i < table->numRows() - 1; ++i ) - m.insert( table->verticalHeader()->label( i ), TRUE ); + m.insert( table->verticalHeader()->label( i ), true ); int n = table->numRows() - 1; TQString t = TQString::number( n ); while ( m.find( t ) != m.end() ) @@ -270,7 +270,7 @@ void TableEditor::newRowClicked() listRows->insertItem( t ); TQListBoxItem *item = listRows->item( listRows->count() - 1 ); listRows->setCurrentItem( item ); - listRows->setSelected( item, TRUE ); + listRows->setSelected( item, true ); #endif } @@ -412,7 +412,7 @@ void TableEditor::readFromTable() #ifndef TQT_NO_TABLE TQHeader *cols = editTable->horizontalHeader(); table->setNumCols( cols->count() ); - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(editTable) ); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( editTable ); for ( int i = 0; i < cols->count(); ++i ) { if ( editTable->horizontalHeader()->iconSet( i ) ) { table->horizontalHeader()->setLabel( i, *editTable->horizontalHeader()->iconSet( i ), @@ -429,7 +429,7 @@ void TableEditor::readFromTable() if ( listColumns->firstItem() ) { listColumns->setCurrentItem( listColumns->firstItem() ); - listColumns->setSelected( listColumns->firstItem(), TRUE ); + listColumns->setSelected( listColumns->firstItem(), true ); } TQHeader *rows = editTable->verticalHeader(); @@ -448,7 +448,7 @@ void TableEditor::readFromTable() if ( listRows->firstItem() ) { listRows->setCurrentItem( listRows->firstItem() ); - listRows->setSelected( listRows->firstItem(), TRUE ); + listRows->setSelected( listRows->firstItem(), true ); } #endif } diff --git a/kdevdesigner/designer/tableeditorimpl.h b/kdevdesigner/designer/tableeditorimpl.h index f6889bc3..d6b42f04 100644 --- a/kdevdesigner/designer/tableeditorimpl.h +++ b/kdevdesigner/designer/tableeditorimpl.h @@ -41,7 +41,7 @@ class TableEditor : public TableEditorBase public: TableEditor( TQWidget* parent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0, - const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + const char* name = 0, bool modal = false, WFlags fl = 0 ); ~TableEditor(); protected slots: diff --git a/kdevdesigner/designer/timestamp.cpp b/kdevdesigner/designer/timestamp.cpp index 553d9e3f..f92e7872 100644 --- a/kdevdesigner/designer/timestamp.cpp +++ b/kdevdesigner/designer/timestamp.cpp @@ -31,10 +31,10 @@ class TQTimer; TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) - : TQObject( parent ), filename( f ), autoCheck( FALSE ) + : TQObject( parent ), filename( f ), autoCheck( false ) { timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoCheckTimeStamp() ) ); update(); } @@ -70,7 +70,7 @@ bool TimeStamp::isUpToDate() const { TQFile f( filename ); if ( !f.exists() ) - return TRUE; + return true; return lastTimeStamp == TQFileInfo( f ).lastModified(); } diff --git a/kdevdesigner/designer/variabledialog.ui b/kdevdesigner/designer/variabledialog.ui index d9cdc7ef..721c45c4 100644 --- a/kdevdesigner/designer/variabledialog.ui +++ b/kdevdesigner/designer/variabledialog.ui @@ -282,14 +282,14 @@ <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>addVariable()</slot> <slot>deleteVariable()</slot> <slot>accessChanged()</slot> <slot>nameChanged()</slot> <slot>okClicked()</slot> <slot>currentItemChanged( TQListViewItem * i )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/variabledialogimpl.cpp b/kdevdesigner/designer/variabledialogimpl.cpp index d2d7ef67..070ab14c 100644 --- a/kdevdesigner/designer/variabledialogimpl.cpp +++ b/kdevdesigner/designer/variabledialogimpl.cpp @@ -44,7 +44,7 @@ VariableDialog::VariableDialog( FormWindow *fw, TQWidget *parent ) : VariableDialogBase( parent ), formWindow( fw ) { varView->setSorting( -1 ); - TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( formWindow ); TQValueList<MetaDataBase::Variable>::Iterator it = varLst.begin(); for ( ; it != varLst.end(); ++it ) { TQListViewItem *i = new TQListViewItem( varView ); @@ -55,7 +55,7 @@ VariableDialog::VariableDialog( FormWindow *fw, TQWidget *parent ) if ( varView->firstChild() ) varView->setCurrentItem( varView->firstChild() ); else - propBox->setEnabled( FALSE ); + propBox->setEnabled( false ); } VariableDialog::~VariableDialog() @@ -131,7 +131,7 @@ void VariableDialog::addVariable() i->setText( 0, "int newVariable" ); i->setText( 1, "protected" ); varView->setCurrentItem( i ); - varView->setSelected( i, TRUE ); + varView->setSelected( i, true ); varName->setFocus(); varName->selectAll(); } @@ -144,7 +144,7 @@ void VariableDialog::deleteVariable() delete i; i = 0; if ( varView->firstChild() ) - varView->setSelected( varView->firstChild(), TRUE ); + varView->setSelected( varView->firstChild(), true ); } void VariableDialog::currentItemChanged( TQListViewItem *i ) @@ -152,7 +152,7 @@ void VariableDialog::currentItemChanged( TQListViewItem *i ) if ( !i ) { varName->clear(); accessCombo->setCurrentItem( 1 ); - propBox->setEnabled( FALSE ); + propBox->setEnabled( false ); return; } varName->setText( i->text( 0 ) ); @@ -162,7 +162,7 @@ void VariableDialog::currentItemChanged( TQListViewItem *i ) accessCombo->setCurrentItem( 1 ); else accessCombo->setCurrentItem( 2 ); - propBox->setEnabled( TRUE ); + propBox->setEnabled( true ); } void VariableDialog::nameChanged() diff --git a/kdevdesigner/designer/widgetaction.cpp b/kdevdesigner/designer/widgetaction.cpp index 1d71f4e0..def64c17 100644 --- a/kdevdesigner/designer/widgetaction.cpp +++ b/kdevdesigner/designer/widgetaction.cpp @@ -39,7 +39,7 @@ void WidgetAction::addedTo( TQWidget *w, TQWidget *container ) if ( !windowsStyle ) windowsStyle = TQStyleFactory::create( "windows" ); w->setStyle( windowsStyle ); - ( (TQToolButton*)w )->setUsesTextLabel( TRUE ); + ( (TQToolButton*)w )->setUsesTextLabel( true ); ( (TQToolButton*)w )->setTextPosition( TQToolButton::Right ); w->setBackgroundMode( container->backgroundMode() ); } diff --git a/kdevdesigner/designer/widgetaction.h b/kdevdesigner/designer/widgetaction.h index 2e0c8e26..b3c81368 100644 --- a/kdevdesigner/designer/widgetaction.h +++ b/kdevdesigner/designer/widgetaction.h @@ -36,15 +36,15 @@ class WidgetAction : public TQAction public: WidgetAction( const TQString &grp, TQObject* parent, - const char* name = 0, bool toggle = FALSE ) + const char* name = 0, bool toggle = false ) : TQAction( parent, name, toggle ) { init( grp ); } WidgetAction( const TQString &grp, const TQString& text, const TQIconSet& icon, const TQString& menuText, TQKeySequence accel, - TQObject* parent, const char* name = 0, bool toggle = FALSE ) + TQObject* parent, const char* name = 0, bool toggle = false ) : TQAction( text, icon, menuText, accel, parent, name, toggle ) { init( grp ); } WidgetAction( const TQString &grp, const TQString& text, const TQString& menuText, TQKeySequence accel, TQObject* parent, - const char* name = 0, bool toggle = FALSE ) + const char* name = 0, bool toggle = false ) : TQAction( text, menuText, accel, parent, name, toggle ) { init( grp ); } ~WidgetAction(); diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp index 00a4fa07..595cae71 100644 --- a/kdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -124,9 +124,9 @@ void TQLayoutWidget::paintEvent( TQPaintEvent* ) QDesignerTabWidget::QDesignerTabWidget( TQWidget *parent, const char *name ) - : TQTabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE ) + : TQTabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( false ) { - tabBar()->setAcceptDrops( TRUE ); + tabBar()->setAcceptDrops( true ); tabBar()->installEventFilter( this ); } @@ -170,11 +170,11 @@ int QDesignerTabWidget::count() const bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) { - if ( o != tabBar() ) return FALSE; + if ( o != tabBar() ) return false; switch ( e->type() ) { case TQEvent::MouseButtonPress: { - mousePressed = TRUE; + mousePressed = true; TQMouseEvent *me = (TQMouseEvent*)e; pressPoint = me->pos(); } @@ -183,7 +183,7 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) TQMouseEvent *me = (TQMouseEvent*)e; if ( mousePressed && ( pressPoint - me->pos()).manhattanLength() > TQApplication::startDragDistance() ) { TQTextDrag *drg = new TQTextDrag( TQString::number( (long) this ) , this ); - mousePressed = FALSE; + mousePressed = false; dragPage = TQTabWidget::currentPage(); dragLabel = TQTabWidget::tabLabel( dragPage ); @@ -212,7 +212,7 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) if ( text == TQString::number( (long)this ) ) de->accept(); else - return FALSE; + return false; } int index = 0; @@ -286,7 +286,7 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) default: break; } - return FALSE; + return false; } @@ -294,15 +294,15 @@ QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *parent, const char *name ) : TQWidgetStack( parent, name ) { prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" ); - prev->setAutoRaise( TRUE ); - prev->setAutoRepeat( TRUE ); + prev->setAutoRaise( true ); + prev->setAutoRepeat( true ); prev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); next = new TQToolButton( TQt::RightArrow, this, "designer_wizardstack_button" ); - next->setAutoRaise( TRUE ); - next->setAutoRepeat( TRUE ); + next->setAutoRaise( true ); + next->setAutoRepeat( true ); next->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); - connect( prev, TQT_SIGNAL( clicked() ), this, TQT_SLOT( prevPage() ) ); - connect( next, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPage() ) ); + connect( prev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( prevPage() ) ); + connect( next, TQ_SIGNAL( clicked() ), this, TQ_SLOT( nextPage() ) ); updateButtons(); } @@ -498,7 +498,7 @@ TQMap< int, TQStringList > *changedProperties = 0; void WidgetFactory::saveDefaultProperties( TQObject *w, int id ) { TQMap< TQString, TQVariant> propMap; - TQStrList lst = w->metaObject()->propertyNames( TRUE ); + TQStrList lst = w->metaObject()->propertyNames( true ); for ( uint i = 0; i < lst.count(); ++i ) { TQVariant var = w->property( lst.at( i ) ); if ( !var.isValid() && qstrcmp( "pixmap", lst.at( i ) ) == 0 ) @@ -517,7 +517,7 @@ void WidgetFactory::saveChangedProperties( TQObject *w, int id ) } /*! Creates a widget of the type which is registered as \a id as - child of \a parent. The \a name is optional. If \a init is TRUE, the + child of \a parent. The \a name is optional. If \a init is true, the widget is initialized with some defaults, else the plain widget is created. */ @@ -543,12 +543,12 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo w = createCustomWidget( parent, name ? name : s, MetaDataBase::customWidget( id ) ); if ( !w ) return 0; - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( w ); if ( !defaultProperties->contains( id ) ) - saveDefaultProperties( TQT_TQOBJECT(w), id ); + saveDefaultProperties( w, id ); if ( !changedProperties->contains( id ) ) - saveChangedProperties( TQT_TQOBJECT(w), id ); + saveChangedProperties( w, id ); return w; } @@ -562,11 +562,11 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou int spacing = MainWindow::self->currentLayoutDefaultSpacing(); int margin = 0; - int metaspacing = MetaDataBase::spacing( TQT_TQOBJECT(widget) ); - int metamargin = MetaDataBase::margin( TQT_TQOBJECT(widget) ); + int metaspacing = MetaDataBase::spacing( widget ); + int metamargin = MetaDataBase::margin( widget ); if ( ::tqt_cast<TQLayoutWidget*>(widget) && - ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) || + ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) || widget && ::tqt_cast<FormWindow*>(widget->parentWidget()) ) ) margin = MainWindow::self->currentLayoutDefaultMargin(); @@ -585,7 +585,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou if ( !layout && ::tqt_cast<TQToolBox*>(widget) ) widget = ((TQToolBox*)widget)->currentItem(); - MetaDataBase::addEntry( TQT_TQOBJECT(widget) ); + MetaDataBase::addEntry( widget ); TQLayout *l = 0; int align = 0; @@ -609,8 +609,8 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou return 0; } align = TQt::AlignTop; - MetaDataBase::setMargin( TQT_TQOBJECT(gb), metamargin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(gb), metaspacing ); + MetaDataBase::setMargin( gb, metamargin ); + MetaDataBase::setSpacing( gb, metaspacing ); } else { if ( layout ) { switch ( type ) { @@ -626,7 +626,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou default: return 0; } - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); l->setSpacing( spacing ); l->setMargin( margin ); } else { @@ -643,10 +643,10 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou default: return 0; } - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); if ( widget ) { - MetaDataBase::setMargin( TQT_TQOBJECT(widget), metamargin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(widget), metaspacing ); + MetaDataBase::setMargin( widget, metamargin ); + MetaDataBase::setSpacing( widget, metaspacing ); } else { l->setMargin( margin ); l->setSpacing( spacing ); @@ -654,7 +654,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou } } l->setAlignment( align ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; } @@ -679,7 +679,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) /*! Factory functions for creating a widget of the type \a className as child of \a parent with the name \a name. - If \a init is TRUE, some initial default properties are set. This + If \a init is true, some initial default properties are set. This has to be in sync with the initChangedProperties() function! */ @@ -701,9 +701,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if ( init ) { QDesignerToolButton *tb = new QDesignerToolButton( parent, name ); if ( ::tqt_cast<TQToolBox*>(widgetOfContainer(parent))) { - tb->setUsesTextLabel(TRUE); + tb->setUsesTextLabel(true); tb->setTextLabel("..."); - tb->setAutoRaise(TRUE); + tb->setAutoRaise(true); tb->setTextPosition(TQToolButton::BesideIcon); } else { tb->setText( "..." ); @@ -790,18 +790,18 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare QDesignerLabel *l = new QDesignerLabel( parent, name ); if ( init ) { l->setText( TQString::fromLatin1( name ) ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "text", TRUE ); + MetaDataBase::addEntry( l ); + MetaDataBase::setPropertyChanged( l, "text", true ); } return l; } else if ( className == "PixmapLabel" ) { QDesignerLabel *l = new QDesignerLabel( parent, name ); if ( init ) { l->setPixmap( BarIcon( "designer_qtlogo.png", KDevDesignerPartFactory::instance() ) ); - l->setScaledContents( TRUE ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "pixmap", TRUE ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "scaledContents", TRUE ); + l->setScaledContents( true ); + MetaDataBase::addEntry( l ); + MetaDataBase::setPropertyChanged( l, "pixmap", true ); + MetaDataBase::setPropertyChanged( l, "scaledContents", true ); } return l; } else if ( className == "TQLayoutWidget" ) @@ -812,11 +812,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, i18n("Tab 1") ); - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( w ); w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, i18n("Tab 2") ); - MetaDataBase::addEntry( TQT_TQOBJECT(tw) ); - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( tw ); + MetaDataBase::addEntry( w ); } return tw; } else if ( className == "TQWidgetStack" ) { @@ -825,12 +825,12 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new QDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" ); ws->insertPage( w ); - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); - MetaDataBase::addEntry( TQT_TQOBJECT(ws) ); + MetaDataBase::addEntry( w ); + MetaDataBase::addEntry( ws ); } return ws; } else if ( className == "TQComboBox" ) { - return new TQComboBox( FALSE, parent, name ); + return new TQComboBox( false, parent, name ); } else if ( className == "TQWidget" ) { if ( parent && ( ::tqt_cast<FormWindow*>(parent) || @@ -842,7 +842,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare FormWindow *fw = find_formwindow( parent ); if ( fw ) { QDesignerWidget *dw = new QDesignerWidget( fw, parent, name ); - MetaDataBase::addEntry( TQT_TQOBJECT(dw) ); + MetaDataBase::addEntry( dw ); return dw; } } @@ -854,24 +854,24 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare else dia = new TQDialog( parent, name ); if ( parent ) - dia->reparent( parent, TQPoint( 0, 0 ), TRUE ); + dia->reparent( parent, TQPoint( 0, 0 ), true ); return dia; } else if ( className == "TQWizard" ) { TQWizard *wiz = new QDesignerWizard( parent, name ); if ( parent ) - wiz->reparent( parent, TQPoint( 0, 0 ), TRUE ); + wiz->reparent( parent, TQPoint( 0, 0 ), true ); if ( init && ::tqt_cast<FormWindow*>(parent) ) { QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" ); - MetaDataBase::addEntry( TQT_TQOBJECT(dw) ); + MetaDataBase::addEntry( dw ); wiz->addPage( dw, i18n( "Page" ) ); - TQTimer::singleShot( 0, wiz, TQT_SLOT( next() ) ); + TQTimer::singleShot( 0, wiz, TQ_SLOT( next() ) ); } return wiz; } else if ( className == "Spacer" ) { Spacer *s = new Spacer( parent, name ); - MetaDataBase::addEntry( TQT_TQOBJECT(s) ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "sizeType", TRUE ); + MetaDataBase::addEntry( s ); + MetaDataBase::setPropertyChanged( s, "orientation", true ); + MetaDataBase::setPropertyChanged( s, "sizeType", true ); if ( !r ) return s; if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) @@ -899,8 +899,8 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare s->setOrientation( orient ); else if ( r->width() > r->height() ) s->setOrientation( TQt::Horizontal ); - MetaDataBase::addEntry( TQT_TQOBJECT(s) ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE ); + MetaDataBase::addEntry( s ); + MetaDataBase::setPropertyChanged( s, "orientation", true ); return s; } else if ( className == "TQScrollBar" ) { TQScrollBar *s = new TQScrollBar( parent, name ); @@ -910,8 +910,8 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare s->setOrientation( orient ); else if ( r->width() > r->height() ) s->setOrientation( TQt::Horizontal ); - MetaDataBase::addEntry( TQT_TQOBJECT(s) ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE ); + MetaDataBase::addEntry( s ); + MetaDataBase::setPropertyChanged( s, "orientation", true ); return s; } else if ( className == "TQFrame" ) { if ( !init ) @@ -921,10 +921,10 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return f; } else if ( className == "Line" ) { Line *l = new Line( parent, name ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "orientation", TRUE ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "frameShadow", TRUE ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "frameShape", TRUE ); + MetaDataBase::addEntry( l ); + MetaDataBase::setPropertyChanged( l, "orientation", true ); + MetaDataBase::setPropertyChanged( l, "frameShadow", true ); + MetaDataBase::setPropertyChanged( l, "frameShape", true ); if ( !r ) return l; if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) @@ -934,10 +934,10 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return l; } else if ( className == "TQMainWindow" ) { TQMainWindow *mw = new TQMainWindow( parent, name, 0 ); - mw->setDockEnabled( TQt::DockMinimized, FALSE ); + mw->setDockEnabled( TQt::DockMinimized, false ); QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, mw, "central widget" ); - mw->setDockMenuEnabled( FALSE ); - MetaDataBase::addEntry( TQT_TQOBJECT(dw) ); + mw->setDockMenuEnabled( false ); + MetaDataBase::addEntry( dw ); mw->setCentralWidget( dw ); (void)mw->statusBar(); dw->show(); @@ -950,23 +950,23 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare TQWidget *w = fw ? new QDesignerWidget( fw, tb, "page1" ) : new TQWidget( tb, "page1" ); tb->addItem( w, i18n("Page 1") ); - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( w ); w = fw ? new QDesignerWidget( fw, tb, "page2" ) : new TQWidget( tb, "page2" ); tb->addItem( w, i18n("Page 2") ); - MetaDataBase::addEntry( TQT_TQOBJECT(tb) ); - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( tb ); + MetaDataBase::addEntry( w ); return tb; } #ifndef TQT_NO_SQL else if ( className == "TQDataBrowser" ) { TQWidget *w = new QDesignerDataBrowser( parent, name ); if ( parent ) - w->reparent( parent, TQPoint( 0, 0 ), TRUE ); + w->reparent( parent, TQPoint( 0, 0 ), true ); return w; } else if ( className == "TQDataView" ) { TQWidget *w = new QDesignerDataView( parent, name ); if ( parent ) - w->reparent( parent, TQPoint( 0, 0 ), TRUE ); + w->reparent( parent, TQPoint( 0, 0 ), true ); return w; } #endif @@ -1021,7 +1021,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay TQLayout *lay = w->layout(); if ( ::tqt_cast<TQGroupBox*>(w) ) { - TQObjectList *l = TQT_TQOBJECT(lay)->queryList( "TQLayout" ); + TQObjectList *l = lay->queryList( "TQLayout" ); if ( l && l->first() ) lay = (TQLayout*)l->first(); delete l; @@ -1063,7 +1063,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w ) TQWidget *WidgetFactory::layoutParent( TQLayout *layout ) { - TQObject *o = TQT_TQOBJECT(layout); + TQObject *o = layout; while ( o ) { if ( o->isWidgetType() ) return (TQWidget*)o; @@ -1132,7 +1132,7 @@ TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w ) ::tqt_cast<TQToolBox*>(w->parentWidget()->parentWidget()->parentWidget()) ) return w->parentWidget()->parentWidget()->parentWidget(); while ( w ) { - int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ); + int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ); if ( WidgetDatabase::isContainer( id ) || w && ::tqt_cast<FormWindow*>(w->parentWidget()) ) return w; @@ -1145,40 +1145,40 @@ TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w ) Returns whether \a o is a passive interactor or not. */ -bool WidgetFactory::lastWasAPassiveInteractor = FALSE; +bool WidgetFactory::lastWasAPassiveInteractor = false; TQGuardedPtr<TQObject> *WidgetFactory::lastPassiveInteractor = new TQGuardedPtr<TQObject>(); bool WidgetFactory::isPassiveInteractor( TQObject* o ) { if ( lastPassiveInteractor && *lastPassiveInteractor && (TQObject*)(*lastPassiveInteractor) == o ) return lastWasAPassiveInteractor; - lastWasAPassiveInteractor = FALSE; + lastWasAPassiveInteractor = false; (*lastPassiveInteractor) = o; if ( TQApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things - return ( lastWasAPassiveInteractor = TRUE ); + return ( lastWasAPassiveInteractor = true ); if ( ::tqt_cast<TQTabBar*>(o) ) - return ( lastWasAPassiveInteractor = TRUE ); + return ( lastWasAPassiveInteractor = true ); else if ( ::tqt_cast<TQSizeGrip*>(o) ) - return ( lastWasAPassiveInteractor = TRUE ); + return ( lastWasAPassiveInteractor = true ); else if ( ::tqt_cast<TQButton*>(o) && ( ::tqt_cast<TQTabBar*>(o->parent()) || ::tqt_cast<TQToolBox*>(o->parent()) ) ) - return ( lastWasAPassiveInteractor = TRUE ); + return ( lastWasAPassiveInteractor = true ); else if ( ::tqt_cast<TQPushButton*>(o) && ::tqt_cast<TQWizard*>(o->parent()) ) - return ( lastWasAPassiveInteractor = TRUE ); + return ( lastWasAPassiveInteractor = true ); else if ( ::tqt_cast<TQMenuBar*>(o) && ::tqt_cast<TQMainWindow*>(o->parent()) ) - return ( lastWasAPassiveInteractor = TRUE ); + return ( lastWasAPassiveInteractor = true ); // else if ( ::tqt_cast<TQDockWindowHandle*>(o) ) else if ( o->inherits( "TQDockWindowHandle" ) ) - return ( lastWasAPassiveInteractor = TRUE ); + return ( lastWasAPassiveInteractor = true ); // else if ( ::tqt_cast<TQHideDock*>(o) ) else if ( o->inherits( "TQHideDock" ) ) - return ( lastWasAPassiveInteractor = TRUE ); + return ( lastWasAPassiveInteractor = true ); else if ( qstrcmp( o->name(), "designer_wizardstack_button" ) == 0 ) - return ( lastWasAPassiveInteractor = TRUE ); + return ( lastWasAPassiveInteractor = true ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS if ( !o->isWidgetType() ) - return ( lastWasAPassiveInteractor = FALSE ); + return ( lastWasAPassiveInteractor = false ); WidgetInterface *iface = 0; TQWidget *w = (TQWidget*)o; while ( !iface && w && !::tqt_cast<FormWindow*>(w) ) { @@ -1186,17 +1186,17 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) w = w->parentWidget(); } if ( !iface ) - return ( lastWasAPassiveInteractor = FALSE ); + return ( lastWasAPassiveInteractor = false ); TQWidgetContainerInterfacePrivate *iface2 = 0; iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 ); if ( !iface2 ) - return ( lastWasAPassiveInteractor = FALSE ); + return ( lastWasAPassiveInteractor = false ); TQWidget *fw = MainWindow::self->isAFormWindowChild( (TQWidget*)o ); if ( !fw ) - return ( lastWasAPassiveInteractor = FALSE ); + return ( lastWasAPassiveInteractor = false ); TQWidget *dw = ( (FormWindow*)fw )->designerWidget( (TQWidget*)o ); if ( !dw ) - return ( lastWasAPassiveInteractor = FALSE ); + return ( lastWasAPassiveInteractor = false ); lastWasAPassiveInteractor = iface2->isPassiveInteractor( dw->className(), (TQWidget*)o ); iface2->release(); iface->release(); @@ -1298,50 +1298,50 @@ void WidgetFactory::initChangedProperties( TQObject *o ) if ( MainWindow::self && MainWindow::self->currProject() && MainWindow::self->currProject()->fakeFormFileFor( o ) ) return; - MetaDataBase::setPropertyChanged( o, "name", TRUE ); + MetaDataBase::setPropertyChanged( o, "name", true ); if ( !::tqt_cast<QDesignerToolBar*>(o) && !::tqt_cast<MenuBarEditor*>(o) ) - MetaDataBase::setPropertyChanged( o, "geometry", TRUE ); + MetaDataBase::setPropertyChanged( o, "geometry", true ); if ( ::tqt_cast<TQPushButton*>(o) || ::tqt_cast<TQRadioButton*>(o) || ::tqt_cast<TQCheckBox*>(o) || ::tqt_cast<TQToolButton*>(o) ) { if (::tqt_cast<TQToolButton*>(o) && ::tqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { - MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE ); - MetaDataBase::setPropertyChanged( o, "textLabel", TRUE ); - MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE ); - MetaDataBase::setPropertyChanged( o, "textPosition", TRUE ); + MetaDataBase::setPropertyChanged( o, "usesTextLabel", true ); + MetaDataBase::setPropertyChanged( o, "textLabel", true ); + MetaDataBase::setPropertyChanged( o, "autoRaise", true ); + MetaDataBase::setPropertyChanged( o, "textPosition", true ); } else { - MetaDataBase::setPropertyChanged( o, "text", TRUE ); + MetaDataBase::setPropertyChanged( o, "text", true ); } } else if ( ::tqt_cast<TQGroupBox*>(o) ) - MetaDataBase::setPropertyChanged( o, "title", TRUE ); + MetaDataBase::setPropertyChanged( o, "title", true ); else if ( o->isA( "TQFrame" ) ) { - MetaDataBase::setPropertyChanged( o, "frameShadow", TRUE ); - MetaDataBase::setPropertyChanged( o, "frameShape", TRUE ); + MetaDataBase::setPropertyChanged( o, "frameShadow", true ); + MetaDataBase::setPropertyChanged( o, "frameShape", true ); } else if ( ::tqt_cast<TQTabWidget*>(o) || ::tqt_cast<TQWizard*>(o) ) { - MetaDataBase::setPropertyChanged( o, "pageTitle", TRUE ); - MetaDataBase::setPropertyChanged( o, "pageName", TRUE ); - MetaDataBase::setPropertyChanged( o, "currentPage", TRUE ); + MetaDataBase::setPropertyChanged( o, "pageTitle", true ); + MetaDataBase::setPropertyChanged( o, "pageName", true ); + MetaDataBase::setPropertyChanged( o, "currentPage", true ); } else if ( ::tqt_cast<TQWidgetStack*>(o) ) { - MetaDataBase::setPropertyChanged( o, "currentPage", TRUE ); - MetaDataBase::setPropertyChanged( o, "pageName", TRUE ); + MetaDataBase::setPropertyChanged( o, "currentPage", true ); + MetaDataBase::setPropertyChanged( o, "pageName", true ); } else if ( ::tqt_cast<TQToolBox*>(o) ) { - MetaDataBase::setPropertyChanged( o, "currentIndex", TRUE ); - MetaDataBase::setPropertyChanged( o, "itemName", TRUE ); - MetaDataBase::setPropertyChanged( o, "itemLabel", TRUE ); - MetaDataBase::setPropertyChanged( o, "itemIconSet", TRUE ); - MetaDataBase::setPropertyChanged( o, "itemToolTip", TRUE ); - MetaDataBase::setPropertyChanged( o, "itemBackgroundMode", TRUE ); + MetaDataBase::setPropertyChanged( o, "currentIndex", true ); + MetaDataBase::setPropertyChanged( o, "itemName", true ); + MetaDataBase::setPropertyChanged( o, "itemLabel", true ); + MetaDataBase::setPropertyChanged( o, "itemIconSet", true ); + MetaDataBase::setPropertyChanged( o, "itemToolTip", true ); + MetaDataBase::setPropertyChanged( o, "itemBackgroundMode", true ); #ifndef TQT_NO_TABLE } else if ( ::tqt_cast<TQTable*>(o) ) { # ifndef TQT_NO_SQL if (!::tqt_cast<TQDataTable*>(o) ) # endif { - MetaDataBase::setPropertyChanged( o, "numRows", TRUE ); - MetaDataBase::setPropertyChanged( o, "numCols", TRUE ); + MetaDataBase::setPropertyChanged( o, "numRows", true ); + MetaDataBase::setPropertyChanged( o, "numCols", true ); TQTable *t = (TQTable*)o; for ( int i = 0; i < 3; ++i ) { t->horizontalHeader()->setLabel( i, TQString::number( i + 1 ) ); @@ -1350,13 +1350,13 @@ void WidgetFactory::initChangedProperties( TQObject *o ) } #endif } else if ( ::tqt_cast<TQSplitter*>(o) ) { - MetaDataBase::setPropertyChanged( o, "orientation", TRUE ); + MetaDataBase::setPropertyChanged( o, "orientation", true ); } else if ( ::tqt_cast<QDesignerToolBar*>(o) ) { - MetaDataBase::setPropertyChanged( o, "label", TRUE ); + MetaDataBase::setPropertyChanged( o, "label", true ); } else if ( ::tqt_cast<MenuBarEditor*>(o) ) { - MetaDataBase::setPropertyChanged( o, "itemName", TRUE ); - MetaDataBase::setPropertyChanged( o, "itemNumber", TRUE ); - MetaDataBase::setPropertyChanged( o, "itemText", TRUE ); + MetaDataBase::setPropertyChanged( o, "itemName", true ); + MetaDataBase::setPropertyChanged( o, "itemNumber", true ); + MetaDataBase::setPropertyChanged( o, "itemText", true ); } } @@ -1365,19 +1365,19 @@ bool WidgetFactory::hasSpecialEditor( int id, TQObject *editorWidget ) TQString className = WidgetDatabase::className( id ); if ( className.contains( "ListBox" ) ) - return TRUE; + return true; if ( className.contains( "ComboBox" ) ) - return TRUE; + return true; if ( className.contains( "ListView" ) ) - return TRUE; + return true; if ( className.contains( "IconView" ) ) - return TRUE; + return true; if ( className == "TQTextEdit" || className == "TQMultiLineEdit" ) - return TRUE; + return true; if ( ::tqt_cast<TQTable*>(editorWidget) != 0 ) - return TRUE; + return true; - return FALSE; + return false; } bool WidgetFactory::hasItems( int id, TQObject *editorWidget ) @@ -1387,9 +1387,9 @@ bool WidgetFactory::hasItems( int id, TQObject *editorWidget ) if ( className.contains( "ListBox" ) || className.contains( "ListView" ) || className.contains( "IconView" ) || className.contains( "ComboBox" ) || ::tqt_cast<TQTable*>(editorWidget) != 0 ) - return TRUE; + return true; - return FALSE; + return false; } void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) @@ -1436,7 +1436,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, } if ( className == "TQMultiLineEdit" || className == "TQTextEdit" ) { - MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, parent, editWidget, fw ); + MultiLineEditor *e = new MultiLineEditor( false, true, parent, editWidget, fw ); e->exec(); delete e; return; @@ -1454,7 +1454,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName ) { if ( propName == "name" || propName == "geometry" ) - return FALSE; + return false; TQStringList l = *changedProperties->find( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ); return l.findIndex( propName ) == -1; } @@ -1462,9 +1462,9 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName ) bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName ) { const TQMetaProperty *p = w->metaObject()->property( w->metaObject()-> - findProperty( propName, TRUE ), TRUE ); + findProperty( propName, true ), true ); if (!p ) - return FALSE; + return false; return p->reset( w ); } @@ -1489,7 +1489,7 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName ) { const TQMetaProperty *p = w->metaObject()-> - property( w->metaObject()->findProperty( propName, TRUE ), TRUE ); + property( w->metaObject()->findProperty( propName, true ), true ); if ( !p ) { int v = defaultValue( w, "alignment" ).toInt(); if ( propName == "hAlign" ) { @@ -1528,8 +1528,8 @@ TQWidget *WidgetFactory::createCustomWidget( TQWidget *parent, const char *name, TQVariant WidgetFactory::property( TQObject *w, const char *name ) { - int id = w->metaObject()->findProperty( name, TRUE ); - const TQMetaProperty* p = w->metaObject()->property( id, TRUE ); + int id = w->metaObject()->findProperty( name, true ); + const TQMetaProperty* p = w->metaObject()->property( id, true ); if ( !p || !p->isValid() ) return MetaDataBase::fakeProperty( w, name ); return w->property( name ); @@ -1541,7 +1541,7 @@ void QDesignerLabel::updateBuddy() if ( myBuddy.isEmpty() ) return; - TQObjectList *l = topLevelWidget()->queryList( "TQWidget", myBuddy, FALSE, TRUE ); + TQObjectList *l = topLevelWidget()->queryList( "TQWidget", myBuddy, false, true ); if ( !l || !l->first() ) { delete l; return; diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h index b120313b..cddc84d3 100644 --- a/kdevdesigner/designer/widgetfactory.h +++ b/kdevdesigner/designer/widgetfactory.h @@ -76,7 +76,7 @@ public: NoLayout }; - static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE, + static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = true, const TQRect *rect = 0, Orientation orient = TQt::Horizontal ); static TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type ); static void deleteLayout( TQWidget *widget ); @@ -204,7 +204,7 @@ class QDesignerWizard : public TQWizard public: QDesignerWizard( TQWidget *parent, const char *name ) - : TQWizard( parent, name ), modal(FALSE) {} + : TQWizard( parent, name ), modal(false) {} int currentPageNum() const; void setCurrentPage( int i ); @@ -377,7 +377,7 @@ class QDesignerDialog : public TQDialog public: QDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name ) - : TQDialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {} + : TQDialog( parent, name, false, WResizeNoErase ), formwindow( fw ), modal(false) {} bool isModal() const { return modal; } void setModal(bool b) { modal = b; } diff --git a/kdevdesigner/designer/wizardeditor.ui b/kdevdesigner/designer/wizardeditor.ui index 84302d09..8885a825 100644 --- a/kdevdesigner/designer/wizardeditor.ui +++ b/kdevdesigner/designer/wizardeditor.ui @@ -319,7 +319,7 @@ <slot>cancelClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">addClicked()</slot> @@ -332,7 +332,7 @@ <slot access="protected">okClicked()</slot> <slot access="protected">removeClicked()</slot> <slot access="protected">upClicked()</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp index c4c4f83d..2de28547 100644 --- a/kdevdesigner/designer/wizardeditorimpl.cpp +++ b/kdevdesigner/designer/wizardeditorimpl.cpp @@ -41,19 +41,19 @@ WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); fillListBox(); // Add drag and drop ListBoxDnd *listBoxDnd = new ListBoxDnd( listBox ); listBoxDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( listBoxDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), - listBoxDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + listBoxDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); - TQObject::connect( listBoxDnd, TQT_SIGNAL( dragged( TQListBoxItem * ) ), - this, TQT_SLOT( itemDragged( TQListBoxItem * ) ) ); - TQObject::connect( listBoxDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), - this, TQT_SLOT( itemDropped( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dragged( TQListBoxItem * ) ), + this, TQ_SLOT( itemDragged( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + this, TQ_SLOT( itemDropped( TQListBoxItem * ) ) ); // Add in-place rename new ListBoxRename( listBox ); @@ -61,7 +61,7 @@ WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) WizardEditor::~WizardEditor() { - commands.setAutoDelete( TRUE ); + commands.setAutoDelete( true ); } void WizardEditor::okClicked() @@ -93,20 +93,20 @@ void WizardEditor::applyClicked() TQWidget * page = wizard->page( i ); if ( i == 0 ) { // first page - wizard->setBackEnabled( page, FALSE ); - wizard->setNextEnabled( page, TRUE ); + wizard->setBackEnabled( page, false ); + wizard->setNextEnabled( page, true ); } else if ( i == wizard->pageCount() - 1 ) { // last page - wizard->setBackEnabled( page, TRUE ); - wizard->setNextEnabled( page, FALSE ); + wizard->setBackEnabled( page, true ); + wizard->setNextEnabled( page, false ); } else { - wizard->setBackEnabled( page, TRUE ); - wizard->setNextEnabled( page, TRUE ); + wizard->setBackEnabled( page, true ); + wizard->setNextEnabled( page, true ); } - wizard->setFinishEnabled( page, FALSE ); + wizard->setFinishEnabled( page, false ); } // update listbox @@ -131,7 +131,7 @@ void WizardEditor::addClicked() // schedule add command AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wizard->name() ), - formwindow, wizard, "Page", index, FALSE); + formwindow, wizard, "Page", index, false); commands.append( cmd ); // update buttons @@ -150,7 +150,7 @@ void WizardEditor::removeClicked() // schedule remove command DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ) .arg( listBox->text( index ) ).arg( wizard->name() ), - formwindow, wizard, index, FALSE ); + formwindow, wizard, index, false ); commands.append( cmd ); // update buttons @@ -231,7 +231,7 @@ void WizardEditor::updateButtons() buttonRemove->setEnabled( index >= 0 ); if ( listBox->count() < 2 ) - buttonRemove->setEnabled( FALSE ); + buttonRemove->setEnabled( false ); } void WizardEditor::itemDragged( TQListBoxItem * i ) diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp index 17bc3153..df14b51e 100644 --- a/kdevdesigner/designer/workspace.cpp +++ b/kdevdesigner/designer/workspace.cpp @@ -60,7 +60,7 @@ WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p ) project = p; t = ProjectType; setPixmap( 0, SmallIcon( "designer_folder.png" , KDevDesignerPartFactory::instance()) ); - setExpandable( FALSE ); + setExpandable( false ); } WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf ) @@ -80,8 +80,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ) project = p; t = ObjectType; setPixmap( 0, SmallIcon( "designer_object.png" , KDevDesignerPartFactory::instance()) ); - TQObject::connect( p->fakeFormFileFor( o ), TQT_SIGNAL( somethingChanged(FormFile*) ), - listView(), TQT_SLOT( update() ) ); + TQObject::connect( p->fakeFormFileFor( o ), TQ_SIGNAL( somethingChanged(FormFile*) ), + listView(), TQ_SLOT( update() ) ); } WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) @@ -92,7 +92,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()) ); - TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); if ( formFile->supportsCodeFile() ) { (void) new WorkspaceItem( this, formFile, FormSourceType ); } @@ -104,8 +104,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) void WorkspaceItem::init() { - autoOpen = FALSE; - useOddColor = FALSE; + autoOpen = false; + useOddColor = false; project = 0; sourceFile = 0; formFile = 0; @@ -130,7 +130,7 @@ void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, if ( isModified() ) { TQFont f = p->font(); - f.setBold( TRUE ); + f.setBold( true ); p->setFont( f ); } @@ -215,7 +215,7 @@ bool WorkspaceItem::checkCompletion( const TQString& completion ) case ObjectType: return completion == object->name(); } - return FALSE; + return false; } @@ -234,7 +234,7 @@ bool WorkspaceItem::isModified() const return project->fakeFormFileFor( object )->isModified(); break; } - return FALSE; // shut up compiler + return false; // shut up compiler } TQString WorkspaceItem::key( int column, bool ) const @@ -261,7 +261,7 @@ TQColor WorkspaceItem::backgroundColor() void WorkspaceItem::setOpen( bool b ) { TQListViewItem::setOpen( b ); - autoOpen = FALSE; + autoOpen = false; } void WorkspaceItem::setAutoOpen( bool b ) @@ -273,14 +273,14 @@ void WorkspaceItem::setAutoOpen( bool b ) Workspace::Workspace( TQWidget *parent, MainWindow *mw ) : TQListView( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_Tool | WStyle_MinMax | WStyle_SysMenu ), mainWindow( mw ), - project( 0 ), completionDirty( FALSE ) + project( 0 ), completionDirty( false ) { init_colors(); setDefaultRenameAction( Accept ); - blockNewForms = FALSE; + blockNewForms = false; bufferEdit = 0; - header()->setStretchEnabled( TRUE ); + header()->setStretchEnabled( true ); header()->hide(); setSorting( 0 ); setResizePolicy( TQScrollView::Manual ); @@ -291,17 +291,17 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw ) setPalette( p ); #endif addColumn( i18n( "Files" ) ); - setAllColumnsShowFocus( TRUE ); - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), + setAllColumnsShowFocus( true ); + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); - viewport()->setAcceptDrops( TRUE ); - setAcceptDrops( TRUE ); + viewport()->setAcceptDrops( true ); + setAcceptDrops( true ); setColumnWidthMode( 1, Manual ); } @@ -319,23 +319,23 @@ void Workspace::setCurrentProject( Project *pro ) if ( project == pro ) return; if ( project ) { - disconnect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( objectAdded(TQObject*) ), this, TQT_SLOT( objectAdded(TQObject*) ) ); - disconnect( project, TQT_SIGNAL( objectRemoved(TQObject*) ), this, TQT_SLOT( objectRemoved(TQObject*) ) ); - disconnect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + disconnect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( objectAdded(TQObject*) ), this, TQ_SLOT( objectAdded(TQObject*) ) ); + disconnect( project, TQ_SIGNAL( objectRemoved(TQObject*) ), this, TQ_SLOT( objectRemoved(TQObject*) ) ); + disconnect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); } project = pro; - connect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - connect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - connect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - connect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - connect( project, TQT_SIGNAL( destroyed(TQObject*) ), this, TQT_SLOT( projectDestroyed(TQObject*) ) ); - connect( project, TQT_SIGNAL( objectAdded(TQObject*) ), this, TQT_SLOT( objectAdded(TQObject*) ) ); - connect( project, TQT_SIGNAL( objectRemoved(TQObject*) ), this, TQT_SLOT( objectRemoved(TQObject*) ) ); - connect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + connect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + connect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + connect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + connect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + connect( project, TQ_SIGNAL( destroyed(TQObject*) ), this, TQ_SLOT( projectDestroyed(TQObject*) ) ); + connect( project, TQ_SIGNAL( objectAdded(TQObject*) ), this, TQ_SLOT( objectAdded(TQObject*) ) ); + connect( project, TQ_SIGNAL( objectRemoved(TQObject*) ), this, TQ_SLOT( objectRemoved(TQObject*) ) ); + connect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); clear(); if ( bufferEdit ) @@ -343,7 +343,7 @@ void Workspace::setCurrentProject( Project *pro ) projectItem = new WorkspaceItem( this, project ); - projectItem->setOpen( TRUE ); + projectItem->setOpen( true ); for ( TQPtrListIterator<SourceFile> sources = project->sourceFiles(); sources.current(); ++sources ) { @@ -368,7 +368,7 @@ void Workspace::setCurrentProject( Project *pro ) } updateColors(); - completionDirty = TRUE; + completionDirty = true; } void Workspace::sourceFileAdded( SourceFile* sf ) @@ -411,7 +411,7 @@ void Workspace::objectRemoved( TQObject *o ) void Workspace::update() { - completionDirty = TRUE; + completionDirty = true; triggerUpdate(); } @@ -431,9 +431,9 @@ void Workspace::activeFormChanged( FormWindow *fw ) WorkspaceItem *i = findItem( fw->formFile() ); if ( i ) { setCurrentItem( i ); - setSelected( i, TRUE ); + setSelected( i, true ); if ( !i->isOpen() ) - i->setAutoOpen( TRUE ); + i->setAutoOpen( true ); } closeAutoOpenItems(); @@ -449,15 +449,15 @@ void Workspace::activeEditorChanged( SourceEditor *se ) WorkspaceItem *i = findItem( se->formWindow()->formFile() ); if ( i && i->firstChild() ) { if ( !i->isOpen() ) - i->setAutoOpen( TRUE ); + i->setAutoOpen( true ); setCurrentItem( i->firstChild() ); - setSelected( i->firstChild(), TRUE ); + setSelected( i->firstChild(), true ); } } else { WorkspaceItem *i = findItem( se->sourceFile() ); if ( i ) { setCurrentItem( i ); - setSelected( i, TRUE ); + setSelected( i, true ); } } @@ -503,7 +503,7 @@ void Workspace::closeAutoOpenItems() if ( i->type() == WorkspaceItem::FormSourceType ) { if ( !i->isSelected() && !ip->isSelected() && ip->isAutoOpen() ) { - ip->setAutoOpen( FALSE ); + ip->setAutoOpen( false ); } } } @@ -518,7 +518,7 @@ void Workspace::closeEvent( TQCloseEvent *e ) void Workspace::itemDoubleClicked( TQListViewItem *i ) { if ( ( (WorkspaceItem*)i)->type()== WorkspaceItem::ProjectType ) - i->setOpen( TRUE ); + i->setOpen( true ); } void Workspace::itemClicked( int button, TQListViewItem *i, const TQPoint& ) @@ -536,7 +536,7 @@ void Workspace::itemClicked( int button, TQListViewItem *i, const TQPoint& ) wi->formFile->showFormWindow(); break; case WorkspaceItem::FormSourceType: - wi->formFile->showEditor( FALSE ); + wi->formFile->showEditor( false ); break; case WorkspaceItem::SourceFileType: mainWindow->editSource( wi->sourceFile ); @@ -592,7 +592,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) enum { OPEN_SOURCE, REMOVE_SOURCE, OPEN_FORM, REMOVE_FORM, OPEN_FORM_SOURCE, REMOVE_FORM_SOURCE, OPEN_OBJECT_SOURCE }; TQPopupMenu menu( this ); - menu.setCheckable( TRUE ); + menu.setCheckable( true ); switch ( wi->type() ) { case WorkspaceItem::SourceFileType: menu.insertItem( i18n( "&Open Source File" ), OPEN_SOURCE ); @@ -632,7 +632,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) project->removeFormFile( wi->formFile ); break; case REMOVE_FORM_SOURCE: - ( (WorkspaceItem*)i )->formFile->setModified( TRUE ); + ( (WorkspaceItem*)i )->formFile->setModified( true ); ( (WorkspaceItem*)i )->formFile->setCodeFileState( FormFile::Deleted ); delete ( (WorkspaceItem*)i )->formFile->editor(); break; @@ -656,8 +656,8 @@ bool Workspace::eventFilter( TQObject *o, TQEvent * e ) void Workspace::setBufferEdit( QCompletionEdit *edit ) { bufferEdit = edit; - connect( bufferEdit, TQT_SIGNAL( chosen( const TQString & ) ), - this, TQT_SLOT( bufferChosen( const TQString & ) ) ); + connect( bufferEdit, TQ_SIGNAL( chosen( const TQString & ) ), + this, TQ_SLOT( bufferChosen( const TQString & ) ) ); bufferEdit->installEventFilter( this ); } @@ -665,7 +665,7 @@ void Workspace::updateBufferEdit() { if ( !bufferEdit || !completionDirty || !MainWindow::self) return; - completionDirty = FALSE; + completionDirty = false; TQStringList completion = MainWindow::self->projectFileNames(); TQListViewItemIterator it( this ); while ( it.current() ) { @@ -701,7 +701,7 @@ void Workspace::updateColors() TQListViewItem* i = firstChild(); if ( i ) i = i->firstChild(); - bool b = TRUE; + bool b = true; while ( i ) { WorkspaceItem* wi = ( WorkspaceItem*) i; i = i->nextSibling(); diff --git a/kdevdesigner/interfaces/actioninterface.h b/kdevdesigner/interfaces/actioninterface.h index cf217ee7..e12d74dd 100644 --- a/kdevdesigner/interfaces/actioninterface.h +++ b/kdevdesigner/interfaces/actioninterface.h @@ -27,7 +27,7 @@ #ifndef ACTIONINTERFACE_H #define ACTIONINTERFACE_H -#include <tqcom_p.h> +#include <private/tqcom_p.h> class TQAction; class TQObject; diff --git a/kdevdesigner/interfaces/classbrowserinterface.h b/kdevdesigner/interfaces/classbrowserinterface.h index 99dc4911..55ccde55 100644 --- a/kdevdesigner/interfaces/classbrowserinterface.h +++ b/kdevdesigner/interfaces/classbrowserinterface.h @@ -40,7 +40,7 @@ // // -#include <tqcom_p.h> +#include <private/tqcom_p.h> #include <tqobject.h> class TQListView; diff --git a/kdevdesigner/interfaces/designerinterface.h b/kdevdesigner/interfaces/designerinterface.h index d5aeebf6..cdffbcdf 100644 --- a/kdevdesigner/interfaces/designerinterface.h +++ b/kdevdesigner/interfaces/designerinterface.h @@ -40,7 +40,7 @@ // // -#include <tqcom_p.h> +#include <private/tqcom_p.h> #include <tqptrlist.h> #include <tqstring.h> #include <tqmap.h> @@ -158,7 +158,7 @@ struct DesignerDatabase virtual void setTables( const TQStringList & ) = 0; virtual TQMap<TQString, TQStringList> fields() const = 0; virtual void setFields( const TQMap<TQString, TQStringList> & ) = 0; - virtual void open( bool suppressDialog = FALSE ) const = 0; + virtual void open( bool suppressDialog = false ) const = 0; virtual void close() const = 0; virtual TQSqlDatabase* connection() = 0; @@ -209,7 +209,7 @@ struct DesignerFormWindow virtual void setCurrentWidget( TQWidget * ) = 0; virtual TQPtrList<TQAction> actionList() const = 0; virtual TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, - TQObject* parent, const char* name = 0, bool toggle = FALSE ) = 0; + TQObject* parent, const char* name = 0, bool toggle = false ) = 0; virtual void addAction( TQAction * ) = 0; virtual void removeAction( TQAction * ) = 0; virtual void preview() const = 0; diff --git a/kdevdesigner/interfaces/editorinterface.h b/kdevdesigner/interfaces/editorinterface.h index 29055324..982b34b9 100644 --- a/kdevdesigner/interfaces/editorinterface.h +++ b/kdevdesigner/interfaces/editorinterface.h @@ -40,7 +40,7 @@ // // -#include <tqcom_p.h> +#include <private/tqcom_p.h> #include <tqmap.h> #include <tqvaluelist.h> diff --git a/kdevdesigner/interfaces/filterinterface.h b/kdevdesigner/interfaces/filterinterface.h index 6af54bcb..abca17b4 100644 --- a/kdevdesigner/interfaces/filterinterface.h +++ b/kdevdesigner/interfaces/filterinterface.h @@ -27,7 +27,7 @@ #ifndef FILTERINTERFACE_H #define FILTERINTERFACE_H -#include <tqcom_p.h> +#include <private/tqcom_p.h> // {ea8cb381-59b5-44a8-bae5-9bea8295762a} #ifndef IID_ImportFilter diff --git a/kdevdesigner/interfaces/interpreterinterface.h b/kdevdesigner/interfaces/interpreterinterface.h index 45ba9e12..fd6a86d3 100644 --- a/kdevdesigner/interfaces/interpreterinterface.h +++ b/kdevdesigner/interfaces/interpreterinterface.h @@ -40,7 +40,7 @@ // // -#include <tqcom_p.h> +#include <private/tqcom_p.h> class TQObject; diff --git a/kdevdesigner/interfaces/languageinterface.h b/kdevdesigner/interfaces/languageinterface.h index 9d1f7e3d..31e9f013 100644 --- a/kdevdesigner/interfaces/languageinterface.h +++ b/kdevdesigner/interfaces/languageinterface.h @@ -40,7 +40,7 @@ // // -#include <tqcom_p.h> +#include <private/tqcom_p.h> #include <tqvaluelist.h> #include <tqstringlist.h> #include <tqmap.h> diff --git a/kdevdesigner/interfaces/preferenceinterface.h b/kdevdesigner/interfaces/preferenceinterface.h index 5b356c4b..ba972933 100644 --- a/kdevdesigner/interfaces/preferenceinterface.h +++ b/kdevdesigner/interfaces/preferenceinterface.h @@ -40,7 +40,7 @@ // // -#include <tqcom_p.h> +#include <private/tqcom_p.h> #include <tqwidgetlist.h> #include <tqcstring.h> diff --git a/kdevdesigner/interfaces/projectsettingsiface.h b/kdevdesigner/interfaces/projectsettingsiface.h index e47f8ae7..d8d39097 100644 --- a/kdevdesigner/interfaces/projectsettingsiface.h +++ b/kdevdesigner/interfaces/projectsettingsiface.h @@ -40,7 +40,7 @@ // // -#include <tqcom_p.h> +#include <private/tqcom_p.h> #include <tqwidgetlist.h> #include <tqcstring.h> diff --git a/kdevdesigner/interfaces/sourcetemplateiface.h b/kdevdesigner/interfaces/sourcetemplateiface.h index 8d914625..cc54f274 100644 --- a/kdevdesigner/interfaces/sourcetemplateiface.h +++ b/kdevdesigner/interfaces/sourcetemplateiface.h @@ -40,7 +40,7 @@ // // -#include <tqcom_p.h> +#include <private/tqcom_p.h> #include <tqstring.h> // {1b3446a4-1c71-424b-8789-1f34eb5697d8} diff --git a/kdevdesigner/interfaces/templatewizardiface.h b/kdevdesigner/interfaces/templatewizardiface.h index be1c57f1..561b5264 100644 --- a/kdevdesigner/interfaces/templatewizardiface.h +++ b/kdevdesigner/interfaces/templatewizardiface.h @@ -40,7 +40,7 @@ // // -#include <tqcom_p.h> +#include <private/tqcom_p.h> class TQWidget; struct DesignerFormWindow; diff --git a/kdevdesigner/interfaces/widgetinterface.h b/kdevdesigner/interfaces/widgetinterface.h index 6f8e1247..2d52829c 100644 --- a/kdevdesigner/interfaces/widgetinterface.h +++ b/kdevdesigner/interfaces/widgetinterface.h @@ -27,7 +27,7 @@ #ifndef WIDGETINTERFACE_H #define WIDGETINTERFACE_H -#include <tqwidgetinterface_p.h> +#include <private/tqwidgetinterface_p.h> #define WidgetInterface TQWidgetFactoryInterface #define IID_Widget IID_QWidgetFactory diff --git a/kdevdesigner/plugins/languageinterfaceimpl.cpp b/kdevdesigner/plugins/languageinterfaceimpl.cpp index 99fa5f2f..f7e996b5 100644 --- a/kdevdesigner/plugins/languageinterfaceimpl.cpp +++ b/kdevdesigner/plugins/languageinterfaceimpl.cpp @@ -163,10 +163,10 @@ TQString LanguageInterfaceImpl::createEmptyFunction() bool LanguageInterfaceImpl::supports( Support s ) const { if ( s == ReturnType ) - return TRUE; + return true; if ( s == ConnectionsToCustomSlots ) - return TRUE; - return FALSE; + return true; + return false; } TQStringList LanguageInterfaceImpl::fileFilterList() const @@ -231,7 +231,7 @@ void LanguageInterfaceImpl::preferedExtensions( TQMap<TQString, TQString> &exten TQStrList LanguageInterfaceImpl::signalNames( TQObject *obj ) const { TQStrList sigs; - sigs = obj->metaObject()->signalNames( TRUE ); + sigs = obj->metaObject()->signalNames( true ); sigs.remove( "destroyed()" ); return sigs; } diff --git a/kdevdesigner/shared/domtool.cpp b/kdevdesigner/shared/domtool.cpp index ec79ffad..828d9d70 100644 --- a/kdevdesigner/shared/domtool.cpp +++ b/kdevdesigner/shared/domtool.cpp @@ -86,10 +86,10 @@ bool DomTool::hasProperty( const TQDomElement& e, const TQString& name ) if ( n.tagName() == "property" ) { if ( n.attribute( "name" ) != name ) continue; - return TRUE; + return true; } } - return FALSE; + return false; } TQStringList DomTool::propertiesOfType( const TQDomElement& e, const TQString& type ) @@ -186,7 +186,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def } else if ( e.tagName() == "cstring" ) { v = TQVariant( TQCString( e.firstChild().toText().data().ascii() ) ); } else if ( e.tagName() == "number" ) { - bool ok = TRUE; + bool ok = true; v = TQVariant( e.firstChild().toText().data().toInt( &ok ) ); if ( !ok ) v = TQVariant( e.firstChild().toText().data().toDouble() ); @@ -340,10 +340,10 @@ bool DomTool::hasAttribute( const TQDomElement& e, const TQString& name ) if ( n.tagName() == "attribute" ) { if ( n.attribute( "name" ) != name ) continue; - return TRUE; + return true; } } - return FALSE; + return false; } static bool toBool( const TQString& s ) diff --git a/kdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp index e2b8665f..94a6bcb4 100644 --- a/kdevdesigner/shared/ui2uib.cpp +++ b/kdevdesigner/shared/ui2uib.cpp @@ -176,7 +176,7 @@ private: void UibIndexMap::setName( int no, const TQString& name ) { if ( !name.isEmpty() ) { - if ( *nameMap.insert(name, no, FALSE) != no ) + if ( *nameMap.insert(name, no, false) != no ) conflicts.insert( name, 0 ); } } diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp index 13e93eb1..8541b21e 100644 --- a/kdevdesigner/shared/widgetdatabase.cpp +++ b/kdevdesigner/shared/widgetdatabase.cpp @@ -55,21 +55,21 @@ static int dbcount = 0; static int dbcustomcount = 200; static TQStrList *wGroups; static TQStrList *invisibleGroups; -static bool whatsThisLoaded = FALSE; +static bool whatsThisLoaded = false; static TQPluginManager<WidgetInterface> *widgetPluginManager = 0; -static bool plugins_set_up = FALSE; -static bool was_in_setup = FALSE; +static bool plugins_set_up = false; +static bool was_in_setup = false; TQCleanupHandler<TQPluginManager<WidgetInterface> > cleanup_manager; WidgetDatabaseRecord::WidgetDatabaseRecord() { - isForm = FALSE; - isContainer = FALSE; + isForm = false; + isContainer = false; icon = 0; nameCounter = 0; - isCommon = FALSE; - isPlugin = FALSE; + isCommon = false; + isPlugin = false; } WidgetDatabaseRecord::~WidgetDatabaseRecord() @@ -108,7 +108,7 @@ WidgetDatabase::WidgetDatabase() void WidgetDatabase::setupDataBase( int id ) { - was_in_setup = TRUE; + was_in_setup = true; #ifndef UIC Q_UNUSED( id ) if ( dbcount ) @@ -129,7 +129,7 @@ void WidgetDatabase::setupDataBase( int id ) invisibleGroups->append( "Forms" ); invisibleGroups->append( "Temp" ); className2Id = new TQDict<int>( dbdictsize ); - className2Id->setAutoDelete( TRUE ); + className2Id->setAutoDelete( true ); WidgetDatabaseRecord *r = 0; @@ -138,7 +138,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQPushButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Push Button"; - r->isCommon = TRUE; + r->isCommon = true; append( r ); @@ -155,7 +155,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQRadioButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Radio Button"; - r->isCommon = TRUE; + r->isCommon = true; append( r ); @@ -164,7 +164,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQCheckBox"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Check Box"; - r->isCommon = TRUE; + r->isCommon = true; append( r ); @@ -173,7 +173,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQGroupBox"; r->group = widgetGroup( "Containers" ); r->toolTip = "Group Box"; - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -182,8 +182,8 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQButtonGroup"; r->group = widgetGroup( "Containers" ); r->toolTip = "Button Group"; - r->isContainer = TRUE; - r->isCommon = TRUE; + r->isContainer = true; + r->isCommon = true; append( r ); @@ -192,7 +192,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQFrame"; r->group = widgetGroup( "Containers" ); r->toolTip = "Frame"; - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -201,7 +201,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQTabWidget"; r->group = widgetGroup( "Containers" ); r->toolTip = "Tabwidget"; - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -210,7 +210,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQWidgetStack"; r->group = widgetGroup( "Containers" ); r->toolTip = "Widget Stack"; - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -219,7 +219,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQToolBox"; r->group = widgetGroup( "Containers" ); r->toolTip = "Tool Box"; - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -228,7 +228,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQListBox"; r->group = widgetGroup( "Views" ); r->toolTip = "List Box"; - r->isCommon = TRUE; + r->isCommon = true; append( r ); @@ -276,7 +276,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQLineEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Line Edit"; - r->isCommon = TRUE; + r->isCommon = true; append( r ); @@ -285,7 +285,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQSpinBox"; r->group = widgetGroup( "Input" ); r->toolTip = "Spin Box"; - r->isCommon = TRUE; + r->isCommon = true; append( r ); @@ -329,7 +329,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQTextEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Rich Text Edit"; - r->isCommon = TRUE; + r->isCommon = true; append( r ); @@ -338,7 +338,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQComboBox"; r->group = widgetGroup( "Input" ); r->toolTip = "Combo Box"; - r->isCommon = TRUE; + r->isCommon = true; append( r ); @@ -380,7 +380,7 @@ void WidgetDatabase::setupDataBase( int id ) r->group = widgetGroup( "Display" ); r->toolTip = "Text Label"; r->whatsThis = "The Text Label provides a widget to display static text."; - r->isCommon = TRUE; + r->isCommon = true; append( r ); @@ -446,7 +446,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->name = "TQWidget"; - r->isForm = TRUE; + r->isForm = true; r->group = widgetGroup( "Forms" ); append( r ); @@ -454,21 +454,21 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->name = "TQDialog"; r->group = widgetGroup( "Forms" ); - r->isForm = TRUE; + r->isForm = true; append( r ); r = new WidgetDatabaseRecord; r->name = "TQWizard"; r->group = widgetGroup( "Forms" ); - r->isContainer = TRUE; + r->isContainer = true; append( r ); r = new WidgetDatabaseRecord; r->name = "TQDesignerWizard"; r->group = widgetGroup( "Forms" ); - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -476,7 +476,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQLayoutWidget"; r->group = widgetGroup( "Temp" ); r->includeFile = ""; - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -484,7 +484,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQSplitter"; r->group = widgetGroup( "Temp" ); r->includeFile = "tqsplitter.h"; - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -492,7 +492,7 @@ void WidgetDatabase::setupDataBase( int id ) r->iconSet = "designer_tabwidget.png"; r->name = "TQDesignerTabWidget"; r->group = widgetGroup( "Temp" ); - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -500,7 +500,7 @@ void WidgetDatabase::setupDataBase( int id ) r->iconSet = "designer_tabwidget.png"; r->name = "TQDesignerWidget"; r->group = widgetGroup( "Temp" ); - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -508,7 +508,7 @@ void WidgetDatabase::setupDataBase( int id ) r->iconSet = "designer_tabwidget.png"; r->name = "TQDesignerDialog"; r->group = widgetGroup( "Temp" ); - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -517,7 +517,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQMainWindow"; r->includeFile = "tqmainwindow.h"; r->group = widgetGroup( "Temp" ); - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -526,7 +526,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQDesignerAction"; r->includeFile = "tqaction.h"; r->group = widgetGroup( "Temp" ); - r->isContainer = FALSE; + r->isContainer = false; append( r ); @@ -535,7 +535,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQDesignerActionGroup"; r->includeFile = "tqaction.h"; r->group = widgetGroup( "Temp" ); - r->isContainer = FALSE; + r->isContainer = false; append( r ); @@ -544,7 +544,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "TQScrollView"; r->includeFile = "tqscrollview.h"; r->group = widgetGroup( "Temp" ); - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -556,7 +556,7 @@ void WidgetDatabase::setupDataBase( int id ) r->group = widgetGroup( "Database" ); r->toolTip = "Data Browser"; r->iconSet = "designer_databrowser.png"; - r->isContainer = TRUE; + r->isContainer = true; append( r ); @@ -567,7 +567,7 @@ void WidgetDatabase::setupDataBase( int id ) r->group = widgetGroup( "Database" ); r->toolTip = "Data View"; r->iconSet = "designer_dataview.png"; - r->isContainer = TRUE; + r->isContainer = true; append( r ); #endif @@ -581,7 +581,7 @@ void WidgetDatabase::setupPlugins() { if ( plugins_set_up ) return; - plugins_set_up = TRUE; + plugins_set_up = true; TQStringList widgets = widgetManager()->featureList(); for ( TQStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) { if ( hasWidget( *it ) ) @@ -606,7 +606,7 @@ void WidgetDatabase::setupPlugins() r->includeFile = iface->includeFile( *it ); r->isContainer = iface->isContainer( *it ); r->name = *it; - r->isPlugin = TRUE; + r->isPlugin = true; append( r ); iface->release(); } @@ -731,7 +731,7 @@ bool WidgetDatabase::isForm( int id ) setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return FALSE; + return false; return r->isForm; } @@ -743,7 +743,7 @@ bool WidgetDatabase::isContainer( int id ) setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return FALSE; + return false; return r->isContainer || r->isForm; } @@ -752,7 +752,7 @@ bool WidgetDatabase::isCommon( int id ) setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return FALSE; + return false; return r->isCommon; } @@ -844,9 +844,9 @@ bool WidgetDatabase::isGroupEmpty( const TQString &grp ) if ( !( r = db[ i ] ) ) continue; if ( r->group == grp ) - return FALSE; + return false; } - return TRUE; + return true; } TQString WidgetDatabase::widgetGroup( int i ) @@ -890,8 +890,8 @@ void WidgetDatabase::customWidgetClassNameChanged( const TQString &oldName, bool WidgetDatabase::isCustomWidget( int id ) { if ( id >= dbcustom && id < dbcustomcount ) - return TRUE; - return FALSE; + return true; + return false; } bool WidgetDatabase::isCustomPluginWidget( int id ) @@ -899,7 +899,7 @@ bool WidgetDatabase::isCustomPluginWidget( int id ) setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return FALSE; + return false; return r->isPlugin; } @@ -923,13 +923,13 @@ void WidgetDatabase::loadWhatsThis( const TQString &docPath ) if ( r ) r->whatsThis = l[ 0 ]; } - whatsThisLoaded = TRUE; + whatsThisLoaded = true; } // ### TQt 3.1: make these publically accessible via TQWidgetDatabase API #if defined(UIC) -bool dbnounload = FALSE; +bool dbnounload = false; TQStringList *dbpaths = 0; #else extern TQString *qwf_plugin_dir; @@ -948,7 +948,7 @@ TQPluginManager<WidgetInterface> *widgetManager() cleanup_manager.add( &widgetPluginManager ); #if defined(UIC) if ( dbnounload ) - widgetPluginManager->setAutoUnload( FALSE ); + widgetPluginManager->setAutoUnload( false ); if ( dbpaths ) { TQStringList::ConstIterator it = dbpaths->begin(); for ( ; it != dbpaths->end(); ++it ) diff --git a/kdevdesigner/shared/widgetdatabase.h b/kdevdesigner/shared/widgetdatabase.h index 5395f2ef..e64e4fae 100644 --- a/kdevdesigner/shared/widgetdatabase.h +++ b/kdevdesigner/shared/widgetdatabase.h @@ -30,7 +30,7 @@ #include <tqiconset.h> #include <tqstring.h> #include "../interfaces/widgetinterface.h" // up here for GCC 2.7.* compatibility -#include <tqpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> extern TQPluginManager<WidgetInterface> *widgetManager(); diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp index f846e99b..d76d487b 100644 --- a/kdevdesigner/src/kdevdesigner.cpp +++ b/kdevdesigner/src/kdevdesigner.cpp @@ -59,7 +59,7 @@ KDevDesigner::KDevDesigner() // our hands on it TQStringList args; args.append("in shell"); - m_part = static_cast<KParts::ReadWritePart *>(factory->create(TQT_TQOBJECT(this), + m_part = static_cast<KParts::ReadWritePart *>(factory->create(this, "kdevdesigner_part", "KParts::ReadWritePart", args)); if (m_part) @@ -76,8 +76,8 @@ KDevDesigner::KDevDesigner() // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, i18n("Could not find the KDevDesigner part.")); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -99,16 +99,16 @@ void KDevDesigner::load(const KURL& url) void KDevDesigner::setupActions() { -/* KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());*/ +/* KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());*/ - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void KDevDesigner::saveProperties(TDEConfig* /*config*/) @@ -174,8 +174,8 @@ void KDevDesigner::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -192,7 +192,7 @@ void KDevDesigner::fileOpen() KURL url = KFileDialog::getOpenURL( TQString(), TQString(), this ); - if (url.isEmpty() == false) + if (!url.isEmpty()) { // About this function, the style guide ( // http://developer.kde.org/documentation/standards/kde/style/basics/index.html ) diff --git a/kdevdesigner/src/main.cpp b/kdevdesigner/src/main.cpp index f70b9285..34c47adb 100644 --- a/kdevdesigner/src/main.cpp +++ b/kdevdesigner/src/main.cpp @@ -25,7 +25,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> static const char description[] = I18N_NOOP("TDE GUI Designer"); diff --git a/kdevdesigner/uilib/database.cpp b/kdevdesigner/uilib/database.cpp index 4e1c8d57..325451d5 100644 --- a/kdevdesigner/uilib/database.cpp +++ b/kdevdesigner/uilib/database.cpp @@ -82,13 +82,13 @@ bool TQDesignerDataBrowser::event( TQEvent* e ) #endif if ( e->type() == TQEvent::Show ) { if ( con ) { - TQSqlCursor* cursor = new TQSqlCursor( tbl, TRUE, con ); - setSqlCursor( cursor, TRUE ); + TQSqlCursor* cursor = new TQSqlCursor( tbl, true, con ); + setSqlCursor( cursor, true ); setForm( frm ); refresh(); first(); } - return TRUE; + return true; } #if defined(DESIGNER) } @@ -110,7 +110,7 @@ bool TQDesignerDataView::event( TQEvent* e ) if ( e->type() == TQEvent::Show ) { setForm( frm ); readFields(); - return TRUE; + return true; } #if defined(DESIGNER) } diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp index a79687a8..be26d088 100644 --- a/kdevdesigner/uilib/qwidgetfactory.cpp +++ b/kdevdesigner/uilib/qwidgetfactory.cpp @@ -41,7 +41,7 @@ #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqobjectlist.h> -#include <tqpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include <tqmime.h> #include <tqdragobject.h> @@ -115,8 +115,8 @@ static TQStringList *availableWidgetList = 0; TQMap<TQWidget*, TQString> *qwf_forms = 0; TQString *qwf_language = 0; -bool qwf_execute_code = TRUE; -bool qwf_stays_on_top = FALSE; +bool qwf_execute_code = true; +bool qwf_stays_on_top = false; TQString qwf_currFileName = ""; TQObject *qwf_form_object = 0; TQString *qwf_plugin_dir = 0; @@ -158,7 +158,7 @@ static void setupWidgetListAndMap() availableWidgetMap = new TQMap<TQString, bool>; for ( it = availableWidgetList->begin(); it != availableWidgetList->end(); ++it ) - availableWidgetMap->insert( *it, TRUE ); + availableWidgetMap->insert( *it, true ); } static TQImage loadImageData( const TQString& format, ulong len, TQByteArray data ) @@ -243,10 +243,10 @@ static TQSizePolicy::SizeType stringToSizeType( const TQString& str ) TQWidgetFactory::TQWidgetFactory() : d( new TQWidgetFactoryPrivate() ), dbControls( 0 ), - usePixmapCollection( FALSE ), defMargin( 11 ), defSpacing( 6 ) + usePixmapCollection( false ), defMargin( 11 ), defSpacing( 6 ) { - widgetFactories.setAutoDelete( TRUE ); - d->customWidgets.setAutoDelete( TRUE ); + widgetFactories.setAutoDelete( true ); + d->customWidgets.setAutoDelete( true ); } /*! \fn TQWidgetFactory::~TQWidgetFactory() @@ -282,9 +282,9 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, { setupPluginDir(); TQFile f( uiFile ); - bool failed = FALSE; + bool failed = false; if ( !f.open( IO_ReadOnly ) ) - failed = TRUE; + failed = true; if ( failed && tqApp->type() == TQApplication::Tty ) { // for TQSA: If we have no GUI, we have no form definition // files, but just the code. So try if only the code exists. @@ -356,10 +356,10 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge continue; if ( cit.key()->inherits( "QDesignerDataBrowser2" ) ) ( (QDesignerDataBrowser2*)cit.key() )->initPreview( (*cit).conn, (*cit).table, - TQT_TQOBJECT(cit.key()), *(*cit).dbControls ); + cit.key(), *(*cit).dbControls ); else if ( cit.key()->inherits( "QDesignerDataView2" ) ) ( (QDesignerDataView2*)cit.key() )->initPreview( (*cit).conn, (*cit).table, - TQT_TQOBJECT(cit.key()), *(*cit).dbControls ); + cit.key(), *(*cit).dbControls ); } for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin(); @@ -379,10 +379,10 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge c = new TQSqlCursor( (*it)[ 1 ] ); } else { db = TQSqlDatabase::database( conn ); - c = new TQSqlCursor( (*it)[ 1 ], TRUE, db ); + c = new TQSqlCursor( (*it)[ 1 ], true, db ); } if ( db ) { - table->setSqlCursor( c, fieldMap.isEmpty(), TRUE ); + table->setSqlCursor( c, fieldMap.isEmpty(), true ); table->refresh( TQDataTable::RefreshAll ); } } @@ -455,7 +455,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec } else if ( e.tagName() == "widget" ) { widget = e; } else if ( e.tagName() == "pixmapinproject" ) { - usePixmapCollection = TRUE; + usePixmapCollection = true; } else if ( e.tagName() == "layoutdefaults" ) { defSpacing = e.attribute( "spacing", TQString::number( defSpacing ) ).toInt(); defMargin = e.attribute( "margin", TQString::number( defMargin ) ).toInt(); @@ -658,7 +658,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, TQVariant value; TQCString comment; TQSizePolicy::SizeType sizeType = TQSizePolicy::Preferred; - bool vertical = FALSE; + bool vertical = false; int w = 0; int h = 0; TQ_UINT16 column = 0; @@ -720,8 +720,8 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, TQString text; TQPixmap pixmap; TQString field; - bool clickable = TRUE; - bool resizable = TRUE; + bool clickable = true; + bool resizable = true; TQCString name; TQVariant value; @@ -787,7 +787,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, TQListView *listView = 0; if ( parent != 0 && parent->inherits("TQListView") ) - parent = TQT_TQOBJECT((TQListView *) parent); + parent = (TQListView *) parent; TQListViewItem *item = 0; if ( listView != 0 ) { if ( parentItem == 0 ) { @@ -803,7 +803,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, switch ( objectTag ) { case Object_Item: if ( listView != 0 ) - d->lastItem->setOpen( TRUE ); + d->lastItem->setOpen( true ); inputItem( strings, in, parent, item ); break; case Object_TextProperty: @@ -946,22 +946,22 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, } else { layout = createLayout( parentWidget, parentLayout, type ); } - obj = TQT_TQOBJECT(layout); + obj = layout; } else if ( className == "TQMenuBar" ) { unpackCString( strings, in, className ); widget = ((TQMainWindow *) parent)->menuBar(); - obj = TQT_TQOBJECT(widget); + obj = widget; } else if ( className == "TQToolBar" ) { TQ_UINT8 dock; in >> dock; unpackCString( strings, in, className ); widget = new TQToolBar( TQString(), (TQMainWindow *) parent, (TQt::Dock) dock ); - obj = TQT_TQOBJECT(widget); + obj = widget; } else if ( className == "TQWidget" ) { unpackCString( strings, in, className ); widget = createWidget( className, parentWidget, 0 ); - obj = TQT_TQOBJECT(widget); + obj = widget; } if ( widget != 0 ) @@ -994,7 +994,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, metAttribute = 2; break; case Object_Column: - inputColumnOrRow( strings, in, obj, FALSE ); + inputColumnOrRow( strings, in, obj, false ); break; case Object_Event: unpackCString( strings, in, name ); @@ -1020,13 +1020,13 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, font.setPointSize( pointSize ); } if ( fontFlags & Font_Bold ) - font.setBold( TRUE ); + font.setBold( true ); if ( fontFlags & Font_Italic ) - font.setItalic( TRUE ); + font.setItalic( true ); if ( fontFlags & Font_Underline ) - font.setUnderline( TRUE ); + font.setUnderline( true ); if ( fontFlags & Font_StrikeOut ) - font.setStrikeOut( TRUE ); + font.setStrikeOut( true ); if ( obj != 0 ) setProperty( obj, name, font ); @@ -1089,7 +1089,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, } break; case Object_Row: - inputColumnOrRow( strings, in, obj, TRUE ); + inputColumnOrRow( strings, in, obj, true ); break; case Object_Spacer: inputSpacer( strings, in, layout ); @@ -1208,7 +1208,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, switch ( blockType ) { case Block_Actions: - inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(toplevel) ); + inputObject( objects, numObjects, strings, in, toplevel, toplevel ); break; case Block_Buddies: { @@ -1291,7 +1291,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, unpackCString( strings, in, d->translationContext ); if ( introFlags & Intro_Pixmapinproject ) - usePixmapCollection = TRUE; + usePixmapCollection = true; if ( defaultMargin != -32768 ) defMargin = defaultMargin; if ( defaultSpacing != -32768 ) @@ -1300,7 +1300,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, } break; case Block_Menubar: - inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(toplevel), + inputObject( objects, numObjects, strings, in, toplevel, toplevel, "TQMenuBar" ); break; case Block_Slots: @@ -1334,7 +1334,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, case Block_Toolbars: do { inputObject( objects, numObjects, strings, in, toplevel, - TQT_TQOBJECT(toplevel), "TQToolBar" ); + toplevel, "TQToolBar" ); } while ( !END_OF_BLOCK() ); break; case Block_Variables: @@ -1344,7 +1344,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, break; case Block_Widget: toplevel = (TQWidget *) - inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(parent), + inputObject( objects, numObjects, strings, in, toplevel, parent, "TQWidget" ); if ( toplevel != 0 ) toplevel->setName( name ); @@ -1447,7 +1447,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *pa } else if ( className == "TQTabWidget" ) { return new TQTabWidget( parent, name ); } else if ( className == "TQComboBox" ) { - return new TQComboBox( FALSE, parent, name ); + return new TQComboBox( false, parent, name ); } else if ( className == "TQWidget" ) { if ( !qwf_stays_on_top ) return new TQWidget( parent, name ); @@ -1455,7 +1455,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *pa } else if ( className == "TQDialog" ) { if ( !qwf_stays_on_top ) return new TQDialog( parent, name ); - return new TQDialog( parent, name, FALSE, TQt::WStyle_StaysOnTop ); + return new TQDialog( parent, name, false, TQt::WStyle_StaysOnTop ); } else if ( className == "TQWizard" ) { return new TQWizard( parent, name ); } else if ( className == "TQLCDNumber" ) { @@ -1534,7 +1534,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *pa if ( iface ) { TQWidget *w = iface->create( className, parent, name ); if ( w ) { - d->customWidgets.replace( className.latin1(), new bool(TRUE) ); + d->customWidgets.replace( className.latin1(), new bool(true) ); return w; } } @@ -1586,18 +1586,18 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget if ( colspan < 1 ) colspan = 1; - bool isTQLayoutWidget = FALSE; + bool isTQLayoutWidget = false; if ( !className.isEmpty() ) { if ( !layout && className == "TQLayoutWidget" ) { className = "TQWidget"; - isTQLayoutWidget = TRUE; + isTQLayoutWidget = true; } if ( layout && className == "TQLayoutWidget" ) { // hide layout widgets w = parent; } else { - obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, parent, 0 )); + obj = TQWidgetFactory::createWidget( className, parent, 0 ); if ( !obj ) return 0; w = (TQWidget*)obj; @@ -1627,7 +1627,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } #ifdef TQT_CONTAINER_CUSTOM_WIDGETS TQString parentClassName = parent ? parent->className() : 0; - bool isPlugin = parent ? !!d->customWidgets.find( parent->className() ) : FALSE; + bool isPlugin = parent ? d->customWidgets.find( parent->className() ) : false; if ( isPlugin ) tqWarning( "####### loading custom container widgets without page support not implemented!" ); // ### TODO loading for custom container widgets without pages @@ -1647,7 +1647,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget layout = createLayout( 0, 0, TQWidgetFactory::HBox, isTQLayoutWidget ); else layout = createLayout( w, layout, TQWidgetFactory::HBox, isTQLayoutWidget ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, @@ -1659,7 +1659,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget layout = createLayout( 0, 0, TQWidgetFactory::Grid, isTQLayoutWidget ); else layout = createLayout( w, layout, TQWidgetFactory::Grid, isTQLayoutWidget ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, @@ -1671,7 +1671,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget layout = createLayout( 0, 0, TQWidgetFactory::VBox, isTQLayoutWidget ); else layout = createLayout( w, layout, TQWidgetFactory::VBox, isTQLayoutWidget ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, @@ -1808,7 +1808,7 @@ TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *layout ) cons void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, TQVariant value ) { - int offset = obj->metaObject()->findProperty( prop.ascii(), TRUE ); + int offset = obj->metaObject()->findProperty( prop.ascii(), true ); if ( offset != -1 ) { if ( prop == "geometry" && obj == toplevel ) { @@ -1819,7 +1819,7 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, if ( value.type() == TQVariant::String || value.type() == TQVariant::CString ) { const TQMetaProperty *metaProp = - obj->metaObject()->property( offset, TRUE ); + obj->metaObject()->property( offset, true ); if ( metaProp != 0 && metaProp->isEnumType() ) { if ( metaProp->isSetType() ) { TQStrList flagsCStr; @@ -2069,11 +2069,11 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto if ( n2.tagName() == "sender" ) { TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name.ascii() ) == 0 ) { - conn.sender = TQT_TQOBJECT(toplevel); + conn.sender = toplevel; } else { if ( name == "this" ) name = toplevel->name(); - TQObjectList *l = toplevel->queryList( 0, name.ascii(), FALSE ); + TQObjectList *l = toplevel->queryList( 0, name.ascii(), false ); if ( l ) { if ( l->first() ) conn.sender = l->first(); @@ -2087,9 +2087,9 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto } else if ( n2.tagName() == "receiver" ) { TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name.ascii() ) == 0 ) { - conn.receiver = TQT_TQOBJECT(toplevel); + conn.receiver = toplevel; } else { - TQObjectList *l = toplevel->queryList( 0, name.ascii(), FALSE ); + TQObjectList *l = toplevel->queryList( 0, name.ascii(), false ); if ( l ) { if ( l->first() ) conn.receiver = l->first(); @@ -2111,9 +2111,9 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto } TQObject *sender = 0, *receiver = 0; - TQObjectList *l = toplevel->queryList( 0, conn.sender->name(), FALSE ); + TQObjectList *l = toplevel->queryList( 0, conn.sender->name(), false ); if ( qstrcmp( conn.sender->name(), toplevel->name() ) == 0 ) { - sender = TQT_TQOBJECT(toplevel); + sender = toplevel; } else { if ( !l || !l->first() ) { delete l; @@ -2127,9 +2127,9 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto sender = findAction( conn.sender->name() ); if ( qstrcmp( conn.receiver->name(), toplevel->name() ) == 0 ) { - receiver = TQT_TQOBJECT(toplevel); + receiver = toplevel; } else { - l = toplevel->queryList( 0, conn.receiver->name(), FALSE ); + l = toplevel->queryList( 0, conn.receiver->name(), false ); if ( !l || !l->first() ) { delete l; n = n.nextSibling().toElement(); @@ -2144,12 +2144,12 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto TQString s2 = "1""%1"; s2 = s2.arg( conn.slot.data() ); - TQStrList signalList = sender->metaObject()->signalNames( TRUE ); - TQStrList slotList = receiver->metaObject()->slotNames( TRUE ); + TQStrList signalList = sender->metaObject()->signalNames( true ); + TQStrList slotList = receiver->metaObject()->slotNames( true ); // if this is a connection to a custom slot and we have a connector, try this as receiver if ( slotList.find( conn.slot ) == -1 && (receiver == toplevel) && connector ) { - slotList = connector->metaObject()->slotNames( TRUE ); + slotList = connector->metaObject()->slotNames( true ); receiver = connector; } @@ -2172,7 +2172,7 @@ void TQWidgetFactory::loadTabOrder( const TQDomElement &e ) while ( !n.isNull() ) { if ( n.tagName() == "tabstop" ) { TQString name = n.firstChild().toText().data(); - TQObjectList *l = toplevel->queryList( 0, name.ascii(), FALSE ); + TQObjectList *l = toplevel->queryList( 0, name.ascii(), false ); if ( l ) { if ( l->first() ) { TQWidget *w = (TQWidget*)l->first(); @@ -2261,7 +2261,7 @@ void TQWidgetFactory::createColumn( const TQDomElement &e, TQWidget *widget ) TQDomElement n = e.firstChild().toElement(); TQPixmap pix; TQString txt; - bool clickable = TRUE, resizable = TRUE; + bool clickable = true, resizable = true; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { TQString attrib = n.attribute( "name" ); @@ -2310,7 +2310,7 @@ void TQWidgetFactory::createColumn( const TQDomElement &e, TQWidget *widget ) void TQWidgetFactory::loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap ) { TQDomElement n = e; - hasPixmap = FALSE; + hasPixmap = false; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { TQString attrib = n.attribute( "name" ); @@ -2331,7 +2331,7 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis if ( widget->inherits( "TQListBox" ) || widget->inherits( "TQComboBox" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; - bool hasPixmap = FALSE; + bool hasPixmap = false; TQString txt; loadItem( n, pix, txt, hasPixmap ); TQListBox *lb = 0; @@ -2348,7 +2348,7 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis } else if ( widget->inherits( "TQIconView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; - bool hasPixmap = FALSE; + bool hasPixmap = false; TQString txt; loadItem( n, pix, txt, hasPixmap ); @@ -2382,7 +2382,7 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis } } } else if ( n.tagName() == "item" ) { - item->setOpen( TRUE ); + item->setOpen( true ); createItem( n, widget, item ); } @@ -2403,7 +2403,7 @@ void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e ) { TQDomElement n = e; TQAction *a = 0; - bool hasMenuText = FALSE; + bool hasMenuText = false; if ( n.tagName() == "action" ) { a = new TQAction( parent ); TQDomElement n2 = n.firstChild().toElement(); @@ -2412,7 +2412,7 @@ void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e ) if ( n2.tagName() == "property" ) { TQString prop(n2.attribute("name")); if (prop == "menuText") - hasMenuText = TRUE; + hasMenuText = true; setProperty( a, prop, n2.firstChild().toElement() ); } n2 = n2.nextSibling().toElement(); @@ -2426,7 +2426,7 @@ void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e ) if ( n2.tagName() == "property" ) { TQString prop(n2.attribute("name")); if (prop == "menuText") - hasMenuText = TRUE; + hasMenuText = true; setProperty( a, prop, n2.firstChild().toElement() ); } else if ( n2.tagName() == "action" || n2.tagName() == "actiongroup" ) { @@ -2448,9 +2448,9 @@ void TQWidgetFactory::loadActions( const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { - loadChildAction( TQT_TQOBJECT(toplevel), n ); + loadChildAction( toplevel, n ); } else if ( n.tagName() == "actiongroup" ) { - loadChildAction( TQT_TQOBJECT(toplevel), n ); + loadChildAction( toplevel, n ); } n = n.nextSibling().toElement(); } @@ -2478,7 +2478,7 @@ void TQWidgetFactory::loadToolBars( const TQDomElement &e ) } else if ( n2.tagName() == "widget" ) { (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", "TQWidget" ) ); } else if ( n2.tagName() == "property" ) { - setProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() ); + setProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() ); } n2 = n2.nextSibling().toElement(); } @@ -2499,7 +2499,7 @@ void TQWidgetFactory::loadMenuBar( const TQDomElement &e ) popup->setName( n.attribute( "name" ).ascii() ); mb->insertItem( translate( n.attribute( "text" ) ), popup ); } else if ( n.tagName() == "property" ) { - setProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() ); + setProperty( mb, n.attribute( "name" ), n.firstChild().toElement() ); } else if ( n.tagName() == "separator" ) { mb->insertSeparator(); } diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h index 8f2b1427..c7045cd3 100644 --- a/kdevdesigner/uilib/qwidgetfactory.h +++ b/kdevdesigner/uilib/qwidgetfactory.h @@ -67,7 +67,7 @@ private: void loadConnections( const TQDomElement &e, TQObject *connector ); void loadTabOrder( const TQDomElement &e ); TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg ); - TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type, bool isTQLayoutWidget = FALSE ); + TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type, bool isTQLayoutWidget = false ); LayoutType layoutType( TQLayout *l ) const; void setProperty( TQObject* widget, const TQString &prop, TQVariant value ); void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e ); diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index 1ca3abfd..05927d6e 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -56,8 +56,8 @@ AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStri setInstance (AdaSupportPartFactory::instance ()); d->problemReporter = new ProblemReporter (this); -// connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)), -// d->problemReporter, TQT_SLOT (configWidget (KDialogBase*))); +// connect (core (), TQ_SIGNAL (configWidget (KDialogBase*)), +// d->problemReporter, TQ_SLOT (configWidget (KDialogBase*))); d->problemReporter->setIcon( SmallIcon("application-vnd.tde.info") ); mainWindow( )->embedOutputView( d->problemReporter, i18n("Problems"), i18n("Problem reporter")); TQWhatsThis::add(d->problemReporter, i18n("<b>Problem reporter</b><p>This window shows various \"problems\" in your project. " @@ -65,15 +65,15 @@ AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStri setXMLFile ("adasupportpart.rc"); - connect (core (), TQT_SIGNAL (projectOpened ()), this, TQT_SLOT (projectOpened ())); - connect (core (), TQT_SIGNAL (projectClosed ()), this, TQT_SLOT (projectClosed ())); + connect (core (), TQ_SIGNAL (projectOpened ()), this, TQ_SLOT (projectOpened ())); + connect (core (), TQ_SIGNAL (projectClosed ()), this, TQ_SLOT (projectClosed ())); - connect (partController (), TQT_SIGNAL (savedFile (const KURL&)), - this, TQT_SLOT (savedFile (const KURL&))); + connect (partController (), TQ_SIGNAL (savedFile (const KURL&)), + this, TQ_SLOT (savedFile (const KURL&))); -// connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)), this, TQT_SLOT (configWidget (KDialogBase*))); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - d->problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); +// connect (core (), TQ_SIGNAL (configWidget (KDialogBase*)), this, TQ_SLOT (configWidget (KDialogBase*))); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + d->problemReporter, TQ_SLOT(configWidget(KDialogBase*)) ); // a small hack (robe) //classStore ()->globalScope ()->setName ("(default packages)"); @@ -102,14 +102,14 @@ KDevLanguageSupport::Features AdaSupportPart::features () void AdaSupportPart::projectOpened () { - connect (project (), TQT_SIGNAL (addedFilesToProject (const TQStringList &)), - this, TQT_SLOT (addedFilesToProject (const TQStringList &))); - connect (project (), TQT_SIGNAL (removedFilesFromProject (const TQStringList &)), - this, TQT_SLOT (removedFilesFromProject (const TQStringList &))); - connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), - this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); - - TQTimer::singleShot (0, this, TQT_SLOT (initialParse ())); + connect (project (), TQ_SIGNAL (addedFilesToProject (const TQStringList &)), + this, TQ_SLOT (addedFilesToProject (const TQStringList &))); + connect (project (), TQ_SIGNAL (removedFilesFromProject (const TQStringList &)), + this, TQ_SLOT (removedFilesFromProject (const TQStringList &))); + connect( project( ), TQ_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQ_SLOT( changedFilesInProject( const TQStringList & ) ) ); + + TQTimer::singleShot (0, this, TQ_SLOT (initialParse ())); } @@ -126,8 +126,8 @@ void AdaSupportPart::initialParse () if (project ()) { mainWindow()->statusBar()->message( i18n("Updating...") ); - kapp->processEvents( ); - kapp->setOverrideCursor (waitCursor); + tdeApp->processEvents( ); + tdeApp->setOverrideCursor (waitCursor); int n = 0; TQStringList files = project ()->allFiles (); @@ -143,7 +143,7 @@ void AdaSupportPart::initialParse () TQString fn = project ()->projectDirectory () + "/" + *it; maybeParse (fn); - kapp->processEvents (500); + tdeApp->processEvents (500); } emit updatedSourceInfo(); @@ -151,7 +151,7 @@ void AdaSupportPart::initialParse () mainWindow( )->statusBar( )->removeWidget( bar ); delete bar; - kapp->restoreOverrideCursor (); + tdeApp->restoreOverrideCursor (); mainWindow( )->statusBar( )->message( i18n( "Done" ), 2000 ); /* mainWindow ()->statusBar ()->message (i18n ("Found 1 problem", "Found %n problems", d->problemReporter->childCount ()));*/ diff --git a/languages/ada/addclassdlg.ui b/languages/ada/addclassdlg.ui index 046b06ab..94006be8 100644 --- a/languages/ada/addclassdlg.ui +++ b/languages/ada/addclassdlg.ui @@ -420,9 +420,9 @@ <tabstop>PushButton2</tabstop> <tabstop>PushButton3</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>Public_toggled( bool )</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui index f2e03383..32a9b13d 100644 --- a/languages/ada/configproblemreporter.ui +++ b/languages/ada/configproblemreporter.ui @@ -78,12 +78,12 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">configproblemreporter.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/ada/configproblemreporter.ui.h b/languages/ada/configproblemreporter.ui.h index cd22ba1f..cda9f269 100644 --- a/languages/ada/configproblemreporter.ui.h +++ b/languages/ada/configproblemreporter.ui.h @@ -11,7 +11,7 @@ void ConfigureProblemReporter::init() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); bgParserCheckbox->setChecked( config->readBoolEntry("EnableAdaBgParser", true) ); delaySlider->setEnabled( bgParserCheckbox->isChecked() ); @@ -24,7 +24,7 @@ void ConfigureProblemReporter::destroy() void ConfigureProblemReporter::accept() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); config->writeEntry( "EnableAdaBgParser", bgParserCheckbox->isChecked() ); if( bgParserCheckbox->isChecked() ) diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index 12090860..6aade4e9 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -88,23 +88,23 @@ ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* parent, const addColumn( i18n("File") ); addColumn( i18n("Line") ); //addColumn( i18n("Column") ); - setAllColumnsShowFocus( TRUE ); + setAllColumnsShowFocus( true ); m_timer = new TQTimer( this ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reparse()) ); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -134,7 +134,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) m_editor = dynamic_cast<KTextEditor::EditInterface*>( part ); if( m_editor ) - connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_document, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast<KTextEditor::MarkInterface*>( part ); @@ -244,9 +244,9 @@ void ProblemReporter::reportMessage( TQString message, void ProblemReporter::configure() { kdDebug() << "ProblemReporter::configure()" << endl; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); - m_active = config->readBoolEntry( "EnableAdaBgParser", TRUE ); + m_active = config->readBoolEntry( "EnableAdaBgParser", true ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); } @@ -255,8 +255,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) kdDebug() << "ProblemReporter::configWidget()" << endl; TQVBox *vbox = dlg->addVBoxPage(i18n("Ada Parsing"), i18n("Ada Parsing"), BarIcon( "text-x-src", TDEIcon::SizeMedium )); ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(configure())); } void ProblemReporter::slotPartAdded( KParts::Part* part ) diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index ca289234..6c86294a 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -15,7 +15,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kdevgenericfactory.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tdeaction.h> #include <tdeparts/part.h> @@ -43,19 +43,19 @@ BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStr setXMLFile("kdevbashsupport.rc"); TDEAction *action; - action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQ_SLOT(slotRun()),actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Starts an application.")); kdDebug() << "Creating BashSupportPart" << endl; - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) ); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), this, TQ_SLOT(savedFile(const KURL&)) ); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part *))); m_cc = new BashCodeCompletion(); } @@ -73,21 +73,21 @@ void BashSupportPart::projectConfigWidget(KDialogBase *dlg) Q_UNUSED( dlg ); // TQVBox *vbox = dlg->addVBoxPage(i18n("Bash")); // RubyConfigWidget *w = new RubyConfigWidget(*projectDom(), (TQWidget *)vbox, "Bash config widget"); -// connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); +// connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } void BashSupportPart::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(parse())); + TQTimer::singleShot(0, this, TQ_SLOT(parse())); } @@ -121,7 +121,7 @@ void BashSupportPart::parse() if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { @@ -129,7 +129,7 @@ void BashSupportPart::parse() parse(project()->projectDirectory() + "/" + *it); } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9014) << "No project" << endl; } @@ -183,7 +183,7 @@ void BashSupportPart::startApplication(const TQString &program) { kdDebug() << "starting application" << program << endl; if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend")) - appFrontend->startAppCommand(TQString(), program, TRUE); + appFrontend->startAppCommand(TQString(), program, true); } @@ -332,11 +332,11 @@ void BashCodeCompletion::setActiveEditorPart(KParts::Part *part) } disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice - connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), - this, TQT_SLOT(cursorPositionChanged())); - connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHidden())); - connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxAbort())); - connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHidden())); + connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), + this, TQ_SLOT(cursorPositionChanged())); + connect(part->widget(), TQ_SIGNAL(argHintHidden()), this, TQ_SLOT(argHintHidden())); + connect(part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionBoxAbort())); + connect(part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(completionBoxHidden())); } diff --git a/languages/bash/bashsupport_part.h b/languages/bash/bashsupport_part.h index 07b6104b..40488930 100644 --- a/languages/bash/bashsupport_part.h +++ b/languages/bash/bashsupport_part.h @@ -9,7 +9,7 @@ #include <tqguardedptr.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdialogbase.h> #include <codemodel.h> diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h index 1d1e61fd..81782fd7 100644 --- a/languages/cpp/addattributedialog.h +++ b/languages/cpp/addattributedialog.h @@ -32,7 +32,7 @@ class AddAttributeDialog : public AddAttributeDialogBase public: AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~AddAttributeDialog(); virtual void addAttribute(); diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui index 793d26b4..86ee3f25 100644 --- a/languages/cpp/addattributedialogbase.ui +++ b/languages/cpp/addattributedialogbase.ui @@ -353,14 +353,14 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot>addAttribute()</slot> <slot>deleteCurrentAttribute()</slot> <slot>currentChanged(TQListViewItem*)</slot> <slot>updateGUI()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/addmethoddialog.h b/languages/cpp/addmethoddialog.h index 0362eae1..20275400 100644 --- a/languages/cpp/addmethoddialog.h +++ b/languages/cpp/addmethoddialog.h @@ -32,7 +32,7 @@ class AddMethodDialog : public AddMethodDialogBase public: AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~AddMethodDialog(); virtual void addMethod(); diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui index b4af8a5e..83af7489 100644 --- a/languages/cpp/addmethoddialogbase.ui +++ b/languages/cpp/addmethoddialogbase.ui @@ -436,7 +436,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot>addMethod()</slot> @@ -444,7 +444,7 @@ <slot>currentChanged(TQListViewItem*)</slot> <slot>updateGUI()</slot> <slot>browseImplementationFile()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src index d2fabc7a..9e3b5385 100644 --- a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src +++ b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src @@ -1,16 +1,16 @@ #this is just a basic CMakeLists.txt, for more information see the cmake manpage #add definitions, compiler switches, etc. -ADD_DEFINITIONS(-Wall -O2) +add_definitions(-Wall -O2) #build a shared library -ADD_LIBRARY(%{APPNAMELC} SHARED %{APPNAMELC}.c) +add_library(%{APPNAMELC} SHARED %{APPNAMELC}.c) #for testing the shared library you probably need some test app too -ADD_EXECUTABLE(%{APPNAMELC}test %{APPNAMELC}test.c) +add_executable(%{APPNAMELC}test %{APPNAMELC}test.c) #need to link to some other libraries ? just add them here -TARGET_LINK_LIBRARIES(%{APPNAMELC}test %{APPNAMELC}) +target_link_libraries(%{APPNAMELC}test %{APPNAMELC}) #add an install target here #INSTALL_FILES(...) diff --git a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src index ee2bb832..6450c4b9 100644 --- a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src +++ b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src @@ -1,16 +1,16 @@ #this is just a basic CMakeLists.txt, for more information see the cmake manpage #add definitions, compiler switches, etc. -ADD_DEFINITIONS(-Wall -O2) +add_definitions(-Wall -O2) #build a shared library -ADD_LIBRARY(%{APPNAMELC} SHARED %{APPNAMELC}.cpp) +add_library(%{APPNAMELC} SHARED %{APPNAMELC}.cpp) #for testing the shared library you probably need some test app too -ADD_EXECUTABLE(%{APPNAMELC}test %{APPNAMELC}test.cpp) +add_executable(%{APPNAMELC}test %{APPNAMELC}test.cpp) #need to link to some other libraries ? just add them here -TARGET_LINK_LIBRARIES(%{APPNAMELC}test %{APPNAMELC}) +target_link_libraries(%{APPNAMELC}test %{APPNAMELC}) #add an install target here #INSTALL_FILES(...) diff --git a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src index 6122c34f..f78028c9 100644 --- a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src +++ b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src @@ -2,26 +2,26 @@ # for more information see the cmake man page # add definitions, compiler switches, etc. -ADD_DEFINITIONS(${QT_DEFINITIONS} -Wall -O2 -g) +add_definitions(${QT_DEFINITIONS} -Wall -O2 -g) # add the Qt include dir to the include path -INCLUDE_DIRECTORIES(${TQT_INCLUDE_DIR}) +include_directories(${TQT_INCLUDE_DIR}) # list all source files in a variable -SET(%{APPNAMELC}_SRCS main.cpp %{APPNAMELC}.cpp) +set(%{APPNAMELC}_SRCS main.cpp %{APPNAMELC}.cpp) # specify the headers which have to be processed by moc # and collect the results in the variable given above -QT_WRAP_CPP (%{APPNAMELC} %{APPNAMELC}_SRCS %{APPNAMELC}.h) +qt_wrap_cpp (%{APPNAMELC} %{APPNAMELC}_SRCS %{APPNAMELC}.h) # create tan executable from the list of source files -ADD_EXECUTABLE(%{APPNAMELC} ${%{APPNAMELC}_SRCS}) +add_executable(%{APPNAMELC} ${%{APPNAMELC}_SRCS}) # link the application to the Qt libs -TARGET_LINK_LIBRARIES(%{APPNAMELC} ${TQT_LIBRARIES} ) +target_link_libraries(%{APPNAMELC} ${TQT_LIBRARIES} ) # create an install rule for the executable -INSTALL(TARGETS %{APPNAMELC} DESTINATION bin ) +install(TARGETS %{APPNAMELC} DESTINATION bin ) # if you need to install more things, take a look at the install() command # in the cmake man page diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp index 39b6e5af..8ce81310 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp @@ -37,17 +37,17 @@ openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen = new TQToolButton( openIcon, tr("Open File"), TQString(), - this, TQT_SLOT(choose()), fileTools, "open file" ); + this, TQ_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave = new TQToolButton( saveIcon, tr("Save File"), TQString(), - this, TQT_SLOT(save()), fileTools, "save file" ); + this, TQ_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint = new TQToolButton( printIcon, tr("Print File"), TQString(), - this, TQT_SLOT(print()), fileTools, "print file" ); + this, TQ_SLOT(print()), fileTools, "print file" ); (void)TQWhatsThis::whatsThisButton( fileTools ); @@ -79,41 +79,41 @@ menuBar()->insertItem( tr("&File"), file ); - file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( tr("&New"), this, TQ_SLOT(newDoc()), CTRL+Key_N ); int id; id = file->insertItem( openIcon, tr("&Open..."), - this, TQT_SLOT(choose()), CTRL+Key_O ); + this, TQ_SLOT(choose()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, tr("&Save"), - this, TQT_SLOT(save()), CTRL+Key_S ); + this, TQ_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) ); + id = file->insertItem( tr("Save &As..."), this, TQ_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); file->insertSeparator(); id = file->insertItem( printIcon, tr("&Print..."), - this, TQT_SLOT(print()), CTRL+Key_P ); + this, TQ_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); file->insertSeparator(); - file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); + file->insertItem( tr("&Close"), this, TQ_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( tr("&Help"), help ); - help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); - help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) ); + help->insertItem( tr("&About"), this, TQ_SLOT(about()), Key_F1 ); + help->insertItem( tr("About &TQt"), this, TQ_SLOT(aboutTQt()) ); help->insertSeparator(); - help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); + help->insertItem( tr("What's &This"), this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 ); e = new TQTextEdit( this, "editor" ); e->setFocus(); diff --git a/languages/cpp/app_templates/cmakeqt3app/main.cpp b/languages/cpp/app_templates/cmakeqt3app/main.cpp index 8938adc5..ba45c728 100644 --- a/languages/cpp/app_templates/cmakeqt3app/main.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/main.cpp @@ -8,6 +8,6 @@ int main( int argc, char ** argv ) { %{APPNAME} * mw = new %{APPNAME}(); mw->setCaption( "%{APPNAME}" ); mw->show(); - a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) ); + a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/languages/cpp/app_templates/cppcurseshello/main.cpp b/languages/cpp/app_templates/cppcurseshello/main.cpp index 3e23a5df..7d900513 100644 --- a/languages/cpp/app_templates/cppcurseshello/main.cpp +++ b/languages/cpp/app_templates/cppcurseshello/main.cpp @@ -25,7 +25,7 @@ int main() initscr(); start_color(); cbreak(); - keypad(stdscr, TRUE); + keypad(stdscr, true); noecho(); init_pair(1, COLOR_BLACK, COLOR_CYAN); diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp index a631186c..cca191c1 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp +++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp @@ -45,5 +45,5 @@ bool %{APPNAME}::remove(TQString arg) bool %{APPNAME}::exit() { - kapp->quit(); + tdeApp->quit(); } diff --git a/languages/cpp/app_templates/dcopservice/main.cpp b/languages/cpp/app_templates/dcopservice/main.cpp index cf1d3ae6..2e7f3722 100644 --- a/languages/cpp/app_templates/dcopservice/main.cpp +++ b/languages/cpp/app_templates/dcopservice/main.cpp @@ -1,6 +1,6 @@ %{CPP_TEMPLATE} -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kdebug.h> @@ -28,15 +28,15 @@ int main (int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutdata ); TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if (!KUniqueApplication::start()) + if (!TDEUniqueApplication::start()) { kdDebug() << "%{APPNAMELC} is already running!" << endl; return (0); } - KUniqueApplication app; + TDEUniqueApplication app; kdDebug() << "starting %{APPNAMELC} " << endl; // This app is started automatically, no need for session management app.disableSessionManagement(); diff --git a/languages/cpp/app_templates/kapp/Makefile.am b/languages/cpp/app_templates/kapp/Makefile.am index efe532d3..a6a4e597 100644 --- a/languages/cpp/app_templates/kapp/Makefile.am +++ b/languages/cpp/app_templates/kapp/Makefile.am @@ -16,4 +16,4 @@ $(templateName).tar.gz: ${dataFiles} archivedir = ${appwizarddatadir} archive_DATA = $(templateName).tar.gz ${templateName}.png -CLEANFILES = *.tar.gz
\ No newline at end of file +CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index 774efe8e..3fad8256 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -49,10 +49,10 @@ setupGUI(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -88,19 +88,19 @@ void %{APPNAME}::load(const KURL& url) void %{APPNAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0, - this, TQT_SLOT(optionsPreferences()), + this, TQ_SLOT(optionsPreferences()), actionCollection(), "custom_action"); } diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index 16c05a3f..244f4a75 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -63,10 +63,10 @@ return; } - connect(m_html, TQT_SIGNAL(setWindowCaption(const TQString&)), - this, TQT_SLOT(slotSetTitle(const TQString&))); - connect(m_html, TQT_SIGNAL(setStatusBarText(const TQString&)), - this, TQT_SLOT(slotOnURL(const TQString&))); + connect(m_html, TQ_SIGNAL(setWindowCaption(const TQString&)), + this, TQ_SLOT(slotSetTitle(const TQString&))); + connect(m_html, TQ_SIGNAL(setStatusBarText(const TQString&)), + this, TQ_SLOT(slotOnURL(const TQString&))); } diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 4d80a74c..436807d4 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -4,7 +4,7 @@ #include <tdeaction.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> class PluginView : public KXMLGUIClient { @@ -55,7 +55,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("Insert Hello World"), 0, this, - TQT_SLOT( slotInsertHello() ), view->actionCollection(), + TQ_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); view->setInstance (new TDEInstance("kate")); diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 8845fae3..c4bdd710 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -4,7 +4,7 @@ #include <tdeaction.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <tqlayout.h> @@ -59,7 +59,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("Insert Hello World"), 0, this, - TQT_SLOT( slotInsertHello() ), view->actionCollection(), + TQ_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); view->setInstance (new TDEInstance("kate")); @@ -94,7 +94,7 @@ Kate::PluginConfigPage* KatePlugin%{APPNAME}::configPage (uint, TQWidget *w, con { %{APPNAME}ConfigPage* p = new %{APPNAME}ConfigPage(this, w); initConfigPage( p ); - connect( p, TQT_SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, TQT_SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) ); + connect( p, TQ_SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, TQ_SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) ); return (Kate::PluginConfigPage*)p; } @@ -124,7 +124,7 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p ) lo->addWidget(lab); - // TODO: add connection to emit TQT_SLOT( changed() ) + // TODO: add connection to emit TQ_SLOT( changed() ) } %{APPNAME}ConfigPage::~%{APPNAME}ConfigPage() diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 69dcd7d8..25955e3f 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -28,17 +28,17 @@ static const KDevPluginInfo data("kdev%{APPNAMELC}"); setXMLFile("kdevlang_%{APPNAMELC}.rc"); - m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQ_SLOT(slotRun()),actionCollection(), "build_execute" ); kdDebug() << "Creating %{APPNAMELC} Part" << endl; - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) ); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), this, TQ_SLOT(savedFile(const KURL&)) ); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part *))); } @@ -74,14 +74,14 @@ void %{APPNAME}Part::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(parse())); + TQTimer::singleShot(0, this, TQ_SLOT(parse())); } void %{APPNAME}Part::projectClosed() { @@ -134,14 +134,14 @@ void %{APPNAME}Part::parse() if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug(9014) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9014) << "No project" << endl; } diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index 6a2559ba..4c940738 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -60,16 +60,16 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("%{APPNAME}"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("%{APPNAME}"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } %{APPNAME}Part::~%{APPNAME}Part() @@ -92,7 +92,7 @@ void %{APPNAME}Part::setupActions() { // create XMLGUI actions here action = new TDEAction(i18n("&Do Something..."), 0, - this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); + this, TQ_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do.")); } @@ -105,13 +105,13 @@ void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, case GLOBALDOC_OPTIONS: { %{APPNAME}GlobalConfig *w = new %{APPNAME}GlobalConfig(this, page, "global config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { %{APPNAME}ProjectConfig *w = new %{APPNAME}ProjectConfig(this, page, "project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -131,7 +131,7 @@ void %{APPNAME}Part::contextMenu(TQPopupMenu *popup, const Context *context) // or create menu items on the fly // int id = -1; // id = popup->insertItem(i18n("Do Something Here"), - // this, TQT_SLOT(doSomething()) ); + // this, TQ_SLOT(doSomething()) ); // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do." } else if (context->hasType(Context::FileContext)) diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index 6a2559ba..4c940738 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -60,16 +60,16 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("%{APPNAME}"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("%{APPNAME}"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } %{APPNAME}Part::~%{APPNAME}Part() @@ -92,7 +92,7 @@ void %{APPNAME}Part::setupActions() { // create XMLGUI actions here action = new TDEAction(i18n("&Do Something..."), 0, - this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); + this, TQ_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do.")); } @@ -105,13 +105,13 @@ void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, case GLOBALDOC_OPTIONS: { %{APPNAME}GlobalConfig *w = new %{APPNAME}GlobalConfig(this, page, "global config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { %{APPNAME}ProjectConfig *w = new %{APPNAME}ProjectConfig(this, page, "project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -131,7 +131,7 @@ void %{APPNAME}Part::contextMenu(TQPopupMenu *popup, const Context *context) // or create menu items on the fly // int id = -1; // id = popup->insertItem(i18n("Do Something Here"), - // this, TQT_SLOT(doSomething()) ); + // this, TQ_SLOT(doSomething()) ); // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do." } else if (context->hasType(Context::FileContext)) diff --git a/languages/cpp/app_templates/khello2/widgetbase.ui b/languages/cpp/app_templates/khello2/widgetbase.ui index 365f4cf2..90cac0c6 100644 --- a/languages/cpp/app_templates/khello2/widgetbase.ui +++ b/languages/cpp/app_templates/khello2/widgetbase.ui @@ -45,8 +45,8 @@ <slot>button_clicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>button_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui index 194d8ffe..a5481dd2 100644 --- a/languages/cpp/app_templates/kmake/mainview.ui +++ b/languages/cpp/app_templates/kmake/mainview.ui @@ -69,8 +69,8 @@ <slot>slotHelloButtonClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotHelloButtonClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp index db665500..7b1a327d 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -5,7 +5,7 @@ #include <%{APPNAMELC}_factory.h> #include <%{APPNAMELC}_part.h> #include <%{APPNAMELC}_aboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kiconloader.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp index a1196404..428c2bc3 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp @@ -16,7 +16,7 @@ bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget ) { // If nothing is loaded, do initialize here - return TRUE; + return true; } KoView* %{APPNAME}Part::createViewInstance( TQWidget* parent, const char* name ) diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h index 57b57cb6..a8ffdd5e 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.h +++ b/languages/cpp/app_templates/kofficepart/kopart_part.h @@ -15,7 +15,7 @@ class %{APPNAME}Part : public KoDocument public: %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); - virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); + virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 ); virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index 601413ef..fed33236 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -18,9 +18,9 @@ { setInstance( %{APPNAME}Factory::global() ); setXMLFile( "%{APPNAMELC}.rc" ); - KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" ); + KStdAction::cut(this, TQ_SLOT( cut() ), actionCollection(), "cut" ); // Note: Prefer KStdAction::* to any custom action if possible. - //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQT_SLOT( cut() ), + //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQ_SLOT( cut() ), // actionCollection(), "cut"); } @@ -32,7 +32,7 @@ void %{APPNAME}View::paintEvent( TQPaintEvent* ev ) /// @todo Scaling // Let the document do the drawing - koDocument()->paintEverything( painter, ev->rect(), FALSE, this ); + koDocument()->paintEverything( painter, ev->rect(), false, this ); painter.end(); } diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp index 48876c9a..7f85ba3e 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp @@ -1,6 +1,6 @@ #include <tqlabel.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tqstring.h> #include <tqwidget.h> diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index aedddf27..d415b838 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -20,7 +20,7 @@ public: /** * Construct a @ref KonqSidebarPlugin. * - * @param inst The sidebar's kinstance class. + * @param inst The sidebar's tdeinstance class. * @param parent The sidebar internal button info class responsible for this plugin. * @param widgetParent The container which will contain the plugins widget. * @param desktopName The filename of the configuration file. diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 759cbf5a..671017ee 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -53,8 +53,8 @@ // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, i18n("Could not find our part.")); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -76,16 +76,16 @@ void %{APPNAME}::load(const KURL& url) void %{APPNAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void %{APPNAME}::saveProperties(TDEConfig* /*config*/) @@ -159,8 +159,8 @@ void %{APPNAME}::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -185,7 +185,7 @@ void %{APPNAME}::fileOpen() KURL url = KFileDialog::getOpenURL( TQString(), TQString(), this ); - if (url.isEmpty() == false) + if (!url.isEmpty()) { // About this function, the style guide ( // http://developer.kde.org/documentation/standards/kde/style/basics/index.html ) diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index adf210b3..6365ef3b 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -1,7 +1,7 @@ #include "%{APPNAMELC}_part.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> @@ -26,9 +26,9 @@ setWidget(m_widget); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("%{APPNAMELC}_part.rc"); @@ -49,12 +49,12 @@ void %{APPNAME}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + connect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); else { - disconnect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + disconnect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); @@ -82,7 +82,7 @@ bool %{APPNAME}Part::openFile() { // m_file is always local so we can use TQFile on it TQFile file(m_file); - if (file.open(IO_ReadOnly) == false) + if (!file.open(IO_ReadOnly)) return false; // our example widget is text-based, so we use TQTextStream instead @@ -106,12 +106,12 @@ bool %{APPNAME}Part::openFile() bool %{APPNAME}Part::saveFile() { // if we aren't read-write, return immediately - if (isReadWrite() == false) + if (!isReadWrite()) return false; // m_file is always local, so we use TQFile TQFile file(m_file); - if (file.open(IO_WriteOnly) == false) + if (!file.open(IO_WriteOnly)) return false; // use TQTextStream to dump the text to the file @@ -130,7 +130,7 @@ void %{APPNAME}Part::fileOpen() // button is clicked TQString file_name = KFileDialog::getOpenFileName(); - if (file_name.isEmpty() == false) + if (!file_name.isEmpty()) openURL(file_name); } @@ -138,7 +138,7 @@ void %{APPNAME}Part::fileSaveAs() { // this slot is called whenever the File->Save As menu is selected, TQString file_name = KFileDialog::getSaveFileName(); - if (file_name.isEmpty() == false) + if (!file_name.isEmpty()) saveAs(file_name); } diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index c395d983..dc1a72d2 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -3,7 +3,7 @@ #include <tdehtml_part.h> #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <tdeglobal.h> @@ -14,7 +14,7 @@ Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. (void) new TDEAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0, - this, TQT_SLOT(slotAction()), + this, TQ_SLOT(slotAction()), actionCollection(), "plugin_action" ); } diff --git a/languages/cpp/app_templates/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART index 4d23ce93..7036e4cb 100644 --- a/languages/cpp/app_templates/kscons_kxt/QUICKSTART +++ b/languages/cpp/app_templates/kscons_kxt/QUICKSTART @@ -64,7 +64,7 @@ To make scons run (much) faster, consult ./addons/README in bksys MOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has -Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro TQ_OBJECT +signals and slots, then 'foo.h' must contain the macro TQ_OBJECT in order to compile. foo_moc.cpp is usually generated, and is used to produce foo_moc.o which is linked with the program or the library. diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index 00e1adea..f918fe91 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -48,10 +48,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); showTipOnStart(); } @@ -62,22 +62,22 @@ void %{APPNAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() + KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, - m_view, TQT_SLOT(switchColors()), + m_view, TQ_SLOT(switchColors()), actionCollection(), "switch_action"); createGUI(); @@ -140,7 +140,7 @@ void %{APPNAME}::optionsPreferences() // to the names of the variables in the .kcfg file TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART index 4d23ce93..7036e4cb 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART +++ b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART @@ -64,7 +64,7 @@ To make scons run (much) faster, consult ./addons/README in bksys MOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has -Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro TQ_OBJECT +signals and slots, then 'foo.h' must contain the macro TQ_OBJECT in order to compile. foo_moc.cpp is usually generated, and is used to produce foo_moc.o which is linked with the program or the library. diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp index cde31592..bcd8563c 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}_part.h" #include <tdeparts/genericfactory.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> @@ -31,9 +31,9 @@ K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); setWidget(m_widget); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("%{APPNAMELC}_part.rc"); @@ -63,12 +63,12 @@ void %{APPNAMELC}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + connect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); else { - disconnect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + disconnect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); @@ -96,7 +96,7 @@ bool %{APPNAMELC}Part::openFile() { // m_file is always local so we can use TQFile on it TQFile file(m_file); - if (file.open(IO_ReadOnly) == false) + if (!file.open(IO_ReadOnly)) return false; // our example widget is text-based, so we use TQTextStream instead @@ -120,12 +120,12 @@ bool %{APPNAMELC}Part::openFile() bool %{APPNAMELC}Part::saveFile() { // if we aren't read-write, return immediately - if (isReadWrite() == false) + if (!isReadWrite()) return false; // m_file is always local, so we use TQFile TQFile file(m_file); - if (file.open(IO_WriteOnly) == false) + if (!file.open(IO_WriteOnly)) return false; // use TQTextStream to dump the text to the file @@ -144,7 +144,7 @@ void %{APPNAMELC}Part::fileOpen() // button is clicked TQString file_name = KFileDialog::getOpenFileName(); - if (file_name.isEmpty() == false) + if (!file_name.isEmpty()) openURL(file_name); } @@ -152,7 +152,7 @@ void %{APPNAMELC}Part::fileSaveAs() { // this slot is called whenever the File->Save As menu is selected, TQString file_name = KFileDialog::getSaveFileName(); - if (file_name.isEmpty() == false) + if (!file_name.isEmpty()) saveAs(file_name); } diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp index c63cb223..51639f36 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp @@ -53,8 +53,8 @@ setStandardMDIMenuEnabled(false); m_manager = new KParts::PartManager(this); - connect(m_manager, TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(createGUI(KParts::Part*)) ); + connect(m_manager, TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(createGUI(KParts::Part*)) ); #if KDE_IS_VERSION(3, 3, 0) setToolviewStyle( KMdi::TextAndIcon ); @@ -77,7 +77,7 @@ // and a status bar statusBar()->show(); - connect( this, TQT_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQT_SLOT( currentChanged( KMdiChildView * ) ) ); + connect( this, TQ_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQ_SLOT( currentChanged( KMdiChildView * ) ) ); m_console = new tdemdikonsole(this, "konsole"); m_console->setIcon( SmallIcon("konsole") ); @@ -92,7 +92,7 @@ but->setIconSet(SmallIcon("tab_remove")); but->adjustSize(); but->hide(); - connect(but, TQT_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQT_SIGNAL(activated())); + connect(but, TQ_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQ_SIGNAL(activated())); tabWidget()->setCornerWidget(but, TopRight); } #endif @@ -124,22 +124,22 @@ void %{APPNAMELC}tdemdi::setupActions() { setXMLFile("%{APPNAMELC}_shell.rc"); - KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); - KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() + KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); - KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); TDEAction* action = KStdAction::configureToolbars(this, - TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + TQ_SLOT(optionsConfigureToolbars()), actionCollection()); createGUI( NULL ); } @@ -320,7 +320,7 @@ void %{APPNAMELC}tdemdi::optionsPreferences() TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp index 1feb1b8b..24b1a974 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp @@ -39,7 +39,7 @@ part()->widget()->reparent( this, TQPoint(0, 0) ); layout->addWidget( part()->widget() ); - // connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) ); + // connect( m_part, TQ_SIGNAL(stateChanged()), this, TQ_SLOT(updateCaption()) ); } else { diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp index d4092b03..22c399ef 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp @@ -35,7 +35,7 @@ void tdemdikonsole::respawn() ((TQFrame*)m_part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); m_haskonsole=true; - connect( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + connect( m_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); m_part->widget()->show(); show(); diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp index ecdd5127..9001f45e 100644 --- a/languages/cpp/app_templates/kxt/app.cpp +++ b/languages/cpp/app_templates/kxt/app.cpp @@ -47,10 +47,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -60,19 +60,19 @@ void %{APPNAMELC}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAMELC}View TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, - m_view, TQT_SLOT(switchColors()), + m_view, TQ_SLOT(switchColors()), actionCollection(), "switch_action"); createGUI(); @@ -135,7 +135,7 @@ void %{APPNAMELC}::optionsPreferences() // to the names of the variables in the .kcfg file TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp index 89ad08e5..a0c0d0ee 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp @@ -33,45 +33,45 @@ mBack=new TQPushButton(this); mBack->setFixedSize(buttonSize,buttonSize); mBack->setPixmap(BarIcon("noatunback")); - connect(mBack, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back())); + connect(mBack, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back())); TQToolTip::add(mBack,i18n("Back")); mStop=new TQPushButton(this); mStop->setFixedSize(buttonSize,buttonSize); mStop->setPixmap(BarIcon("noatunstop")); - connect(mStop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop())); + connect(mStop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop())); TQToolTip::add(mStop, i18n("Stop")); mPlay=new TQPushButton(this); mPlay->setToggleButton(true); mPlay->setFixedSize(buttonSize,buttonSize); mPlay->setPixmap(BarIcon("noatunplay")); - connect(mPlay, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause())); + connect(mPlay, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause())); TQToolTip::add(mPlay, i18n("Play")); mForward=new TQPushButton(this); mForward->setFixedSize(buttonSize,buttonSize); mForward->setPixmap(BarIcon("noatunforward")); - connect(mForward, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward())); + connect(mForward, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward())); TQToolTip::add(mForward, i18n("Forward")); mPlaylist=new TQPushButton(this); mPlaylist->setToggleButton(true); mPlaylist->setFixedSize(buttonSize,buttonSize); mPlaylist->setPixmap(BarIcon("noatunplaylist")); - connect(mPlaylist, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView())); + connect(mPlaylist, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView())); TQToolTip::add(mPlaylist, i18n("Playlist")); mLoop=new TQPushButton(this); mLoop->setFixedSize(buttonSize,buttonSize); mLoop->setPixmap(BarIcon("noatunloopnone")); - connect(mLoop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(loop())); + connect(mLoop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(loop())); TQToolTip::add(mLoop, i18n("Change loop style")); mPopup=new TQPushButton(this); mPopup->setFixedSize(buttonSize,buttonSize); mPopup->setPixmap(BarIcon("noatun")); - connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup())); + connect(mPopup, TQ_SIGNAL(clicked()), TQ_SLOT(popup())); mVolume=new L33tSlider(0,100,10,0,TQt::Horizontal, this); @@ -98,30 +98,30 @@ statusBar()->message(i18n("No File Loaded")); statusBar()->insertItem("--:--/--:--", 1, 0, true); - connect(napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); - connect(napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); + connect(napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) ); + connect(napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) ); - connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); - connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); - connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); + connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused())); napp->player()->handleButtons(); - connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(changeLoopType(int))); + connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(changeLoopType(int))); /* This skipToWrapper is needed to pass milliseconds to Player() as everybody * below the GUI is based on milliseconds instead of some unprecise thingy * like seconds or mille */ - connect(seeker(), TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); - connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int))); - connect(seeker(), TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int))); + connect(seeker(), TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int))); + connect(this, TQ_SIGNAL(skipTo(int)), napp->player(), TQ_SLOT(skipTo(int))); + connect(seeker(), TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(sliderMoved(int))); - connect(mVolume, TQT_SIGNAL(sliderMoved(int)), napp->player(), TQT_SLOT(setVolume(int))); - connect(mVolume, TQT_SIGNAL(userChanged(int)), napp->player(), TQT_SLOT(setVolume(int))); + connect(mVolume, TQ_SIGNAL(sliderMoved(int)), napp->player(), TQ_SLOT(setVolume(int))); + connect(mVolume, TQ_SIGNAL(userChanged(int)), napp->player(), TQ_SLOT(setVolume(int))); - connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(playlistShown())); - connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); + connect(napp->player(), TQ_SIGNAL(playlistShown()), TQ_SLOT(playlistShown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(playlistHidden())); // Event Filter for the RMB for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i) diff --git a/languages/cpp/app_templates/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp index 6a0d616e..f0be7179 100644 --- a/languages/cpp/app_templates/opieapp/example.cpp +++ b/languages/cpp/app_templates/opieapp/example.cpp @@ -12,7 +12,7 @@ OPIE_EXPORT_APP( %{APPNAME}Factory ) %{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) : %{APPNAME}Base( parent, name, fl ) { - connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); + connect(quit, TQ_SIGNAL(clicked()), this, TQ_SLOT(goodBye())); } /* diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index a77f413b..dd3475e1 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp @@ -11,33 +11,33 @@ : TQHBox(par, "name", fl ) { TQCheckBox *box1 = new TQCheckBox(tr("Alt"),this); - connect(box1,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(slotAlt(bool))); + connect(box1,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(slotAlt(bool))); m_alt = box1; box1 = new TQCheckBox(tr("Shift"),this ); - connect(box1,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(slotShift(bool))); + connect(box1,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(slotShift(bool))); m_shi = box1; box1 = new TQCheckBox(tr("Ctrl","Control Shortcut on keyboard"),this ); - connect(box1,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(slotCtrl(bool))); + connect(box1,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(slotCtrl(bool))); m_ctrl = box1; TQSignalMapper *map = new TQSignalMapper(this); TQPushButton *btn = new TQPushButton("a",this); map->setMapping(btn,0); - connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); + connect(btn,TQ_SIGNAL(clicked()),map,TQ_SLOT(map())); btn = new TQPushButton("b",this); map->setMapping(btn,1); - connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); + connect(btn,TQ_SIGNAL(clicked()),map,TQ_SLOT(map())); btn = new TQPushButton("c",this); map->setMapping(btn,2); - connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); + connect(btn,TQ_SIGNAL(clicked()),map,TQ_SLOT(map())); - connect(map,TQT_SIGNAL(mapped(int)), - this,TQT_SLOT(slotKey(int))); + connect(map,TQ_SIGNAL(mapped(int)), + this,TQ_SLOT(slotKey(int))); resetState(); } @@ -130,7 +130,7 @@ TQString %{APPNAME}Impl::name() void %{APPNAME}Impl::onKeyPress( TQObject *receiver, const char *slot ) { if ( m_pickboard ) - TQObject::connect( m_pickboard, TQT_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); + TQObject::connect( m_pickboard, TQ_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); } #ifndef TQT_NO_COMPONENT diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp index 2f491481..fdbbf4dd 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp @@ -17,7 +17,7 @@ // that should be triggered when clicked are defined in slotClicked() // of course also normal widgets can be used. m_exampleLabel = new OClickableLabel( this ); - connect( m_exampleLabel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ) ); + connect( m_exampleLabel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClicked() ) ); if ( m_layout ) { delete m_layout; diff --git a/languages/cpp/app_templates/qmakeapp/main.cpp b/languages/cpp/app_templates/qmakeapp/main.cpp index 8938adc5..ba45c728 100644 --- a/languages/cpp/app_templates/qmakeapp/main.cpp +++ b/languages/cpp/app_templates/qmakeapp/main.cpp @@ -8,6 +8,6 @@ int main( int argc, char ** argv ) { %{APPNAME} * mw = new %{APPNAME}(); mw->setCaption( "%{APPNAME}" ); mw->show(); - a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) ); + a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp index 39b6e5af..a3b82a79 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp @@ -37,17 +37,17 @@ openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen = new TQToolButton( openIcon, tr("Open File"), TQString(), - this, TQT_SLOT(choose()), fileTools, "open file" ); + this, TQ_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave = new TQToolButton( saveIcon, tr("Save File"), TQString(), - this, TQT_SLOT(save()), fileTools, "save file" ); + this, TQ_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint = new TQToolButton( printIcon, tr("Print File"), TQString(), - this, TQT_SLOT(print()), fileTools, "print file" ); + this, TQ_SLOT(print()), fileTools, "print file" ); (void)TQWhatsThis::whatsThisButton( fileTools ); @@ -79,41 +79,41 @@ menuBar()->insertItem( tr("&File"), file ); - file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( tr("&New"), this, TQ_SLOT(newDoc()), CTRL+Key_N ); int id; id = file->insertItem( openIcon, tr("&Open..."), - this, TQT_SLOT(choose()), CTRL+Key_O ); + this, TQ_SLOT(choose()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, tr("&Save"), - this, TQT_SLOT(save()), CTRL+Key_S ); + this, TQ_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) ); + id = file->insertItem( tr("Save &As..."), this, TQ_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); file->insertSeparator(); id = file->insertItem( printIcon, tr("&Print..."), - this, TQT_SLOT(print()), CTRL+Key_P ); + this, TQ_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); file->insertSeparator(); - file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); + file->insertItem( tr("&Close"), this, TQ_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( tr("&Help"), help ); - help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); - help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) ); + help->insertItem( tr("&About"), this, TQ_SLOT(about()), Key_F1 ); + help->insertItem( tr("About &TQt"), this, TQ_SLOT(aboutTQt()) ); help->insertSeparator(); - help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); + help->insertItem( tr("What's &This"), this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 ); e = new TQTextEdit( this, "editor" ); e->setFocus(); @@ -157,7 +157,7 @@ void %{APPNAME}::load( const TQString &fileName ) TQTextStream ts( &f ); e->setText( ts.read() ); - e->setModified( FALSE ); + e->setModified( false ); setCaption( fileName ); statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 ); } @@ -182,7 +182,7 @@ void %{APPNAME}::save() t << text; f.close(); - e->setModified( FALSE ); + e->setModified( false ); setCaption( filename ); diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp index d68f6c6d..f03ea5c3 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.cpp +++ b/languages/cpp/app_templates/qtopiaapp/example.cpp @@ -9,7 +9,7 @@ %{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) : %{APPNAME}Base( parent, name, fl ) { - connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); + connect(quit, TQ_SIGNAL(clicked()), this, TQ_SLOT(goodBye())); } /* diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp index 1aab14b5..66a901d2 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.cpp +++ b/languages/cpp/app_templates/tdeconfig35/app.cpp @@ -34,10 +34,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -47,14 +47,14 @@ void %{APPNAMELC}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, - m_view, TQT_SLOT(switchColors()), + m_view, TQ_SLOT(switchColors()), actionCollection(), "switch_action"); setupGUI(); @@ -75,7 +75,7 @@ void %{APPNAMELC}::optionsPreferences() // to the names of the variables in the .kcfg file TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/tdeioslave/slave.cpp b/languages/cpp/app_templates/tdeioslave/slave.cpp index 8bf85fee..03bba9de 100644 --- a/languages/cpp/app_templates/tdeioslave/slave.cpp +++ b/languages/cpp/app_templates/tdeioslave/slave.cpp @@ -14,9 +14,9 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kurl.h> #include <ksock.h> diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp index 0d2bf1ff..869dfe96 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp @@ -34,14 +34,14 @@ extern "C" //----------------------------------------------------------------------------- //! dialog to setup screen saver parameters %{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name ) - : %{APPNAME}UI( parent, name, TRUE ) + : %{APPNAME}UI( parent, name, true ) { /// @todo //Connect your signals and slots here to configure the screen saver. - connect( OkayPushButton, TQT_SIGNAL( released() ), - TQT_SLOT( slotOkPressed() ) ); - connect( CancelPushButton, TQT_SIGNAL( released() ), - TQT_SLOT( slotCancelPressed() ) ); + connect( OkayPushButton, TQ_SIGNAL( released() ), + TQ_SLOT( slotOkPressed() ) ); + connect( CancelPushButton, TQ_SIGNAL( released() ), + TQ_SLOT( slotCancelPressed() ) ); } diff --git a/languages/cpp/app_templates/wxhello/app.cpp b/languages/cpp/app_templates/wxhello/app.cpp index 6bcb3d47..1c761616 100644 --- a/languages/cpp/app_templates/wxhello/app.cpp +++ b/languages/cpp/app_templates/wxhello/app.cpp @@ -14,9 +14,9 @@ bool { %{APPNAME}Frame *frame = new %{APPNAME}Frame( wxT( "Hello World" ), wxPoint(50,50), wxSize(450,340) ); - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); - return TRUE; + return true; } %{APPNAME}Frame::%{APPNAME}Frame( const wxString& title, const wxPoint& pos, const wxSize& size ) @@ -40,7 +40,7 @@ bool void %{APPNAME}Frame::OnQuit( wxCommandEvent& WXUNUSED( event ) ) { - Close(TRUE); + Close(true); } void diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index a111acde..be28b31b 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -77,9 +77,9 @@ public: { m_deadlock.unlock(); // GET LOCK - kapp->lock (); + tdeApp->lock (); - //kdDebug(9007) << "-------> kapp locked" << endl; + //kdDebug(9007) << "-------> tdeApp locked" << endl; TQPtrList<KParts::Part> parts( *m_cppSupport->partController() ->parts() ); TQPtrListIterator<KParts::Part> it( parts ); @@ -94,15 +94,15 @@ public: contents = TQString( editIface->text().ascii() ); // deep copy - //kdDebug(9007) << "-------> kapp unlocked" << endl; + //kdDebug(9007) << "-------> tdeApp unlocked" << endl; break; } // RELEASE LOCK - kapp->unlock(); + tdeApp->unlock(); m_deadlock.lock(); - //kdDebug(9007) << "-------> kapp unlocked" << endl; + //kdDebug(9007) << "-------> tdeApp unlocked" << endl; } if( m_readFromDisk || contents == TQString() ) @@ -123,7 +123,7 @@ public: { bool ret = false; m_deadlock.unlock(); - kapp->lock (); + tdeApp->lock (); KParts::ReadOnlyPart *part = m_cppSupport->partController()->partForURL( KURL(fileName) ); KTextEditor::Document * doc = dynamic_cast<KTextEditor::Document*>( part ); @@ -131,7 +131,7 @@ public: if ( doc ) ret = doc->isModified(); - kapp->unlock(); + tdeApp->unlock(); m_deadlock.lock(); return ret; } @@ -475,11 +475,11 @@ void BackgroundParser::close() m_close = true; m_canParse.wakeAll(); } - kapp->unlock(); + tdeApp->unlock(); while ( running() ) sleep( 1 ); - kapp->lock(); + tdeApp->lock(); } bool BackgroundParser::filesInQueue() diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 9067d1e9..3969930f 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -30,7 +30,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefileitem.h> #include <kurlrequester.h> #include <keditlistbox.h> @@ -64,15 +64,15 @@ CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const ch : CCConfigWidgetBase( parent, name ) { m_pPart = part; - connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogRegistered( Catalog* ) ), - this, TQT_SLOT( catalogRegistered( Catalog* ) ) ); - connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogUnregistered( Catalog* ) ), - this, TQT_SLOT( catalogUnregistered( Catalog* ) ) ); + connect( m_pPart->codeRepository(), TQ_SIGNAL( catalogRegistered( Catalog* ) ), + this, TQ_SLOT( catalogRegistered( Catalog* ) ) ); + connect( m_pPart->codeRepository(), TQ_SIGNAL( catalogUnregistered( Catalog* ) ), + this, TQ_SLOT( catalogUnregistered( Catalog* ) ) ); - connect( m_qtDir, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SLOT(isValidTQtDir(const TQString &))); - connect( m_qtDir, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(isValidTQtDir(const TQString &))); + connect( m_qtDir, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SLOT(isValidTQtDir(const TQString &))); + connect( m_qtDir, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(isValidTQtDir(const TQString &))); initGeneralTab( ); initTQtTab(); @@ -510,9 +510,9 @@ void CCConfigWidget::openPluginPaths() KDialog d( this ); TQVBoxLayout* mainlayout = new TQVBoxLayout( &d ); KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d ); - connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept())); + connect( ok, TQ_SIGNAL(clicked()), &d, TQ_SLOT(accept())); KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d ); - connect( cancel, TQT_SIGNAL(clicked()), &d, TQT_SLOT(reject())); + connect( cancel, TQ_SIGNAL(clicked()), &d, TQ_SLOT(reject())); TQHBoxLayout* btns = new TQHBoxLayout( &d ); btns->addItem( new TQSpacerItem(10,10,TQSizePolicy::Expanding) ); btns->addWidget(ok); diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui index 49b6c553..294deadc 100644 --- a/languages/cpp/ccconfigwidgetbase.ui +++ b/languages/cpp/ccconfigwidgetbase.ui @@ -1655,7 +1655,7 @@ you right click on a variable in a header file.</string> <tabstop>newPCSButton</tabstop> <tabstop>advancedOptions</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">implementationFile()</slot> <slot access="protected">interfaceFile()</slot> <slot access="protected">slotAddPPPath()</slot> @@ -1676,7 +1676,7 @@ you right click on a variable in a header file.</string> <slot>isQMakeExecutable(const TQString&)</slot> <slot>isValidQtDir(const TQString&)</slot> <slot>openPluginPaths()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp index f8b42f52..d8c3f203 100644 --- a/languages/cpp/classgeneratorconfig.cpp +++ b/languages/cpp/classgeneratorconfig.cpp @@ -15,7 +15,7 @@ #include <tqfile.h> #include <tqfileinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include "cppsupportfactory.h" diff --git a/languages/cpp/classgeneratorconfigbase.ui b/languages/cpp/classgeneratorconfigbase.ui index a047fca3..a0c7f964 100644 --- a/languages/cpp/classgeneratorconfigbase.ui +++ b/languages/cpp/classgeneratorconfigbase.ui @@ -253,9 +253,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">templateTypeChanged(int type)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp index a1ad79b0..4c9dbd6e 100644 --- a/languages/cpp/codeinformationrepository.cpp +++ b/languages/cpp/codeinformationrepository.cpp @@ -32,7 +32,7 @@ my_unique( const TQValueList<KTextEditor::CompletionEntry>& entryList ) e.postfix + " "; if ( map.find( key ) == map.end() ) { - map[ key ] = TRUE; + map[ key ] = true; l << e; } } diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui index d752d715..9085a377 100644 --- a/languages/cpp/configproblemreporter.ui +++ b/languages/cpp/configproblemreporter.ui @@ -176,14 +176,14 @@ If disabled, the parser will typically only run when the file is saved.</string> <variables> <variable>CppSupportPart* m_part;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>setPart( CppSupportPart * part )</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> <slot access="protected">setDelayLabel( int delay )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h index f65db442..b71f0c53 100644 --- a/languages/cpp/configproblemreporter.ui.h +++ b/languages/cpp/configproblemreporter.ui.h @@ -21,7 +21,7 @@ void ConfigureProblemReporter::init() { m_part = 0; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); problemReporterCheckbox->setChecked( config->readBoolEntry( "EnableProblemReporter", true ) ); bgParserCheckbox->setChecked( config->readBoolEntry( "EnableCppBgParser", true ) ); @@ -54,7 +54,7 @@ void ConfigureProblemReporter::setPart( CppSupportPart* part ) void ConfigureProblemReporter::accept() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "General Options" ); config->writeEntry( "EnableProblemReporter", problemReporterCheckbox->isChecked() ); config->writeEntry( "EnableCppBgParser", bgParserCheckbox->isChecked() ); @@ -83,7 +83,7 @@ void ConfigureProblemReporter::accept() void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b ) { delaySlider->setEnabled( b ); - if ( b == TRUE ) + if ( b ) delayLabel->show(); else delayLabel->hide(); diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index a62087ac..56cd0b50 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -256,7 +256,7 @@ static TQValueList<ItemType> unique( const TQValueList<ItemType>& entryList ) { e.text + " " + e.postfix + " " ).simplifyWhiteSpace().stripWhiteSpace(); if ( map.find( key ) == map.end() ) { - map[ key ] = TRUE; + map[ key ] = true; l << e; } } @@ -271,7 +271,7 @@ static TQStringList unique( const TQStringList& entryList ) { while ( it != entryList.end() ) { TQString e = *it++; if ( map.find( e ) == map.end() ) { - map[ e ] = TRUE; + map[ e ] = true; l << e; } } @@ -287,7 +287,7 @@ static TQStringList unique( const TQValueList<TQStringList>& entryList ) { TQStringList li = ( *it++ ); TQString e = li.join( "\n" ); if ( map.find( e ) == map.end() ) { - map[ e ] = TRUE; + map[ e ] = true; l += li; } } @@ -358,7 +358,7 @@ struct PopupFillerHelpStruct { memType = "enum"; TQString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQ_SLOT( popupAction( int ) ) ); receiver->m_popupActions.insert( id, d.decl ); } @@ -448,12 +448,12 @@ struct PopupFillerHelpStruct { } } - int id = parent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt1, receiver, TQ_SLOT( popupAction( int ) ) ); if ( d.resolved() ) receiver->m_popupActions.insert( id, d.resolved() ->getDeclarationInfo() ); if ( !txt2.isEmpty() ) { - int id2 = parent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) ); + int id2 = parent->insertItem( txt2, receiver, TQ_SLOT( popupDefinitionAction( int ) ) ); if ( d.resolved() ) receiver->m_popupDefinitionActions.insert( id2, d.resolved() ->getDeclarationInfo() ); } @@ -538,7 +538,7 @@ struct PopupClassViewFillerHelpStruct { memType = "enum"; TQString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQ_SLOT( popupClassViewAction( int ) ) ); receiver->m_popupClassViewActions.insert( id, dom ); } @@ -597,7 +597,7 @@ struct PopupClassViewFillerHelpStruct { } } - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQ_SLOT( popupClassViewAction( int ) ) ); if ( dom ) receiver->m_popupClassViewActions.insert( id, dom ); @@ -645,7 +645,7 @@ class PopupFiller { //kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl; } - int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQ_SLOT( popupAction( int ) ) ); DeclarationInfo fakeDec; fakeDec.name = decl.name; fakeDec.file = includeFile; @@ -671,7 +671,7 @@ class PopupFiller { f.type = d.desc(); f.memberType = SimpleTypeImpl::MemberInfo::Variable; - /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); + /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQ_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable );*/ struk.insertItem( parent, f, prefix ); @@ -683,7 +683,7 @@ class PopupFiller { parent->insertItem( i18n( "Comment on %1" ).arg( sourceVariable.name ), m ); TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } parent->insertSeparator(); } @@ -764,7 +764,7 @@ class PopupFiller { mo->insertItem( i18n( "Comment" ), m ); TQStringList ls = prepareTextForMenu( ( *it ).first.decl.comment, 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } } @@ -796,7 +796,7 @@ class PopupFiller { parent->insertItem( i18n( "Comment on %1" ).arg( cleanForMenu( d->name() ) ), m ); TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } } } @@ -896,7 +896,7 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_pSupport = part; - connect( m_pSupport->codeCompletionConfig(), TQT_SIGNAL( stored() ), this, TQT_SLOT( emptyCache() ) ); + connect( m_pSupport->codeCompletionConfig(), TQ_SIGNAL( stored() ), this, TQ_SLOT( emptyCache() ) ); m_activeCursor = 0; m_activeEditor = 0; @@ -908,17 +908,17 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_ccLine = 0; m_ccColumn = 0; - connect( m_ccTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) ); - connect( m_showStatusTextTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotStatusTextTimeout() ) ); + connect( m_ccTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) ); + connect( m_showStatusTextTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotStatusTextTimeout() ) ); computeFileEntryList(); CppSupportPart* cppSupport = m_pSupport; - connect( cppSupport->project(), TQT_SIGNAL( addedFilesToProject( const TQStringList& ) ), - this, TQT_SLOT( computeFileEntryList() ) ); - connect( cppSupport->project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList& ) ), - this, TQT_SLOT( computeFileEntryList() ) ); - connect( cppSupport, TQT_SIGNAL( synchronousParseReady( const TQString&, ParsedFilePointer ) ), this, TQT_SLOT( synchronousParseReady( const TQString&, ParsedFilePointer ) ) ); + connect( cppSupport->project(), TQ_SIGNAL( addedFilesToProject( const TQStringList& ) ), + this, TQ_SLOT( computeFileEntryList() ) ); + connect( cppSupport->project(), TQ_SIGNAL( removedFilesFromProject( const TQStringList& ) ), + this, TQ_SLOT( computeFileEntryList() ) ); + connect( cppSupport, TQ_SIGNAL( synchronousParseReady( const TQString&, ParsedFilePointer ) ), this, TQ_SLOT( synchronousParseReady( const TQString&, ParsedFilePointer ) ) ); m_bArgHintShow = false; m_bCompletionBoxShow = false; @@ -928,9 +928,9 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_repository = new CodeInformationRepository( cppSupport->codeRepository() ); - connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogRegistered( Catalog* )), this, TQT_SLOT( emptyCache() ) ); - connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogUnregistered( Catalog* )), this, TQT_SLOT( emptyCache() ) ); - connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogChanged( Catalog* )), this, TQT_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQ_SIGNAL(catalogRegistered( Catalog* )), this, TQ_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQ_SIGNAL(catalogUnregistered( Catalog* )), this, TQ_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQ_SIGNAL(catalogChanged( Catalog* )), this, TQ_SLOT( emptyCache() ) ); setupCodeInformationRepository(); @@ -945,22 +945,22 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { if ( part->partController() ->activePart() ) slotActivePartChanged( part->partController() ->activePart() ); - connect( part->partController( ), TQT_SIGNAL( partAdded( KParts::Part* ) ), - this, TQT_SLOT( slotPartAdded( KParts::Part* ) ) ); - connect( part->partController( ), TQT_SIGNAL( activePartChanged( KParts::Part* ) ), - this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) ); + connect( part->partController( ), TQ_SIGNAL( partAdded( KParts::Part* ) ), + this, TQ_SLOT( slotPartAdded( KParts::Part* ) ) ); + connect( part->partController( ), TQ_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQ_SLOT( slotActivePartChanged( KParts::Part* ) ) ); - connect( part, TQT_SIGNAL( fileParsed( const TQString& ) ), - this, TQT_SLOT( slotFileParsed( const TQString& ) ) ); - connect( part, TQT_SIGNAL( codeModelUpdated( const TQString& ) ), - this, TQT_SLOT( slotCodeModelUpdated( const TQString& ) ) ); + connect( part, TQ_SIGNAL( fileParsed( const TQString& ) ), + this, TQ_SLOT( slotFileParsed( const TQString& ) ) ); + connect( part, TQ_SIGNAL( codeModelUpdated( const TQString& ) ), + this, TQ_SLOT( slotCodeModelUpdated( const TQString& ) ) ); TDEAction * action = new TDEAction( i18n("Jump to declaration under cursor"), 0, CTRL + Key_Comma, - this, TQT_SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" ); + this, TQ_SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" ); action->plug( &m_DummyActionWidget ); action = new TDEAction( i18n("Jump to definition under cursor"), 0, CTRL + Key_Period, - this, TQT_SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" ); + this, TQ_SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" ); action->plug( &m_DummyActionWidget ); } @@ -1028,13 +1028,13 @@ void CppCodeCompletion::integratePart( KParts::Part * part ) { if ( m_pSupport ) { //The slot should connected even when automatic completion is disabled, so it can be enabled any time kdDebug( 9007 ) << k_funcinfo << "enabling code completion" << endl; - connect( part, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotTextChanged() ) ); - connect( part->widget(), TQT_SIGNAL( completionDone() ), this, - TQT_SLOT( slotCompletionBoxHidden() ) ); - connect( part->widget(), TQT_SIGNAL( completionAborted() ), this, - TQT_SLOT( slotCompletionBoxHidden() ) ); - connect( part->widget(), TQT_SIGNAL( argHintHidden() ), this, - TQT_SLOT( slotArgHintHidden() ) ); + connect( part, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( slotTextChanged() ) ); + connect( part->widget(), TQ_SIGNAL( completionDone() ), this, + TQ_SLOT( slotCompletionBoxHidden() ) ); + connect( part->widget(), TQ_SIGNAL( completionAborted() ), this, + TQ_SLOT( slotCompletionBoxHidden() ) ); + connect( part->widget(), TQ_SIGNAL( argHintHidden() ), this, + TQ_SLOT( slotArgHintHidden() ) ); } } } @@ -1047,7 +1047,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { emptyCache(); this->d->recoveryPoints.clear(); if ( m_activeHintInterface && m_activeView ) { - disconnect( m_activeView , TQT_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQT_SLOT( slotTextHint( int, int, TQString& ) ) ); + disconnect( m_activeView , TQ_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQ_SLOT( slotTextHint( int, int, TQString& ) ) ); m_activeHintInterface = 0; } @@ -1094,7 +1094,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { if ( m_activeHintInterface ) { #ifndef DISABLETOOLTIPS m_activeHintInterface->enableTextHints( 500 ); - connect( m_activeView, TQT_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQT_SLOT( slotTextHint( int, int, TQString& ) ) ); + connect( m_activeView, TQ_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQ_SLOT( slotTextHint( int, int, TQString& ) ) ); #endif } else { @@ -1537,7 +1537,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte else gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQ_SLOT( popupAction( int ) ) ); TQPopupMenu * b = PopupTracker::createPopup( m ); m->insertItem( i18n( "Body" ), b ); @@ -1551,7 +1551,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte TQStringList ls = prepareTextForMenu( type.macro.body(), 20, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - b->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + b->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } } @@ -1569,7 +1569,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte else gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQ_SLOT( popupAction( int ) ) ); DeclarationInfo i; i.file = includeFilePath; @@ -1617,7 +1617,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) ); /*if( type.sourceVariable && type.sourceVariable.name != "this" ) { - int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQ_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable ); }*/ @@ -2050,14 +2050,13 @@ void CppCodeCompletion::needRecoveryPoints() { if ( this->d->recoveryPoints.isEmpty() ) { kdDebug( 9007 ) << "missing recovery-points for file " << m_activeFileName << " they have to be computed now" << endl; - m_pSupport->backgroundParser() ->lock () - ; + m_pSupport->backgroundParser() ->lock(); std::vector<CppCodeCompletion> vec; - TranslationUnitAST * ast = *m_pSupport->backgroundParser() ->translationUnit( m_activeFileName ); + ParsedFilePointer pTransUnit = m_pSupport->backgroundParser() ->translationUnit( m_activeFileName ); m_pSupport->backgroundParser() ->unlock(); - if ( !ast ) { + if ( !pTransUnit ) { kdDebug( 9007 ) << "background-parser is missing the translation-unit. The file needs to be reparsed." << endl; m_pSupport->parseFileAndDependencies( m_activeFileName, true ); // m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).arg( m_activeFileName ), 2000 ); @@ -2420,7 +2419,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { - showArguments = TRUE; + showArguments = true; } EvaluationResult type; @@ -2500,8 +2499,8 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( start_expr != int( contents.length() ) ) expr = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); - if ( expr.startsWith( "SIGNAL" ) || expr.startsWith( "SLOT" ) ) { - m_completionMode = expr.startsWith( "SIGNAL" ) ? SignalCompletion : SlotCompletion; + if ( expr.startsWith( "TQ_SIGNAL" ) || expr.startsWith( "TQ_SLOT" ) ) { + m_completionMode = expr.startsWith( "TQ_SIGNAL" ) ? SignalCompletion : SlotCompletion; showArguments = false; int end_expr = start_expr - 1; @@ -2684,70 +2683,74 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { ///@todo is all this necessary? if ( !recoveredDecl.get() && !recoveredTypeSpec.get() ) { - TranslationUnitAST * ast = *m_pSupport->backgroundParser() ->translationUnit( m_activeFileName ); - if ( AST * node = findNodeAt( ast, line, column ) ) { - kdDebug( 9007 ) << "------------------- AST FOUND --------------------" << endl; - kdDebug( 9007 ) << "node-kind = " << nodeTypeToString( node->nodeType() ) << endl; + ParsedFilePointer pTransUnit = m_pSupport->backgroundParser() ->translationUnit(m_activeFileName); + if (pTransUnit) + { + TranslationUnitAST *ast = *pTransUnit; + if ( AST * node = findNodeAt( ast, line, column ) ) { + kdDebug( 9007 ) << "------------------- AST FOUND --------------------" << endl; + kdDebug( 9007 ) << "node-kind = " << nodeTypeToString( node->nodeType() ) << endl; - if ( FunctionDefinitionAST * def = functionDefinition( node ) ) { - kdDebug( 9007 ) << "------> found a function definition" << endl; + if ( FunctionDefinitionAST * def = functionDefinition( node ) ) { + kdDebug( 9007 ) << "------> found a function definition" << endl; - int startLine, startColumn; - def->getStartPosition( &startLine, &startColumn ); + int startLine, startColumn; + def->getStartPosition( &startLine, &startColumn ); - TQString contents = getText( startLine, startColumn, line, showArguments ? nCol : column ); + TQString contents = getText( startLine, startColumn, line, showArguments ? nCol : column ); - /// @todo remove code duplication - int start_expr = expressionAt( contents, contents.length() ); + /// @todo remove code duplication + int start_expr = expressionAt( contents, contents.length() ); - // kdDebug(9007) << "start_expr = " << start_expr << endl; - if ( start_expr != int( contents.length() ) ) - expr = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); + // kdDebug(9007) << "start_expr = " << start_expr << endl; + if ( start_expr != int( contents.length() ) ) + expr = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); - if ( expr.startsWith( "SIGNAL" ) || expr.startsWith( "SLOT" ) ) { - m_completionMode = expr.startsWith( "SIGNAL" ) ? SignalCompletion : SlotCompletion; + if ( expr.startsWith( "TQ_SIGNAL" ) || expr.startsWith( "TQ_SLOT" ) ) { + m_completionMode = expr.startsWith( "TQ_SIGNAL" ) ? SignalCompletion : SlotCompletion; - showArguments = false; - int end_expr = start_expr - 1; - while ( end_expr > 0 && contents[ end_expr ].isSpace() ) - --end_expr; + showArguments = false; + int end_expr = start_expr - 1; + while ( end_expr > 0 && contents[ end_expr ].isSpace() ) + --end_expr; - if ( contents[ end_expr ] != ',' ) { - expr = TQString(); + if ( contents[ end_expr ] != ',' ) { + expr = TQString(); + } else { + start_expr = expressionAt( contents, end_expr ); + expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace(); + } } else { - start_expr = expressionAt( contents, end_expr ); - expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace(); - } - } else { - int idx = expr.length() - 1; - while ( expr[ idx ].isLetterOrNumber() || expr[ idx ] == '_' ) - --idx; - - if ( idx != int( expr.length() ) - 1 ) { - ++idx; - word = expr.mid( idx ).stripWhiteSpace(); - expr = expr.left( idx ).stripWhiteSpace(); + int idx = expr.length() - 1; + while ( expr[ idx ].isLetterOrNumber() || expr[ idx ] == '_' ) + --idx; + + if ( idx != int( expr.length() ) - 1 ) { + ++idx; + word = expr.mid( idx ).stripWhiteSpace(); + expr = expr.left( idx ).stripWhiteSpace(); + } } - } - ctx = computeContext( def, line, column, startLine, startColumn ); + ctx = computeContext( def, line, column, startLine, startColumn ); - TQStringList scope; - scopeOfNode( def, scope ); - this_type = SimpleType( scope, getIncludeFiles() ); + TQStringList scope; + scopeOfNode( def, scope ); + this_type = SimpleType( scope, getIncludeFiles() ); - if ( scope.size() ) { /* - SimpleVariable var; - var.type = scope; - var.name = "this"; - ctx->add( var );*/ - //kdDebug(9007) << "add variable " << var.name << " with type " << var.type << endl; - } + if ( scope.size() ) { /* + SimpleVariable var; + var.type = scope; + var.name = "this"; + ctx->add( var );*/ + //kdDebug(9007) << "add variable " << var.name << " with type " << var.type << endl; + } - ExpressionInfo exp( expr ); - exp.t = ( ExpressionInfo::Type ) ( ExpressionInfo::NormalExpression | ExpressionInfo::TypeExpression ); - type = evaluateExpression( exp, ctx ); + ExpressionInfo exp( expr ); + exp.t = ( ExpressionInfo::Type ) ( ExpressionInfo::NormalExpression | ExpressionInfo::TypeExpression ); + type = evaluateExpression( exp, ctx ); + } } } } diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h index 7350a996..1ebee6ba 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -56,7 +56,7 @@ public: if( !pt ) pt = new PopupTracker(); TQPopupMenu* m = new TQPopupMenu( parent ); ++pendingPopups; - connect( m, TQT_SIGNAL(destroyed()), pt, TQT_SLOT(destroyedPopup()) ); + connect( m, TQ_SIGNAL(destroyed()), pt, TQ_SLOT(destroyedPopup()) ); return m; } diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index f04db100..514974fe 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -79,20 +79,20 @@ CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, co accessMenu = new TQPopupMenu( this ); accessMenu->insertItem( i18n( "Use as Private" ), - this, TQT_SLOT( changeToPrivate() ), 0, 1 ); + this, TQ_SLOT( changeToPrivate() ), 0, 1 ); accessMenu->insertItem( i18n( "Use as Protected" ), - this, TQT_SLOT( changeToProtected() ), 0, 2 ); + this, TQ_SLOT( changeToProtected() ), 0, 2 ); accessMenu->insertItem( i18n( "Use as Public" ), - this, TQT_SLOT( changeToPublic() ), 0, 3 ); + this, TQ_SLOT( changeToPublic() ), 0, 3 ); accessMenu->insertSeparator(); accessMenu->insertItem( i18n( "Unset" ), - this, TQT_SLOT( changeToInherited() ), 0, 5 ); + this, TQ_SLOT( changeToInherited() ), 0, 5 ); overMenu = new TQPopupMenu( this ); overMenu->insertItem( i18n( "Extend Base Class Functionality" ), - this, TQT_SLOT( extendFunctionality() ), 0, 11 ); + this, TQ_SLOT( extendFunctionality() ), 0, 11 ); overMenu->insertItem( i18n( "Replace Base Class Method" ), - this, TQT_SLOT( replaceFunctionality() ), 0, 12 ); + this, TQ_SLOT( replaceFunctionality() ), 0, 12 ); compBasename = basename_edit->completionObject(); setCompletionBasename( m_part->codeModel() ); diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index 6cef7a20..4f827821 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -1236,7 +1236,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <tabstop>gen_config</tabstop> <tabstop>constructors_cpp_edit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">updateClassStore()</slot> <slot access="protected">access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint & p, int c )</slot> <slot access="protected">classNameChanged( const TQString & text )</slot> @@ -1278,7 +1278,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <slot access="protected">scopeboxActivated( int )</slot> <slot access="protected">classNamespaceChanged( const TQString & )</slot> <slot access="protected">headeronly_box_stateChanged(int val)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp index e58639e0..68c89488 100644 --- a/languages/cpp/cppsupport_utils.cpp +++ b/languages/cpp/cppsupport_utils.cpp @@ -120,7 +120,7 @@ static void typedefMap( TQMap<TQString, TQString> & map, ClassDom klass ) TQString formattedOpeningParenthesis(bool suppressSpace) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("AStyle"); bool use_spaces = config->readBoolEntry("PadParentheses", false); if (not use_spaces or suppressSpace) return "("; @@ -129,7 +129,7 @@ TQString formattedOpeningParenthesis(bool suppressSpace) TQString formattedClosingParenthesis(bool suppressSpace) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("AStyle"); bool use_spaces = config->readBoolEntry("PadParentheses", false); if (not use_spaces or suppressSpace) return ")"; diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp index cf5ff24a..a4a64ae0 100644 --- a/languages/cpp/cppsupportfactory.cpp +++ b/languages/cpp/cppsupportfactory.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <kdevplugininfo.h> #include "cppsupportfactory.h" diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index bd35d649..2e77030b 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -82,7 +82,7 @@ #include <kstatusbar.h> #include <tdeconfig.h> #include <tdeversion.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdetexteditor/document.h> @@ -178,7 +178,7 @@ class BackgroundParserConfig public: void readConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); m_useProblemReporter = config->readBoolEntry( "EnableProblemReporter", true ); m_useBackgroundParser = config->readBoolEntry( "EnableCppBgParser", true ); @@ -201,10 +201,10 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri m_pCompletionConfig = new CppCodeCompletionConfig( this, projectDom() ); m_pSplitHeaderSourceConfig = new CppSplitHeaderSourceConfig( this, projectDom() ); - m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this ); connect( m_pSplitHeaderSourceConfig, TQT_SIGNAL( stored() ), - this, TQT_SLOT( splitHeaderSourceConfigStored() ) ); - connect( m_pCompletionConfig, TQT_SIGNAL( stored() ), - this, TQT_SLOT( codeCompletionConfigStored() ) ); + m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this ); connect( m_pSplitHeaderSourceConfig, TQ_SIGNAL( stored() ), + this, TQ_SLOT( splitHeaderSourceConfigStored() ) ); + connect( m_pCompletionConfig, TQ_SIGNAL( stored() ), + this, TQ_SLOT( codeCompletionConfigStored() ) ); m_qtBuildConfig = new QtBuildConfig( this, projectDom() ); m_qtBuildConfig->store(); @@ -215,44 +215,44 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri m_problemReporter = 0; m_textChangedTimer = new TQTimer( this ); - connect( m_textChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseCurrentFile()) ); + connect( m_textChangedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseCurrentFile()) ); m_cursorMovedTimer = new TQTimer( this ); - connect( m_cursorMovedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCursorPositionChanged()) ); + connect( m_cursorMovedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCursorPositionChanged()) ); // m_deleteParserStoreTimer = new TQTimer( this ); m_saveMemoryTimer = new TQTimer( this ); m_buildSafeFileSetTimer = new TQTimer( this ); // m_functionHintTimer = new TQTimer( this ); - connect( m_buildSafeFileSetTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(buildSafeFileSet()) ); - connect( m_saveMemoryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveMemory()) ); -// connect( m_deleteParserStoreTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDeleteParserStore()) ); + connect( m_buildSafeFileSetTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(buildSafeFileSet()) ); + connect( m_saveMemoryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSaveMemory()) ); +// connect( m_deleteParserStoreTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDeleteParserStore()) ); resetParserStoreTimer(); m_saveMemoryTimer->start( 240000, false ); //Free some memory every 4 minutes - // connect( m_functionHintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFunctionHint()) ); + // connect( m_functionHintTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFunctionHint()) ); setXMLFile( "kdevcppsupport.rc" ); m_catalogList.setAutoDelete( true ); - connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( projectOpened() ) ); - connect( core(), TQT_SIGNAL( projectClosed() ), this, TQT_SLOT( projectClosed() ) ); - connect( core(), TQT_SIGNAL( languageChanged() ), this, TQT_SLOT( projectOpened() ) ); - connect( partController(), TQT_SIGNAL( savedFile( const KURL& ) ), - this, TQT_SLOT( savedFile( const KURL& ) ) ); - connect( core(), TQT_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), - this, TQT_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); - connect( partController(), TQT_SIGNAL( activePartChanged( KParts::Part* ) ), - this, TQT_SLOT( activePartChanged( KParts::Part* ) ) ); - connect( partController(), TQT_SIGNAL( partRemoved( KParts::Part* ) ), - this, TQT_SLOT( partRemoved( KParts::Part* ) ) ); - - connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), - this, TQT_SLOT( configWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( projectOpened() ) ); + connect( core(), TQ_SIGNAL( projectClosed() ), this, TQ_SLOT( projectClosed() ) ); + connect( core(), TQ_SIGNAL( languageChanged() ), this, TQ_SLOT( projectOpened() ) ); + connect( partController(), TQ_SIGNAL( savedFile( const KURL& ) ), + this, TQ_SLOT( savedFile( const KURL& ) ) ); + connect( core(), TQ_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), + this, TQ_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); + connect( partController(), TQ_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQ_SLOT( activePartChanged( KParts::Part* ) ) ); + connect( partController(), TQ_SIGNAL( partRemoved( KParts::Part* ) ), + this, TQ_SLOT( partRemoved( KParts::Part* ) ) ); + + connect( core(), TQ_SIGNAL( configWidget( KDialogBase* ) ), + this, TQ_SLOT( configWidget( KDialogBase* ) ) ); m_switchHeaderSourceAction = new TDEAction( i18n( "Switch Header/Implementation" ), SHIFT + Key_F12, - this, TQT_SLOT( slotSwitchHeader() ), + this, TQ_SLOT( slotSwitchHeader() ), actionCollection(), "edit_switchheader" ); m_switchHeaderSourceAction->setToolTip( i18n( "Switch between header and implementation files" ) ); m_switchHeaderSourceAction->setWhatsThis( i18n( "<b>Switch Header/Implementation</b><p>" @@ -265,7 +265,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri TDEAction *action; action = new TDEAction( i18n( "Complete Text" ), CTRL + Key_Space, - this, TQT_SLOT( slotCompleteText() ), + this, TQ_SLOT( slotCompleteText() ), actionCollection(), "edit_complete_text" ); action->setToolTip( i18n( "Complete current expression" ) ); action->setWhatsThis( i18n( "<b>Complete Text</p><p>Completes current expression using " @@ -274,11 +274,11 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action->setEnabled( false ); m_createGetterSetterAction = new TDEAction( i18n( "Create Accessor Methods" ), 0, - this, TQT_SLOT( slotCreateAccessMethods() ), actionCollection(), + this, TQ_SLOT( slotCreateAccessMethods() ), actionCollection(), "edit_create_getter_setter" ); action = new TDEAction( i18n( "Make Member" ), 0, Key_F2, - this, TQT_SLOT( slotMakeMember() ), + this, TQ_SLOT( slotMakeMember() ), actionCollection(), "edit_make_member" ); action->setToolTip( i18n( "Make member" ) ); action->setWhatsThis( i18n( "<b>Make member</b><p>Creates a class member function in implementation file " @@ -286,7 +286,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action->plug( &m_DummyActionWidget ); action = new TDEAction( i18n( "Navigation Menu" ), 0, CTRL + ALT + Key_Space, - this, TQT_SLOT( slotNavigate() ), + this, TQ_SLOT( slotNavigate() ), actionCollection(), "edit_navigate" ); action->setToolTip( i18n( "Show the navigation-menu" ) ); action->setWhatsThis( i18n( "<b>Navigate</b><p>Shows a navigation-menu based on the type-evaluation of the item under the cursor." ) ); @@ -294,7 +294,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action = new TDEAction( i18n( "New Class..." ), "classnew", 0, - this, TQT_SLOT( slotNewClass() ), + this, TQ_SLOT( slotNewClass() ), actionCollection(), "project_newclass" ); action->setToolTip( i18n( "Generate a new class" ) ); action->setWhatsThis( i18n( "<b>New Class</b><p>Calls the <b>New Class</b> wizard." ) ); @@ -306,8 +306,8 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri withcpp = true; // daniel - connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); new KDevCppSupportIface( this ); //(void) dcopClient(); @@ -438,7 +438,7 @@ void CppSupportPart::projectConfigWidget( KDialogBase* dlg ) vbox = dlg->addVBoxPage( i18n( "C++ Support" ), i18n( "C++ Support" ), BarIcon( info() ->icon(), TDEIcon::SizeMedium ) ); CCConfigWidget* w = new CCConfigWidget( this, vbox ); - connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) ); + connect( dlg, TQ_SIGNAL( okClicked( ) ), w, TQ_SLOT( accept( ) ) ); } void CppSupportPart::configWidget( KDialogBase *dlg ) @@ -446,13 +446,13 @@ void CppSupportPart::configWidget( KDialogBase *dlg ) TQVBox * vbox = dlg->addVBoxPage( i18n( "C++ Class Generator" ), i18n( "C++ Class Generator" ), BarIcon( info() ->icon(), TDEIcon::SizeMedium ) ); ClassGeneratorConfig *w = new ClassGeneratorConfig( vbox, "classgenerator config widget" ); - connect( dlg, TQT_SIGNAL( okClicked() ), w, TQT_SLOT( storeConfig() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w, TQ_SLOT( storeConfig() ) ); vbox = dlg->addVBoxPage(i18n("C++ Parsing"), i18n("C++ Parsing"), BarIcon( "text-x-c++src", TDEIcon::SizeMedium) ); ConfigureProblemReporter* ww = new ConfigureProblemReporter( vbox ); ww->setPart( this ); - connect(dlg, TQT_SIGNAL(okClicked()), ww, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), ww, TQ_SLOT(accept())); } void CppSupportPart::activePartChanged( KParts::Part *part ) @@ -465,11 +465,11 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( m_activeView ) { - disconnect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, 0 ); + disconnect( m_activeView, TQ_SIGNAL( cursorPositionChanged() ), this, 0 ); } if ( m_activeDocument ) { - disconnect( m_activeDocument, TQT_SIGNAL(textChanged()), this, 0 ); + disconnect( m_activeDocument, TQ_SIGNAL(textChanged()), this, 0 ); } m_isTyping = false; @@ -500,14 +500,14 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( m_activeDocument ) { - connect( m_activeDocument, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_activeDocument, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_textChangedTimer->start( 250, true ); // kick the parse timer, we might want to parse the current file } if ( m_activeViewCursor ) { - connect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, TQT_SLOT(slotCursorMoved()) ); -// this, TQT_SLOT( slotCursorPositionChanged() ) ); + connect( m_activeView, TQ_SIGNAL( cursorPositionChanged() ), this, TQ_SLOT(slotCursorMoved()) ); +// this, TQ_SLOT( slotCursorPositionChanged() ) ); } @@ -516,8 +516,8 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( !textHintIface ) return ; - connect( view, TQT_SIGNAL( needTextHint( int, int, TQString& ) ), - this, TQT_SLOT( slotNeedTextHint( int, int, TQString& ) ) ); + connect( view, TQ_SIGNAL( needTextHint( int, int, TQString& ) ), + this, TQ_SLOT( slotNeedTextHint( int, int, TQString& ) ) ); textHintIface->enableTextHints( 1000 ); #endif @@ -551,17 +551,17 @@ void CppSupportPart::projectOpened( ) embedProblemReporter(); - connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), - m_problemReporter, TQT_SLOT( configWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL( configWidget( KDialogBase* ) ), + m_problemReporter, TQ_SLOT( configWidget( KDialogBase* ) ) ); - connect( project( ), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), - this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), - this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), - this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); - connect( project(), TQT_SIGNAL( projectCompiled() ), - this, TQT_SLOT( slotProjectCompiled() ) ); + connect( project( ), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQ_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQ_SLOT( removedFilesFromProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQ_SLOT( changedFilesInProject( const TQStringList & ) ) ); + connect( project(), TQ_SIGNAL( projectCompiled() ), + this, TQ_SLOT( slotProjectCompiled() ) ); m_timestamp.clear(); m_parseEmitWaiting.clear(); @@ -573,7 +573,7 @@ void CppSupportPart::projectOpened( ) m_buildSafeFileSetTimer->start( 500, true ); updateParserConfiguration(); //Necessary to respect custom include-paths and such - TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( initialParse( ) ) ); } void CppSupportPart::embedProblemReporter( bool force ) @@ -687,7 +687,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) MakeMemberHelper( text, atline, atcol ); if ( !text.isEmpty() ) { - id = popup->insertItem( i18n( "Make Member" ), this, TQT_SLOT( slotMakeMember() ) ); + id = popup->insertItem( i18n( "Make Member" ), this, TQ_SLOT( slotMakeMember() ) ); popup->setWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file " "based on the member declaration at the current line." ) ); } @@ -754,7 +754,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) } text += formatModelItem( *it, true ); text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); - int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) ); + int id = m2->insertItem( text, this, TQ_SLOT( gotoDeclarationLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); m2->setItemParameter( id, line ); @@ -795,7 +795,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) } text += formatModelItem( *it, true ); text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); - int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) ); + int id = m->insertItem( text, this, TQ_SLOT( gotoLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); m->setItemParameter( id, line ); @@ -821,7 +821,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) if ( mcontext->item() ->isClass() ) { m_activeClass = ( ClassModel* ) mcontext->item(); - int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQT_SLOT( slotExtractInterface() ) ); + int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQ_SLOT( slotExtractInterface() ) ); popup->setWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. " "No implementation code is extracted and no implementation code is created." ) ); } @@ -839,7 +839,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) if ( url.fileName().endsWith( ".ui" ) ) { m_contextFileName = url.path(); - int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) ); + int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQ_SLOT( slotCreateSubclass() ) ); popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) ); } } @@ -1464,7 +1464,7 @@ bool CppSupportPart::parseProject( bool force ) mainWindow() ->statusBar() ->message( i18n( "Updating..." ) ); - kapp->setOverrideCursor( waitCursor ); + tdeApp->setOverrideCursor( waitCursor ); _jd = new JobData; if( TQFileInfo( project() ->projectDirectory() + "/" + project()->projectName().lower() @@ -1526,7 +1526,7 @@ bool CppSupportPart::parseProject( bool force ) _jd->backgroundCount = 0; _jd->cycle = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); m_saveMemoryTimer->stop(); //Do not regularly remove cached files that may still be needed while parsing(the cache anyway be full for the whole parsing-process) return true; @@ -1583,7 +1583,7 @@ void CppSupportPart::slotParseFiles() } ++( _jd->it ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); if( _jd->it == _jd->files.end()) { if( _jd->reparseList.isEmpty() ) { @@ -1604,7 +1604,7 @@ void CppSupportPart::slotParseFiles() _jd->backgroundState = 0; _jd->cycle = 1; _jd->lastParse = TQTime::currentTime(); - kapp->restoreOverrideCursor( ); + tdeApp->restoreOverrideCursor( ); } } else // finished or interrupted @@ -1615,7 +1615,7 @@ void CppSupportPart::slotParseFiles() if ( !m_projectClosed ) { kdDebug( 9007 ) << "updating sourceinfo" << endl; - kapp->restoreOverrideCursor( ); + tdeApp->restoreOverrideCursor( ); emit updatedSourceInfo(); mainWindow( ) ->statusBar( ) ->message( i18n( "Done" ), 2000 ); TQFile::remove( project() ->projectDirectory() @@ -1639,11 +1639,11 @@ void CppSupportPart::slotParseFiles() _jd->progressBar->setTotalSteps( _jd->backgroundCount ); if( _jd->lastParse.msecsTo( TQTime::currentTime()) > 60000 && !m_backgroundParser->filesInQueue()) { _jd->backgroundCount = _jd->backgroundState; ///Stop waiting if there is no progress and no file in the background-parser - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); } else { int timeStep = 0; if( alwaysParseInBackground ) { - TQTimer::singleShot( 10, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( slotParseFiles() ) ); } else { if( _jd->it == _jd->reparseList.end() ) { /*_jd->it = _jd->files.end(); @@ -1659,7 +1659,7 @@ void CppSupportPart::slotParseFiles() timeStep = 1; }*/ } - TQTimer::singleShot( timeStep, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( timeStep, this, TQ_SLOT( slotParseFiles() ) ); } } } @@ -1699,25 +1699,29 @@ void CppSupportPart::slotNeedTextHint( int line, int column, TQString& textHint return ; m_backgroundParser->lock(); - TranslationUnitAST* ast = *m_backgroundParser->translationUnit( m_activeFileName ); - AST* node = 0; - if ( ast && ( node = findNodeAt( ast, line, column ) ) ) + ParsedFilePointer pTransUnit = m_backgroundParser->translationUnit(m_activeFileName); + if (pTransUnit) { + TranslationUnitAST* ast = *pTransUnit; + AST* node = 0; + if ( ast && ( node = findNodeAt( ast, line, column ) ) ) + { - while ( node && node->nodeType() != NodeType_FunctionDefinition ) - node = node->parent(); + while ( node && node->nodeType() != NodeType_FunctionDefinition ) + node = node->parent(); - if ( node ) - { - int startLine, startColumn; - int endLine, endColumn; - node->getStartPosition( &startLine, &startColumn ); - node->getEndPosition( &endLine, &endColumn ); + if ( node ) + { + int startLine, startColumn; + int endLine, endColumn; + node->getStartPosition( &startLine, &startColumn ); + node->getEndPosition( &endLine, &endColumn ); - if ( !node->text().isNull() ) - textHint = node->text(); - else - textHint = m_activeEditor->textLine( startLine ).simplifyWhiteSpace(); + if ( !node->text().isNull() ) + textHint = node->text(); + else + textHint = m_activeEditor->textLine( startLine ).simplifyWhiteSpace(); + } } } m_backgroundParser->unlock(); @@ -1831,7 +1835,7 @@ void CppSupportPart::slotMakeMember() if ( !implFile.isEmpty() ) { partController() ->editDocument( KURL( implFile ) ); - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 500 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 500 ); } if ( atLine == -2 ) atLine = m_activeEditor->numLines() - 1; @@ -3165,7 +3169,7 @@ void UIBlockTester::UIBlockTesterThread::stop() { UIBlockTester::UIBlockTester( uint milliseconds ) : m_thread( *this ), m_msecs( milliseconds ) { m_timer = new TQTimer( this ); m_timer->start( milliseconds/10 ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timer()) ); timer(); m_thread.start(); } diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui index fcd6e684..1080ffc3 100644 --- a/languages/cpp/creategettersetter.ui +++ b/languages/cpp/creategettersetter.ui @@ -219,9 +219,9 @@ <tabstop>m_btnCancel</tabstop> <tabstop>m_btnOk</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotInlineChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index 893ac55b..00fce53b 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -29,8 +29,8 @@ #include <kiconloader.h> #include <tdelistview.h> #include <tdeapplication.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kstringhandler.h> #include <klineedit.h> @@ -212,7 +212,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const KService::Ptr ptr = *it; int error = 0; - KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, TQT_TQOBJECT(this), ptr->name().latin1(), TQStringList(), &error ); + KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, this, ptr->name().latin1(), TQStringList(), &error ); if ( importer ) { new PCSListViewItem( ptr, importer, importerListView ); @@ -276,7 +276,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) m_settings = importer->createSettingsPage( settingsPage ); setNextEnabled( currentPage(), false ); setHelpEnabled( currentPage(), false ); - connect( m_settings, TQT_SIGNAL( enabled( int ) ), this, TQT_SLOT( setNextPageEnabled( int ) ) ); + connect( m_settings, TQ_SIGNAL( enabled( int ) ), this, TQ_SLOT( setNextPageEnabled( int ) ) ); if ( m_settings ) { @@ -307,7 +307,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) m_part->removeCatalog( dbName ); m_jobData = new PCSJobData( dbName, fileList ); - TQTimer::singleShot( 0, this, TQT_SLOT(parseNext()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(parseNext()) ); } } @@ -340,7 +340,7 @@ void CreatePCSDialog::parseNext( ) ++(m_jobData->it); - TQTimer::singleShot( 0, this, TQT_SLOT(parseNext()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(parseNext()) ); } diff --git a/languages/cpp/createpcsdialog.h b/languages/cpp/createpcsdialog.h index 9aab172b..df303173 100644 --- a/languages/cpp/createpcsdialog.h +++ b/languages/cpp/createpcsdialog.h @@ -24,7 +24,7 @@ class CreatePCSDialog : public CreatePCSDialogBase public: - CreatePCSDialog( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreatePCSDialog( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~CreatePCSDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui index a128e877..14e859b0 100644 --- a/languages/cpp/createpcsdialogbase.ui +++ b/languages/cpp/createpcsdialogbase.ui @@ -159,10 +159,10 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>slotSelected(const TQString&)</slot> <slot>slotSelectionChanged(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/debugger/dbgcontroller.cpp b/languages/cpp/debugger/dbgcontroller.cpp index 6ca94543..bc9d3cd5 100644 --- a/languages/cpp/debugger/dbgcontroller.cpp +++ b/languages/cpp/debugger/dbgcontroller.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include "dbgcontroller.h" -#include <kprocess.h> +#include <tdeprocess.h> /***************************************************************************/ diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index 63f6229b..1d311aff 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -19,7 +19,7 @@ #include <kdialog.h> #include <tdeglobalsettings.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kstdguiitem.h> #include <tdeversion.h> #include <tdelistview.h> @@ -80,14 +80,14 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) buttonbox->layout(); topLayout->addWidget(buttonbox); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); // Default display to 40 chars wide, default height is okay resize( ((TDEGlobalSettings::fixedFont()).pointSize())*40, height()); topLayout->activate(); - TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); } @@ -133,8 +133,8 @@ void Dbg_PS_Dialog::slotInit() } #endif - connect( psProc_, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotProcessExited()) ); - connect( psProc_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); + connect( psProc_, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(slotProcessExited()) ); + connect( psProc_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); psProc_->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index f7d23b0c..bf503bad 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -21,7 +21,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <twinmodule.h> @@ -111,9 +111,9 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) TDEPopupMenu *menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - parent(), TQT_SLOT(slotDock())); + parent(), TQ_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify TDevelop"), - parent(), TQT_SLOT(slotIconifyAndDock())); + parent(), TQ_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; @@ -243,8 +243,8 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) { TDEPopupMenu* menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); - menu->insertItem(i18n("Activate"), toolBar_, TQT_SLOT(slotUndock())); - menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQT_SLOT(slotActivateAndUndock())); + menu->insertItem(i18n("Activate"), toolBar_, TQ_SLOT(slotUndock())); + menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQ_SLOT(slotActivateAndUndock())); menu->popup(e->globalPos()); break; } @@ -270,9 +270,9 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, docker_(0), dockWindow_(new KSystemTray(parent)) { - winModule_ = new KWinModule(TQT_TQOBJECT(this)); + winModule_ = new KWinModule(this); docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); - connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); + connect(docker_, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. // see slotDbgKdevFocus() for more comments @@ -310,17 +310,17 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, bKDevFocus_ = new DbgButton(BarIcon("tdevelop"), TQString(), this); bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), TQString(), this); - connect(bRun, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRun())); - connect(bInterrupt, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotPause())); - connect(bNext, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); - connect(bNexti, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOverInstruction())); - connect(bStep, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepInto())); - connect(bStepi, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepIntoInstruction())); - connect(bFinish, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOut())); - connect(bRunTo, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRunToCursor())); - connect(bView, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotMemoryView())); - connect(bKDevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKdevFocus())); - connect(bPrevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevFocus())); + connect(bRun, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRun())); + connect(bInterrupt, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotPause())); + connect(bNext, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver())); + connect(bNexti, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOverInstruction())); + connect(bStep, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepInto())); + connect(bStepi, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepIntoInstruction())); + connect(bFinish, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOut())); + connect(bRunTo, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRunToCursor())); + connect(bView, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotMemoryView())); + connect(bKDevFocus_, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotKdevFocus())); + connect(bPrevFocus_, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrevFocus())); TQToolTip::add( bRun, i18n("Continue with application execution, may start the application") ); TQToolTip::add( bInterrupt, i18n("Interrupt the application execution") ); diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 6621cbf8..ea0c410d 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -166,12 +166,12 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi mainWindow()->setViewAvailable(gdbOutputWidget, false); // gdbBreakpointWidget -> this - connect( gdbBreakpointWidget, TQT_SIGNAL(refreshBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( gdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( gdbBreakpointWidget, TQT_SIGNAL(gotoSourcePosition(const TQString&, int)), - this, TQT_SLOT(slotGotoSource(const TQString&, int)) ); + connect( gdbBreakpointWidget, TQ_SIGNAL(refreshBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( gdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( gdbBreakpointWidget, TQ_SIGNAL(gotoSourcePosition(const TQString&, int)), + this, TQ_SLOT(slotGotoSource(const TQString&, int)) ); viewerWidget = new ViewerWidget( controller, 0, "viewerWidget"); @@ -179,15 +179,15 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi i18n("Debug views"), i18n("Special debugger views")); mainWindow()->setViewAvailable(viewerWidget, false); - connect(viewerWidget, TQT_SIGNAL(setViewShown(bool)), - this, TQT_SLOT(slotShowView(bool))); + connect(viewerWidget, TQ_SIGNAL(setViewShown(bool)), + this, TQ_SLOT(slotShowView(bool))); // Now setup the actions TDEAction *action; // action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, action = new TDEAction(i18n("&Start"), "dbgrun", Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); action->setWhatsThis( i18n("<b>Start in debugger</b><p>" @@ -198,7 +198,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "about variables, frame stack, and so on.") ); action = new TDEAction(i18n("&Restart"), "dbgrestart", 0, - this, TQT_SLOT(slotRestart()), + this, TQ_SLOT(slotRestart()), actionCollection(), "debug_restart"); action->setToolTip( i18n("Restart program") ); action->setWhatsThis( i18n("<b>Restarts application</b><p>" @@ -208,33 +208,33 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Sto&p"), "process-stop", 0, - this, TQT_SLOT(slotStop()), + this, TQ_SLOT(slotStop()), actionCollection(), "debug_stop"); action->setToolTip( i18n("Stop debugger") ); action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger.")); action = new TDEAction(i18n("Interrupt"), "media-playback-pause", 0, - this, TQT_SLOT(slotPause()), + this, TQ_SLOT(slotPause()), actionCollection(), "debug_pause"); action->setToolTip( i18n("Interrupt application") ); action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current GDB command.")); action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0, - this, TQT_SLOT(slotRunToCursor()), + this, TQ_SLOT(slotRunToCursor()), actionCollection(), "debug_runtocursor"); action->setToolTip( i18n("Run to cursor") ); action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached.")); action = new TDEAction(i18n("Set E&xecution Position to Cursor"), "dbgjumpto", 0, - this, TQT_SLOT(slotJumpToCursor()), + this, TQ_SLOT(slotJumpToCursor()), actionCollection(), "debug_jumptocursor"); action->setToolTip( i18n("Jump to cursor") ); action->setWhatsThis(i18n("<b>Set Execution Position </b><p>Set the execution pointer to the current cursor position.")); action = new TDEAction(i18n("Step &Over"), "dbgnext", Key_F10, - this, TQT_SLOT(slotStepOver()), + this, TQ_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); action->setWhatsThis( i18n("<b>Step over</b><p>" @@ -245,14 +245,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Step over Ins&truction"), "dbgnextinst", 0, - this, TQT_SLOT(slotStepOverInstruction()), + this, TQ_SLOT(slotStepOverInstruction()), actionCollection(), "debug_stepoverinst"); action->setToolTip( i18n("Step over instruction") ); action->setWhatsThis(i18n("<b>Step over instruction</b><p>Steps over the next assembly instruction.")); action = new TDEAction(i18n("Step &Into"), "dbgstep", Key_F11, - this, TQT_SLOT(slotStepInto()), + this, TQ_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); action->setWhatsThis( i18n("<b>Step into</b><p>" @@ -262,14 +262,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Step into I&nstruction"), "dbgstepinst", 0, - this, TQT_SLOT(slotStepIntoInstruction()), + this, TQ_SLOT(slotStepIntoInstruction()), actionCollection(), "debug_stepintoinst"); action->setToolTip( i18n("Step into instruction") ); action->setWhatsThis(i18n("<b>Step into instruction</b><p>Steps into the next assembly instruction.")); action = new TDEAction(i18n("Step O&ut"), "dbgstepout", Key_F12, - this, TQT_SLOT(slotStepOut()), + this, TQ_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current function") ); action->setWhatsThis( i18n("<b>Step out</b><p>" @@ -281,7 +281,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Viewers"), "dbgmemview", 0, - this, TQT_SLOT(slotMemoryView()), + this, TQ_SLOT(slotMemoryView()), actionCollection(), "debug_memview"); action->setToolTip( i18n("Debugger viewers") ); action->setWhatsThis(i18n("<b>Debugger viewers</b><p>Various information about application being executed. There are 4 views available:<br>" @@ -292,7 +292,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Examine Core File..."), "application-x-core", 0, - this, TQT_SLOT(slotExamineCore()), + this, TQ_SLOT(slotExamineCore()), actionCollection(), "debug_core"); action->setToolTip( i18n("Examine core file") ); action->setWhatsThis( i18n("<b>Examine core file</b><p>" @@ -304,83 +304,83 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Attach to Process"), "connect_creating", 0, - this, TQT_SLOT(slotAttachProcess()), + this, TQ_SLOT(slotAttachProcess()), actionCollection(), "debug_attach"); action->setToolTip( i18n("Attach to process") ); action->setWhatsThis(i18n("<b>Attach to process</b><p>Attaches the debugger to a running process.")); action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0, - this, TQT_SLOT(toggleBreakpoint()), + this, TQ_SLOT(toggleBreakpoint()), actionCollection(), "debug_toggle_breakpoint"); action->setToolTip(i18n("Toggle breakpoint")); action->setWhatsThis(i18n("<b>Toggle breakpoint</b><p>Toggles the breakpoint at the current line in editor.")); - connect( mainWindow()->main()->guiFactory(), TQT_SIGNAL(clientAdded(KXMLGUIClient*)), - this, TQT_SLOT(guiClientAdded(KXMLGUIClient*)) ); + connect( mainWindow()->main()->guiFactory(), TQ_SIGNAL(clientAdded(KXMLGUIClient*)), + this, TQ_SLOT(guiClientAdded(KXMLGUIClient*)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( partController(), TQT_SIGNAL(loadedFile(const KURL &)), - gdbBreakpointWidget, TQT_SLOT(slotRefreshBP(const KURL &)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpoint(const TQString &, int)), - gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(editedBreakpoint(const TQString &, int)), - gdbBreakpointWidget, TQT_SLOT(slotEditBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), - gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); + connect( partController(), TQ_SIGNAL(loadedFile(const KURL &)), + gdbBreakpointWidget, TQ_SLOT(slotRefreshBP(const KURL &)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpoint(const TQString &, int)), + gdbBreakpointWidget, TQ_SLOT(slotToggleBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(editedBreakpoint(const TQString &, int)), + gdbBreakpointWidget, TQ_SLOT(slotEditBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + gdbBreakpointWidget, TQ_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStop(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectClosed()), - this, TQT_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStop(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectClosed()), + this, TQ_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); procLineMaker = new ProcessLineMaker(); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStdoutLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStderrLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStderrLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStdoutLine(const TQCString&))); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStderrLine(const TQCString&))); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStdoutLine(const TQCString&))); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStderrLine(const TQCString&))); // The output from tracepoints goes to "application" window, because // we don't have any better alternative, and using yet another window // is undesirable. Besides, this makes tracepoint look even more similar // to printf debugging. - connect( gdbBreakpointWidget, TQT_SIGNAL(tracingOutput(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); + connect( gdbBreakpointWidget, TQ_SIGNAL(tracingOutput(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStdout(const char*))); - connect(partController(), TQT_SIGNAL(savedFile(const KURL &)), - this, TQT_SLOT(slotFileSaved())); + connect(partController(), TQ_SIGNAL(savedFile(const KURL &)), + this, TQ_SLOT(slotFileSaved())); if (project()) - connect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotProjectCompiled())); + connect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotProjectCompiled())); setupController(); - TQTimer::singleShot(0, this, TQT_SLOT(setupDcop())); + TQTimer::singleShot(0, this, TQ_SLOT(setupDcop())); } void DebuggerPart::setupDcop() { - QCStringList objects = kapp->dcopClient()->registeredApplications(); + QCStringList objects = tdeApp->dcopClient()->registeredApplications(); for (QCStringList::Iterator it = objects.begin(); it != objects.end(); ++it) if ((*it).find("drkonqi-") == 0) slotDCOPApplicationRegistered(*it); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), TQT_SLOT(slotDCOPApplicationRegistered(const TQCString&))); - kapp->dcopClient()->setNotifications(true); + connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), TQ_SLOT(slotDCOPApplicationRegistered(const TQCString&))); + tdeApp->dcopClient()->setNotifications(true); } void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId) @@ -389,14 +389,14 @@ void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId) TQByteArray answer; TQCString replyType; - kapp->dcopClient()->call(appId, "krashinfo", "appName()", TQByteArray(), replyType, answer, true, 5000); + tdeApp->dcopClient()->call(appId, "krashinfo", "appName()", TQByteArray(), replyType, answer, true, 5000); TQDataStream d(answer, IO_ReadOnly); TQCString appName; d >> appName; if (appName.length() && project() && project()->mainProgram().endsWith(appName)) { - kapp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(TQString)", i18n("Debug in &TDevelop")); + tdeApp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(TQString)", i18n("Debug in &TDevelop")); connectDCOPSignal(appId, "krashinfo", "acceptDebuggingApplication()", "slotDebugExternalProcess()", true); } } @@ -407,15 +407,15 @@ ASYNC DebuggerPart::slotDebugExternalProcess() TQByteArray answer; TQCString replyType; - kapp->dcopClient()->call(kapp->dcopClient()->senderId(), "krashinfo", "pid()", TQByteArray(), replyType, answer, true, 5000); + tdeApp->dcopClient()->call(tdeApp->dcopClient()->senderId(), "krashinfo", "pid()", TQByteArray(), replyType, answer, true, 5000); TQDataStream d(answer, IO_ReadOnly); int pid; d >> pid; if (attachProcess(pid) && m_drkonqi.isEmpty()) { - m_drkonqi = kapp->dcopClient()->senderId(); - TQTimer::singleShot(15000, this, TQT_SLOT(slotCloseDrKonqi())); + m_drkonqi = tdeApp->dcopClient()->senderId(); + TQTimer::singleShot(15000, this, TQ_SLOT(slotCloseDrKonqi())); mainWindow()->raiseView(framestackWidget); } @@ -429,13 +429,13 @@ ASYNC DebuggerPart::slotDebugCommandLine(const TQString& /*command*/) void DebuggerPart::slotCloseDrKonqi() { - kapp->dcopClient()->send(m_drkonqi, "MainApplication-Interface", "quit()", TQByteArray()); + tdeApp->dcopClient()->send(m_drkonqi, "MainApplication-Interface", "quit()", TQByteArray()); m_drkonqi = ""; } DebuggerPart::~DebuggerPart() { - kapp->dcopClient()->setNotifications(false); + tdeApp->dcopClient()->setNotifications(false); if (variableWidget) mainWindow()->removeView(variableWidget); @@ -497,7 +497,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) if (act) { int id = popup->insertItem( act->iconSet(), i18n("Run to &Cursor"), - this, TQT_SLOT(slotRunToCursor()), + this, TQ_SLOT(slotRunToCursor()), 0, -1, index); popup->setWhatsThis(id, act->whatsThis()); @@ -507,7 +507,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) if (econtext->url().isLocalFile()) { int id = popup->insertItem( i18n("Toggle Breakpoint"), - this, TQT_SLOT(toggleBreakpoint()), + this, TQ_SLOT(toggleBreakpoint()), 0, -1, index); index += running; popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); @@ -516,12 +516,12 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) { TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); int id = popup->insertItem( i18n("Evaluate: %1").arg(squeezed), - this, TQT_SLOT(contextEvaluate()), + this, TQ_SLOT(contextEvaluate()), 0, -1, index); index += running; popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor.")); int id2 = popup->insertItem( i18n("Watch: %1").arg(squeezed), - this, TQT_SLOT(contextWatch()), + this, TQ_SLOT(contextWatch()), 0, -1, index); index += running; popup->setWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list.")); @@ -562,8 +562,8 @@ void DebuggerPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Debugger"), i18n("Debugger"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); DebuggerConfigWidget *w = new DebuggerConfigWidget(this, vbox, "debugger config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(finished()), controller, TQT_SLOT(configure()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(finished()), controller, TQ_SLOT(configure()) ); } @@ -572,57 +572,57 @@ void DebuggerPart::setupController() VariableTree *variableTree = variableWidget->varTree(); // variableTree -> gdbBreakpointWidget - connect( variableTree, TQT_SIGNAL(toggleWatchpoint(const TQString &)), - gdbBreakpointWidget, TQT_SLOT(slotToggleWatchpoint(const TQString &))); + connect( variableTree, TQ_SIGNAL(toggleWatchpoint(const TQString &)), + gdbBreakpointWidget, TQ_SLOT(slotToggleWatchpoint(const TQString &))); // gdbOutputWidget -> controller - connect( gdbOutputWidget, TQT_SIGNAL(userGDBCmd(const TQString &)), - controller, TQT_SLOT(slotUserGDBCmd(const TQString&))); - connect( gdbOutputWidget, TQT_SIGNAL(breakInto()), - controller, TQT_SLOT(slotBreakInto())); + connect( gdbOutputWidget, TQ_SIGNAL(userGDBCmd(const TQString &)), + controller, TQ_SLOT(slotUserGDBCmd(const TQString&))); + connect( gdbOutputWidget, TQ_SIGNAL(breakInto()), + controller, TQ_SLOT(slotBreakInto())); - connect( controller, TQT_SIGNAL(breakpointHit(int)), - gdbBreakpointWidget, TQT_SLOT(slotBreakpointHit(int))); + connect( controller, TQ_SIGNAL(breakpointHit(int)), + gdbBreakpointWidget, TQ_SLOT(slotBreakpointHit(int))); // controller -> disassembleWidget - connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), - disassembleWidget, TQT_SLOT(slotShowStepInSource(const TQString&, int, const TQString&))); + connect( controller, TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + disassembleWidget, TQ_SLOT(slotShowStepInSource(const TQString&, int, const TQString&))); // controller -> this - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - this, TQT_SLOT(slotStatus(const TQString&, int))); - connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), - this, TQT_SLOT(slotShowStep(const TQString&, int))); - connect( controller, TQT_SIGNAL(debuggerAbnormalExit()), - this, TQT_SLOT(slotDebuggerAbnormalExit())); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + this, TQ_SLOT(slotStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + this, TQ_SLOT(slotShowStep(const TQString&, int))); + connect( controller, TQ_SIGNAL(debuggerAbnormalExit()), + this, TQ_SLOT(slotDebuggerAbnormalExit())); - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - this, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + this, TQ_SLOT(slotEvent(GDBController::event_t))); // controller -> procLineMaker - connect( controller, TQT_SIGNAL(ttyStdout(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); - connect( controller, TQT_SIGNAL(ttyStderr(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStderr(const char*))); + connect( controller, TQ_SIGNAL(ttyStdout(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStdout(const char*))); + connect( controller, TQ_SIGNAL(ttyStderr(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStderr(const char*))); // controller -> gdbOutputWidget - connect( controller, TQT_SIGNAL(gdbInternalCommandStdout(const char*)), - gdbOutputWidget, TQT_SLOT(slotInternalCommandStdout(const char*)) ); - connect( controller, TQT_SIGNAL(gdbUserCommandStdout(const char*)), - gdbOutputWidget, TQT_SLOT(slotUserCommandStdout(const char*)) ); + connect( controller, TQ_SIGNAL(gdbInternalCommandStdout(const char*)), + gdbOutputWidget, TQ_SLOT(slotInternalCommandStdout(const char*)) ); + connect( controller, TQ_SIGNAL(gdbUserCommandStdout(const char*)), + gdbOutputWidget, TQ_SLOT(slotUserCommandStdout(const char*)) ); - connect( controller, TQT_SIGNAL(gdbStderr(const char*)), - gdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - gdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(gdbStderr(const char*)), + gdbOutputWidget, TQ_SLOT(slotReceivedStderr(const char*)) ); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + gdbOutputWidget, TQ_SLOT(slotDbgStatus(const TQString&, int))); // controller -> viewerWidget - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - viewerWidget, TQT_SLOT(slotDebuggerState(const TQString&, int))); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + viewerWidget, TQ_SLOT(slotDebuggerState(const TQString&, int))); - connect(statusBarIndicator, TQT_SIGNAL(doubleClicked()), - controller, TQT_SLOT(explainDebuggerStatus())); + connect(statusBarIndicator, TQ_SIGNAL(doubleClicked()), + controller, TQ_SLOT(explainDebuggerStatus())); } @@ -857,18 +857,18 @@ void DebuggerPart::slotRun() if (rebuild) { - disconnect(TQT_SIGNAL(buildProject())); + disconnect(TQ_SIGNAL(buildProject())); // The KDevProject has no method to build the project, // so try connecting to a slot has is present to all // existing project managers. // Note: this assumes that 'slotBuild' will save // modified files. - if (connect(this, TQT_SIGNAL(buildProject()), - project(), TQT_SLOT(slotBuild()))) + if (connect(this, TQ_SIGNAL(buildProject()), + project(), TQ_SLOT(slotBuild()))) { - connect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotRun_part2())); + connect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotRun_part2())); emit buildProject(); rebuild = true; @@ -894,8 +894,8 @@ void DebuggerPart::slotRun_part2() { needRebuild_ = false; - disconnect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotRun_part2())); + disconnect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotRun_part2())); if (controller->stateIsOn( s_dbgNotStarted )) { diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp index 90657b29..6d1122ee 100644 --- a/languages/cpp/debugger/debuggertracingdialog.cpp +++ b/languages/cpp/debugger/debuggertracingdialog.cpp @@ -19,11 +19,11 @@ namespace GDBDebugger { expressions->setButtons(KEditListBox::Add | KEditListBox::Remove); - connect(enable, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(enableOrDisable(int))); + connect(enable, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(enableOrDisable(int))); - connect(enableCustomFormat, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(enableOrDisableCustomFormat(int))); + connect(enableCustomFormat, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(enableOrDisableCustomFormat(int))); enable->setChecked(bp_->tracingEnabled()); expressions->setItems(bp_->tracedExpressions()); diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui index b6e01791..4f42b213 100644 --- a/languages/cpp/debugger/debuggertracingdialogbase.ui +++ b/languages/cpp/debugger/debuggertracingdialogbase.ui @@ -130,9 +130,9 @@ If custom format string is not enabled, names and values of all expressions will <slot>reject()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>enableOrDisable()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp index 423fae89..e81bf590 100644 --- a/languages/cpp/debugger/framestackwidget.cpp +++ b/languages/cpp/debugger/framestackwidget.cpp @@ -57,11 +57,11 @@ FramestackWidget::FramestackWidget(GDBController* controller, // FIXME: maybe, all debugger components should derive from // a base class that does this connect. - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - this, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + this, TQ_SLOT(slotEvent(GDBController::event_t))); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); } diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index c777226a..c8064711 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -145,8 +145,8 @@ void BreakpointTableRow::appendEmptyRow() ComplexEditCell* act = new ComplexEditCell(table()); table()->setItem(row, Tracing, act); - TQObject::connect(act, TQT_SIGNAL(edit(TQTableItem*)), - table()->parent(), TQT_SLOT(editTracing(TQTableItem*))); + TQObject::connect(act, TQ_SIGNAL(edit(TQTableItem*)), + table()->parent(), TQ_SLOT(editTracing(TQTableItem*))); } /***************************************************************************/ @@ -251,39 +251,39 @@ controller_(controller) m_table->show(); - connect( newBreakpoint, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAddBlankBreakpoint(int)) ); + connect( newBreakpoint, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAddBlankBreakpoint(int)) ); - connect( m_table, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), - this, TQT_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); - connect( m_ctxMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotContextMenuSelect(int)) ); + connect( m_table, TQ_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), + this, TQ_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); + connect( m_ctxMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotContextMenuSelect(int)) ); - connect( m_table, TQT_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), - this, TQT_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); + connect( m_table, TQ_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), + this, TQ_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); - connect( m_table, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_SLOT(slotNewValue(int, int))); + connect( m_table, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(slotNewValue(int, int))); - connect( m_table, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotEditBreakpoint())); -// connect( m_table, TQT_SIGNAL(f2Pressed()), -// this, TQT_SLOT(slotEditBreakpoint())); - connect( m_table, TQT_SIGNAL(deletePressed()), - this, TQT_SLOT(slotRemoveBreakpoint())); + connect( m_table, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotEditBreakpoint())); +// connect( m_table, TQ_SIGNAL(f2Pressed()), +// this, TQ_SLOT(slotEditBreakpoint())); + connect( m_table, TQ_SIGNAL(deletePressed()), + this, TQ_SLOT(slotRemoveBreakpoint())); // This slot doesn't exist anymore -// connect( m_table, TQT_SIGNAL(insertPressed()), -// this, TQT_SLOT(slotAddBlankBreakpoint())); +// connect( m_table, TQ_SIGNAL(insertPressed()), +// this, TQ_SLOT(slotAddBlankBreakpoint())); // FIXME: maybe, all debugger components should derive from // a base class that does this connect. - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - this, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + this, TQ_SLOT(slotEvent(GDBController::event_t))); connect(controller, - TQT_SIGNAL(watchpointHit(int, const TQString&, const TQString&)), + TQ_SIGNAL(watchpointHit(int, const TQString&, const TQString&)), this, - TQT_SLOT(slotWatchpointHit(int, const TQString&, const TQString&))); + TQ_SLOT(slotWatchpointHit(int, const TQString&, const TQString&))); } /***************************************************************************/ @@ -453,8 +453,8 @@ BreakpointTableRow* GDBBreakpointWidget::addBreakpoint(Breakpoint *bp) BreakpointTableRow* btr = new BreakpointTableRow( m_table, TQTableItem::WhenCurrent, bp ); - connect(bp, TQT_SIGNAL(modified(Breakpoint*)), - this, TQT_SLOT(slotBreakpointModified(Breakpoint*))); + connect(bp, TQ_SIGNAL(modified(Breakpoint*)), + this, TQ_SLOT(slotBreakpointModified(Breakpoint*))); sendToGdb(*bp); @@ -1238,7 +1238,7 @@ TQWidget* ComplexEditCell::createEditor() const // than 20. b->setFixedWidth( 20 ); - connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit())); + connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit())); return box; } diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index bca8b98d..da53c0ec 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -30,7 +30,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <twin.h> #include <tqdatetime.h> @@ -798,17 +798,17 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en dbgProcess_ = new TDEProcess; - connect( dbgProcess_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotDbgWroteStdin(TDEProcess *)) ); + connect( dbgProcess_, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotDbgWroteStdin(TDEProcess *)) ); - connect( dbgProcess_, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotDbgProcessExited(TDEProcess*)) ); + connect( dbgProcess_, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotDbgProcessExited(TDEProcess*)) ); application_ = application; @@ -984,7 +984,7 @@ void GDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); now = TQTime::currentTime(); if (!stateIsOn(s_dbgBusy) || start.msecsTo( now ) > 2000) break; @@ -1002,7 +1002,7 @@ void GDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); now = TQTime::currentTime(); if (!stateIsOn(s_attached) || start.msecsTo( now ) > 2000) break; @@ -1018,7 +1018,7 @@ void GDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 20 ); now = TQTime::currentTime(); if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000) break; @@ -1098,11 +1098,11 @@ void GDBController::slotRun() if (stateIsOn(s_appNotStarted)) { delete tty_; - tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); + tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *tdeApp->config() )); if (!config_dbgTerminal_) { - connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) ); - connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) ); + connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) ); + connect( tty_, TQ_SIGNAL(ErrOutput(const char*)), TQ_SIGNAL(ttyStderr(const char*)) ); } TQString tty(tty_->getSlave()); @@ -1459,9 +1459,9 @@ void GDBController::slotDbgStdout(TDEProcess *, char *buf, int buflen) FileSymbol file; file.contents = reply; - std::auto_ptr<GDBMI::Record> r(mi_parser_.parse(&file)); + std::unique_ptr<GDBMI::Record> r(mi_parser_.parse(&file)); - if (r.get() == 0) + if (!r) { // FIXME: Issue an error! kdDebug(9012) << "Invalid MI message: " << reply << "\n"; @@ -1840,7 +1840,7 @@ int GDBController::qtVersion( ) const void GDBController::demandAttention() const { - if ( TQWidget * w = kapp->mainWidget() ) + if ( TQWidget * w = tdeApp->mainWidget() ) { KWin::demandAttention( w->winId(), true ); } diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h index ef7800b6..f0f6389b 100644 --- a/languages/cpp/debugger/gdbcontroller.h +++ b/languages/cpp/debugger/gdbcontroller.h @@ -330,7 +330,7 @@ private: // After highting current line we need to do something more, // like announcing write watchpoints, and so need to have // access to the stop packet. So store it here. - std::auto_ptr<GDBMI::ResultRecord> last_stop_result; + std::unique_ptr<GDBMI::ResultRecord> last_stop_result; // Gdb 6.4 (and 6.3) does not support "character" format with MI, // so the only way it can work is via the "print" command. As gdb diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index deabf2c8..74ce3dc1 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -78,11 +78,11 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : slotDbgStatus( "", s_dbgNotStarted); - connect( m_userGDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotGDBCmd()) ); - connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); + connect( m_userGDBCmdEditor, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotGDBCmd()) ); + connect( m_Interrupt, TQ_SIGNAL(clicked()), TQ_SIGNAL(breakInto())); - connect( &updateTimer_, TQT_SIGNAL(timeout()), - this, TQT_SLOT(flushPending())); + connect( &updateTimer_, TQ_SIGNAL(timeout()), + this, TQ_SLOT(flushPending())); } /***************************************************************************/ @@ -325,7 +325,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) int id = popup->insertItem(i18n("Show Internal Commands"), this, - TQT_SLOT(toggleShowInternalCommands())); + TQ_SLOT(toggleShowInternalCommands())); popup->setItemChecked(id, parent_->showInternalCommands_); popup->setWhatsThis( @@ -338,7 +338,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) popup->insertItem(i18n("Copy All"), this, - TQT_SLOT(copyAll())); + TQ_SLOT(copyAll())); return popup; diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index 42ad9d4c..86f7e61c 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -116,11 +116,11 @@ namespace GDBDebugger l->addSpacing(2); - connect(startAddressLineEdit, TQT_SIGNAL(returnPressed()), - okButton, TQT_SLOT(animateClick())); + connect(startAddressLineEdit, TQ_SIGNAL(returnPressed()), + okButton, TQ_SLOT(animateClick())); - connect(amountLineEdit, TQT_SIGNAL(returnPressed()), - okButton, TQT_SLOT(animateClick())); + connect(amountLineEdit, TQ_SIGNAL(returnPressed()), + okButton, TQ_SLOT(animateClick())); } }; @@ -162,8 +162,8 @@ namespace GDBDebugger { ok_ = true; - connect(real_widget, TQT_SIGNAL(bufferChanged(int, int)), - this, TQT_SLOT(memoryEdited(int, int))); + connect(real_widget, TQ_SIGNAL(bufferChanged(int, int)), + this, TQ_SLOT(memoryEdited(int, int))); khexedit2_real_widget = real_widget; @@ -197,22 +197,22 @@ namespace GDBDebugger rangeSelector_ = new MemoryRangeSelector(this); l->addWidget(rangeSelector_); - connect(rangeSelector_->okButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeMemoryRange())); + connect(rangeSelector_->okButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeMemoryRange())); - connect(rangeSelector_->cancelButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotHideRangeDialog())); + connect(rangeSelector_->cancelButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotHideRangeDialog())); connect(rangeSelector_->startAddressLineEdit, - TQT_SIGNAL(textChanged(const TQString&)), + TQ_SIGNAL(textChanged(const TQString&)), this, - TQT_SLOT(slotEnableOrDisable())); + TQ_SLOT(slotEnableOrDisable())); connect(rangeSelector_->amountLineEdit, - TQT_SIGNAL(textChanged(const TQString&)), + TQ_SIGNAL(textChanged(const TQString&)), this, - TQT_SLOT(slotEnableOrDisable())); + TQ_SLOT(slotEnableOrDisable())); l->addWidget(khexedit2_widget); @@ -436,11 +436,11 @@ namespace GDBDebugger toolBox_->setCurrentItem(widget); memoryViews_.push_back(widget); - connect(widget, TQT_SIGNAL(captionChanged(const TQString&)), - this, TQT_SLOT(slotChildCaptionChanged(const TQString&))); + connect(widget, TQ_SIGNAL(captionChanged(const TQString&)), + this, TQ_SLOT(slotChildCaptionChanged(const TQString&))); - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(slotChildDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(slotChildDestroyed(TQObject*))); } void ViewerWidget::slotDebuggerState(const TQString&, int state) diff --git a/languages/cpp/debugger/mi/miparser.cpp b/languages/cpp/debugger/mi/miparser.cpp index e078c04c..e950f2f3 100644 --- a/languages/cpp/debugger/mi/miparser.cpp +++ b/languages/cpp/debugger/mi/miparser.cpp @@ -97,7 +97,7 @@ bool MIParser::parsePrompt(Record *&record) bool MIParser::parseStreamRecord(Record *&record) { - std::auto_ptr<StreamRecord> stream(new StreamRecord); + std::unique_ptr<StreamRecord> stream(new StreamRecord); switch (lex->lookAhead()) { case '~': @@ -128,7 +128,7 @@ bool MIParser::parseResultRecord(Record *&record) TQString reason = lex->currentTokenText(); lex->nextToken(); - std::auto_ptr<ResultRecord> res(new ResultRecord); + std::unique_ptr<ResultRecord> res(new ResultRecord); res->reason = reason; if (lex->lookAhead() != ',') { @@ -151,7 +151,7 @@ bool MIParser::parseResult(Result *&result) TQString variable = lex->currentTokenText(); lex->nextToken(); - std::auto_ptr<Result> res(new Result); + std::unique_ptr<Result> res(new Result); res->variable = variable; if (lex->lookAhead() != '=') @@ -207,7 +207,7 @@ bool MIParser::parseList(Value *&value) { ADVANCE('['); - std::auto_ptr<ListValue> lst(new ListValue); + std::unique_ptr<ListValue> lst(new ListValue); // Note: can't use parseCSV here because of nested // "is this Value or Result" guessing. Too lazy to factor @@ -248,7 +248,7 @@ bool MIParser::parseList(Value *&value) bool MIParser::parseCSV(TupleValue** value, char start, char end) { - std::auto_ptr<TupleValue> tuple(new TupleValue); + std::unique_ptr<TupleValue> tuple(new TupleValue); if (!parseCSV(*tuple, start, end)) return false; diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index 6960ad6d..2e39ce5f 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -26,11 +26,6 @@ #include <config.h> #endif -#ifdef __osf__ -#define _XOPEN_SOURCE_EXTENDED -#define O_NDELAY O_NONBLOCK -#endif - #include <sys/types.h> #include <sys/ioctl.h> #include <sys/stat.h> @@ -65,7 +60,7 @@ #include <tqfile.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include "stty.h" @@ -132,7 +127,7 @@ STTY::STTY(bool ext, const TQString &termAppName) if (fout >= 0) { ttySlave = TQString(tty_slave); out = new TQSocketNotifier(fout, TQSocketNotifier::Read, this); - connect( out, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OutReceived(int)) ); + connect( out, TQ_SIGNAL(activated(int)), this, TQ_SLOT(OutReceived(int)) ); } } } @@ -155,7 +150,7 @@ STTY::~STTY() int STTY::findTTY() { int ptyfd = -1; - bool needGrantPty = TRUE; + bool needGrantPty = true; // Find a master pty that we can open //////////////////////////////// @@ -168,7 +163,7 @@ int STTY::findTTY() strncpy(tty_slave, ptsname(ptyfd), 50); grantpt(ptyfd); unlockpt(ptyfd); - needGrantPty = FALSE; + needGrantPty = false; #endif // first we try UNIX PTY's @@ -182,7 +177,7 @@ int STTY::findTTY() struct stat sbuf; sprintf(tty_slave,"/dev/pts/%d",ptyno); if (stat(tty_slave,&sbuf) == 0 && S_ISCHR(sbuf.st_mode)) - needGrantPty = FALSE; + needGrantPty = false; else { close(ptyfd); ptyfd = -1; @@ -227,7 +222,7 @@ int STTY::findTTY() } if (ptyfd >= 0) { - if (needGrantPty && !chownpty(ptyfd, TRUE)) { + if (needGrantPty && !chownpty(ptyfd, true)) { fprintf(stderr,"tdevelop: chownpty failed for device %s::%s.\n",pty_master,tty_slave); fprintf(stderr," : This means the session can be eavesdroped.\n"); fprintf(stderr," : Make sure konsole_grantpty is installed and setuid root.\n"); diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 5750d243..e46db5dc 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -104,14 +104,14 @@ VariableWidget::VariableWidget(GDBController* controller, topLayout->addItem(buttons); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddWatchVariable()) ); - connect( evalButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEvaluateExpression()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddWatchVariable()) ); + connect( evalButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEvaluateExpression()) ); - connect( watchVarEditor_, TQT_SIGNAL(returnPressed()), - TQT_SLOT(slotEvaluateExpression()) ); + connect( watchVarEditor_, TQ_SIGNAL(returnPressed()), + TQ_SLOT(slotEvaluateExpression()) ); - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - varTree_, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + varTree_, TQ_SLOT(slotEvent(GDBController::event_t))); // Setup help items. @@ -223,10 +223,10 @@ VariableTree::VariableTree(VariableWidget *parent, addColumn(i18n("Value")); // setResizeMode(AllColumns); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem*, int, const TQString&)), - this, TQT_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&))); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(itemRenamed( TQListViewItem*, int, const TQString&)), + this, TQ_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&))); } // ************************************************************************** @@ -1085,9 +1085,9 @@ VarItem::VarItem(TrimmableItem *parent, baseClassMember_(false), alive_(true) { - connect(this, TQT_SIGNAL(varobjNameChange(const TQString&, const TQString&)), + connect(this, TQ_SIGNAL(varobjNameChange(const TQString&, const TQString&)), varTree(), - TQT_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); + TQ_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); // User might have entered format together with expression: like @@ -1130,9 +1130,9 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, baseClassMember_(baseClassMember), alive_(true) { - connect(this, TQT_SIGNAL(varobjNameChange(const TQString&, const TQString&)), + connect(this, TQ_SIGNAL(varobjNameChange(const TQString&, const TQString&)), varTree(), - TQT_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); + TQ_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); expression_ = varobj["exp"].literal(); varobjName_ = varobj["name"].literal(); diff --git a/languages/cpp/doc/cppannotations.toc b/languages/cpp/doc/cppannotations.toc index 7631c681..15cb3367 100644 --- a/languages/cpp/doc/cppannotations.toc +++ b/languages/cpp/doc/cppannotations.toc @@ -433,7 +433,6 @@ <tocsect3 name="18.3.4: Pointing to a newly allocated object" url="cplusplus18.html#l324"/> <tocsect3 name="18.3.5: Operators and members" url="cplusplus18.html#l325"/> <tocsect3 name="18.3.6: Using `unique_ptr' objects for arrays" url="cplusplus18.html#l326"/> - <tocsect3 name="18.3.7: The legacy class 'auto_ptr' (deprecated)" url="cplusplus18.html#l327"/> </tocsect2> <tocsect2 name="18.4: The class 'shared_ptr'" url="cplusplus18.html#l328"> <tocsect3 name="18.4.1: Defining `shared_ptr' objects" url="cplusplus18.html#l329"/> diff --git a/languages/cpp/doc/qt-kdev3.toc b/languages/cpp/doc/qt-kdev3.toc index ff9826cd..4675d7c2 100644 --- a/languages/cpp/doc/qt-kdev3.toc +++ b/languages/cpp/doc/qt-kdev3.toc @@ -16,7 +16,7 @@ <tocsect2 name="Designing the program" url="#Designing_the_Program"/> <tocsect2 name="Adding widgets" url="#Adding_Widgets"/> <tocsect2 name="Getting spaced out" url="#Getting_Spaced_Out"/> - <tocsect2 name="Signals and Q_SLOTS" url="#Signals_and_Slots"/> + <tocsect2 name="Signals and slots" url="#Signals_and_Slots"/> <tocsect2 name="Generating the source" url="#Generating_the_Source"/> <tocsect2 name="Implementing the slot" url="#Implementing_the_Slot"/> </tocsect1> diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp index cc3f3244..338ea1c3 100644 --- a/languages/cpp/includepathresolver.cpp +++ b/languages/cpp/includepathresolver.cpp @@ -31,7 +31,7 @@ #include "tqdir.h" /* defines TQDir */ #include "tqregexp.h" /* defines TQRegExp */ #include "tdelocale.h" /* defines [function] i18n */ -#include "blockingkprocess.h" /* defines BlockingTDEProcess */ +#include "blockingtdeprocess.h" /* defines BlockingTDEProcess */ #include "includepathresolver.h" #include <sys/stat.h> #include <sys/time.h> @@ -39,7 +39,7 @@ #include <stdlib.h> #ifdef TEST -#include "blockingkprocess.cpp" +#include "blockingtdeprocess.cpp" #include <iostream> using namespace std; diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index 7ec48cfa..2b4cb5d1 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -15,7 +15,7 @@ #include <catalog.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <stdlib.h> #include <unistd.h> @@ -132,20 +132,6 @@ public: } } - else if ( qmakespec == "win32-borland" ) - { - TQString incl = getenv( "INCLUDE" ); - TQStringList includePaths = TQStringList::split( ';', incl ); - TQStringList::Iterator it = includePaths.begin(); - while ( it != includePaths.end() ) - { - addIncludePath( ( *it ).stripWhiteSpace() ); - ++it; - } - // ### I am sure there are more standard include paths on - // ### windows. I will fix that soon - // ### Also do the compiler specific defines on windows - } } private: diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp index cdaf65b9..f08703b0 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp @@ -45,10 +45,10 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) grid->addMultiCellWidget( elb, 3, 3, 0, grid->numCols() ); - // connect( dbName_edit, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( validate() ) ); - connect( elb->addButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( validate() ) ); - connect( elb->removeButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( validate() ) ); - connect( elb, TQT_SIGNAL( added( const TQString& ) ), this, TQT_SLOT( validateDirectory( const TQString& ) ) ); + // connect( dbName_edit, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( validate() ) ); + connect( elb->addButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( validate() ) ); + connect( elb->removeButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( validate() ) ); + connect( elb, TQ_SIGNAL( added( const TQString& ) ), this, TQ_SLOT( validateDirectory( const TQString& ) ) ); } SettingsDialog::~SettingsDialog() diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui index 7fc72d0e..5d1ff666 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui @@ -55,9 +55,9 @@ </widget> </vbox> </widget> -<Q_SIGNALS> +<signals> <signal>enabled(int)</signal> -</Q_SIGNALS> +</signals> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp index 2993c789..b79e4b17 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp @@ -56,7 +56,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) qtUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui index efba8920..af41060e 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui @@ -125,12 +125,12 @@ Only the selected entry will be used</string> <forwards> <forward>class TQListBoxItem;</forward> </forwards> -<Q_SIGNALS> +<signals> <signal>enabled(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotSelectionChanged(TQListBoxItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp index 631d50d0..5c81906a 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp @@ -15,7 +15,7 @@ #include <tdelistbox.h> #include <kcombobox.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include <kdebug.h> #include <klineedit.h> @@ -41,8 +41,8 @@ TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox ) SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { - TDEApplication::kApplication()->dirs()->addResourceType("include","include"); - TQStringList tdedirs=TDEApplication::kApplication()->dirs()->findDirs("include",""); + tdeApp->dirs()->addResourceType("include","include"); + TQStringList tdedirs=tdeApp->dirs()->findDirs("include",""); for( TQStringList::Iterator it=tdedirs.begin(); it!=tdedirs.end(); ++it ) { TQString tdedir = *it; @@ -53,7 +53,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) kdeUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui index 8ac0d2db..7253be6d 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui @@ -118,12 +118,12 @@ Only the selected entry will be used</string> <forwards> <forward>class TQListBoxItem;</forward> </forwards> -<Q_SIGNALS> +<signals> <signal>enabled(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotSelectionChanged(TQListBoxItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index 49cb66f7..cb33ed94 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -96,7 +96,7 @@ m_markIface( 0 ) "<tt>//FIXME fix this</tt>")); m_initCurrentTimer = new TQTimer( this ); - connect( m_initCurrentTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initCurrentList()) ); + connect( m_initCurrentTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(initCurrentList()) ); m_gridLayout = new TQGridLayout(this,2,3); m_errorList = new TDEListView(this); @@ -145,16 +145,16 @@ m_markIface( 0 ) m_gridLayout->addWidget(m_filterLabel,0,1,TQt::AlignRight); m_gridLayout->addWidget(m_filterEdit,0,2,TQt::AlignLeft); - connect( m_filterEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotFilter()) ); - connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )), - this, TQT_SLOT(slotFilter()) ); - connect( m_tabBar, TQT_SIGNAL(selected(int)), - this, TQT_SLOT(slotTabSelected(int)) ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); + connect( m_filterEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotFilter()) ); + connect( m_filterEdit, TQ_SIGNAL(textChanged( const TQString & )), + this, TQ_SLOT(slotFilter()) ); + connect( m_tabBar, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(slotTabSelected(int)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); // any editors that were open when we loaded the project needs to have their markType07 icon set too.. TQPtrListIterator<KParts::Part> it( *m_cppSupport->partController()->parts() ); @@ -223,13 +223,13 @@ void ProblemReporter::InitListView(TDEListView* listview) listview->addColumn( i18n("Line") ); listview->addColumn( i18n("Column") ); listview->addColumn( i18n("Problem") ); - listview->setAllColumnsShowFocus( TRUE ); + listview->setAllColumnsShowFocus( true ); - connect( listview, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( listview, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); - connect( listview, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem* )) ); + connect( listview, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem* )) ); } diff --git a/languages/cpp/setuphelper.cpp b/languages/cpp/setuphelper.cpp index 3d868c61..93456000 100644 --- a/languages/cpp/setuphelper.cpp +++ b/languages/cpp/setuphelper.cpp @@ -11,11 +11,11 @@ ***************************************************************************/ #include "setuphelper.h" -#include "blockingkprocess.h" +#include "blockingtdeprocess.h" #include "driver.h" #include <kdebug.h> #include "tdetempfile.h" /* defines [function] KTempDir */ -#include "kstandarddirs.h" /* defines [function] locateLocal */ +#include "tdestandarddirs.h" /* defines [function] locateLocal */ #include "tqdir.h" /* defines TQDir */ #include <stdio.h> diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 96ec6385..3b583e09 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -31,7 +31,7 @@ #include <tqpushbutton.h> #include <domutil.h> #include <tqdom.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <tqfile.h> @@ -313,7 +313,7 @@ bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal) replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); if (canBeModal) { - replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); + replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = false"); replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); } diff --git a/languages/cpp/subclassingdlg.h b/languages/cpp/subclassingdlg.h index 93fe9279..ee3a05d4 100644 --- a/languages/cpp/subclassingdlg.h +++ b/languages/cpp/subclassingdlg.h @@ -43,10 +43,10 @@ class SubclassingDlg : public SubclassingDlgBase public: SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, TQStringList &newFileNames, TQWidget* parent = 0, const char* name = 0, - bool modal = FALSE, WFlags fl = 0 ); + bool modal = false, WFlags fl = 0 ); SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, const TQString &filename, TQStringList &dummy, TQWidget* parent = 0, const char* name = 0, - bool modal = FALSE, WFlags fl = 0 ); + bool modal = false, WFlags fl = 0 ); ~SubclassingDlg(); private: diff --git a/languages/cpp/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui index 67dcd97f..1b41e69e 100644 --- a/languages/cpp/subclassingdlgbase.ui +++ b/languages/cpp/subclassingdlgbase.ui @@ -233,9 +233,9 @@ <slot>onChangedClassName()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>onChangedClassName()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/csharp/csharpdoc.cpp b/languages/csharp/csharpdoc.cpp index 3b1c9450..1438446e 100644 --- a/languages/csharp/csharpdoc.cpp +++ b/languages/csharp/csharpdoc.cpp @@ -8,9 +8,9 @@ #include <tqtextstream.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> -#include <kinstance.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeinstance.h> +#include <tdeprocess.h> #include <tdeversion.h> #include <tdeglobal.h> diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index 8ecb44eb..886b486e 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -28,7 +28,7 @@ #include <kstatusbar.h> #include "kdevmainwindow.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <stdlib.h> #include <unistd.h> @@ -55,35 +55,35 @@ CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const T setXMLFile("kdevcsharpsupport.rc"); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); TDEAction *action; action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Runs the CSharp program") ); action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0, - this, TQT_SLOT(slotExecuteString()), + this, TQ_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Executes a string as CSharp code") ); action = new TDEAction( i18n("Start CSharp Interpreter"), "application-x-executable", 0, - this, TQT_SLOT(slotStartInterpreter()), + this, TQ_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Starts the CSharp interpreter without a program") ); action = new TDEAction( i18n("Find CSharp Function Documentation..."), 0, - this, TQT_SLOT(slotCSharpdocFunction()), + this, TQ_SLOT(slotCSharpdocFunction()), actionCollection(), "help_csharpdocfunction" ); action->setToolTip( i18n("Show the documentation page of a CSharp function") ); action = new TDEAction( i18n("Find CSharp FAQ Entry..."), 0, - this, TQT_SLOT(slotCSharpdocFAQ()), + this, TQ_SLOT(slotCSharpdocFAQ()), actionCollection(), "help_csharpdocfaq" ); action->setToolTip( i18n("Show the FAQ entry for a keyword") ); @@ -106,14 +106,14 @@ void CSharpSupportPart::projectOpened() { kdDebug(9007) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // procsharpy initialized - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } @@ -262,9 +262,9 @@ void CSharpSupportPart::initialParse() if (project()) { //copy from cpp support : give user some feedback mainWindow()->statusBar()->message( i18n("Updating...") ); - kapp->processEvents( ); + tdeApp->processEvents( ); - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); // m_parser->initialParse(); @@ -281,7 +281,7 @@ void CSharpSupportPart::initialParse() //update progress bar bar->setProgress( n++ ); if( (n%5) == 0 ) - kapp->processEvents(); + tdeApp->processEvents(); } parseUseFiles(); emit updatedSourceInfo(); @@ -289,7 +289,7 @@ void CSharpSupportPart::initialParse() //remove progressbar mainWindow( )->statusBar( )->removeWidget( bar ); delete bar; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); mainWindow()->statusBar()->message( i18n("Done") ); } else { diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp index 6e019589..4e7efd73 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include "pgioptionsplugin.h" #include "pgioptionsfactory.h" diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index 170ff230..cd82ebab 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -29,7 +29,7 @@ #include <kdialogbase.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kregexp.h> #include <kdevgenericfactory.h> #include <tdeaction.h> @@ -55,17 +55,17 @@ FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const setXMLFile("kdevfortransupport.rc"); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); TDEAction *action; action = new TDEAction( i18n("&Ftnchek"), 0, - this, TQT_SLOT(slotFtnchek()), + this, TQ_SLOT(slotFtnchek()), actionCollection(), "project_ftnchek" ); action->setToolTip(i18n("Run ftnchek")); action->setWhatsThis(i18n("<b>Run ftnchek</b><p>Runs <b>ftnchek</b> to check fortran programs for semantic errors. Configure ftnchek options in project settings dialog, <b>Ftnchek</b> tab.")); @@ -159,7 +159,7 @@ void FortranSupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Ftnchek"), i18n("Ftnchek"), BarIcon("tdevelop", TDEIcon::SizeMedium)); FtnchekConfigWidget *w = new FtnchekConfigWidget(*projectDom(), vbox, "ftnchek config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } @@ -167,16 +167,16 @@ void FortranSupportPart::projectOpened() { kdDebug(9019) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized parser = new FixedFormParser(codeModel()); - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } @@ -208,7 +208,7 @@ void FortranSupportPart::initialParse() kdDebug(9019) << "initialParse()" << endl; if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { TQFileInfo fileInfo( project()->projectDirectory(), *it ); @@ -217,7 +217,7 @@ void FortranSupportPart::initialParse() } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9019) << "No project" << endl; } diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java index 40bc6b93..00202b9d 100644 --- a/languages/java/app_templates/kappjava/app.java +++ b/languages/java/app_templates/kappjava/app.java @@ -43,10 +43,10 @@ public class %{APPNAME} extends TDEMainWindow setupGUI(); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL("signalChangeStatusbar(String)"), - this, SLOT("changeStatusbar(String)")); - connect(m_view, SIGNAL("signalChangeCaption(String)"), - this, SLOT("changeCaption(String)")); + connect(m_view, TQ_SIGNAL("signalChangeStatusbar(String)"), + this, TQ_SLOT("changeStatusbar(String)")); + connect(m_view, TQ_SIGNAL("signalChangeCaption(String)"), + this, TQ_SLOT("changeCaption(String)")); } @@ -76,20 +76,20 @@ public void load(KURL url) public void setupActions() { - TDEApplication kapp = TDEApplication.kApplication(); - KStdAction.openNew(this, SLOT("fileNew()"), actionCollection()); - KStdAction.open(this, SLOT("fileOpen()"), actionCollection()); - KStdAction.save(this, SLOT("fileSave()"), actionCollection()); - KStdAction.saveAs(this, SLOT("fileSaveAs()"), actionCollection()); - KStdAction.print(this, SLOT("filePrint()"), actionCollection()); - KStdAction.quit(kapp, SLOT("quit()"), actionCollection()); + TDEApplication tdeApp = TDEApplication.tdeApplication(); + KStdAction.openNew(this, TQ_SLOT("fileNew()"), actionCollection()); + KStdAction.open(this, TQ_SLOT("fileOpen()"), actionCollection()); + KStdAction.save(this, TQ_SLOT("fileSave()"), actionCollection()); + KStdAction.saveAs(this, TQ_SLOT("fileSaveAs()"), actionCollection()); + KStdAction.print(this, TQ_SLOT("filePrint()"), actionCollection()); + KStdAction.quit(tdeApp, TQ_SLOT("quit()"), actionCollection()); - KStdAction.preferences(this, SLOT("optionsPreferences()"), actionCollection()); + KStdAction.preferences(this, TQ_SLOT("optionsPreferences()"), actionCollection()); // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item TDEAction custom = new TDEAction(tr("Cus&tom Menuitem"), new TDEShortcut(), - this, SLOT("optionsPreferences()"), + this, TQ_SLOT("optionsPreferences()"), actionCollection(), "custom_action"); } diff --git a/languages/java/app_templates/kappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java index ab327d4c..4b310179 100644 --- a/languages/java/app_templates/kappjava/app_client.java +++ b/languages/java/app_templates/kappjava/app_client.java @@ -2,10 +2,10 @@ * Copyright (C) %{YEAR} %{AUTHOR} <%{EMAIL}> */ -#include <kapp.h> +#include <tdeapplication.h> #include <dcopclient.h> -#include <qdatastream.h> -#include <qstring.h> +#include <tqdatastream.h> +#include <tqstring.h> int main(int argc, char **argv) { @@ -16,8 +16,8 @@ int main(int argc, char **argv) client->attach(); // do a 'send' for now - QByteArray data; - QDataStream ds(data, IO_WriteOnly); + TQByteArray data; + TQDataStream ds(data, IO_WriteOnly); if (argc > 1) ds << TQString(argv[1]); else diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java index 0d79ac31..4a1e9f84 100644 --- a/languages/java/app_templates/kappjava/appview.java +++ b/languages/java/app_templates/kappjava/appview.java @@ -71,10 +71,10 @@ public %{APPNAME}View(TQWidget parent) return; } - connect(m_html, SIGNAL("setWindowCaption(String)"), - this, SLOT("slotSetTitle(String)")); - connect(m_html, SIGNAL("setStatusBarText(String)"), - this, SLOT("slotOnURL(String)")); + connect(m_html, TQ_SIGNAL("setWindowCaption(String)"), + this, TQ_SLOT("slotSetTitle(String)")); + connect(m_html, TQ_SIGNAL("setStatusBarText(String)"), + this, TQ_SLOT("slotOnURL(String)")); } diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index 7c63a63f..ccc2032a 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -47,13 +47,13 @@ public: virtual TQString contents( const TQString& fileName ) { if( !m_readFromDisk ){ - //kdDebug(9013) << "-------> kapp is locked = " << kapp->locked() << endl; - bool needToLock = kapp->locked() == false; + //kdDebug(9013) << "-------> tdeApp is locked = " << tdeApp->locked() << endl; + bool needToLock = !tdeApp->locked(); if( needToLock ) - kapp->lock(); + tdeApp->lock(); - //kdDebug(9013) << "-------> kapp locked" << endl; + //kdDebug(9013) << "-------> tdeApp locked" << endl; TQPtrList<KParts::Part> parts( *m_javaSupport->partController()->parts() ); TQPtrListIterator<KParts::Part> it( parts ); @@ -68,16 +68,16 @@ public: TQString contents = TQString( editIface->text().ascii() ); // deep copy if( needToLock ) - kapp->unlock(); + tdeApp->unlock(); - //kdDebug(9013) << "-------> kapp unlocked" << endl; + //kdDebug(9013) << "-------> tdeApp unlocked" << endl; return contents; } if( needToLock ) - kapp->unlock(); - //kdDebug(9013) << "-------> kapp unlocked" << endl; + tdeApp->unlock(); + //kdDebug(9013) << "-------> tdeApp unlocked" << endl; } TQFile f( fileName ); diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui index 9bea48d7..c253e1d4 100644 --- a/languages/java/configproblemreporter.ui +++ b/languages/java/configproblemreporter.ui @@ -234,7 +234,7 @@ <tabstop>pushButton5</tabstop> <tabstop>pushButton6</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> @@ -244,7 +244,7 @@ <slot>removeSpecialHeader()</slot> <slot>moveUpSpecialHeader()</slot> <slot>moveDownSpecialHeader()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h index ef0510d3..72405f0d 100644 --- a/languages/java/configproblemreporter.ui.h +++ b/languages/java/configproblemreporter.ui.h @@ -11,7 +11,7 @@ void ConfigureProblemReporter::init() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); bgParserCheckbox->setChecked( config->readBoolEntry("EnableJavaBgParser", true) ); delaySlider->setEnabled( bgParserCheckbox->isChecked() ); @@ -25,7 +25,7 @@ void ConfigureProblemReporter::destroy() void ConfigureProblemReporter::accept() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); config->writeEntry( "EnableJavaBgParser", bgParserCheckbox->isChecked() ); if( bgParserCheckbox->isChecked() ) @@ -37,7 +37,7 @@ void ConfigureProblemReporter::accept() void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b ) { delaySlider->setEnabled( b ); - if ( b == TRUE ) + if ( b ) delayLabel->show(); else delayLabel->hide(); diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp index 299e283f..7757991e 100644 --- a/languages/java/javasupportfactory.cpp +++ b/languages/java/javasupportfactory.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <kdevplugininfo.h> #include "javasupportfactory.h" diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 80203576..ff2d120c 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -51,7 +51,7 @@ #include <kstatusbar.h> #include <tdeconfig.h> #include <tdeversion.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdetexteditor/document.h> @@ -135,37 +135,37 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr m_backgroundParser = new BackgroundParser( this, &m_eventConsumed ); m_backgroundParser->start(); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*))); - connect( partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(partRemoved(KParts::Part*))); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); + connect( partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(partRemoved(KParts::Part*))); m_problemReporter = new ProblemReporter( this, 0, "problemReporterWidget" ); m_problemReporter->setIcon( SmallIcon("application-vnd.tde.info") ); mainWindow( )->embedOutputView( m_problemReporter, i18n("Problems"), i18n("Problem reporter")); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - m_problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + m_problemReporter, TQ_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); TDEAction *action; action = new TDEAction(i18n("New Class..."), "classnew", 0, - this, TQT_SLOT(slotNewClass()), + this, TQ_SLOT(slotNewClass()), actionCollection(), "project_newclass"); action->setToolTip( i18n("Generate a new class") ); action->setWhatsThis( i18n("<b>New Class</b>Generates a new class.<p>") ); // daniel - connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); new KDevJavaSupportIface( this ); //(void) dcopClient(); @@ -288,8 +288,8 @@ void JavaSupportPart::activePartChanged(KParts::Part *part) if( !textHintIface ) return; - connect( view, TQT_SIGNAL(needTextHint(int,int,TQString&)), - this, TQT_SLOT(slotNeedTextHint(int,int,TQString&)) ); + connect( view, TQ_SIGNAL(needTextHint(int,int,TQString&)), + this, TQ_SLOT(slotNeedTextHint(int,int,TQString&)) ); textHintIface->enableTextHints( 1000 ); #endif @@ -302,20 +302,20 @@ void JavaSupportPart::projectOpened( ) m_projectDirectory = URLUtil::canonicalPath( project()->projectDirectory() ); - connect( project( ), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), - this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( removedFilesFromProject( const TQStringList &) ), - this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), - this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); - connect( project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotProjectCompiled()) ); + connect( project( ), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQ_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( removedFilesFromProject( const TQStringList &) ), + this, TQ_SLOT( removedFilesFromProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQ_SLOT( changedFilesInProject( const TQStringList & ) ) ); + connect( project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotProjectCompiled()) ); m_timestamp.clear(); m_projectClosed = false; - TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( initialParse( ) ) ); } @@ -491,8 +491,8 @@ JavaSupportPart::parseProject( ) mainWindow()->statusBar()->message( i18n("Updating...") ); - kapp->processEvents( ); - kapp->setOverrideCursor( waitCursor ); + tdeApp->processEvents( ); + tdeApp->setOverrideCursor( waitCursor ); TQStringList files = modifiedFileList(); @@ -546,7 +546,7 @@ JavaSupportPart::parseProject( ) kdDebug(9013) << "parse file: " << absFilePath << endl; if( (n%5) == 0 ){ - kapp->processEvents(); + tdeApp->processEvents(); if( m_projectClosed ){ delete( bar ); @@ -574,7 +574,7 @@ JavaSupportPart::parseProject( ) if( m_projectClosed ){ kdDebug(9013) << "ABORT" << endl; - kapp->restoreOverrideCursor( ); + tdeApp->restoreOverrideCursor( ); return false; } } @@ -587,7 +587,7 @@ JavaSupportPart::parseProject( ) //mainWindow( )->statusBar( )->removeWidget( label ); //delete label; - kapp->restoreOverrideCursor( ); + tdeApp->restoreOverrideCursor( ); mainWindow( )->statusBar( )->message( i18n( "Done" ), 2000 ); return true; diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index e1fc4174..088032f2 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -93,21 +93,21 @@ ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const addColumn( i18n("Line") ); addColumn( i18n("Column") ); addColumn( i18n("Problem") ); - setAllColumnsShowFocus( TRUE ); + setAllColumnsShowFocus( true ); m_timer = new TQTimer( this ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reparse()) ); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -137,7 +137,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) if( !m_javaSupport->isValidSource(m_fileName) ) return; - connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_document, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast<KTextEditor::MarkInterface*>( part ); if( !m_javaSupport->backgroundParser() ) @@ -227,9 +227,9 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p void ProblemReporter::configure() { kdDebug(9013) << "ProblemReporter::configure()" << endl; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); - m_active = config->readBoolEntry( "EnableJavaBgParser", TRUE ); + m_active = config->readBoolEntry( "EnableJavaBgParser", true ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); } @@ -239,8 +239,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); //FIXME adymo: unused functionality w->groupBox3->hide(); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(configure())); } void ProblemReporter::slotPartAdded( KParts::Part* part ) diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp index 436e0a95..8a204c7a 100644 --- a/languages/kjssupport/jscodecompletion.cpp +++ b/languages/kjssupport/jscodecompletion.cpp @@ -21,7 +21,7 @@ #include <kiconloader.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tdeaction.h> #include <tdeparts/part.h> @@ -82,11 +82,11 @@ void JSCodeCompletion::setActiveEditorPart( KParts::Part * part ) } disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice - connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), - this, TQT_SLOT(cursorPositionChanged())); - connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHidden())); - connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxAbort())); - connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHidden())); + connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), + this, TQ_SLOT(cursorPositionChanged())); + connect(part->widget(), TQ_SIGNAL(argHintHidden()), this, TQ_SLOT(argHintHidden())); + connect(part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionBoxAbort())); + connect(part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(completionBoxHidden())); } TQValueList< KTextEditor::CompletionEntry > JSCodeCompletion::getVars( const TQString & startText ) diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp index 71c680b4..a2e6b989 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -69,20 +69,20 @@ kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStrin setXMLFile("kdevkjssupport.rc"); - m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQ_SLOT(slotRun()),actionCollection(), "build_execute" ); m_build->setStatusText( i18n("Test the active script.") ); kdDebug() << "Creating kjssupport Part" << endl; - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const TQString&)), this, TQT_SLOT(savedFile(const TQString&)) ); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const TQString&)), this, TQ_SLOT(savedFile(const TQString&)) ); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part *))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); // Building kjs interpreter. @@ -140,14 +140,14 @@ void kjsSupportPart::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(parse())); + TQTimer::singleShot(0, this, TQ_SLOT(parse())); } void kjsSupportPart::projectClosed() { @@ -202,7 +202,7 @@ void kjsSupportPart::parse() if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); m_problemReporter->clear(); @@ -214,7 +214,7 @@ void kjsSupportPart::parse() } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9014) << "No project" << endl; } @@ -427,7 +427,7 @@ void kjsSupportPart::contextMenu(TQPopupMenu * popupMenu, const Context *context m_selectedUI = fcontext->fileName(); if (m_selectedUI.right(3).lower() == ".ui") int id = popupMenu->insertItem(i18n("Implement Slots"), - this, TQT_SLOT(implementSlots())); + this, TQ_SLOT(implementSlots())); else m_selectedUI = TQString(); } diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp index 34d1f682..8c634bda 100644 --- a/languages/kjssupport/subclassingdlg.cpp +++ b/languages/kjssupport/subclassingdlg.cpp @@ -30,7 +30,7 @@ #include <tqpushbutton.h> #include <domutil.h> #include <tqdom.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <tqfile.h> @@ -332,7 +332,7 @@ bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal) replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); if (canBeModal) { - replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); + replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = false"); replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); } diff --git a/languages/kjssupport/subclassingdlg.h b/languages/kjssupport/subclassingdlg.h index 651120b0..43c4ba6d 100644 --- a/languages/kjssupport/subclassingdlg.h +++ b/languages/kjssupport/subclassingdlg.h @@ -43,10 +43,10 @@ class SubclassingDlg : public SubclassingDlgBase public: SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,TQStringList &newFileNames, TQWidget* parent = 0, const char* name = 0, - bool modal = FALSE, WFlags fl = 0 ); + bool modal = false, WFlags fl = 0 ); /* SubclassingDlg(CppSupportPart* kjsSupport, const TQString &formFile,const TQString &filename,TQStringList &dummy, TQWidget* parent = 0, const char* name = 0, - bool modal = FALSE, WFlags fl = 0 );*/ + bool modal = false, WFlags fl = 0 );*/ ~SubclassingDlg(); private: diff --git a/languages/kjssupport/subclassingdlgbase.ui b/languages/kjssupport/subclassingdlgbase.ui index 23ec7b34..250da264 100644 --- a/languages/kjssupport/subclassingdlgbase.ui +++ b/languages/kjssupport/subclassingdlgbase.ui @@ -245,9 +245,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>onChangedClassName()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/lib/debugger/Mainpage.dox b/languages/lib/debugger/Mainpage.dox index 3e0641a9..c0e6b077 100644 --- a/languages/lib/debugger/Mainpage.dox +++ b/languages/lib/debugger/Mainpage.dox @@ -12,16 +12,16 @@ This library contains classes to implement debugger support for a programming la Each debugger support plugin must interact with an editor to set breakpoints, jump to execution points, etc. This kind of interaction is implemented in @ref Debugger class. Your debugger support plugin just need to create -an instance of @ref Debugger class and connect its Q_SIGNALS, for example: +an instance of @ref Debugger class and connect its signals, for example: @code m_debugger = new Debugger( partController() ); -connect( m_debugger, SIGNAL(toggledBreakpoint(const TQString &, int)), - debuggerBreakpointWidget, SLOT(slotToggleBreakpoint(const TQString &, int)) ); -connect( m_debugger, SIGNAL(editedBreakpoint(const TQString &, int)), - debuggerBreakpointWidget, SLOT(slotEditBreakpoint(const TQString &, int)) ); -connect( m_debugger, SIGNAL(toggledBreakpointEnabled(const TQString &, int)), - debuggerBreakpointWidget, SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); +connect( m_debugger, TQ_SIGNAL(toggledBreakpoint(const TQString &, int)), + debuggerBreakpointWidget, TQ_SLOT(slotToggleBreakpoint(const TQString &, int)) ); +connect( m_debugger, TQ_SIGNAL(editedBreakpoint(const TQString &, int)), + debuggerBreakpointWidget, TQ_SLOT(slotEditBreakpoint(const TQString &, int)) ); +connect( m_debugger, TQ_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + debuggerBreakpointWidget, TQ_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); @endcode Then m_debugger instance can be used for example, to jump to the execution point: @code diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp index bc8356b7..111ca93c 100644 --- a/languages/lib/debugger/debugger.cpp +++ b/languages/lib/debugger/debugger.cpp @@ -16,8 +16,8 @@ Debugger *Debugger::s_instance = 0; Debugger::Debugger(KDevPartController *partController) :m_partController(partController) { - connect( m_partController, TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(partAdded(KParts::Part*)) ); + connect( m_partController, TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(partAdded(KParts::Part*)) ); } @@ -46,7 +46,7 @@ void Debugger::setBreakpoint(const TQString &fileName, int lineNum, int id, bool // Temporarily disconnect so we don't get confused by receiving extra // marksChanged signals - disconnect( part, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()) ); + disconnect( part, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()) ); iface->removeMark( lineNum, Breakpoint | ActiveBreakpoint | ReachedBreakpoint | DisabledBreakpoint ); BPItem bpItem(fileName, lineNum); @@ -71,7 +71,7 @@ void Debugger::setBreakpoint(const TQString &fileName, int lineNum, int id, bool BPList.append(BPItem(fileName, lineNum)); } - connect( part, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()) ); + connect( part, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()) ); } @@ -203,7 +203,7 @@ void Debugger::partAdded( KParts::Part* part ) iface->setPixmap((MarkInterface::MarkTypes)ExecutionPoint, *executionPointPixmap()); iface->setMarksUserChangable( Bookmark | Breakpoint ); - connect( part, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()) ); + connect( part, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()) ); } #include "debugger.moc" diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui index d2780bc1..45cebd8e 100644 --- a/languages/lib/designer_integration/implementationwidgetbase.ui +++ b/languages/lib/designer_integration/implementationwidgetbase.ui @@ -257,9 +257,9 @@ <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">classNameChanged(const TQString &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/pascal/PascalStoreWalkerTokenTypes.h b/languages/pascal/PascalStoreWalkerTokenTypes.h index 4631429c..1911fc9c 100644 --- a/languages/pascal/PascalStoreWalkerTokenTypes.h +++ b/languages/pascal/PascalStoreWalkerTokenTypes.h @@ -183,7 +183,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes { INHERITED = 172, NEW = 173, SELF = 174, - TQT_METHOD = 175, + METHOD = 175, ADDSUBOR = 176, ASSIGNEQUAL = 177, SIGN = 178, diff --git a/languages/pascal/PascalTokenTypes.h b/languages/pascal/PascalTokenTypes.h index 42e97d53..185197e4 100644 --- a/languages/pascal/PascalTokenTypes.h +++ b/languages/pascal/PascalTokenTypes.h @@ -186,7 +186,7 @@ struct CUSTOM_API PascalTokenTypes { INHERITED = 172, NEW = 173, SELF = 174, - TQT_METHOD = 175, + METHOD = 175, ADDSUBOR = 176, ASSIGNEQUAL = 177, SIGN = 178, diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp index 306fe5a0..bc586c0c 100644 --- a/languages/pascal/compiler/dccoptions/optiontabs.cpp +++ b/languages/pascal/compiler/dccoptions/optiontabs.cpp @@ -357,8 +357,8 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) layout3->addWidget(release); layout3->addWidget(debug); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions())); - connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions())); + connect(release, TQ_SIGNAL(clicked()), this, TQ_SLOT(setReleaseOptions())); + connect(debug, TQ_SIGNAL(clicked()), this, TQ_SLOT(setDebugOptions())); layout->addStretch(); } diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp index 86c77cda..4f39337d 100644 --- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp +++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp @@ -410,8 +410,8 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) TQPushButton *debug = new TQPushButton(i18n("Debug"), this); layout6->addWidget(release); layout6->addWidget(debug); - connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions())); - connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions())); + connect(release, TQ_SIGNAL(clicked()), this, TQ_SLOT(setReleaseOptions())); + connect(debug, TQ_SIGNAL(clicked()), this, TQ_SLOT(setDebugOptions())); layout->addStretch(); } diff --git a/languages/pascal/configproblemreporter.ui b/languages/pascal/configproblemreporter.ui index 020557a1..3ba64c82 100644 --- a/languages/pascal/configproblemreporter.ui +++ b/languages/pascal/configproblemreporter.ui @@ -77,12 +77,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp index 90532c22..bb00f039 100644 --- a/languages/pascal/pascalsupport_part.cpp +++ b/languages/pascal/pascalsupport_part.cpp @@ -55,19 +55,19 @@ PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const T setXMLFile("kdevpascalsupport.rc"); d->problemReporter = new ProblemReporter( this ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - d->problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); - - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); - connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + d->problemReporter, TQ_SLOT(configWidget(KDialogBase*)) ); + + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); + connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); mainWindow()->embedOutputView( d->problemReporter, i18n("Problems"), i18n("problem reporter") ); TQWhatsThis::add(d->problemReporter, i18n("<b>Problem reporter</b><p>This window shows various \"problems\" in your project. " @@ -89,17 +89,17 @@ PascalSupportPart::Features PascalSupportPart::features() void PascalSupportPart::projectOpened() { - connect(project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &))); - connect(project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &))); - connect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotProjectCompiled()) ); + connect(project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &))); + connect(project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &))); + connect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotProjectCompiled()) ); m_projectFileList = project()->allFiles(); m_projectClosed = false; - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } void PascalSupportPart::projectClosed() @@ -138,7 +138,7 @@ void PascalSupportPart::addedFilesToProject(const TQStringList &fileList) { TQString fn = project()->projectDirectory() + "/" + *it; maybeParse( fn ); - kapp->processEvents( 500 ); + tdeApp->processEvents( 500 ); emit addedSourceInfo(fn); } } @@ -165,7 +165,7 @@ void PascalSupportPart::initialParse( ) if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); /// @todo Progress indicator! @@ -173,12 +173,12 @@ void PascalSupportPart::initialParse( ) for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it){ TQString fn = project()->projectDirectory() + "/" + *it; maybeParse( fn ); - kapp->processEvents( 500 ); + tdeApp->processEvents( 500 ); } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); mainWindow()->statusBar()->message( i18n("Found 1 problem", "Found %n problems", d->problemReporter->childCount()) ); } } diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index d0aaf01a..0d505e8f 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -82,23 +82,23 @@ ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* parent, con addColumn( i18n("File") ); addColumn( i18n("Line") ); //addColumn( i18n("Column") ); - setAllColumnsShowFocus( TRUE ); + setAllColumnsShowFocus( true ); m_timer = new TQTimer( this ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reparse()) ); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -128,7 +128,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) m_editor = dynamic_cast<KTextEditor::EditInterface*>( part ); if( m_editor ) - connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_document, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast<KTextEditor::MarkInterface*>( part ); @@ -250,9 +250,9 @@ void ProblemReporter::reportMessage( TQString message, void ProblemReporter::configure() { kdDebug(9007) << "ProblemReporter::configure()" << endl; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); - m_active = config->readBoolEntry( "EnablePascalBgParser", TRUE ); + m_active = config->readBoolEntry( "EnablePascalBgParser", true ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); } @@ -262,8 +262,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) Q_UNUSED(dlg); /* TQVBox *vbox = dlg->addVBoxPage(i18n("Pascal Parsing")); ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure()));*/ + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(configure()));*/ } void ProblemReporter::slotPartAdded( KParts::Part* part ) diff --git a/languages/perl/perldoc.cpp b/languages/perl/perldoc.cpp index 4255d633..63a23af5 100644 --- a/languages/perl/perldoc.cpp +++ b/languages/perl/perldoc.cpp @@ -8,9 +8,9 @@ #include <tqtextstream.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> -#include <kinstance.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeinstance.h> +#include <tdeprocess.h> #include <tdeversion.h> #include <tdeglobal.h> diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index 1bcbb96b..910e9f7e 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -28,7 +28,7 @@ #include <kstatusbar.h> #include "kdevmainwindow.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <stdlib.h> #include <unistd.h> @@ -55,35 +55,35 @@ PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStr setXMLFile("kdevperlsupport.rc"); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); TDEAction *action; action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Runs the Perl program") ); action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0, - this, TQT_SLOT(slotExecuteString()), + this, TQ_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Executes a string as Perl code") ); action = new TDEAction( i18n("Start Perl Interpreter"), "application-x-executable", 0, - this, TQT_SLOT(slotStartInterpreter()), + this, TQ_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Starts the Perl interpreter without a program") ); action = new TDEAction( i18n("Find Perl Function Documentation..."), 0, - this, TQT_SLOT(slotPerldocFunction()), + this, TQ_SLOT(slotPerldocFunction()), actionCollection(), "help_perldocfunction" ); action->setToolTip( i18n("Show the documentation page of a Perl function") ); action = new TDEAction( i18n("Find Perl FAQ Entry..."), 0, - this, TQT_SLOT(slotPerldocFAQ()), + this, TQ_SLOT(slotPerldocFAQ()), actionCollection(), "help_perldocfaq" ); action->setToolTip( i18n("Show the FAQ entry for a keyword") ); @@ -106,14 +106,14 @@ void PerlSupportPart::projectOpened() { kdDebug(9007) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } @@ -262,9 +262,9 @@ void PerlSupportPart::initialParse() if (project()) { //copy from cpp support : give user some feedback mainWindow()->statusBar()->message( i18n("Updating...") ); - kapp->processEvents( ); + tdeApp->processEvents( ); - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); m_parser->initialParse(); @@ -281,7 +281,7 @@ void PerlSupportPart::initialParse() //update progress bar bar->setProgress( n++ ); if( (n%5) == 0 ) - kapp->processEvents(); + tdeApp->processEvents(); } parseUseFiles(); emit updatedSourceInfo(); @@ -289,7 +289,7 @@ void PerlSupportPart::initialParse() //remove progressbar mainWindow( )->statusBar( )->removeWidget( bar ); delete bar; - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); mainWindow()->statusBar()->message( i18n("Done") ); } else { diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index af301000..0a286653 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -22,8 +22,8 @@ #include "phpconfigdata.h" #include <kdevcore.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tqfile.h> @@ -119,11 +119,11 @@ void PHPCodeCompletion::setActiveEditorPart(KParts::Part *part) } disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice -// connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); - connect( part, TQT_SIGNAL(textChanged()), this, TQT_SLOT(cursorPositionChanged()) ); - connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHided())); - connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxHided())); - connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHided())); +// connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged())); + connect( part, TQ_SIGNAL(textChanged()), this, TQ_SLOT(cursorPositionChanged()) ); + connect(part->widget(), TQ_SIGNAL(argHintHidden()), this, TQ_SLOT(argHintHided())); + connect(part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionBoxHided())); + connect(part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(completionBoxHided())); } void PHPCodeCompletion::cursorPositionChanged(){ @@ -159,7 +159,7 @@ void PHPCodeCompletion::cursorPositionChanged(){ } if (m_config->getCodeCompletion()) { - if (m_completionBoxShow == true) { + if (m_completionBoxShow) { return; } @@ -204,7 +204,7 @@ bool PHPCodeCompletion::showCompletionBox(TQValueList<KTextEditor::CompletionEnt return false; } m_completionBoxShow = true; - m_codeInterface->showCompletionBox(list, max, FALSE); + m_codeInterface->showCompletionBox(list, max, false); return true; } return false; @@ -218,7 +218,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) { return false; TQRegExp Class("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); - Class.setCaseSensitive(FALSE); + Class.setCaseSensitive(false); if (Class.search(line) != -1) { TQString classname = Class.cap(1); @@ -234,7 +234,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) { for (funcIt = funcList.begin(); funcIt != funcList.end(); ++funcIt) { FunctionDom nFunc = *funcIt; - if ((function.isEmpty() || nFunc->name().startsWith(function, FALSE)) && nFunc->isStatic()) { + if ((function.isEmpty() || nFunc->name().startsWith(function, false)) && nFunc->isStatic()) { KTextEditor::CompletionEntry e; e.prefix = nClass->name() + " ::"; e.text = nFunc->name(); @@ -267,11 +267,11 @@ bool PHPCodeCompletion::checkForNew(TQString line, int col){ kdDebug(9018) << "checkForNew" << endl; TQValueList<KTextEditor::CompletionEntry> list; - if (line.find("new ", 0, FALSE) == -1) + if (line.find("new ", 0, false) == -1) return false; TQRegExp New("[& \t]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); - New.setCaseSensitive(FALSE); + New.setCaseSensitive(false); if (New.search(line) != -1) { list = getClasses( New.cap(1) ); @@ -297,11 +297,11 @@ bool PHPCodeCompletion::checkForExtends(TQString line, int col){ kdDebug(9018) << "checkForExtends" << endl; TQValueList<KTextEditor::CompletionEntry> list; - if (line.find("extends", 0, FALSE) == -1) + if (line.find("extends", 0, false) == -1) return false; TQRegExp extends("[ \t]*extends[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); - extends.setCaseSensitive(FALSE); + extends.setCaseSensitive(false); if (extends.search(line) != -1) { list = getClasses(extends.cap(1)); @@ -362,7 +362,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getClasses(TQString ClassList::Iterator classIt; for (classIt = classList.begin(); classIt != classList.end(); ++classIt) { ClassDom nClass = *classIt; - if (name == NULL || name.isEmpty() || nClass->name().startsWith(name, FALSE)) { + if (name == NULL || name.isEmpty() || nClass->name().startsWith(name, false)) { KTextEditor::CompletionEntry e; TQStringList::Iterator it = added.find(nClass->name()); @@ -383,7 +383,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars if (classname.isEmpty()) { TQValueList<FunctionCompletionEntry>::Iterator it; for( it = m_globalFunctions.begin(); it != m_globalFunctions.end(); ++it ) { - if((*it).text.startsWith(function, FALSE)){ + if((*it).text.startsWith(function, false)){ KTextEditor::CompletionEntry e; e = (*it); list.append(e); @@ -393,7 +393,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars FunctionList methodList = m_model->globalNamespace()->functionList(); FunctionList::Iterator methodIt; for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) { - if ((*methodIt)->name().startsWith(function, FALSE)){ + if ((*methodIt)->name().startsWith(function, false)){ KTextEditor::CompletionEntry e; e.text = (*methodIt)->name(); ArgumentDom pArg = (*methodIt)->argumentList().first(); @@ -416,7 +416,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars FunctionList::Iterator methodIt; for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) { FunctionDom pMethod = *methodIt; - if (function.isEmpty() || pMethod->name().startsWith(function, FALSE)) { + if (function.isEmpty() || pMethod->name().startsWith(function, false)) { KTextEditor::CompletionEntry e; ArgumentDom arg = pMethod->argumentList().first(); @@ -430,7 +430,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars VariableList::Iterator attrIt; for (attrIt = attrList.begin(); attrIt != attrList.end(); ++attrIt) { VariableDom pVar = *attrIt; - if (function.isEmpty() || pVar->name().startsWith(function, FALSE)) { + if (function.isEmpty() || pVar->name().startsWith(function, false)) { KTextEditor::CompletionEntry e; e.prefix = nClass->name() + " ::"; e.text = pVar->name(); @@ -517,7 +517,7 @@ TQStringList PHPCodeCompletion::getArguments(TQString classname, TQString functi TQString PHPCodeCompletion::getCurrentClassName() { kdDebug(9018) << "getCurrentClassName" << endl; TQRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$"); - Class.setCaseSensitive(FALSE); + Class.setCaseSensitive(false); for(int i = m_currentLine; i >= 0; i--){ TQString line = m_editInterface->textLine(i); @@ -577,7 +577,7 @@ TQString PHPCodeCompletion::getClassName(TQString varName, TQString classname) { for(int i = m_currentLine; i >= 0; i--){ TQString line = m_editInterface->textLine(i); - if (!line.isNull() && line.find(varName,0 , FALSE) != -1) { + if (!line.isNull() && line.find(varName,0 , false) != -1) { if (createmember.search(line) != -1) { TQString right = createmember.cap(1).stripWhiteSpace(); @@ -637,12 +637,12 @@ bool PHPCodeCompletion::checkForArgHint(TQString line, int col) { TQValueList<KTextEditor::CompletionEntry> list; TQStringList argsList; - if (m_argWidgetShow == true) + if (m_argWidgetShow) return false; if (line.find("::") != -1) { TQRegExp Static("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); - Static.setCaseSensitive(FALSE); + Static.setCaseSensitive(false); if (Static.search(line) != -1) { TQString classname = Static.cap(1); diff --git a/languages/php/phpconfigdata.cpp b/languages/php/phpconfigdata.cpp index 9c89f7db..4de70deb 100644 --- a/languages/php/phpconfigdata.cpp +++ b/languages/php/phpconfigdata.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "phpconfigdata.h" #include "domutil.h" #include <iostream> diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp index 6cddabdf..15006bf9 100644 --- a/languages/php/phpconfigwidget.cpp +++ b/languages/php/phpconfigwidget.cpp @@ -1,5 +1,5 @@ #include "domutil.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <klineedit.h> #include <tqcheckbox.h> #include <tqmultilineedit.h> @@ -8,7 +8,7 @@ #include <tqradiobutton.h> #include <tdefiledialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "phpinfodlg.h" #include "phpconfigwidget.h" @@ -129,8 +129,8 @@ void PHPConfigWidget::slotAboutClicked() proc << exe_edit->text(); proc << "-m"; - connect( &proc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPInfo (TDEProcess*, char*, int))); + connect( &proc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedPHPInfo (TDEProcess*, char*, int))); proc.start(TDEProcess::Block,TDEProcess::Stdout); PHPInfoDlg dlg(this,"phpinfo",true); dlg.php_edit->setText(m_phpInfo); diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui index 09124bf8..4213cca5 100644 --- a/languages/php/phpconfigwidgetbase.ui +++ b/languages/php/phpconfigwidgetbase.ui @@ -544,12 +544,12 @@ the internal web browser. Please make sure that the webserver was compiled with <tabstop>zend_edit</tabstop> <tabstop>zend_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotAboutClicked()</slot> <slot>slotPHPExeButtonClicked()</slot> <slot>slotPHPIniButtonClicked()</slot> <slot>slotZendButtonClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index 2ee5bbf3..5d8dccdc 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -136,12 +136,12 @@ PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* parent, const char* m_gridLayout->addWidget(m_filterLabel,0,1,TQt::AlignRight); m_gridLayout->addWidget(m_filterEdit,0,2,TQt::AlignLeft); - connect( m_filterEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotFilter()) ); - connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )), this, TQT_SLOT(slotFilter()) ); - connect( m_tabBar, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotTabSelected(int)) ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); + connect( m_filterEdit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotFilter()) ); + connect( m_filterEdit, TQ_SIGNAL(textChanged( const TQString & )), this, TQ_SLOT(slotFilter()) ); + connect( m_tabBar, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotTabSelected(int)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); slotActivePartChanged( part->partController()->activePart() ); } @@ -184,13 +184,13 @@ void PHPErrorView::InitListView(TDEListView* listview) listview->addColumn( i18n("Line") ); listview->addColumn( i18n("Column") ); listview->addColumn( i18n("Problem") ); - listview->setAllColumnsShowFocus( TRUE ); + listview->setAllColumnsShowFocus( true ); - connect( listview, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( listview, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); - connect( listview, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem* )) ); + connect( listview, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem* )) ); } diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index 92d2fc4c..8bc0ba0a 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -22,7 +22,7 @@ #include <tqregexp.h> #include <urlutil.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <kdevpartcontroller.h> @@ -39,14 +39,14 @@ PHPFile::PHPFile(PHPSupportPart *phpSupport, const TQString& fileName) m_fileinfo = new TQFileInfo(fileName); m_part = phpSupport; modified = true; - inClass = FALSE; - inMethod = FALSE; + inClass = false; + inMethod = false; /* phpCheckProc = new KShellProcess("/bin/sh"); - connect(phpCheckProc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStdout (TDEProcess*, char*, int))); - connect(phpCheckProc, TQT_SIGNAL(receivedStderr (TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStderr (TDEProcess*, char*, int))); - connect(phpCheckProc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPHPCheckExited(TDEProcess*))); + connect(phpCheckProc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedPHPCheckStdout (TDEProcess*, char*, int))); + connect(phpCheckProc, TQ_SIGNAL(receivedStderr (TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedPHPCheckStderr (TDEProcess*, char*, int))); + connect(phpCheckProc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotPHPCheckExited(TDEProcess*))); */ } @@ -71,7 +71,7 @@ TQStringList PHPFile::readFromEditor() { TQStringList contents; - kapp->lock(); + tdeApp->lock(); TQPtrList<KParts::Part> parts( *m_part->partController()->parts() ); TQPtrListIterator<KParts::Part> it( parts ); while( it.current() ){ @@ -85,7 +85,7 @@ TQStringList PHPFile::readFromEditor() contents = TQStringList::split("\n", editIface->text().ascii(), true); break; } - kapp->unlock(); + tdeApp->unlock(); return contents; } @@ -120,8 +120,8 @@ void PHPFile::Analyse() { postEvent( new FileParseEvent( Event_StartParse, this->fileName() ) ); - inClass = FALSE; - inMethod = FALSE; + inClass = false; + inMethod = false; /* m_contents = readFromEditor(); @@ -138,36 +138,36 @@ void PHPFile::Analyse() { } bool PHPFile::ParseClass(TQString line, int lineNo) { - if (line.find("class ", 0, FALSE) == -1) - return FALSE; + if (line.find("class ", 0, false) == -1) + return false; TQRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$"); - Class.setCaseSensitive(FALSE); + Class.setCaseSensitive(false); if (Class.search(line) != -1) { - if (AddClass(Class.cap(2), Class.cap(4), lineNo) == FALSE) - return FALSE; + if (!AddClass(Class.cap(2), Class.cap(4), lineNo)) + return false; /// @fixme Activate when it exists in ClassModel // if (Class.cap(1).lower() == "abstract") // SetClass("abstract"); - return TRUE; + return true; } - return FALSE; + return false; } bool PHPFile::ParseFunction(TQString line, int lineNo) { - if (line.find("function", 0, FALSE) == -1) - return FALSE; + if (line.find("function", 0, false) == -1) + return false; TQRegExp function("^[ \t]*(final|abstract|static|)[ \t]*(public|private|protected|)[ \t]*(static|)[ \t]*function[ \t&]*([_a-zA-Z\x7f-\xff][_a-zA-Z0-9\x7f-\xff]*)[ \t]*\\(([_a-zA-Z\x7f-\xff]*[_$, &'\\\"0-9A-Za-z\x7f-\xff\t-=]*)\\).*$"); - function.setCaseSensitive(FALSE); + function.setCaseSensitive(false); if (function.search(line) != -1) { - if (AddFunction(function.cap(4), function.cap(5), lineNo) == FALSE) - return FALSE; + if (!AddFunction(function.cap(4), function.cap(5), lineNo)) + return false; if (function.cap(3).lower() == "static" || function.cap(1).lower() == "static") SetFunction("static"); @@ -175,7 +175,7 @@ bool PHPFile::ParseFunction(TQString line, int lineNo) { if (function.cap(1).lower() == "abstract") { SetFunction("abstract"); CloseFunction( lineNo ); - return FALSE; + return false; } /// @fixme Activate when it exists in FunctionModel @@ -191,22 +191,22 @@ bool PHPFile::ParseFunction(TQString line, int lineNo) { if (function.cap(2).lower() == "protected") SetFunction("protected"); - return TRUE; + return true; } - return FALSE; + return false; } bool PHPFile::ParseVariable(TQString line, int lineNo) { if (line.find("var") == -1 && line.find("public") == -1 && line.find("private") == -1 && line.find("protected") == -1) - return FALSE; + return false; TQRegExp variable("^[ \t]*(var|public|private|protected|static)[ \t]*\\$([a-zA-Z_\x7f-\xff][0-9A-Za-z_\x7f-\xff]*)[ \t;=].*$"); - variable.setCaseSensitive(FALSE); + variable.setCaseSensitive(false); if (variable.search(line) != -1) { - if (AddVariable(variable.cap(2), "", lineNo) == FALSE) - return FALSE; + if (!AddVariable(variable.cap(2), "", lineNo)) + return false; if (variable.cap(1).lower() == "private") SetVariable( "private" ); @@ -220,117 +220,117 @@ bool PHPFile::ParseVariable(TQString line, int lineNo) { if (variable.cap(1).lower() == "static") SetVariable( "static" ); - return TRUE; + return true; } - return FALSE; + return false; } bool PHPFile::ParseThisMember(TQString line, int lineNo) { - if (line.find("$this->", 0, FALSE) == -1) - return FALSE; + if (line.find("$this->", 0, false) == -1) + return false; TQRegExp createthis; - createthis.setCaseSensitive(FALSE); + createthis.setCaseSensitive(false); createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*([0-9]*)[ \t]*;"); if (createthis.search(line) != -1) { - if (AddVariable(createthis.cap(1), "integer", lineNo, TRUE) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createthis.cap(1), "integer", lineNo, true)) + return false; + return true; } - if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) { + if (line.find("true", 0, false) != -1 || line.find("false", 0, false) != -1) { createthis.setPattern("\\$(this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;"); if (createthis.search(line) != -1) { - if (AddVariable(createthis.cap(1), "boolean", lineNo, TRUE) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createthis.cap(1), "boolean", lineNo, true)) + return false; + return true; } } - if (line.find("new", 0, FALSE) != -1) { + if (line.find("new", 0, false) != -1) { createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); if (createthis.search(line) != -1) { - if (AddVariable(createthis.cap(1), createthis.cap(2), lineNo, TRUE) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createthis.cap(1), createthis.cap(2), lineNo, true)) + return false; + return true; } } - if (line.find("array", 0, FALSE) != -1) { + if (line.find("array", 0, false) != -1) { createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+"); if (createthis.search(line) != -1) { - if (AddVariable(createthis.cap(1), "array", lineNo, TRUE) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createthis.cap(1), "array", lineNo, true)) + return false; + return true; } } - return FALSE; + return false; } bool PHPFile::ParseMember(TQString line, int lineNo) { - if (line.find("$", 0, FALSE) == -1) - return FALSE; + if (line.find("$", 0, false) == -1) + return false; /// @todo Ajouter plus de test .... TQRegExp createmember; - createmember.setCaseSensitive(FALSE); + createmember.setCaseSensitive(false); createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*([0-9]*)[ \t]*;"); if (createmember.search(line) != -1) { - if (AddVariable(createmember.cap(1), "integer", lineNo) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createmember.cap(1), "integer", lineNo)) + return false; + return true; } createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*[\"']+(.*)[\"']+[ \t]*;"); if (createmember.search(line) != -1) { - if (AddVariable(createmember.cap(1), "string", lineNo) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createmember.cap(1), "string", lineNo)) + return false; + return true; } - if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) { + if (line.find("true", 0, false) != -1 || line.find("false", 0, false) != -1) { createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;"); if (createmember.search(line) != -1) { - if (AddVariable(createmember.cap(1), "boolean", lineNo) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createmember.cap(1), "boolean", lineNo)) + return false; + return true; } } - if (line.find("new", 0, FALSE) != -1) { + if (line.find("new", 0, false) != -1) { createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); if (createmember.search(line) != -1) { - if (AddVariable(createmember.cap(1), createmember.cap(2), lineNo) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createmember.cap(1), createmember.cap(2), lineNo)) + return false; + return true; } } - if (line.find("array", 0, FALSE) != -1) { + if (line.find("array", 0, false) != -1) { createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+"); if (createmember.search(line) != -1) { - if (AddVariable(createmember.cap(1), "array", lineNo) == FALSE) - return FALSE; - return TRUE; + if (!AddVariable(createmember.cap(1), "array", lineNo)) + return false; + return true; } } - return FALSE; + return false; } bool PHPFile::ParseReturn(TQString line, int lineNo) { TQString rettype; - if (line.find("return", 0, FALSE) == -1) - return FALSE; + if (line.find("return", 0, false) == -1) + return false; TQRegExp typeex; - typeex.setCaseSensitive(FALSE); + typeex.setCaseSensitive(false); typeex.setPattern("return[ \t]*(\\(|)([a-zA-Z_\x7f-\xff$][a-zA-Z0-9_\x7f-\xff]*)(\\)|)[ \t]*;"); if (typeex.search(line) != -1) { @@ -362,37 +362,37 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) { } SetFunction("result", rettype); - return TRUE; + return true; } bool PHPFile::ParseTodo(TQString line, int lineNo) { - if (line.find("todo", 0, FALSE) == -1) - return FALSE; + if (line.find("todo", 0, false) == -1) + return false; TQRegExp todo("/[/]+[ \t]*[@]*todo([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$"); - todo.setCaseSensitive(FALSE); + todo.setCaseSensitive(false); if (todo.search(line) != -1) { AddTodo( todo.cap(2), lineNo ); - return TRUE; + return true; } - return FALSE; + return false; } bool PHPFile::ParseFixme(TQString line, int lineNo) { - if (line.find("fixme", 0, FALSE) == -1) - return FALSE; + if (line.find("fixme", 0, false) == -1) + return false; TQRegExp fixme("/[/]+[ \t]*[@]*fixme([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$"); - fixme.setCaseSensitive(FALSE); + fixme.setCaseSensitive(false); if (fixme.search(line) != -1) { AddFixme( fixme.cap(2), lineNo ); - return TRUE; + return true; } - return FALSE; + return false; } void PHPFile::ParseSource() { @@ -405,13 +405,13 @@ void PHPFile::ParseSource() { TQRegExp includere("^[ \t]*(include|require|include_once|require_once)[ \t]*(\\(|)[ \t]*[\"'](.*)[\"'][ \t]*(\\)|)[ \t]*;$"); - includere.setCaseSensitive(FALSE); + includere.setCaseSensitive(false); for ( TQStringList::Iterator it = m_contents.begin(); it != m_contents.end(); ++it ) { line = (*it).local8Bit(); if (!line.isNull()) { - if (line.find("include", 0, FALSE) != -1 || line.find("require", 0, FALSE) != -1) { + if (line.find("include", 0, false) != -1 || line.find("require", 0, false) != -1) { if (includere.search(line) != -1) { TQStringList include_path; include_path = include_path.split(":", m_part->getIncludePath()); @@ -431,7 +431,7 @@ void PHPFile::ParseSource() { } - if ( inMethod == TRUE ) { + if ( inMethod ) { bracketFuncOpen += line.contains("{"); bracketFuncClose += line.contains("}"); if (bracketFuncOpen == bracketFuncClose && bracketFuncOpen != 0 && bracketFuncClose != 0) { @@ -439,31 +439,31 @@ void PHPFile::ParseSource() { } } - if ( inMethod == FALSE ) { + if ( !inMethod ) { bracketOpen += line.contains("{"); bracketClose += line.contains("}"); - if (bracketOpen == bracketClose && bracketOpen != 0 && bracketClose != 0 && inClass == TRUE) { + if (bracketOpen == bracketClose && bracketOpen != 0 && bracketClose != 0 && inClass) { CloseClass( lineNo ); } } - if ( inClass == FALSE ) { - if (ParseClass(line, lineNo) == TRUE) { + if ( !inClass ) { + if (ParseClass(line, lineNo)) { bracketOpen = line.contains("{"); bracketClose = line.contains("}"); } } - if ( inClass == TRUE ) { + if ( inClass ) { ParseThisMember(line, lineNo); } - if (ParseFunction(line, lineNo) == TRUE) { + if (ParseFunction(line, lineNo)) { bracketFuncOpen = line.contains("{"); bracketFuncClose = line.contains("}"); } - if ( inMethod == TRUE ) + if ( inMethod ) ParseReturn(line, lineNo); ParseVariable(line, lineNo); @@ -480,7 +480,7 @@ void PHPFile::PHPCheck() { // int status = 0; m_phpCheckOutput = ""; -/// @todo try with kprocess in futur version actually this create zombie +/// @todo try with tdeprocess in futur version actually this create zombie /* phpCheckProc->clearArguments(); @@ -582,58 +582,58 @@ void PHPFile::postEvent(FileParseEvent *event) { bool PHPFile::AddClass(TQString name, TQString extends, int start) { postEvent( new FileParseEvent( Event_AddClass, this->fileName(), name, extends, start ) ); - inClass = TRUE; - return TRUE; + inClass = true; + return true; } bool PHPFile::SetClass(TQString arguments) { postEvent( new FileParseEvent( Event_SetClass, this->fileName(), "", arguments ) ); - return TRUE; + return true; } bool PHPFile::CloseClass(int end) { postEvent( new FileParseEvent( Event_CloseClass, this->fileName(), end ) ); - inClass = FALSE; - return TRUE; + inClass = false; + return true; } bool PHPFile::AddFunction(TQString name, TQString arguments, int start) { postEvent( new FileParseEvent( Event_AddFunction, this->fileName(), name, arguments, start ) ); - inMethod = TRUE; - return TRUE; + inMethod = true; + return true; } bool PHPFile::SetFunction(TQString name, TQString arguments) { postEvent( new FileParseEvent( Event_SetFunction, this->fileName(), name, arguments ) ); - return TRUE; + return true; } bool PHPFile::CloseFunction(int end) { postEvent( new FileParseEvent( Event_CloseFunction, this->fileName(), end ) ); - inMethod = FALSE; - return TRUE; + inMethod = false; + return true; } bool PHPFile::AddVariable(TQString name, TQString type, int position, bool classvar) { postEvent( new FileParseEvent( Event_AddVariable, this->fileName(), name, type, position, classvar ) ); - return TRUE; + return true; } bool PHPFile::SetVariable(TQString arguments) { postEvent( new FileParseEvent( Event_SetVariable, this->fileName(), "", arguments ) ); - return TRUE; + return true; } bool PHPFile::AddTodo(TQString arguments, int position) { postEvent( new FileParseEvent( Event_AddTodo, this->fileName(), "", arguments, position ) ); - inClass = TRUE; - return TRUE; + inClass = true; + return true; } bool PHPFile::AddFixme(TQString arguments, int position) { postEvent( new FileParseEvent( Event_AddFixme, this->fileName(), "", arguments, position ) ); - inClass = TRUE; - return TRUE; + inClass = true; + return true; } #include "phpfile.moc" diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h index da4da636..2db93552 100644 --- a/languages/php/phpfile.h +++ b/languages/php/phpfile.h @@ -27,7 +27,7 @@ #include <tqthread.h> #include <urlutil.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <kdevproject.h> @@ -98,7 +98,7 @@ private: bool SetFunction(TQString name, TQString arguments = ""); bool CloseFunction(int end); - bool AddVariable(TQString name, TQString type, int position, bool classvar = FALSE); + bool AddVariable(TQString name, TQString type, int position, bool classvar = false); bool SetVariable(TQString arguments); bool AddTodo(TQString arguments, int position); diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 061bb956..58316af2 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -24,8 +24,8 @@ #include <tqregexp.h> #include <tqtextedit.h> #include <tdeglobal.h> -#include <kstandarddirs.h> -#include <kinstance.h> +#include <tdestandarddirs.h> +#include <tdeinstance.h> #include <kdebug.h> using namespace std; @@ -49,13 +49,13 @@ PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString m_baseClassEdit->setCompletionObject( comp ); /// @todo change it to KLineEdit - connect(m_baseClassEdit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); - connect(m_classNameEdit,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(classNameTextChanged(const TQString&))); - connect(m_fileNameEdit,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(fileNameTextChanged(const TQString&))); - connect(m_dirButton,TQT_SIGNAL(clicked()), - this,TQT_SLOT(slotDirButtonClicked())); + connect(m_baseClassEdit,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); + connect(m_classNameEdit,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(classNameTextChanged(const TQString&))); + connect(m_fileNameEdit,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(fileNameTextChanged(const TQString&))); + connect(m_dirButton,TQ_SIGNAL(clicked()), + this,TQ_SLOT(slotDirButtonClicked())); } PHPNewClassDlg::~PHPNewClassDlg(){ } diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp index 6b725dc8..99bc4b71 100644 --- a/languages/php/phpparser.cpp +++ b/languages/php/phpparser.cpp @@ -150,7 +150,7 @@ void PHPParser::close() m_canParse.wakeAll(); while (running()) { - kapp->processEvents(); + tdeApp->processEvents(); } } diff --git a/languages/php/phpsupport_event.h b/languages/php/phpsupport_event.h index 28713efb..c3dfcd02 100644 --- a/languages/php/phpsupport_event.h +++ b/languages/php/phpsupport_event.h @@ -51,7 +51,7 @@ public: m_name = ""; m_arguments = ""; m_position = 0; - m_global = FALSE; + m_global = false; } FileParseEvent(long event, const TQString& fileName, int position ) @@ -59,20 +59,20 @@ public: { m_name = ""; m_arguments = ""; - m_global = FALSE; + m_global = false; } FileParseEvent(long event, const TQString& fileName, const TQString& name, const TQString& arguments ) : TQCustomEvent(event), m_fileName( fileName ), m_name( name ), m_arguments( arguments ) { m_position = 0; - m_global = FALSE; + m_global = false; } FileParseEvent(long event, const TQString& fileName, const TQString& name, const TQString& arguments, int position ) : TQCustomEvent(event), m_fileName( fileName ), m_name( name ), m_arguments( arguments ), m_position( position ) { - m_global = FALSE; + m_global = false; } FileParseEvent(long event, const TQString& fileName, const TQString& name, const TQString& arguments, int position, bool global ) diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 252b2167..ab73766c 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -38,7 +38,7 @@ #include <tdehtmlview.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kregexp.h> #include <kstatusbar.h> #include <tdeparts/browserextension.h> @@ -79,23 +79,23 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin setXMLFile("kdevphpsupport.rc"); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); TDEAction *action; action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Executes script on a terminal or a webserver.")); action = new TDEAction( i18n("&New Class..."),0, - this, TQT_SLOT(slotNewClass()), + this, TQ_SLOT(slotNewClass()), actionCollection(), "project_new_class" ); action->setToolTip(i18n("New class")); action->setWhatsThis(i18n("<b>New class</b><p>Runs New Class wizard.")); @@ -107,29 +107,29 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin mainWindow()->embedOutputView(m_phpErrorView, i18n("Problems"), i18n("Problems")); phpExeProc = new KShellProcess("/bin/sh"); - connect( phpExeProc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPExeStdout (TDEProcess*, char*, int))); - connect( phpExeProc, TQT_SIGNAL(receivedStderr (TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPExeStderr (TDEProcess*, char*, int))); - connect( phpExeProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotPHPExeExited(TDEProcess*))); + connect( phpExeProc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedPHPExeStdout (TDEProcess*, char*, int))); + connect( phpExeProc, TQ_SIGNAL(receivedStderr (TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedPHPExeStderr (TDEProcess*, char*, int))); + connect( phpExeProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotPHPExeExited(TDEProcess*))); m_htmlView = new PHPHTMLView(this); mainWindow()->embedOutputView(m_htmlView->view(), i18n("PHP"), i18n("PHP")); - connect( m_htmlView, TQT_SIGNAL(started(TDEIO::Job*)), - this, TQT_SLOT(slotWebJobStarted(TDEIO::Job*))); + connect( m_htmlView, TQ_SIGNAL(started(TDEIO::Job*)), + this, TQ_SLOT(slotWebJobStarted(TDEIO::Job*))); configData = new PHPConfigData(projectDom()); - connect( configData, TQT_SIGNAL(configStored()), - this, TQT_SLOT(slotConfigStored())); + connect( configData, TQ_SIGNAL(configStored()), + this, TQ_SLOT(slotConfigStored())); m_codeCompletion = new PHPCodeCompletion(this, configData); - new TDEAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQT_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text"); + new TDEAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQ_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text"); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); - connect( this, TQT_SIGNAL(fileParsed( PHPFile* )), this, TQT_SLOT(slotfileParsed( PHPFile* ))); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part *))); + connect( this, TQ_SIGNAL(fileParsed( PHPFile* )), this, TQ_SLOT(slotfileParsed( PHPFile* ))); } PHPSupportPart::~PHPSupportPart() @@ -180,7 +180,7 @@ void PHPSupportPart::slotActivePartChanged(KParts::Part *part) { if (m_editInterface) { // connect to the editor disconnect(part, 0, this, 0 ); // to make sure that it is't connected twice if (configData->getRealtimeParsing()) { - connect(part,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged())); + connect(part,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged())); } m_codeCompletion->setActiveEditorPart(part); } @@ -210,7 +210,7 @@ void PHPSupportPart::slotConfigStored() { void PHPSupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n( "PHP Specific" ), i18n("PHP Settings"), BarIcon( "text-x-src", TDEIcon::SizeMedium )); PHPConfigWidget* w = new PHPConfigWidget(configData,vbox, "php config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } void PHPSupportPart::slotNewClass() { @@ -242,7 +242,7 @@ bool PHPSupportPart::validateConfig() { TQVBox *vbox = dlg.addVBoxPage(i18n("PHP Settings")); PHPConfigWidget* w = new PHPConfigWidget(configData,vbox, "php config widget"); - connect( &dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( &dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); dlg.exec(); } if (configData->validateConfig()) { @@ -298,10 +298,10 @@ void PHPSupportPart::slotWebJobStarted(TDEIO::Job* job) { if (job && job->className() == TQString("TDEIO::TransferJob")) { kdDebug(9018) << endl << "job started" << job->progressId(); TDEIO::TransferJob *tjob = static_cast<TDEIO::TransferJob*>(job); - connect( tjob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotWebData(TDEIO::Job*, const TQByteArray&))); - connect( tjob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotWebResult(TDEIO::Job*))); + connect( tjob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotWebData(TDEIO::Job*, const TQByteArray&))); + connect( tjob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotWebResult(TDEIO::Job*))); } } @@ -381,10 +381,10 @@ void PHPSupportPart::projectOpened() { kdDebug(9018) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); if (!m_parser) { m_parser = new PHPParser( this ); @@ -393,7 +393,7 @@ void PHPSupportPart::projectOpened() // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(500, this, TQT_SLOT( initialParse() ) ); + TQTimer::singleShot(500, this, TQ_SLOT( initialParse() ) ); } void PHPSupportPart::initialParse( ) @@ -426,7 +426,7 @@ bool PHPSupportPart::parseProject() kdDebug(9018) << "parseProject()" << endl; mainWindow() ->statusBar() ->message( i18n( "Updating..." ) ); - kapp->setOverrideCursor( waitCursor ); + tdeApp->setOverrideCursor( waitCursor ); _jd = new JobData; @@ -442,15 +442,15 @@ bool PHPSupportPart::parseProject() _jd->it = _jd->files.begin(); _jd->dir.setPath( project()->projectDirectory() ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); - return TRUE; + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); + return true; } void PHPSupportPart::slotParseFiles() { kdDebug(9018) << "slotParseFiles()" << endl; - kapp->lock(); + tdeApp->lock(); if ( _jd->it != _jd->files.end() ) { @@ -470,11 +470,11 @@ void PHPSupportPart::slotParseFiles() ++( _jd->it ); } - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); } else // finished or interrupted { - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); mainWindow()->statusBar()->removeWidget( _jd->progressBar ); mainWindow()->statusBar()->message( i18n( "Done" ), 2000 ); @@ -486,7 +486,7 @@ void PHPSupportPart::slotParseFiles() _jd = 0; } - kapp->unlock(); + tdeApp->unlock(); } void PHPSupportPart::addedFilesToProject(const TQStringList &fileList) @@ -570,7 +570,7 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev ) if ( ev->type() < Event_AddFile || ev->type() > Event_AddFixme ) return; - kapp->lock(); + tdeApp->lock(); FileParseEvent* event = (FileParseEvent*) ev; NamespaceDom ns = codeModel()->globalNamespace(); @@ -609,7 +609,7 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev ) nClass->setStartPosition( event->posititon(), 0); m_file->addClass( nClass ); - if ( event->arguments().isEmpty() != TRUE ) + if ( !event->arguments().isEmpty() ) nClass->addBaseClass( event->arguments() ); ns->addClass( nClass ); @@ -690,10 +690,10 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev ) nVariable->setStartPosition( event->posititon(), 0 ); nVariable->setAccess(VariableModel::Public); - if ( event->arguments().isEmpty() != TRUE ) + if ( !event->arguments().isEmpty() ) nVariable->setType( event->arguments() ); - if ( LastClass != NULL && ( LastMethod == NULL || event->global() == TRUE ) ) { + if ( LastClass != NULL && ( LastMethod == NULL || event->global() ) ) { // kdDebug(9018) << "AddVariable To Class " << LastClass->name() << " " << nVariable->name() << endl; LastClass->addVariable(nVariable); } else { @@ -736,8 +736,8 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev ) } - kapp->unlock(); - kapp->processEvents(); + tdeApp->unlock(); + tdeApp->processEvents(); } PHPErrorView *PHPSupportPart::ErrorView( ) { diff --git a/languages/python/app_templates/pyqt/app.py b/languages/python/app_templates/pyqt/app.py index d2207de3..960dcf40 100644 --- a/languages/python/app_templates/pyqt/app.py +++ b/languages/python/app_templates/pyqt/app.py @@ -262,7 +262,7 @@ def main(args): app=QApplication(args) mainWindow = %{APPNAME}() mainWindow.show() - app.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) + app.connect(app, TQ_SIGNAL("lastWindowClosed()"), app, TQ_SLOT("quit()")) app.exec_loop() diff --git a/languages/python/app_templates/pyqt/templates-ui-mainwin b/languages/python/app_templates/pyqt/templates-ui-mainwin index 5ce4dec8..62d6d51a 100644 --- a/languages/python/app_templates/pyqt/templates-ui-mainwin +++ b/languages/python/app_templates/pyqt/templates-ui-mainwin @@ -400,7 +400,7 @@ <slot>helpAbout()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>fileNew()</slot> <slot>fileOpen()</slot> <slot>fileSave()</slot> @@ -416,6 +416,6 @@ <slot>helpIndex()</slot> <slot>helpContents()</slot> <slot>helpAbout()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp index 86027d3a..489cdb35 100644 --- a/languages/python/pydoc.cpp +++ b/languages/python/pydoc.cpp @@ -6,9 +6,9 @@ #include <unistd.h> #include <tqtextstream.h> -#include <kstandarddirs.h> -#include <kinstance.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeinstance.h> +#include <tdeprocess.h> #include <tdeversion.h> #include <tdeglobal.h> #include <tdelocale.h> diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index 68baf71e..333d5c82 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -49,37 +49,37 @@ PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const T setXMLFile("kdevpythonsupport.rc"); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); TDEAction *action; action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Execute program") ); action->setWhatsThis(i18n("<b>Execute program</b><p>Runs the Python program.")); action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0, - this, TQT_SLOT(slotExecuteString()), + this, TQ_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Execute string") ); action->setWhatsThis(i18n("<b>Execute String</b><p>Executes a string as Python code.")); action = new TDEAction( i18n("Start Python Interpreter"), "application-x-executable", 0, - this, TQT_SLOT(slotStartInterpreter()), + this, TQ_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Start Python interpreter") ); action->setWhatsThis(i18n("<b>Start python interpreter</b><p>Starts the Python interpreter without a program")); action = new TDEAction( i18n("Python Documentation..."), 0, - this, TQT_SLOT(slotPydoc()), + this, TQ_SLOT(slotPydoc()), actionCollection(), "help_pydoc" ); action->setToolTip( i18n("Python documentation") ); action->setWhatsThis(i18n("<b>Python documentation</b><p>Shows a Python documentation page.")); @@ -99,7 +99,7 @@ void PythonSupportPart::contextMenu(TQPopupMenu *popup, const Context *context) if (url.fileName().endsWith(".ui")) { m_contextFileName = url.fileName(); - int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass())); + int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQ_SLOT(slotCreateSubclass())); popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); } } @@ -110,7 +110,7 @@ void PythonSupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Python")); PythonConfigWidget *w = new PythonConfigWidget(*projectDom(), vbox, "python config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } @@ -118,14 +118,14 @@ void PythonSupportPart::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } @@ -154,7 +154,7 @@ void PythonSupportPart::initialParse() kdDebug(9014) << "initialParse()" << endl; if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug(9014) << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; @@ -162,7 +162,7 @@ void PythonSupportPart::initialParse() } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug(9014) << "No project" << endl; } diff --git a/languages/ruby/app_templates/dcopservice/app.cpp b/languages/ruby/app_templates/dcopservice/app.cpp index 04770335..09d2f1fa 100644 --- a/languages/ruby/app_templates/dcopservice/app.cpp +++ b/languages/ruby/app_templates/dcopservice/app.cpp @@ -2,8 +2,8 @@ #include <tqstring.h> #include <tqfileinfo.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> int main(int argc, char **argv) { TDEInstance * instance = new TDEInstance("%{APPNAMELC}"); diff --git a/languages/ruby/app_templates/dcopservice/dcopservice.rb b/languages/ruby/app_templates/dcopservice/dcopservice.rb index b0e59b6d..487d4804 100644 --- a/languages/ruby/app_templates/dcopservice/dcopservice.rb +++ b/languages/ruby/app_templates/dcopservice/dcopservice.rb @@ -31,7 +31,7 @@ class %{APPNAME} < KDE::DCOPObject end def exit() - $kapp.quit() + $tdeApp.quit() return true end end diff --git a/languages/ruby/app_templates/kapp/app.cpp b/languages/ruby/app_templates/kapp/app.cpp index 04770335..09d2f1fa 100644 --- a/languages/ruby/app_templates/kapp/app.cpp +++ b/languages/ruby/app_templates/kapp/app.cpp @@ -2,8 +2,8 @@ #include <tqstring.h> #include <tqfileinfo.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> int main(int argc, char **argv) { TDEInstance * instance = new TDEInstance("%{APPNAMELC}"); diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/kapp/app.rb index af807fe9..39b919da 100644 --- a/languages/ruby/app_templates/kapp/app.rb +++ b/languages/ruby/app_templates/kapp/app.rb @@ -9,7 +9,7 @@ class %{APPNAMESC} < KDE::MainWindow - Q_SLOTS 'fileNew()', + slots 'fileNew()', 'fileOpen()', 'fileSave()', 'fileSaveAs()', @@ -41,10 +41,10 @@ class %{APPNAMESC} < KDE::MainWindow setupGUI(); # allow the view to change the statusbar and caption - connect(@view, SIGNAL('signalChangeStatusbar(const TQString&)'), - self, SLOT('changeStatusbar(const TQString&)')) - connect(@view, SIGNAL('signalChangeCaption(const TQString&)'), - self, SLOT('changeCaption(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeStatusbar(const TQString&)'), + self, TQ_SLOT('changeStatusbar(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeCaption(const TQString&)'), + self, TQ_SLOT('changeCaption(const TQString&)')) end @@ -74,19 +74,19 @@ class %{APPNAMESC} < KDE::MainWindow end def setupActions() - KDE::StdAction.openNew(self, SLOT('fileNew()'), actionCollection()) - KDE::StdAction.open(self, SLOT('fileOpen()'), actionCollection()) - KDE::StdAction.save(self, SLOT('fileSave()'), actionCollection()) - KDE::StdAction.saveAs(self, SLOT('fileSaveAs()'), actionCollection()) - KDE::StdAction.print(self, SLOT('filePrint()'), actionCollection()) - KDE::StdAction.quit($kapp, SLOT('quit()'), actionCollection()) + KDE::StdAction.openNew(self, TQ_SLOT('fileNew()'), actionCollection()) + KDE::StdAction.open(self, TQ_SLOT('fileOpen()'), actionCollection()) + KDE::StdAction.save(self, TQ_SLOT('fileSave()'), actionCollection()) + KDE::StdAction.saveAs(self, TQ_SLOT('fileSaveAs()'), actionCollection()) + KDE::StdAction.print(self, TQ_SLOT('filePrint()'), actionCollection()) + KDE::StdAction.quit($tdeApp, TQ_SLOT('quit()'), actionCollection()) - KDE::StdAction.preferences(self, SLOT('optionsPreferences()'), actionCollection()) + KDE::StdAction.preferences(self, TQ_SLOT('optionsPreferences()'), actionCollection()) # this doesn't do anything useful. it's just here to illustrate # how to insert a custom menu and menu item custom = KDE::Action.new(i18n("Cus&tom Menuitem"), KDE::Shortcut.new(), - self, SLOT('optionsPreferences()'), + self, TQ_SLOT('optionsPreferences()'), actionCollection(), "custom_action") end diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb index 3fed1ce1..7ee8133f 100644 --- a/languages/ruby/app_templates/kapp/appview.rb +++ b/languages/ruby/app_templates/kapp/appview.rb @@ -15,14 +15,14 @@ class %{APPNAMESC}View < TQt::Widget # # Use this signal to change the content of the statusbar # - Q_SIGNALS 'signalChangeStatusbar(const TQString&)' + signals 'signalChangeStatusbar(const TQString&)' # # Use this signal to change the content of the caption # - Q_SIGNALS 'signalChangeCaption(const TQString&)' + signals 'signalChangeCaption(const TQString&)' - Q_SLOTS 'slotOnURL(const TQString&)', + slots 'slotOnURL(const TQString&)', 'slotSetTitle(const TQString&)' def initialize(parent) @@ -71,10 +71,10 @@ class %{APPNAMESC}View < TQt::Widget return end - connect(@html, SIGNAL('setWindowCaption(const TQString&)'), - self, SLOT('slotSetTitle(const TQString&)')) - connect(@html, SIGNAL('setStatusBarText(const TQString&)'), - self, SLOT('slotOnURL(const TQString&)')) + connect(@html, TQ_SIGNAL('setWindowCaption(const TQString&)'), + self, TQ_SLOT('slotSetTitle(const TQString&)')) + connect(@html, TQ_SIGNAL('setStatusBarText(const TQString&)'), + self, TQ_SLOT('slotOnURL(const TQString&)')) end diff --git a/languages/ruby/app_templates/kxt/app.cpp b/languages/ruby/app_templates/kxt/app.cpp index 04770335..09d2f1fa 100644 --- a/languages/ruby/app_templates/kxt/app.cpp +++ b/languages/ruby/app_templates/kxt/app.cpp @@ -2,8 +2,8 @@ #include <tqstring.h> #include <tqfileinfo.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> int main(int argc, char **argv) { TDEInstance * instance = new TDEInstance("%{APPNAMELC}"); diff --git a/languages/ruby/app_templates/kxt/app.rb b/languages/ruby/app_templates/kxt/app.rb index 59a7c266..c8485460 100644 --- a/languages/ruby/app_templates/kxt/app.rb +++ b/languages/ruby/app_templates/kxt/app.rb @@ -9,7 +9,7 @@ class %{APPNAMESC} < KDE::MainWindow - Q_SLOTS 'fileNew()', + slots 'fileNew()', 'optionsPreferences()', 'newToolbarConfig()', 'changeStatusbar(const TQString&)', @@ -40,23 +40,23 @@ class %{APPNAMESC} < KDE::MainWindow setupGUI(); # allow the view to change the statusbar and caption - connect(@view, SIGNAL('signalChangeStatusbar(const TQString&)'), - self, SLOT('changeStatusbar(const TQString&)')) - connect(@view, SIGNAL('signalChangeCaption(const TQString&)'), - self, SLOT('changeCaption(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeStatusbar(const TQString&)'), + self, TQ_SLOT('changeStatusbar(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeCaption(const TQString&)'), + self, TQ_SLOT('changeCaption(const TQString&)')) end def setupActions() - KDE::StdAction.openNew(self, SLOT('fileNew()'), actionCollection()) - KDE::StdAction.quit($kapp, SLOT('quit()'), actionCollection()) + KDE::StdAction.openNew(self, TQ_SLOT('fileNew()'), actionCollection()) + KDE::StdAction.quit($tdeApp, TQ_SLOT('quit()'), actionCollection()) - KDE::StdAction.preferences(self, SLOT('optionsPreferences()'), actionCollection()) + KDE::StdAction.preferences(self, TQ_SLOT('optionsPreferences()'), actionCollection()) # this doesn't do anything useful. it's just here to illustrate # how to insert a custom menu and menu item custom = KDE::Action.new(i18n("Swi&tch Colors"), KDE::Shortcut.new(), - @view, SLOT('switchColors()'), + @view, TQ_SLOT('switchColors()'), actionCollection(), "switch_action") end @@ -76,7 +76,7 @@ class %{APPNAMESC} < KDE::MainWindow # to the names of the variables in the .kcfg file dialog = KDE::ConfigDialog.new(self, "settings", Settings.instance, KDE::DialogBase::Swallow) dialog.addPage(Prefs.new(), i18n("General"), "package_settings") - connect(dialog, SIGNAL('settingsChanged()'), @view, SLOT('settingsChanged()')) + connect(dialog, TQ_SIGNAL('settingsChanged()'), @view, TQ_SLOT('settingsChanged()')) dialog.show() end diff --git a/languages/ruby/app_templates/kxt/appview.rb b/languages/ruby/app_templates/kxt/appview.rb index 4f63037f..2557b9da 100644 --- a/languages/ruby/app_templates/kxt/appview.rb +++ b/languages/ruby/app_templates/kxt/appview.rb @@ -15,14 +15,14 @@ class %{APPNAMESC}View < %{APPNAMESC}view_base # # Use this signal to change the content of the statusbar # - Q_SIGNALS 'signalChangeStatusbar(const TQString&)' + signals 'signalChangeStatusbar(const TQString&)' # # Use this signal to change the content of the caption # - Q_SIGNALS 'signalChangeCaption(const TQString&)' + signals 'signalChangeCaption(const TQString&)' - Q_SLOTS 'switchColors()', + slots 'switchColors()', 'settingsChanged()' def initialize(parent) diff --git a/languages/ruby/app_templates/qtrubyapp/main.rb b/languages/ruby/app_templates/qtrubyapp/main.rb index 431ea442..f76c9dac 100644 --- a/languages/ruby/app_templates/qtrubyapp/main.rb +++ b/languages/ruby/app_templates/qtrubyapp/main.rb @@ -5,6 +5,6 @@ a = TQt::Application.new( ARGV ) mw = %{APPNAMESC}.new mw.caption = "%{APPNAMESC}" mw.show -a.connect( a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()') ) +a.connect( a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()') ) a.exec diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb index df98824d..ceae4ad1 100644 --- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb +++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb @@ -1,6 +1,6 @@ class %{APPNAMESC} < TQt::MainWindow - Q_SLOTS 'newDoc()', + slots 'newDoc()', 'choose()', 'load( const TQString& )', 'save()', @@ -18,15 +18,15 @@ class %{APPNAMESC} < TQt::MainWindow openIcon = TQt::Pixmap.new( "fileopen.xpm" ) fileOpen = TQt::ToolButton.new( TQt::IconSet.new(openIcon), tr("Open File"), nil, - self, SLOT('choose()'), fileTools, "open file" ) + self, TQ_SLOT('choose()'), fileTools, "open file" ) saveIcon = TQt::Pixmap.new( "filesave.xpm" ) fileSave = TQt::ToolButton.new( TQt::IconSet.new(saveIcon), tr("Save File"), nil, - self, SLOT('save()'), fileTools, "save file" ) + self, TQ_SLOT('save()'), fileTools, "save file" ) printIcon = TQt::Pixmap.new( "fileprint.xpm" ) filePrint = TQt::ToolButton.new( TQt::IconSet.new(printIcon), tr("Print File"), nil, - self, SLOT('print()'), fileTools, "print file" ) + self, TQ_SLOT('print()'), fileTools, "print file" ) TQt::WhatsThis.whatsThisButton( fileTools ) @@ -58,40 +58,40 @@ class %{APPNAMESC} < TQt::MainWindow menuBar().insertItem( tr("&File"), file ) - file.insertItem( tr("&New"), self, SLOT('newDoc()'), TQt::KeySequence.new(CTRL+Key_N) ) + file.insertItem( tr("&New"), self, TQ_SLOT('newDoc()'), TQt::KeySequence.new(CTRL+Key_N) ) id = file.insertItem( TQt::IconSet.new(openIcon), tr("&Open..."), - self, SLOT('choose()'), TQt::KeySequence.new(CTRL+Key_O) ) + self, TQ_SLOT('choose()'), TQt::KeySequence.new(CTRL+Key_O) ) file.setWhatsThis( id, fileOpenText ) id = file.insertItem( TQt::IconSet.new(saveIcon), tr("&Save"), - self, SLOT('save()'), TQt::KeySequence.new(CTRL+Key_S) ) + self, TQ_SLOT('save()'), TQt::KeySequence.new(CTRL+Key_S) ) file.setWhatsThis( id, fileSaveText ) - id = file.insertItem( tr("Save &As..."), self, SLOT('saveAs()') ) + id = file.insertItem( tr("Save &As..."), self, TQ_SLOT('saveAs()') ) file.setWhatsThis( id, fileSaveText ) file.insertSeparator() id = file.insertItem( TQt::IconSet.new(printIcon), tr("&Print..."), - self, SLOT('print()'), TQt::KeySequence.new(CTRL+Key_P) ) + self, TQ_SLOT('print()'), TQt::KeySequence.new(CTRL+Key_P) ) file.setWhatsThis( id, filePrintText ) file.insertSeparator() - file.insertItem( tr("&Close"), self, SLOT('close()'), TQt::KeySequence.new(CTRL+Key_W) ) + file.insertItem( tr("&Close"), self, TQ_SLOT('close()'), TQt::KeySequence.new(CTRL+Key_W) ) - file.insertItem( tr("&Quit"), $tqApp, SLOT( 'closeAllWindows()' ), TQt::KeySequence.new(CTRL+Key_Q) ) + file.insertItem( tr("&Quit"), $tqApp, TQ_SLOT( 'closeAllWindows()' ), TQt::KeySequence.new(CTRL+Key_Q) ) menuBar().insertSeparator() help = TQt::PopupMenu.new( self ) menuBar().insertItem( tr("&Help"), help ) - help.insertItem( tr("&About"), self, SLOT('about()'), TQt::KeySequence.new(Key_F1) ) - help.insertItem( tr("About &Qt"), self, SLOT('aboutQt()') ) + help.insertItem( tr("&About"), self, TQ_SLOT('about()'), TQt::KeySequence.new(Key_F1) ) + help.insertItem( tr("About &Qt"), self, TQ_SLOT('aboutQt()') ) help.insertSeparator() - help.insertItem( tr("What's &This"), self, SLOT('whatsThis()'), TQt::KeySequence.new(SHIFT+Key_F1) ) + help.insertItem( tr("What's &This"), self, TQ_SLOT('whatsThis()'), TQt::KeySequence.new(SHIFT+Key_F1) ) @e = TQt::TextEdit.new( self, "editor" ) @e.setFocus() diff --git a/languages/ruby/debugger/dbgcontroller.cpp b/languages/ruby/debugger/dbgcontroller.cpp index 7ee560b7..51e01c30 100644 --- a/languages/ruby/debugger/dbgcontroller.cpp +++ b/languages/ruby/debugger/dbgcontroller.cpp @@ -20,7 +20,7 @@ ***************************************************************************/ #include "dbgcontroller.h" -#include <kprocess.h> +#include <tdeprocess.h> /***************************************************************************/ diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index b012f0be..fe2c000e 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -25,7 +25,7 @@ #include <kdialog.h> #include <tdeglobalsettings.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kstdguiitem.h> #include <tdeversion.h> @@ -78,8 +78,8 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) buttonbox->layout(); topLayout->addWidget(buttonbox); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); psProc_ = new KShellProcess("/bin/sh"); #ifdef USE_SOLARIS @@ -106,8 +106,8 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) } #endif - connect( psProc_, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotProcessExited()) ); - connect( psProc_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); + connect( psProc_, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(slotProcessExited()) ); + connect( psProc_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); psProc_->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); // Default display to 40 chars wide, default height is okay diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index 07c0b415..138f1a8c 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -27,7 +27,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <twinmodule.h> @@ -117,9 +117,9 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) TDEPopupMenu *menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - parent(), TQT_SLOT(slotDock())); + parent(), TQ_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify TDevelop"), - parent(), TQT_SLOT(slotIconifyAndDock())); + parent(), TQ_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; @@ -242,8 +242,8 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) { TDEPopupMenu* menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); - menu->insertItem(i18n("Activate"), toolBar_, TQT_SLOT(slotUndock())); - menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQT_SLOT(slotActivateAndUndock())); + menu->insertItem(i18n("Activate"), toolBar_, TQ_SLOT(slotUndock())); + menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQ_SLOT(slotActivateAndUndock())); menu->popup(e->globalPos()); break; } @@ -269,9 +269,9 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, docker_(0), dockWindow_(new KSystemTray(parent)) { - winModule_ = new KWinModule(TQT_TQOBJECT(this)); + winModule_ = new KWinModule(this); docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); - connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); + connect(docker_, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. // see slotDbgKdevFocus() for more comments @@ -306,14 +306,14 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), TQString(), this); bKDevFocus_ = new DbgButton(BarIcon("tdevelop"), TQString(), this); - connect(bRun, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRun())); - connect(bInterrupt, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotPause())); - connect(bNext, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); - connect(bStep, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepInto())); - connect(bFinish, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOut())); - connect(bRunTo, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRunToCursor())); - connect(bKDevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKdevFocus())); - connect(bPrevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevFocus())); + connect(bRun, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRun())); + connect(bInterrupt, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotPause())); + connect(bNext, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver())); + connect(bStep, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepInto())); + connect(bFinish, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOut())); + connect(bRunTo, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRunToCursor())); + connect(bKDevFocus_, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotKdevFocus())); + connect(bPrevFocus_, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrevFocus())); TQToolTip::add( bRun, i18n("Continue with application execution, may start the application") ); TQToolTip::add( bInterrupt, i18n("Interrupt the application execution") ); diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index bfa5de96..1ce6946e 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -38,7 +38,7 @@ #include <dcopclient.h> #include <tqtimer.h> #include <kstringhandler.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kdevcore.h" #include "kdevproject.h" @@ -148,19 +148,19 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ mainWindow()->setViewAvailable(rdbOutputWidget, false); // rdbBreakpointWidget -> this - connect( rdbBreakpointWidget, TQT_SIGNAL(refreshBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( rdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( rdbBreakpointWidget, TQT_SIGNAL(gotoSourcePosition(const TQString&, int)), - this, TQT_SLOT(slotGotoSource(const TQString&, int)) ); + connect( rdbBreakpointWidget, TQ_SIGNAL(refreshBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( rdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( rdbBreakpointWidget, TQ_SIGNAL(gotoSourcePosition(const TQString&, int)), + this, TQ_SLOT(slotGotoSource(const TQString&, int)) ); // Now setup the actions TDEAction *action; // action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, action = new TDEAction(i18n("&Start"), "dbgrun", CTRL+SHIFT+Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); action->setWhatsThis( i18n("<b>Start in debugger</b><p>" @@ -171,26 +171,26 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ "about variables, frame stack, and so on.") ); action = new TDEAction(i18n("Sto&p"), "process-stop", 0, - this, TQT_SLOT(slotStop()), + this, TQ_SLOT(slotStop()), actionCollection(), "debug_stop"); action->setToolTip( i18n("Stop debugger") ); action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger.")); action = new TDEAction(i18n("Interrupt"), "media-playback-pause", 0, - this, TQT_SLOT(slotPause()), + this, TQ_SLOT(slotPause()), actionCollection(), "debug_pause"); action->setToolTip( i18n("Interrupt application") ); action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current RDB command.")); action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0, - this, TQT_SLOT(slotRunToCursor()), + this, TQ_SLOT(slotRunToCursor()), actionCollection(), "debug_runtocursor"); action->setToolTip( i18n("Run to cursor") ); action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached.")); action = new TDEAction(i18n("Step &Over"), "dbgnext", 0, - this, TQT_SLOT(slotStepOver()), + this, TQ_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); action->setWhatsThis( i18n("<b>Step over</b><p>" @@ -201,7 +201,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ action = new TDEAction(i18n("Step &Into"), "dbgstep", 0, - this, TQT_SLOT(slotStepInto()), + this, TQ_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); action->setWhatsThis( i18n("<b>Step into</b><p>" @@ -212,7 +212,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ action = new TDEAction(i18n("Step O&ut"), "dbgstepout", 0, - this, TQT_SLOT(slotStepOut()), + this, TQ_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current method") ); action->setWhatsThis( i18n("<b>Step out</b><p>" @@ -224,53 +224,53 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0, - this, TQT_SLOT(toggleBreakpoint()), + this, TQ_SLOT(toggleBreakpoint()), actionCollection(), "debug_toggle_breakpoint"); action->setToolTip(i18n("Toggle breakpoint")); action->setWhatsThis(i18n("<b>Toggle breakpoint</b><p>Toggles the breakpoint at the current line in editor.")); - connect( mainWindow()->main()->guiFactory(), TQT_SIGNAL(clientAdded(KXMLGUIClient*)), - this, TQT_SLOT(guiClientAdded(KXMLGUIClient*)) ); + connect( mainWindow()->main()->guiFactory(), TQ_SIGNAL(clientAdded(KXMLGUIClient*)), + this, TQ_SLOT(guiClientAdded(KXMLGUIClient*)) ); - connect( partController(), TQT_SIGNAL(loadedFile(const KURL &)), - rdbBreakpointWidget, TQT_SLOT(slotRefreshBP(const KURL &)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpoint(const TQString &, int)), - rdbBreakpointWidget, TQT_SLOT(slotToggleBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(editedBreakpoint(const TQString &, int)), - rdbBreakpointWidget, TQT_SLOT(slotEditBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), - rdbBreakpointWidget, TQT_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); + connect( partController(), TQ_SIGNAL(loadedFile(const KURL &)), + rdbBreakpointWidget, TQ_SLOT(slotRefreshBP(const KURL &)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpoint(const TQString &, int)), + rdbBreakpointWidget, TQ_SLOT(slotToggleBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(editedBreakpoint(const TQString &, int)), + rdbBreakpointWidget, TQ_SLOT(slotEditBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + rdbBreakpointWidget, TQ_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStop(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectClosed()), - this, TQT_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStop(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectClosed()), + this, TQ_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); procLineMaker = new ProcessLineMaker(); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStdoutLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStderrLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStdoutLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStderrLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStderrLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStderrLine(const TQCString&)) ); setupController(); - TQTimer::singleShot(0, this, TQT_SLOT(setupDcop())); + TQTimer::singleShot(0, this, TQ_SLOT(setupDcop())); } RubyDebuggerPart::~RubyDebuggerPart() { - kapp->dcopClient()->setNotifications(false); + tdeApp->dcopClient()->setNotifications(false); if (variableWidget) mainWindow()->removeView(variableWidget); @@ -311,16 +311,16 @@ void RubyDebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); if (econtext->url().isLocalFile()) { - int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQT_SLOT(toggleBreakpoint()) ); + int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQ_SLOT(toggleBreakpoint()) ); popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); } if (!m_contextIdent.isEmpty()) { TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); - int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQT_SLOT(contextWatch()) ); + int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQ_SLOT(contextWatch()) ); popup->setWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list.")); - id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQT_SLOT(contextRubyInspect()) ); + id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQ_SLOT(contextRubyInspect()) ); popup->setWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor.")); } } @@ -362,74 +362,74 @@ void RubyDebuggerPart::setupController() controller = new RDBController(variableTree, framestackWidget, *projectDom()); // this -> controller - connect( this, TQT_SIGNAL(rubyInspect(const TQString&)), - controller, TQT_SLOT(slotRubyInspect(const TQString&))); + connect( this, TQ_SIGNAL(rubyInspect(const TQString&)), + controller, TQ_SLOT(slotRubyInspect(const TQString&))); // variableTree -> framestackWidget - connect( variableTree, TQT_SIGNAL(selectFrame(int, int)), - framestackWidget, TQT_SLOT(slotSelectFrame(int, int))); + connect( variableTree, TQ_SIGNAL(selectFrame(int, int)), + framestackWidget, TQ_SLOT(slotSelectFrame(int, int))); // framestackWidget -> variableTree - connect( framestackWidget, TQT_SIGNAL(frameActive(int, int, const TQString&)), - variableTree, TQT_SLOT(slotFrameActive(int, int, const TQString&))); + connect( framestackWidget, TQ_SIGNAL(frameActive(int, int, const TQString&)), + variableTree, TQ_SLOT(slotFrameActive(int, int, const TQString&))); // variableTree -> controller - connect( variableTree, TQT_SIGNAL(expandItem(VarItem*, const TQCString&)), - controller, TQT_SLOT(slotExpandItem(VarItem*, const TQCString&))); - connect( variableTree, TQT_SIGNAL(fetchGlobals(bool)), - controller, TQT_SLOT(slotFetchGlobals(bool))); - connect( variableTree, TQT_SIGNAL(addWatchExpression(const TQString&, bool)), - controller, TQT_SLOT(slotAddWatchExpression(const TQString&, bool))); - connect( variableTree, TQT_SIGNAL(removeWatchExpression(int)), - controller, TQT_SLOT(slotRemoveWatchExpression(int))); + connect( variableTree, TQ_SIGNAL(expandItem(VarItem*, const TQCString&)), + controller, TQ_SLOT(slotExpandItem(VarItem*, const TQCString&))); + connect( variableTree, TQ_SIGNAL(fetchGlobals(bool)), + controller, TQ_SLOT(slotFetchGlobals(bool))); + connect( variableTree, TQ_SIGNAL(addWatchExpression(const TQString&, bool)), + controller, TQ_SLOT(slotAddWatchExpression(const TQString&, bool))); + connect( variableTree, TQ_SIGNAL(removeWatchExpression(int)), + controller, TQ_SLOT(slotRemoveWatchExpression(int))); // framestackWidget -> controller - connect( framestackWidget, TQT_SIGNAL(selectFrame(int,int,const TQString&)), - controller, TQT_SLOT(slotSelectFrame(int,int,const TQString&))); + connect( framestackWidget, TQ_SIGNAL(selectFrame(int,int,const TQString&)), + controller, TQ_SLOT(slotSelectFrame(int,int,const TQString&))); // rdbBreakpointWidget -> controller - connect( rdbBreakpointWidget, TQT_SIGNAL(clearAllBreakpoints()), - controller, TQT_SLOT(slotClearAllBreakpoints())); - connect( rdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), - controller, TQT_SLOT(slotBPState(const Breakpoint &))); + connect( rdbBreakpointWidget, TQ_SIGNAL(clearAllBreakpoints()), + controller, TQ_SLOT(slotClearAllBreakpoints())); + connect( rdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)), + controller, TQ_SLOT(slotBPState(const Breakpoint &))); // rdbOutputWidget -> controller - connect( rdbOutputWidget, TQT_SIGNAL(userRDBCmd(const TQString &)), - controller, TQT_SLOT(slotUserRDBCmd(const TQString&))); - connect( rdbOutputWidget, TQT_SIGNAL(breakInto()), - controller, TQT_SLOT(slotBreakInto())); + connect( rdbOutputWidget, TQ_SIGNAL(userRDBCmd(const TQString &)), + controller, TQ_SLOT(slotUserRDBCmd(const TQString&))); + connect( rdbOutputWidget, TQ_SIGNAL(breakInto()), + controller, TQ_SLOT(slotBreakInto())); // controller -> rdbBreakpointWidget - connect( controller, TQT_SIGNAL(acceptPendingBPs()), - rdbBreakpointWidget, TQT_SLOT(slotSetPendingBPs())); - connect( controller, TQT_SIGNAL(unableToSetBPNow(int)), - rdbBreakpointWidget, TQT_SLOT(slotUnableToSetBPNow(int))); - connect( controller, TQT_SIGNAL(rawRDBBreakpointList (char*)), - rdbBreakpointWidget, TQT_SLOT(slotParseRDBBrkptList(char*))); - connect( controller, TQT_SIGNAL(rawRDBBreakpointSet(char*, int)), - rdbBreakpointWidget, TQT_SLOT(slotParseRDBBreakpointSet(char*, int))); + connect( controller, TQ_SIGNAL(acceptPendingBPs()), + rdbBreakpointWidget, TQ_SLOT(slotSetPendingBPs())); + connect( controller, TQ_SIGNAL(unableToSetBPNow(int)), + rdbBreakpointWidget, TQ_SLOT(slotUnableToSetBPNow(int))); + connect( controller, TQ_SIGNAL(rawRDBBreakpointList (char*)), + rdbBreakpointWidget, TQ_SLOT(slotParseRDBBrkptList(char*))); + connect( controller, TQ_SIGNAL(rawRDBBreakpointSet(char*, int)), + rdbBreakpointWidget, TQ_SLOT(slotParseRDBBreakpointSet(char*, int))); // controller -> this - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - this, TQT_SLOT(slotStatus(const TQString&, int))); - connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), - this, TQT_SLOT(slotShowStep(const TQString&, int))); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + this, TQ_SLOT(slotStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + this, TQ_SLOT(slotShowStep(const TQString&, int))); // controller -> procLineMaker - connect( controller, TQT_SIGNAL(ttyStdout(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); - connect( controller, TQT_SIGNAL(ttyStderr(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStderr(const char*))); + connect( controller, TQ_SIGNAL(ttyStdout(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStdout(const char*))); + connect( controller, TQ_SIGNAL(ttyStderr(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStderr(const char*))); // controller -> rdbOutputWidget - connect( controller, TQT_SIGNAL(rdbStdout(const char*)), - rdbOutputWidget, TQT_SLOT(slotReceivedStdout(const char*)) ); - connect( controller, TQT_SIGNAL(rdbStderr(const char*)), - rdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - rdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(rdbStdout(const char*)), + rdbOutputWidget, TQ_SLOT(slotReceivedStdout(const char*)) ); + connect( controller, TQ_SIGNAL(rdbStderr(const char*)), + rdbOutputWidget, TQ_SLOT(slotReceivedStderr(const char*)) ); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + rdbOutputWidget, TQ_SLOT(slotDbgStatus(const TQString&, int))); } diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp index 4d90092f..024cff2c 100644 --- a/languages/ruby/debugger/framestackwidget.cpp +++ b/languages/ruby/debugger/framestackwidget.cpp @@ -51,8 +51,8 @@ FramestackWidget::FramestackWidget(TQWidget *parent, const char *name, WFlags f) setSorting(0); header()->hide(); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); } diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index 0c1fea0b..92170f52 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -239,34 +239,34 @@ RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) : m_ctxMenu->insertItem( i18n( "Disable" ), BW_ITEM_Disable ); m_ctxMenu->insertItem( i18n( "Delete" ), BW_ITEM_Delete ); - connect( addMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAddBlankBreakpoint(int)) ); - connect( m_delete, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveBreakpoint()) ); - connect( m_edit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditBreakpoint()) ); - connect( m_removeAll, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveAllBreakpoints()) ); - - connect( m_table, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), - this, TQT_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); - connect( m_ctxMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotContextMenuSelect(int)) ); - - connect( m_table, TQT_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), - this, TQT_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); - - connect( m_table, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_SLOT(slotNewValue(int, int))); - - connect( m_table, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotEditBreakpoint())); -// connect( m_table, TQT_SIGNAL(f2Pressed()), -// this, TQT_SLOT(slotEditBreakpoint())); - connect( m_table, TQT_SIGNAL(deletePressed()), - this, TQT_SLOT(slotRemoveBreakpoint())); - connect( m_table, TQT_SIGNAL(insertPressed()), - this, TQT_SLOT(slotAddBreakpoint())); + connect( addMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAddBlankBreakpoint(int)) ); + connect( m_delete, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveBreakpoint()) ); + connect( m_edit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditBreakpoint()) ); + connect( m_removeAll, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveAllBreakpoints()) ); + + connect( m_table, TQ_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), + this, TQ_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); + connect( m_ctxMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotContextMenuSelect(int)) ); + + connect( m_table, TQ_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), + this, TQ_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); + + connect( m_table, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(slotNewValue(int, int))); + + connect( m_table, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotEditBreakpoint())); +// connect( m_table, TQ_SIGNAL(f2Pressed()), +// this, TQ_SLOT(slotEditBreakpoint())); + connect( m_table, TQ_SIGNAL(deletePressed()), + this, TQ_SLOT(slotRemoveBreakpoint())); + connect( m_table, TQ_SIGNAL(insertPressed()), + this, TQ_SLOT(slotAddBreakpoint())); } /***************************************************************************/ diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp index 16ce7179..a9580249 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -43,7 +43,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqdatetime.h> #include <tqfileinfo.h> @@ -130,8 +130,8 @@ RDBController::RDBController(VariableTree *varTree, FramestackWidget *frameStack bind(masterSocket_, (const struct sockaddr*) &sockaddr, sizeof(sockaddr)); listen(masterSocket_, 1); acceptNotifier_ = new TQSocketNotifier(masterSocket_, TQSocketNotifier::Read, this); - TQObject::connect( acceptNotifier_, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAcceptConnection(int)) ); + TQObject::connect( acceptNotifier_, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAcceptConnection(int)) ); configure(); cmdList_.setAutoDelete(true); @@ -693,11 +693,11 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& Q_ASSERT (!dbgProcess_ && !tty_); // tty_ = new STTY(config_dbgTerminal_, "konsole"); - tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); + tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *tdeApp->config() )); if (!config_dbgTerminal_) { - connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) ); - connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) ); + connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) ); + connect( tty_, TQ_SIGNAL(ErrOutput(const char*)), TQ_SIGNAL(ttyStderr(const char*)) ); } TQString tty(tty_->getSlave()); @@ -716,17 +716,17 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& dbgProcess_ = new TDEProcess; - connect( dbgProcess_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotDbgWroteStdin(TDEProcess *)) ); + connect( dbgProcess_, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotDbgWroteStdin(TDEProcess *)) ); - connect( dbgProcess_, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotDbgProcessExited(TDEProcess*)) ); + connect( dbgProcess_, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotDbgProcessExited(TDEProcess*)) ); rubyInterpreter_ = ruby_interpreter; characterCoding_ = character_coding; @@ -797,7 +797,7 @@ void RDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->processEvents(20); + tdeApp->processEvents(20); now = TQTime::currentTime(); if (!stateIsOn(s_appBusy) || start.msecsTo( now ) > 2000) break; @@ -816,7 +816,7 @@ void RDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->processEvents(20); + tdeApp->processEvents(20); now = TQTime::currentTime(); if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000) break; @@ -1199,8 +1199,8 @@ void RDBController::slotAcceptConnection(int masterSocket) } socketNotifier_ = new TQSocketNotifier(socket_, TQSocketNotifier::Read, 0); - TQObject::connect( socketNotifier_, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotReadFromSocket(int)) ); + TQObject::connect( socketNotifier_, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotReadFromSocket(int)) ); setStateOff(s_dbgNotStarted); emit dbgStatus ("", state_); diff --git a/languages/ruby/debugger/rdbcontroller.h b/languages/ruby/debugger/rdbcontroller.h index f28302db..5e10d848 100644 --- a/languages/ruby/debugger/rdbcontroller.h +++ b/languages/ruby/debugger/rdbcontroller.h @@ -149,7 +149,7 @@ private: int stdoutSizeofBuf_; // size of the buffer for holding stdout piped // from the ruby program int stdoutOutputLen_; // amount of data in the output buffer - char* stdoutOutput_; // buffer for the output from kprocess + char* stdoutOutput_; // buffer for the output from tdeprocess TQCString holdingZone_; int rdbSizeofBuf_; // size of the output buffer from rdb diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp index 575d60ad..52ba2c0f 100644 --- a/languages/ruby/debugger/rdboutputwidget.cpp +++ b/languages/ruby/debugger/rdboutputwidget.cpp @@ -81,8 +81,8 @@ RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) : slotDbgStatus( "", s_dbgNotStarted); - connect( m_userRDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotRDBCmd()) ); - connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); + connect( m_userRDBCmdEditor, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotRDBCmd()) ); + connect( m_Interrupt, TQ_SIGNAL(clicked()), TQ_SIGNAL(breakInto())); } /***************************************************************************/ diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp index 73ea4784..2e52096d 100644 --- a/languages/ruby/debugger/stty.cpp +++ b/languages/ruby/debugger/stty.cpp @@ -26,11 +26,6 @@ #include <config.h> #endif -#ifdef __osf__ -#define _XOPEN_SOURCE_EXTENDED -#define O_NDELAY O_NONBLOCK -#endif - #include <sys/types.h> #include <sys/ioctl.h> #include <sys/stat.h> @@ -64,7 +59,7 @@ #include <tqfile.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include "stty.h" @@ -131,7 +126,7 @@ STTY::STTY(bool ext, const TQString &termAppName) if (fout >= 0) { ttySlave = TQString(tty_slave); out = new TQSocketNotifier(fout, TQSocketNotifier::Read, this); - connect( out, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OutReceived(int)) ); + connect( out, TQ_SIGNAL(activated(int)), this, TQ_SLOT(OutReceived(int)) ); } } } @@ -160,7 +155,7 @@ STTY::~STTY() int STTY::findTTY() { int ptyfd = -1; - bool needGrantPty = TRUE; + bool needGrantPty = true; // Find a master pty that we can open //////////////////////////////// @@ -173,7 +168,7 @@ int STTY::findTTY() strncpy(tty_slave, ptsname(ptyfd), 50); grantpt(ptyfd); unlockpt(ptyfd); - needGrantPty = FALSE; + needGrantPty = false; #endif // first we try UNIX PTY's @@ -187,7 +182,7 @@ int STTY::findTTY() struct stat sbuf; sprintf(tty_slave,"/dev/pts/%d",ptyno); if (stat(tty_slave,&sbuf) == 0 && S_ISCHR(sbuf.st_mode)) - needGrantPty = FALSE; + needGrantPty = false; else { close(ptyfd); ptyfd = -1; @@ -232,7 +227,7 @@ int STTY::findTTY() } if (ptyfd >= 0) { - if (needGrantPty && !chownpty(ptyfd, TRUE)) { + if (needGrantPty && !chownpty(ptyfd, true)) { fprintf(stderr,"tdevelop: chownpty failed for device %s::%s.\n",pty_master,tty_slave); fprintf(stderr," : This means the session can be eavesdroped.\n"); fprintf(stderr," : Make sure konsole_grantpty is installed and setuid root.\n"); diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index 94fd4e88..c4173dfb 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -71,8 +71,8 @@ VariableWidget::VariableWidget(TQWidget *parent, const char *name) topLayout->addWidget(varTree_, 10); topLayout->addLayout( vbox ); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddWatchExpression()) ); - connect( watchVarEditor_, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotAddWatchExpression()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddWatchExpression()) ); + connect( watchVarEditor_, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotAddWatchExpression()) ); } @@ -145,11 +145,11 @@ VariableTree::VariableTree(VariableWidget *parent, const char *name) addColumn(i18n("Variable"), 100 ); addColumn(i18n("Value"), 100 ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(pressed(TQListViewItem*)), - this, TQT_SLOT(slotPressed(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(pressed(TQListViewItem*)), + this, TQ_SLOT(slotPressed(TQListViewItem*)) ); watchRoot_ = new WatchRoot(this); } diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index db9576b3..ead9194f 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -25,7 +25,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kdevgenericfactory.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tdeaction.h> #include <tdeparts/part.h> @@ -49,26 +49,26 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr TDEAction *action; action = new TDEAction( i18n("&Run"), "application-x-executable", SHIFT + Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Starts an application.")); action->setIcon("ruby_run.png"); action = new TDEAction( i18n("Run Test Under Cursor"), "application-x-executable", ALT + Key_F9, - this, TQT_SLOT(slotRunTestUnderCursor()), + this, TQ_SLOT(slotRunTestUnderCursor()), actionCollection(), "build_execute_test_function" ); action->setToolTip(i18n("Run Test Under Cursor")); action->setWhatsThis(i18n("<b>Run Test Under Cursor</b><p>Runs the function under the cursor as test.")); - action = new TDEAction( i18n("Launch Browser"), "network", 0, this, TQT_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" ); + action = new TDEAction( i18n("Launch Browser"), "network", 0, this, TQ_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" ); action->setToolTip(i18n("Launch Browser")); action->setWhatsThis(i18n("<b>Launch Browser</b><p>Opens a web browser pointing to the Ruby Rails server") ); - action = new TDEAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQT_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" ); - action = new TDEAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQT_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" ); - action = new TDEAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQT_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" ); - action = new TDEAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQT_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" ); + action = new TDEAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQ_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" ); + action = new TDEAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQ_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" ); + action = new TDEAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQ_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" ); + action = new TDEAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQ_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" ); kdDebug() << "Creating RubySupportPart" << endl; @@ -78,14 +78,14 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr mainWindow()->embedOutputView( m_shellWidget, i18n("Ruby Shell"), i18n("Ruby Shell")); mainWindow()->raiseView( m_shellWidget ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -101,7 +101,7 @@ void RubySupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Ruby"), i18n("Ruby"), BarIcon("ruby_config.png", TDEIcon::SizeMedium, TDEIcon::DefaultState, RubySupportPart::instance())); RubyConfigWidget *w = new RubyConfigWidget(*projectDom(), (TQWidget *)vbox, "ruby config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } void RubySupportPart::projectOpened() @@ -114,10 +114,10 @@ void RubySupportPart::projectOpened() m_shellWidget->activate(); m_shellWidget->setAutoReactivateOnClose( true ); - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); TQFileInfo program(mainProgram()); @@ -134,7 +134,7 @@ void RubySupportPart::projectOpened() // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } void RubySupportPart::maybeParse(const TQString fileName) @@ -157,7 +157,7 @@ void RubySupportPart::initialParse() kdDebug() << "initialParse()" << endl; if (project()) { - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQStringList files = project()->allFiles(); for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it) { kdDebug() << "maybe parse " << project()->projectDirectory() + "/" + (*it) << endl; @@ -165,7 +165,7 @@ void RubySupportPart::initialParse() } emit updatedSourceInfo(); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } else { kdDebug() << "No project" << endl; } @@ -518,7 +518,7 @@ void RubySupportPart::parse(const TQString &fileName) void RubySupportPart::slotRun () { // if we can't save all parts, then the user canceled - if ( partController()->saveAllFiles() == false ) + if ( !partController()->saveAllFiles() ) return; TQFileInfo program(mainProgram()); if (mainProgram().endsWith("script/server")) { @@ -668,7 +668,7 @@ void RubySupportPart::contextMenu( TQPopupMenu * popup, const Context * context if (url.fileName().endsWith(".ui")) { m_contextFileName = url.fileName(); - int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass())); + int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQ_SLOT(slotCreateSubclass())); popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); } } @@ -686,7 +686,7 @@ void RubySupportPart::slotCreateSubclass() void RubySupportPart::slotBrowse() { - kapp->invokeBrowser("http://localhost:3000/"); + tdeApp->invokeBrowser("http://localhost:3000/"); } void RubySupportPart::slotSwitchToController() @@ -875,7 +875,7 @@ void RubySupportPart::slotSwitchToView() void RubySupportPart::slotRunTestUnderCursor() { // if we can't save all parts, then the user canceled - if ( partController()->saveAllFiles() == false ) + if ( !partController()->saveAllFiles() ) return; KParts::ReadOnlyPart *ro_part = dynamic_cast<KParts::ReadOnlyPart*>(partController()->activePart()); diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index 1d1a5b14..6ef46f2c 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -37,8 +37,8 @@ SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, m_combo->setMinimumWidth( 200 ); m_combo->setMaximumWidth( 400 ); - connect( m_combo, TQT_SIGNAL(activated(const TQString&)), receiver, slot ); - connect( m_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(activated(int)) ); + connect( m_combo, TQ_SIGNAL(activated(const TQString&)), receiver, slot ); + connect( m_combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(activated(int)) ); setShortcutConfigurable( false ); setAutoSized( true ); diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui index cfa61833..81e20b78 100644 --- a/languages/sql/sqlconfigwidget.ui +++ b/languages/sql/sqlconfigwidget.ui @@ -164,10 +164,10 @@ <variable access="private">TQDomDocument* doc;</variable> <variable access="private">bool changed;</variable> </variables> -<Q_SIGNALS> +<signals> <signal>newConfigSaved()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>init()</slot> <slot>valueChanged( int, int )</slot> <slot>removeDb()</slot> @@ -176,7 +176,7 @@ <slot>accept()</slot> <slot>setProjectDom( TQDomDocument * doc )</slot> <slot>loadConfig()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/sql/sqloutputwidget.cpp b/languages/sql/sqloutputwidget.cpp index d845e6e0..83b8e74e 100644 --- a/languages/sql/sqloutputwidget.cpp +++ b/languages/sql/sqloutputwidget.cpp @@ -27,7 +27,7 @@ class TQCustomSqlCursor: public TQSqlCursor { public: - TQCustomSqlCursor( const TQString & query = TQString(), bool autopopulate = TRUE, TQSqlDatabase* db = 0 ) : + TQCustomSqlCursor( const TQString & query = TQString(), bool autopopulate = true, TQSqlDatabase* db = 0 ) : TQSqlCursor( TQString(), autopopulate, db ) { exec( query ); @@ -42,15 +42,15 @@ public: TQCustomSqlCursor( const TQCustomSqlCursor & other ): TQSqlCursor( other ) {} bool select( const TQString & /*filter*/, const TQSqlIndex & /*sort*/ = TQSqlIndex() ) { return exec( lastQuery() ); } - TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const + TQSqlIndex primaryIndex( bool /*prime*/ = true ) const { return TQSqlIndex(); } - int insert( bool /*invalidate*/ = TRUE ) - { return FALSE; } - int update( bool /*invalidate*/ = TRUE ) - { return FALSE; } - int del( bool /*invalidate*/ = TRUE ) - { return FALSE; } - void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {} + int insert( bool /*invalidate*/ = true ) + { return false; } + int update( bool /*invalidate*/ = true ) + { return false; } + int del( bool /*invalidate*/ = true ) + { return false; } + void setName( const TQString& /*name*/, bool /*autopopulate*/ = true ) {} }; diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index 96e8ed4f..096d49d9 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -40,20 +40,20 @@ SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStri setXMLFile( "kdevsqlsupport.rc" ); TDEAction *action; - action = new TDEAction( i18n( "&Run" ), "application-x-executable", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" ); + action = new TDEAction( i18n( "&Run" ), "application-x-executable", Key_F9, this, TQ_SLOT( slotRun() ), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Executes a SQL script.")); - dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQT_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" ); + dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQ_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" ); kdDebug( 9000 ) << "Creating SQLSupportPart" << endl; - connect( core(), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), - this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(projectOpened()) ); - connect( partController(), TQT_SIGNAL( savedFile( const KURL& ) ), this, TQT_SLOT( savedFile( const KURL& ) ) ); + connect( core(), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), + this, TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(languageChanged()), this, TQ_SLOT(projectOpened()) ); + connect( partController(), TQ_SIGNAL( savedFile( const KURL& ) ), this, TQ_SLOT( savedFile( const KURL& ) ) ); m_widget = new SqlOutputWidget(); mainWindow()->embedOutputView( m_widget, i18n( "SQL" ), i18n( "Output of SQL commands" ) ); @@ -136,22 +136,22 @@ void SQLSupportPart::projectConfigWidget( KDialogBase *dlg ) SqlConfigWidget *w = new SqlConfigWidget( (TQWidget*)vbox, "SQL config widget" ); w->setProjectDom( projectDom() ); w->loadConfig(); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( w, TQT_SIGNAL(newConfigSaved()), this, TQT_SLOT(loadConfig()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( w, TQ_SIGNAL(newConfigSaved()), this, TQ_SLOT(loadConfig()) ); } void SQLSupportPart::projectOpened() { - connect( project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), - this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); - connect( project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), - this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); + connect( project(), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQ_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project(), TQ_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQ_SLOT( removedFilesFromProject( const TQStringList & ) ) ); loadConfig(); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot( 0, this, TQT_SLOT( parse() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( parse() ) ); } diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h index 921743e2..6747522d 100644 --- a/languages/sql/sqlsupport_part.h +++ b/languages/sql/sqlsupport_part.h @@ -4,7 +4,7 @@ #include <tqguardedptr.h> #include <tqstringlist.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdialogbase.h> #include "kdevplugin.h" diff --git a/lib/antlr/antlr/CharScanner.h b/lib/antlr/antlr/CharScanner.h index 9ad6fc7b..4a0816a8 100644 --- a/lib/antlr/antlr/CharScanner.h +++ b/lib/antlr/antlr/CharScanner.h @@ -10,6 +10,7 @@ #include <antlr/config.h> +#include <functional> #include <map> #ifdef HAS_NOT_CCTYPE_H @@ -40,8 +41,6 @@ namespace antlr { class ANTLR_API CharScanner; -ANTLR_C_USING(tolower) - #ifdef ANTLR_REALLY_NO_STRCASECMP // Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior // on the mac has neither... @@ -56,17 +55,11 @@ inline int strcasecmp(const char *s1, const char *s2) if (c1 == 0) return 0; } } -#else -#ifdef NO_STRCASECMP -ANTLR_C_USING(stricmp) -#else -ANTLR_C_USING(strcasecmp) -#endif #endif /** Functor for the literals map */ -class ANTLR_API CharScannerLiteralsLess : public ANTLR_USE_NAMESPACE(std)binary_function<ANTLR_USE_NAMESPACE(std)string,ANTLR_USE_NAMESPACE(std)string,bool> { +class ANTLR_API CharScannerLiteralsLess : public ANTLR_USE_NAMESPACE(std)function<bool(ANTLR_USE_NAMESPACE(std)string,ANTLR_USE_NAMESPACE(std)string)> { private: const CharScanner* scanner; public: diff --git a/lib/antlr/antlr/config.h b/lib/antlr/antlr/config.h index 4d3456ec..2e4c6e2f 100644 --- a/lib/antlr/antlr/config.h +++ b/lib/antlr/antlr/config.h @@ -18,7 +18,6 @@ #define ANTLR_USE_NAMESPACE(_x_) _x_:: #define ANTLR_USING_NAMESPACE(_x_) using namespace _x_; #define ANTLR_CXX_SUPPORTS_NAMESPACE 1 -#define ANTLR_C_USING(_x_) #define ANTLR_API #ifndef CUSTOM_API # define CUSTOM_API @@ -194,25 +193,6 @@ #endif // end IBM VisualAge C++ /*}}}*/ /*****************************************************************************/ -/*{{{ Metrowerks Codewarrior - *****************************************************************************/ -#ifdef __MWERKS__ -# if (__MWERKS__ <= 0x2201) -# define NO_TEMPLATE_PARTS -# endif - -// CW 6.0 and 7.0 still do not have it. -# define ANTLR_REALLY_NO_STRCASECMP - -# undef ANTLR_C_USING -# define ANTLR_C_USING(_x_) using std:: ## _x_; - -# define ANTLR_CCTYPE_NEEDS_STD -# undef ANTLR_CXX_SUPPORTS_UNCAUGHT_EXCEPTION - -#endif // End of Metrowerks Codewarrior -/*}}}*/ -/*****************************************************************************/ /*{{{ SGI Irix 6.5.10 MIPSPro compiler *****************************************************************************/ // (contributed by Anna Winkler) @@ -258,22 +238,6 @@ #endif // ! __GNUC__ /*}}}*/ /*****************************************************************************/ -/*{{{ Digital CXX (Tru64) - *****************************************************************************/ -#ifdef __DECCXX -#define __USE_STD_IOSTREAM -#endif -/*}}}*/ -/*****************************************************************************/ -#ifdef __BORLANDC__ -# if __BORLANDC__ >= 560 -# include <ctype> -# include <stdlib> -# define ANTLR_CCTYPE_NEEDS_STD -# else -# error "sorry, compiler is too old - consider an update." -# endif -#endif // Redefine these for backwards compatability.. #undef ANTLR_BEGIN_NAMESPACE diff --git a/lib/antlr/src/CharScanner.cpp b/lib/antlr/src/CharScanner.cpp index 63545468..ba217983 100644 --- a/lib/antlr/src/CharScanner.cpp +++ b/lib/antlr/src/CharScanner.cpp @@ -13,7 +13,6 @@ #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { #endif -ANTLR_C_USING(exit) CharScanner::CharScanner(InputBuffer& cb, bool case_sensitive ) : saveConsumedInput(true) //, caseSensitiveLiterals(true) diff --git a/lib/antlr/src/String.cpp b/lib/antlr/src/String.cpp index 6d8b43cf..4de93c8a 100644 --- a/lib/antlr/src/String.cpp +++ b/lib/antlr/src/String.cpp @@ -19,15 +19,6 @@ namespace antlr { #endif -// wh: hack for Borland C++ 5.6 -#if __BORLANDC__ - using std::sprintf; -#endif - - -// RK: should be using snprintf actually... (or stringstream) -ANTLR_C_USING(sprintf) - ANTLR_USE_NAMESPACE(std)string operator+( const ANTLR_USE_NAMESPACE(std)string& lhs, const int rhs ) { char tmp[100]; diff --git a/lib/astyle/ASFormatter.cpp b/lib/astyle/ASFormatter.cpp index eb418760..6e7a70f0 100644 --- a/lib/astyle/ASFormatter.cpp +++ b/lib/astyle/ASFormatter.cpp @@ -388,7 +388,7 @@ string ASFormatter::nextLine() isAppendPostBlockEmptyLineRequested = false; isInLineComment = true; // do not indent if in column 1 or 2 - if (lineCommentNoIndent == false) + if (!lineCommentNoIndent) { if (charNum == 0) lineCommentNoIndent = true; @@ -396,7 +396,7 @@ string ASFormatter::nextLine() lineCommentNoIndent = true; } // move comment if spaces were added or deleted - if (lineCommentNoIndent == false && spacePadNum != 0) + if (!lineCommentNoIndent && spacePadNum != 0) adjustComments(); formattedLineCommentNum = formattedLine.length(); appendSequence(AS_OPEN_LINE_COMMENT); @@ -1652,7 +1652,7 @@ void ASFormatter::adjustComments(void) if (formattedLine.find_last_not_of(' ') < len - adjust - 1 && formattedLine[len-1] != '\t') // don't adjust a tab formattedLine.resize(len - adjust); - // the following are commented out to avoid a Borland compiler warning + // the following are commented out to avoid compiler warning //else // adjust = 0; TRcomment(-adjust); // trace macro diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp index f0cc848c..21c7f375 100644 --- a/lib/cppparser/ast.cpp +++ b/lib/cppparser/ast.cpp @@ -219,13 +219,13 @@ void NameAST::setGlobal( bool b ) void NameAST::setUnqualifiedName( ClassOrNamespaceNameAST::Node& unqualifiedName ) { - m_unqualifiedName = unqualifiedName; - if( m_unqualifiedName.get() ) m_unqualifiedName->setParent( this ); + m_unqualifiedName = std::move(unqualifiedName); + if( m_unqualifiedName ) m_unqualifiedName->setParent( this ); } void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNamespaceName ) { - if( !classOrNamespaceName.get() ) + if( !classOrNamespaceName ) return; classOrNamespaceName->setParent( this ); @@ -234,7 +234,7 @@ void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNam TQString NameAST::text() const { - if( !m_unqualifiedName.get() ) + if( !m_unqualifiedName ) return TQString(); TQString str; @@ -249,7 +249,7 @@ TQString NameAST::text() const ++it; } - if( m_unqualifiedName.get() ) + if( m_unqualifiedName ) str += m_unqualifiedName->text(); return str; @@ -268,7 +268,7 @@ LinkageBodyAST::LinkageBodyAST() void LinkageBodyAST::addDeclaration( DeclarationAST::Node& ast ) { - if( !ast.get() ) + if( !ast ) return; ast->setParent( this ); @@ -282,32 +282,32 @@ LinkageSpecificationAST::LinkageSpecificationAST() void LinkageSpecificationAST::setExternType( AST::Node& externType ) { - m_externType = externType; - if( m_externType.get() ) m_externType->setParent( this ); + m_externType = std::move(externType); + if( m_externType ) m_externType->setParent( this ); } void LinkageSpecificationAST::setLinkageBody( LinkageBodyAST::Node& linkageBody ) { - m_linkageBody = linkageBody; - if( m_linkageBody.get() ) m_linkageBody->setParent( this ); + m_linkageBody = std::move(linkageBody); + if( m_linkageBody ) m_linkageBody->setParent( this ); } void LinkageSpecificationAST::setDeclaration( DeclarationAST::Node& decl ) { - m_declaration = decl; - if( m_declaration.get() ) m_declaration->setParent( this ); + m_declaration = std::move(decl); + if( m_declaration ) m_declaration->setParent( this ); } // ------------------------------------------------------------------------ TranslationUnitAST::TranslationUnitAST() { - ////kdDebug(9007) << "++ TranslationUnitAST::TranslationUnitAST()" << endl; + //kdDebug(9007) << "++ TranslationUnitAST::TranslationUnitAST()" << endl; m_declarationList.setAutoDelete( true ); } void TranslationUnitAST::addDeclaration( DeclarationAST::Node& ast ) { - if( !ast.get() ) + if( !ast ) return; ast->setParent( this ); @@ -321,14 +321,14 @@ NamespaceAST::NamespaceAST() void NamespaceAST::setNamespaceName( AST::Node& namespaceName ) { - m_namespaceName = namespaceName; - if( m_namespaceName.get() ) m_namespaceName->setParent( this ); + m_namespaceName = std::move(namespaceName); + if( m_namespaceName ) m_namespaceName->setParent( this ); } void NamespaceAST::setLinkageBody( LinkageBodyAST::Node& linkageBody ) { - m_linkageBody = linkageBody; - if( m_linkageBody.get() ) m_linkageBody->setParent( this ); + m_linkageBody = std::move(linkageBody); + if( m_linkageBody ) m_linkageBody->setParent( this ); } @@ -339,14 +339,14 @@ NamespaceAliasAST::NamespaceAliasAST() void NamespaceAliasAST::setNamespaceName( AST::Node& namespaceName ) { - m_namespaceName = namespaceName; - if( m_namespaceName.get() ) m_namespaceName->setParent( this ); + m_namespaceName = std::move(namespaceName); + if( m_namespaceName ) m_namespaceName->setParent( this ); } void NamespaceAliasAST::setAliasName( NameAST::Node& name ) { - m_aliasName = name; - if( m_aliasName.get() ) m_aliasName->setParent( this ); + m_aliasName = std::move(name); + if( m_aliasName ) m_aliasName->setParent( this ); } // ------------------------------------------------------------------------ @@ -356,14 +356,14 @@ UsingAST::UsingAST() void UsingAST::setTypeName( AST::Node& typeName ) { - m_typeName = typeName; - if( m_typeName.get() ) m_typeName->setParent( this ); + m_typeName = std::move(typeName); + if( m_typeName ) m_typeName->setParent( this ); } void UsingAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } // ------------------------------------------------------------------------ @@ -373,8 +373,8 @@ UsingDirectiveAST::UsingDirectiveAST() void UsingDirectiveAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } TypedefAST::TypedefAST() @@ -383,20 +383,20 @@ TypedefAST::TypedefAST() void TypeSpecifierAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } void TypedefAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void TypedefAST::setInitDeclaratorList( InitDeclaratorListAST::Node& initDeclaratorList ) { - m_initDeclaratorList = initDeclaratorList; - if( m_initDeclaratorList.get() ) m_initDeclaratorList->setParent( this ); + m_initDeclaratorList = std::move(initDeclaratorList); + if( m_initDeclaratorList ) m_initDeclaratorList->setParent( this ); } // ------------------------------------------------------------------------ @@ -407,7 +407,7 @@ TemplateArgumentListAST::TemplateArgumentListAST() void TemplateArgumentListAST::addArgument( AST::Node& arg ) { - if( !arg.get() ) + if( !arg ) return; arg->setParent( this ); @@ -434,20 +434,20 @@ TemplateDeclarationAST::TemplateDeclarationAST() void TemplateDeclarationAST::setExported( AST::Node& exported ) { - m_exported = exported; - if( m_exported.get() ) m_exported->setParent( this ); + m_exported = std::move(exported); + if( m_exported ) m_exported->setParent( this ); } void TemplateDeclarationAST::setTemplateParameterList( TemplateParameterListAST::Node& templateParameterList ) { - m_templateParameterList = templateParameterList; - if( m_templateParameterList.get() ) m_templateParameterList->setParent( this ); + m_templateParameterList = std::move(templateParameterList); + if( m_templateParameterList ) m_templateParameterList->setParent( this ); } void TemplateDeclarationAST::setDeclaration( DeclarationAST::Node& declaration ) { - m_declaration = declaration; - if( m_declaration.get() ) m_declaration->setParent( this ); + m_declaration = std::move(declaration); + if( m_declaration ) m_declaration->setParent( this ); } // ------------------------------------------------------------------------ @@ -457,23 +457,23 @@ ClassOrNamespaceNameAST::ClassOrNamespaceNameAST() void ClassOrNamespaceNameAST::setName( AST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } void ClassOrNamespaceNameAST::setTemplateArgumentList( TemplateArgumentListAST::Node& templateArgumentList ) { - m_templateArgumentList = templateArgumentList; - if( m_templateArgumentList.get() ) m_templateArgumentList->setParent( this ); + m_templateArgumentList = std::move(templateArgumentList); + if( m_templateArgumentList ) m_templateArgumentList->setParent( this ); } TQString ClassOrNamespaceNameAST::text() const { - if( !m_name.get() ) + if( !m_name ) return TQString(); TQString str = m_name->text(); - if( m_templateArgumentList.get() ) + if( m_templateArgumentList ) str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >"); return str; @@ -486,27 +486,27 @@ TypeSpecifierAST::TypeSpecifierAST() void TypeSpecifierAST::setCvQualify( GroupAST::Node& cvQualify ) { - m_cvQualify = cvQualify; - if( m_cvQualify.get() ) m_cvQualify->setParent( this ); + m_cvQualify = std::move(cvQualify); + if( m_cvQualify ) m_cvQualify->setParent( this ); } void TypeSpecifierAST::setCv2Qualify( GroupAST::Node& cv2Qualify ) { - m_cv2Qualify = cv2Qualify; - if( m_cv2Qualify.get() ) m_cv2Qualify->setParent( this ); + m_cv2Qualify = std::move(cv2Qualify); + if( m_cv2Qualify ) m_cv2Qualify->setParent( this ); } TQString TypeSpecifierAST::text() const { TQString str; - if( m_cvQualify.get() ) + if( m_cvQualify ) str += m_cvQualify->text() + " "; - if( m_name.get() ) + if( m_name ) str += m_name->text(); - if( m_cv2Qualify.get() ) + if( m_cv2Qualify ) str += TQString(" ") + m_cv2Qualify->text(); return str; @@ -520,13 +520,13 @@ ClassSpecifierAST::ClassSpecifierAST() void ClassSpecifierAST::setClassKey( AST::Node& classKey ) { - m_classKey = classKey; - if( m_classKey.get() ) m_classKey->setParent( this ); + m_classKey = std::move(classKey); + if( m_classKey ) m_classKey->setParent( this ); } void ClassSpecifierAST::addDeclaration( DeclarationAST::Node& declaration ) { - if( !declaration.get() ) + if( !declaration ) return; declaration->setParent( this ); @@ -535,8 +535,8 @@ void ClassSpecifierAST::addDeclaration( DeclarationAST::Node& declaration ) void ClassSpecifierAST::setBaseClause( BaseClauseAST::Node& baseClause ) { - m_baseClause = baseClause; - if( m_baseClause.get() ) m_baseClause->setParent( this ); + m_baseClause = std::move(baseClause); + if( m_baseClause ) m_baseClause->setParent( this ); } // ------------------------------------------------------------------------ @@ -547,7 +547,7 @@ EnumSpecifierAST::EnumSpecifierAST() void EnumSpecifierAST::addEnumerator( EnumeratorAST::Node& enumerator ) { - if( !enumerator.get() ) + if( !enumerator ) return; enumerator->setParent( this ); @@ -562,13 +562,13 @@ ElaboratedTypeSpecifierAST::ElaboratedTypeSpecifierAST() void ElaboratedTypeSpecifierAST::setKind( AST::Node& kind ) { - m_kind = kind; - if( m_kind.get() ) m_kind->setParent( this ); + m_kind = std::move(kind); + if( m_kind ) m_kind->setParent( this ); } TQString ElaboratedTypeSpecifierAST::text() const { - if( m_kind.get() ) + if( m_kind ) return m_kind->text() + " " + TypeSpecifierAST::text(); return TypeSpecifierAST::text(); @@ -586,14 +586,14 @@ EnumeratorAST::EnumeratorAST() void EnumeratorAST::setId( AST::Node& id ) { - m_id = id; - if( m_id.get() ) m_id->setParent( this ); + m_id = std::move(id); + if( m_id ) m_id->setParent( this ); } void EnumeratorAST::setExpr( AST::Node& expr ) { - m_expr = expr; - if( m_expr.get() ) m_expr->setParent( this ); + m_expr = std::move(expr); + if( m_expr ) m_expr->setParent( this ); } // ------------------------------------------------------------------------ @@ -604,7 +604,7 @@ BaseClauseAST::BaseClauseAST() void BaseClauseAST::addBaseSpecifier( BaseSpecifierAST::Node& baseSpecifier ) { - if( !baseSpecifier.get() ) + if( !baseSpecifier ) return; baseSpecifier->setParent( this ); @@ -618,20 +618,20 @@ BaseSpecifierAST::BaseSpecifierAST() void BaseSpecifierAST::setIsVirtual( AST::Node& isVirtual ) { - m_isVirtual = isVirtual; - if( m_isVirtual.get() ) m_isVirtual->setParent( this ); + m_isVirtual = std::move(isVirtual); + if( m_isVirtual ) m_isVirtual->setParent( this ); } void BaseSpecifierAST::setAccess( AST::Node& access ) { - m_access = access; - if( m_access.get() ) m_access->setParent( this ); + m_access = std::move(access); + if( m_access ) m_access->setParent( this ); } void BaseSpecifierAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } // ------------------------------------------------------------------------ @@ -641,32 +641,32 @@ SimpleDeclarationAST::SimpleDeclarationAST() void SimpleDeclarationAST::setFunctionSpecifier( GroupAST::Node& functionSpecifier ) { - m_functionSpecifier = functionSpecifier; - if( m_functionSpecifier.get() ) m_functionSpecifier->setParent( this ); + m_functionSpecifier = std::move(functionSpecifier); + if( m_functionSpecifier ) m_functionSpecifier->setParent( this ); } void SimpleDeclarationAST::setStorageSpecifier( GroupAST::Node& storageSpecifier ) { - m_storageSpecifier = storageSpecifier; - if( m_storageSpecifier.get() ) m_storageSpecifier->setParent( this ); + m_storageSpecifier = std::move(storageSpecifier); + if( m_storageSpecifier ) m_storageSpecifier->setParent( this ); } void SimpleDeclarationAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void SimpleDeclarationAST::setInitDeclaratorList( InitDeclaratorListAST::Node& initDeclaratorList ) { - m_initDeclaratorList = initDeclaratorList; - if( m_initDeclaratorList.get() ) m_initDeclaratorList->setParent( this ); + m_initDeclaratorList = std::move(initDeclaratorList); + if( m_initDeclaratorList ) m_initDeclaratorList->setParent( this ); } void SimpleDeclarationAST::setWinDeclSpec( GroupAST::Node& winDeclSpec ) { - m_winDeclSpec = winDeclSpec; - if( m_winDeclSpec.get() ) m_winDeclSpec->setParent( this ); + m_winDeclSpec = std::move(winDeclSpec); + if( m_winDeclSpec ) m_winDeclSpec->setParent( this ); } @@ -678,7 +678,7 @@ InitDeclaratorListAST::InitDeclaratorListAST() void InitDeclaratorListAST::addInitDeclarator( InitDeclaratorAST::Node& decl ) { - if( !decl.get() ) + if( !decl ) return; decl->setParent( this ); @@ -694,52 +694,52 @@ DeclaratorAST::DeclaratorAST() void DeclaratorAST::setSubDeclarator( DeclaratorAST::Node& subDeclarator ) { - m_subDeclarator = subDeclarator; - if( m_subDeclarator.get() ) m_subDeclarator->setParent( this ); + m_subDeclarator = std::move(subDeclarator); + if( m_subDeclarator ) m_subDeclarator->setParent( this ); } void DeclaratorAST::setDeclaratorId( NameAST::Node& declaratorId ) { - m_declaratorId = declaratorId; - if( m_declaratorId.get() ) m_declaratorId->setParent( this ); + m_declaratorId = std::move(declaratorId); + if( m_declaratorId ) m_declaratorId->setParent( this ); } void DeclaratorAST::setBitfieldInitialization( AST::Node& bitfieldInitialization ) { - m_bitfieldInitialization = bitfieldInitialization; - if( m_bitfieldInitialization.get() ) m_bitfieldInitialization->setParent( this ); + m_bitfieldInitialization = std::move(bitfieldInitialization); + if( m_bitfieldInitialization ) m_bitfieldInitialization->setParent( this ); } void DeclaratorAST::addArrayDimension( AST::Node& arrayDimension ) { - if( !arrayDimension.get() ) + if( !arrayDimension ) return; arrayDimension->setParent( this ); m_arrayDimensionList.append( arrayDimension.release() ); } -void DeclaratorAST::setParameterDeclarationClause( ParameterDeclarationClauseAST::Node& parameterDeclarationClause ) +void DeclaratorAST::setParameterDeclarationClause( std::unique_ptr<class ParameterDeclarationClauseAST>& parameterDeclarationClause ) { - m_parameterDeclarationClause = parameterDeclarationClause; - if( m_parameterDeclarationClause.get() ) m_parameterDeclarationClause->setParent( this ); + m_parameterDeclarationClause = std::move(parameterDeclarationClause); + if( m_parameterDeclarationClause ) m_parameterDeclarationClause->setParent( this ); } void DeclaratorAST::setConstant( AST::Node& constant ) { - m_constant = constant; - if( m_constant.get() ) m_constant->setParent( this ); + m_constant = std::move(constant); + if( m_constant ) m_constant->setParent( this ); } void DeclaratorAST::setExceptionSpecification( GroupAST::Node& exceptionSpecification ) { - m_exceptionSpecification = exceptionSpecification; - if( m_exceptionSpecification.get() ) m_exceptionSpecification->setParent( this ); + m_exceptionSpecification = std::move(exceptionSpecification); + if( m_exceptionSpecification ) m_exceptionSpecification->setParent( this ); } void DeclaratorAST::addPtrOp( AST::Node& ptrOp ) { - if( !ptrOp.get() ) + if( !ptrOp ) return; ptrOp->setParent( this ); @@ -753,14 +753,14 @@ InitDeclaratorAST::InitDeclaratorAST() void InitDeclaratorAST::setDeclarator( DeclaratorAST::Node& declarator ) { - m_declarator = declarator; - if( m_declarator.get() ) m_declarator->setParent( this ); + m_declarator = std::move(declarator); + if( m_declarator ) m_declarator->setParent( this ); } void InitDeclaratorAST::setInitializer( AST::Node& initializer ) { - m_initializer = initializer; - if( m_initializer.get() ) m_initializer->setParent( this ); + m_initializer = std::move(initializer); + if( m_initializer ) m_initializer->setParent( this ); } // -------------------------------------------------------------------------- @@ -770,38 +770,38 @@ FunctionDefinitionAST::FunctionDefinitionAST() void FunctionDefinitionAST::setFunctionSpecifier( GroupAST::Node& functionSpecifier ) { - m_functionSpecifier = functionSpecifier; - if( m_functionSpecifier.get() ) m_functionSpecifier->setParent( this ); + m_functionSpecifier = std::move(functionSpecifier); + if( m_functionSpecifier ) m_functionSpecifier->setParent( this ); } void FunctionDefinitionAST::setStorageSpecifier( GroupAST::Node& storageSpecifier ) { - m_storageSpecifier = storageSpecifier; - if( m_storageSpecifier.get() ) m_storageSpecifier->setParent( this ); + m_storageSpecifier = std::move(storageSpecifier); + if( m_storageSpecifier ) m_storageSpecifier->setParent( this ); } void FunctionDefinitionAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void FunctionDefinitionAST::setInitDeclarator( InitDeclaratorAST::Node& initDeclarator ) { - m_initDeclarator = initDeclarator; - if( m_initDeclarator.get() ) m_initDeclarator->setParent( this ); + m_initDeclarator = std::move(initDeclarator); + if( m_initDeclarator ) m_initDeclarator->setParent( this ); } void FunctionDefinitionAST::setFunctionBody( StatementListAST::Node& functionBody ) { - m_functionBody = functionBody; - if( m_functionBody.get() ) m_functionBody->setParent( this ); + m_functionBody = std::move(functionBody); + if( m_functionBody ) m_functionBody->setParent( this ); } void FunctionDefinitionAST::setWinDeclSpec( GroupAST::Node& winDeclSpec ) { - m_winDeclSpec = winDeclSpec; - if( m_winDeclSpec.get() ) m_winDeclSpec->setParent( this ); + m_winDeclSpec = std::move(winDeclSpec); + if( m_winDeclSpec ) m_winDeclSpec->setParent( this ); } // -------------------------------------------------------------------------- @@ -812,7 +812,7 @@ StatementListAST::StatementListAST() void StatementListAST::addStatement( StatementAST::Node& statement ) { - if( !statement.get() ) + if( !statement ) return; statement->setParent( this ); @@ -826,20 +826,20 @@ IfStatementAST::IfStatementAST() void IfStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void IfStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } void IfStatementAST::setElseStatement( StatementAST::Node& elseStatement ) { - m_elseStatement = elseStatement; - if( m_elseStatement.get() ) m_elseStatement->setParent( this ); + m_elseStatement = std::move(elseStatement); + if( m_elseStatement ) m_elseStatement->setParent( this ); } // -------------------------------------------------------------------------- @@ -849,14 +849,14 @@ WhileStatementAST::WhileStatementAST() void WhileStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void WhileStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } // -------------------------------------------------------------------------- @@ -866,14 +866,14 @@ DoStatementAST::DoStatementAST() void DoStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void DoStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } // -------------------------------------------------------------------------- @@ -883,26 +883,26 @@ ForStatementAST::ForStatementAST() void ForStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void ForStatementAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } void ForStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } void ForStatementAST::setInitStatement( StatementAST::Node& initStatement ) { - m_initStatement = initStatement; - if( m_initStatement.get() ) m_initStatement->setParent( this ); + m_initStatement = std::move(initStatement); + if( m_initStatement ) m_initStatement->setParent( this ); } // -------------------------------------------------------------------------- @@ -912,20 +912,20 @@ ForEachStatementAST::ForEachStatementAST() void ForEachStatementAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } void ForEachStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } void ForEachStatementAST::setInitStatement( StatementAST::Node& initStatement ) { - m_initStatement = initStatement; - if( m_initStatement.get() ) m_initStatement->setParent( this ); + m_initStatement = std::move(initStatement); + if( m_initStatement ) m_initStatement->setParent( this ); } // -------------------------------------------------------------------------- @@ -935,14 +935,14 @@ SwitchStatementAST::SwitchStatementAST() void SwitchStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void SwitchStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } // -------------------------------------------------------------------------- @@ -953,7 +953,7 @@ CatchStatementListAST::CatchStatementListAST() void CatchStatementListAST::addStatement( CatchStatementAST::Node& statement ) { - if( !statement.get() ) + if( !statement ) return; statement->setParent( this ); @@ -967,14 +967,14 @@ CatchStatementAST::CatchStatementAST() void CatchStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void CatchStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } // -------------------------------------------------------------------------- @@ -984,14 +984,14 @@ TryBlockStatementAST::TryBlockStatementAST() void TryBlockStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } void TryBlockStatementAST::setCatchStatementList( CatchStatementListAST::Node& statementList ) { - m_catchStatementList = statementList; - if( m_catchStatementList.get() ) m_catchStatementList->setParent( this ); + m_catchStatementList = std::move(statementList); + if( m_catchStatementList ) m_catchStatementList->setParent( this ); } // -------------------------------------------------------------------------- @@ -1001,8 +1001,8 @@ DeclarationStatementAST::DeclarationStatementAST() void DeclarationStatementAST::setDeclaration( DeclarationAST::Node& declaration ) { - m_declaration = declaration; - if( m_declaration.get() ) m_declaration->setParent( this ); + m_declaration = std::move(declaration); + if( m_declaration ) m_declaration->setParent( this ); } // -------------------------------------------------------------------------- @@ -1012,8 +1012,8 @@ ExpressionStatementAST::ExpressionStatementAST() void ExpressionStatementAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } @@ -1024,32 +1024,32 @@ ParameterDeclarationAST::ParameterDeclarationAST() void ParameterDeclarationAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void ParameterDeclarationAST::setDeclarator( DeclaratorAST::Node& declarator ) { - m_declarator = declarator; - if( m_declarator.get() ) m_declarator->setParent( this ); + m_declarator = std::move(declarator); + if( m_declarator ) m_declarator->setParent( this ); } void ParameterDeclarationAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } TQString ParameterDeclarationAST::text() const { TQString str; - if( m_typeSpec.get() ) + if( m_typeSpec ) str += m_typeSpec->text() + " "; - if( m_declarator.get() ) + if( m_declarator ) str += m_declarator->text(); - if( m_expression.get() ) + if( m_expression ) str += TQString( " = " ) + m_expression->text(); return str; @@ -1063,7 +1063,7 @@ ParameterDeclarationListAST::ParameterDeclarationListAST() void ParameterDeclarationListAST::addParameter( ParameterDeclarationAST::Node& parameter ) { - if( !parameter.get() ) + if( !parameter ) return; parameter->setParent( this ); @@ -1091,24 +1091,24 @@ ParameterDeclarationClauseAST::ParameterDeclarationClauseAST() void ParameterDeclarationClauseAST::setParameterDeclarationList( ParameterDeclarationListAST::Node& parameterDeclarationList ) { - m_parameterDeclarationList = parameterDeclarationList; - if( m_parameterDeclarationList.get() ) m_parameterDeclarationList->setParent( this ); + m_parameterDeclarationList = std::move(parameterDeclarationList); + if( m_parameterDeclarationList ) m_parameterDeclarationList->setParent( this ); } void ParameterDeclarationClauseAST::setEllipsis( AST::Node& ellipsis ) { - m_ellipsis = ellipsis; - if( m_ellipsis.get() ) m_ellipsis->setParent( this ); + m_ellipsis = std::move(ellipsis); + if( m_ellipsis ) m_ellipsis->setParent( this ); } TQString ParameterDeclarationClauseAST::text() const { TQString str; - if( m_parameterDeclarationList.get() ) + if( m_parameterDeclarationList ) str += m_parameterDeclarationList->text(); - if( m_ellipsis.get() ) + if( m_ellipsis ) str += " ..."; return str; @@ -1123,7 +1123,7 @@ GroupAST::GroupAST() void GroupAST::addNode( AST::Node& node ) { - if( !node.get() ) + if( !node ) return; node->setParent( this ); @@ -1151,7 +1151,7 @@ AccessDeclarationAST::AccessDeclarationAST() void AccessDeclarationAST::addAccess( AST::Node& access ) { - if( !access.get() ) + if( !access ) return; access->setParent( this ); @@ -1178,26 +1178,26 @@ TypeParameterAST::TypeParameterAST() void TypeParameterAST::setKind( AST::Node& kind ) { - m_kind = kind; - if( m_kind.get() ) m_kind->setParent( this ); + m_kind = std::move(kind); + if( m_kind ) m_kind->setParent( this ); } -void TypeParameterAST::setTemplateParameterList( TemplateParameterListAST::Node& templateParameterList ) +void TypeParameterAST::setTemplateParameterList( std::unique_ptr<class TemplateParameterListAST>& templateParameterList ) { - m_templateParameterList = templateParameterList; - if( m_templateParameterList.get() ) m_templateParameterList->setParent( this ); + m_templateParameterList = std::move(templateParameterList); + if( m_templateParameterList ) m_templateParameterList->setParent( this ); } void TypeParameterAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } void TypeParameterAST::setTypeId( AST::Node& typeId ) { - m_typeId = typeId; - if( m_typeId.get() ) m_typeId->setParent( this ); + m_typeId = std::move(typeId); + if( m_typeId ) m_typeId->setParent( this ); } // -------------------------------------------------------------------------- @@ -1207,14 +1207,14 @@ TemplateParameterAST::TemplateParameterAST() void TemplateParameterAST::setTypeParameter( TypeParameterAST::Node& typeParameter ) { - m_typeParameter = typeParameter; - if( m_typeParameter.get() ) m_typeParameter->setParent( this ); + m_typeParameter = std::move(typeParameter); + if( m_typeParameter ) m_typeParameter->setParent( this ); } void TemplateParameterAST::setTypeValueParameter( ParameterDeclarationAST::Node& typeValueParameter ) { - m_typeValueParameter = typeValueParameter; - if( m_typeValueParameter.get() ) m_typeValueParameter->setParent( this ); + m_typeValueParameter = std::move(typeValueParameter); + if( m_typeValueParameter ) m_typeValueParameter->setParent( this ); } // -------------------------------------------------------------------------- @@ -1225,7 +1225,7 @@ TemplateParameterListAST::TemplateParameterListAST() void TemplateParameterListAST::addTemplateParameter( TemplateParameterAST::Node& templateParameter ) { - if( !templateParameter.get() ) + if( !templateParameter ) return; templateParameter->setParent( this ); @@ -1239,24 +1239,24 @@ ConditionAST::ConditionAST() void ConditionAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void ConditionAST::setDeclarator( DeclaratorAST::Node& declarator ) { - m_declarator = declarator; - if( m_declarator.get() ) m_declarator->setParent( this ); + m_declarator = std::move(declarator); + if( m_declarator ) m_declarator->setParent( this ); } void ConditionAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } void ClassSpecifierAST::setWinDeclSpec( GroupAST::Node & winDeclSpec ) { - m_winDeclSpec = winDeclSpec; - if( m_winDeclSpec.get() ) m_winDeclSpec->setParent( this ); + m_winDeclSpec = std::move(winDeclSpec); + if( m_winDeclSpec ) m_winDeclSpec->setParent( this ); } diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h index c53cce20..b6c2d64b 100644 --- a/lib/cppparser/ast.h +++ b/lib/cppparser/ast.h @@ -155,7 +155,7 @@ class CommentAST { class AST : public CommentAST { public: - typedef std::auto_ptr<AST> Node; + typedef std::unique_ptr<AST> Node; enum { Type=NodeType_Generic }; DECLARE_ALLOC( AST ) @@ -217,7 +217,7 @@ private: class GroupAST: public AST { public: - typedef std::auto_ptr<GroupAST> Node; + typedef std::unique_ptr<GroupAST> Node; enum { Type = NodeType_Group }; DECLARE_ALLOC( GroupAST ) @@ -242,7 +242,7 @@ private: class TemplateArgumentListAST: public AST { public: - typedef std::auto_ptr<TemplateArgumentListAST> Node; + typedef std::unique_ptr<TemplateArgumentListAST> Node; enum { Type = NodeType_TemplateArgumentList }; DECLARE_ALLOC( TemplateArgumentListAST ) @@ -266,7 +266,7 @@ private: class ClassOrNamespaceNameAST: public AST { public: - typedef std::auto_ptr<ClassOrNamespaceNameAST> Node; + typedef std::unique_ptr<ClassOrNamespaceNameAST> Node; enum { Type = NodeType_ClassOrNamespaceName }; DECLARE_ALLOC( ClassOrNamespaceNameAST ) @@ -294,7 +294,7 @@ private: class NameAST: public AST { public: - typedef std::auto_ptr<NameAST> Node; + typedef std::unique_ptr<NameAST> Node; enum { Type = NodeType_Name }; DECLARE_ALLOC( NameAST ) @@ -326,7 +326,7 @@ private: class TypeParameterAST: public AST { public: - typedef std::auto_ptr<TypeParameterAST> Node; + typedef std::unique_ptr<TypeParameterAST> Node; enum { Type = NodeType_TypeParameter }; DECLARE_ALLOC( TypeParameterAST ) @@ -338,7 +338,7 @@ public: void setKind( AST::Node& kind ); class TemplateParameterListAST* templateParameterList() { return m_templateParameterList.get(); } - void setTemplateParameterList( std::auto_ptr<class TemplateParameterListAST>& templateParameterList ); + void setTemplateParameterList( std::unique_ptr<class TemplateParameterListAST>& templateParameterList ); NameAST* name() { return m_name.get(); } void setName( NameAST::Node& name ); @@ -348,7 +348,7 @@ public: private: AST::Node m_kind; - std::auto_ptr<class TemplateParameterListAST> m_templateParameterList; + std::unique_ptr<class TemplateParameterListAST> m_templateParameterList; NameAST::Node m_name; AST::Node m_typeId; @@ -360,7 +360,7 @@ private: class DeclarationAST: public AST { public: - typedef std::auto_ptr<DeclarationAST> Node; + typedef std::unique_ptr<DeclarationAST> Node; enum { Type = NodeType_Declaration }; DECLARE_ALLOC( DeclarationAST ) @@ -376,7 +376,7 @@ private: class AccessDeclarationAST: public DeclarationAST { public: - typedef std::auto_ptr<AccessDeclarationAST> Node; + typedef std::unique_ptr<AccessDeclarationAST> Node; enum { Type = NodeType_AccessDeclaration }; DECLARE_ALLOC( AccessDeclarationAST ) @@ -400,7 +400,7 @@ private: class TypeSpecifierAST: public AST { public: - typedef std::auto_ptr<TypeSpecifierAST> Node; + typedef std::unique_ptr<TypeSpecifierAST> Node; enum { Type = NodeType_TypeSpecifier }; DECLARE_ALLOC( TypeSpecifierAST ) @@ -432,7 +432,7 @@ private: class BaseSpecifierAST: public AST { public: - typedef std::auto_ptr<BaseSpecifierAST> Node; + typedef std::unique_ptr<BaseSpecifierAST> Node; enum { Type = NodeType_BaseSpecifier }; DECLARE_ALLOC( BaseSpecifierAST ) @@ -462,7 +462,7 @@ private: class BaseClauseAST: public AST { public: - typedef std::auto_ptr<BaseClauseAST> Node; + typedef std::unique_ptr<BaseClauseAST> Node; enum { Type = NodeType_BaseClause }; DECLARE_ALLOC( BaseClauseAST ) @@ -484,7 +484,7 @@ private: class ClassSpecifierAST: public TypeSpecifierAST { public: - typedef std::auto_ptr<ClassSpecifierAST> Node; + typedef std::unique_ptr<ClassSpecifierAST> Node; enum { Type = NodeType_ClassSpecifier }; DECLARE_ALLOC( ClassSpecifierAST ) @@ -517,7 +517,7 @@ private: class EnumeratorAST: public AST { public: - typedef std::auto_ptr<EnumeratorAST> Node; + typedef std::unique_ptr<EnumeratorAST> Node; enum { Type = NodeType_Enumerator }; DECLARE_ALLOC( EnumeratorAST ) @@ -543,7 +543,7 @@ private: class EnumSpecifierAST: public TypeSpecifierAST { public: - typedef std::auto_ptr<EnumSpecifierAST> Node; + typedef std::unique_ptr<EnumSpecifierAST> Node; enum { Type = NodeType_EnumSpecifier }; DECLARE_ALLOC( EnumSpecifierAST ) @@ -565,7 +565,7 @@ private: class ElaboratedTypeSpecifierAST: public TypeSpecifierAST { public: - typedef std::auto_ptr<ElaboratedTypeSpecifierAST> Node; + typedef std::unique_ptr<ElaboratedTypeSpecifierAST> Node; enum { Type = NodeType_ElaboratedTypeSpecifier }; DECLARE_ALLOC( ElaboratedTypeSpecifierAST ) @@ -590,7 +590,7 @@ private: class LinkageBodyAST: public AST { public: - typedef std::auto_ptr<LinkageBodyAST> Node; + typedef std::unique_ptr<LinkageBodyAST> Node; enum { Type = NodeType_LinkageBody }; DECLARE_ALLOC( LinkageBodyAST ) @@ -612,7 +612,7 @@ private: class LinkageSpecificationAST: public DeclarationAST { public: - typedef std::auto_ptr<LinkageSpecificationAST> Node; + typedef std::unique_ptr<LinkageSpecificationAST> Node; enum { Type = NodeType_LinkageSpecification }; DECLARE_ALLOC( LinkageSpecificationAST ) @@ -642,7 +642,7 @@ private: class NamespaceAST: public DeclarationAST { public: - typedef std::auto_ptr<NamespaceAST> Node; + typedef std::unique_ptr<NamespaceAST> Node; enum { Type = NodeType_Namespace }; DECLARE_ALLOC( NamespaceAST ) @@ -668,7 +668,7 @@ private: class NamespaceAliasAST: public DeclarationAST { public: - typedef std::auto_ptr<NamespaceAliasAST> Node; + typedef std::unique_ptr<NamespaceAliasAST> Node; enum { Type = NodeType_NamespaceAlias }; DECLARE_ALLOC( NamespaceAliasAST ) @@ -694,7 +694,7 @@ private: class UsingAST: public DeclarationAST { public: - typedef std::auto_ptr<UsingAST> Node; + typedef std::unique_ptr<UsingAST> Node; enum { Type = NodeType_Using }; DECLARE_ALLOC( UsingAST ) @@ -720,7 +720,7 @@ private: class UsingDirectiveAST: public DeclarationAST { public: - typedef std::auto_ptr<UsingDirectiveAST> Node; + typedef std::unique_ptr<UsingDirectiveAST> Node; enum { Type = NodeType_UsingDirective }; DECLARE_ALLOC( UsingDirectiveAST ) @@ -742,7 +742,7 @@ private: class DeclaratorAST: public AST { public: - typedef std::auto_ptr<DeclaratorAST> Node; + typedef std::unique_ptr<DeclaratorAST> Node; enum { Type = NodeType_Declarator }; DECLARE_ALLOC( DeclaratorAST ) @@ -754,7 +754,7 @@ public: void addPtrOp( AST::Node& ptrOp ); DeclaratorAST* subDeclarator() { return m_subDeclarator.get(); } - void setSubDeclarator( std::auto_ptr<DeclaratorAST>& subDeclarator ); + void setSubDeclarator( Node& subDeclarator ); NameAST* declaratorId() { return m_declaratorId.get(); } void setDeclaratorId( NameAST::Node& declaratorId ); @@ -766,7 +766,7 @@ public: void addArrayDimension( AST::Node& arrayDimension ); class ParameterDeclarationClauseAST* parameterDeclarationClause() { return m_parameterDeclarationClause.get(); } - void setParameterDeclarationClause( std::auto_ptr<class ParameterDeclarationClauseAST>& parameterDeclarationClause ); + void setParameterDeclarationClause( std::unique_ptr<class ParameterDeclarationClauseAST>& parameterDeclarationClause ); // ### replace 'constant' with cvQualify AST* constant() { return m_constant.get(); } @@ -777,11 +777,11 @@ public: private: TQPtrList<AST> m_ptrOpList; - std::auto_ptr<DeclaratorAST> m_subDeclarator; + Node m_subDeclarator; NameAST::Node m_declaratorId; AST::Node m_bitfieldInitialization; TQPtrList<AST> m_arrayDimensionList; - std::auto_ptr<class ParameterDeclarationClauseAST> m_parameterDeclarationClause; + std::unique_ptr<class ParameterDeclarationClauseAST> m_parameterDeclarationClause; AST::Node m_constant; GroupAST::Node m_exceptionSpecification; @@ -793,7 +793,7 @@ private: class ParameterDeclarationAST: public AST { public: - typedef std::auto_ptr<ParameterDeclarationAST> Node; + typedef std::unique_ptr<ParameterDeclarationAST> Node; enum { Type = NodeType_ParameterDeclaration }; DECLARE_ALLOC( ParameterDeclarationAST ) @@ -825,7 +825,7 @@ private: class ParameterDeclarationListAST: public AST { public: - typedef std::auto_ptr<ParameterDeclarationListAST> Node; + typedef std::unique_ptr<ParameterDeclarationListAST> Node; enum { Type = NodeType_ParameterDeclarationList }; DECLARE_ALLOC( ParameterDeclarationListAST ) @@ -849,7 +849,7 @@ private: class ParameterDeclarationClauseAST: public AST { public: - typedef std::auto_ptr<ParameterDeclarationClauseAST> Node; + typedef std::unique_ptr<ParameterDeclarationClauseAST> Node; enum { Type = NodeType_ParameterDeclarationClause }; DECLARE_ALLOC( ParameterDeclarationClauseAST ) @@ -878,7 +878,7 @@ private: class InitDeclaratorAST: public AST { public: - typedef std::auto_ptr<InitDeclaratorAST> Node; + typedef std::unique_ptr<InitDeclaratorAST> Node; enum { Type = NodeType_InitDeclarator }; DECLARE_ALLOC( InitDeclaratorAST ) @@ -904,7 +904,7 @@ private: class InitDeclaratorListAST: public AST { public: - typedef std::auto_ptr<InitDeclaratorListAST> Node; + typedef std::unique_ptr<InitDeclaratorListAST> Node; enum { Type = NodeType_InitDeclaratorList }; DECLARE_ALLOC( InitDeclaratorListAST ) @@ -926,7 +926,7 @@ private: class TypedefAST: public DeclarationAST { public: - typedef std::auto_ptr<TypedefAST> Node; + typedef std::unique_ptr<TypedefAST> Node; enum { Type = NodeType_Typedef }; DECLARE_ALLOC( TypedefAST ) @@ -952,7 +952,7 @@ private: class TemplateParameterAST: public AST { public: - typedef std::auto_ptr<TemplateParameterAST> Node; + typedef std::unique_ptr<TemplateParameterAST> Node; enum { Type = NodeType_TemplateParameter }; DECLARE_ALLOC( TemplateParameterAST ) @@ -978,7 +978,7 @@ private: class TemplateParameterListAST: public AST { public: - typedef std::auto_ptr<TemplateParameterListAST> Node; + typedef std::unique_ptr<TemplateParameterListAST> Node; enum { Type = NodeType_TemplateParameterList }; DECLARE_ALLOC( TemplateParameterListAST ) @@ -1000,7 +1000,7 @@ private: class TemplateDeclarationAST: public DeclarationAST { public: - typedef std::auto_ptr<TemplateDeclarationAST> Node; + typedef std::unique_ptr<TemplateDeclarationAST> Node; enum { Type = NodeType_TemplateDeclaration }; DECLARE_ALLOC( TemplateDeclarationAST ) @@ -1030,7 +1030,7 @@ private: class SimpleDeclarationAST: public DeclarationAST { public: - typedef std::auto_ptr<SimpleDeclarationAST> Node; + typedef std::unique_ptr<SimpleDeclarationAST> Node; enum { Type = NodeType_SimpleDeclaration }; DECLARE_ALLOC( SimpleDeclarationAST ) @@ -1068,7 +1068,7 @@ private: class StatementAST: public AST { public: - typedef std::auto_ptr<StatementAST> Node; + typedef std::unique_ptr<StatementAST> Node; enum { Type = NodeType_Statement }; DECLARE_ALLOC( StatementAST ) @@ -1084,7 +1084,7 @@ private: class ExpressionStatementAST: public StatementAST { public: - typedef std::auto_ptr<ExpressionStatementAST> Node; + typedef std::unique_ptr<ExpressionStatementAST> Node; enum { Type = NodeType_ExpressionStatement }; DECLARE_ALLOC( ExpressionStatementAST ) @@ -1106,7 +1106,7 @@ private: class ConditionAST: public AST { public: - typedef std::auto_ptr<ConditionAST> Node; + typedef std::unique_ptr<ConditionAST> Node; enum { Type = NodeType_Condition }; DECLARE_ALLOC( ConditionAST ) @@ -1136,7 +1136,7 @@ private: class IfStatementAST: public StatementAST { public: - typedef std::auto_ptr<IfStatementAST> Node; + typedef std::unique_ptr<IfStatementAST> Node; enum { Type = NodeType_IfStatement }; DECLARE_ALLOC( IfStatementAST ) @@ -1166,7 +1166,7 @@ private: class WhileStatementAST: public StatementAST { public: - typedef std::auto_ptr<WhileStatementAST> Node; + typedef std::unique_ptr<WhileStatementAST> Node; enum { Type = NodeType_WhileStatement }; DECLARE_ALLOC( WhileStatementAST ) @@ -1192,7 +1192,7 @@ private: class DoStatementAST: public StatementAST { public: - typedef std::auto_ptr<DoStatementAST> Node; + typedef std::unique_ptr<DoStatementAST> Node; enum { Type = NodeType_DoStatement }; DECLARE_ALLOC( DoStatementAST ) @@ -1218,7 +1218,7 @@ private: class ForStatementAST: public StatementAST { public: - typedef std::auto_ptr<ForStatementAST> Node; + typedef std::unique_ptr<ForStatementAST> Node; enum { Type = NodeType_ForStatement }; DECLARE_ALLOC( ForStatementAST ) @@ -1252,7 +1252,7 @@ private: class ForEachStatementAST: public StatementAST { public: - typedef std::auto_ptr<ForEachStatementAST> Node; + typedef std::unique_ptr<ForEachStatementAST> Node; enum { Type = NodeType_ForEachStatement }; DECLARE_ALLOC( ForEachStatementAST ) @@ -1282,7 +1282,7 @@ private: class SwitchStatementAST: public StatementAST { public: - typedef std::auto_ptr<SwitchStatementAST> Node; + typedef std::unique_ptr<SwitchStatementAST> Node; enum { Type = NodeType_SwitchStatement }; DECLARE_ALLOC( SwitchStatementAST ) @@ -1308,7 +1308,7 @@ private: class StatementListAST: public StatementAST { public: - typedef std::auto_ptr<StatementListAST> Node; + typedef std::unique_ptr<StatementListAST> Node; enum { Type = NodeType_StatementList }; DECLARE_ALLOC( StatementListAST ) @@ -1330,7 +1330,7 @@ private: class CatchStatementAST: public StatementAST { public: - typedef std::auto_ptr<CatchStatementAST> Node; + typedef std::unique_ptr<CatchStatementAST> Node; enum { Type = NodeType_CatchStatement }; DECLARE_ALLOC( CatchStatementAST ) @@ -1356,7 +1356,7 @@ private: class CatchStatementListAST: public StatementAST { public: - typedef std::auto_ptr<CatchStatementListAST> Node; + typedef std::unique_ptr<CatchStatementListAST> Node; enum { Type = NodeType_CatchStatementList }; DECLARE_ALLOC( CatchStatementListAST ) @@ -1378,7 +1378,7 @@ private: class TryBlockStatementAST: public StatementAST { public: - typedef std::auto_ptr<TryBlockStatementAST> Node; + typedef std::unique_ptr<TryBlockStatementAST> Node; enum { Type = NodeType_TryBlockStatement }; DECLARE_ALLOC( TryBlockStatementAST ) @@ -1404,7 +1404,7 @@ private: class DeclarationStatementAST: public StatementAST { public: - typedef std::auto_ptr<DeclarationStatementAST> Node; + typedef std::unique_ptr<DeclarationStatementAST> Node; enum { Type = NodeType_DeclarationStatement }; DECLARE_ALLOC( DeclarationStatementAST ) @@ -1426,7 +1426,7 @@ private: class FunctionDefinitionAST: public DeclarationAST { public: - typedef std::auto_ptr<FunctionDefinitionAST> Node; + typedef std::unique_ptr<FunctionDefinitionAST> Node; enum { Type = NodeType_FunctionDefinition }; DECLARE_ALLOC( FunctionDefinitionAST ) diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index 3dc8569c..dbda4aca 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -101,7 +101,7 @@ class DefaultSourceProvider: public SourceProvider { Driver::Driver() - : depresolv( FALSE ), lexer( 0 ), m_lexerCache( this ), m_dependenceDepth( 0 ), m_maxDependenceDepth( 20 ) { + : depresolv( false ), lexer( 0 ), m_lexerCache( this ), m_dependenceDepth( 0 ), m_maxDependenceDepth( 20 ) { m_sourceProvider = new DefaultSourceProvider(); } @@ -552,7 +552,6 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "ANTLR_USE_NAMESPACE", SkipWordAndArguments ); lexer->addSkipWord( "ANTLR_USING_NAMESPACE", SkipWordAndArguments ); lexer->addSkipWord( "ANTLR_END_NAMESPACE" ); - lexer->addSkipWord( "ANTLR_C_USING", SkipWordAndArguments ); lexer->addSkipWord( "ANTLR_API" ); // gnu @@ -594,7 +593,7 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "EXPORT_DOCKCLASS" ); lexer->addSkipWord( "K_EXPORT_COMPONENT_FACTORY", SkipWordAndArguments ); lexer->addSkipWord( "K_SYCOCAFACTORY", SkipWordAndArguments ); - lexer->addSkipWord( "KDE_DEPRECATED" ); + lexer->addSkipWord( "TDE_DEPRECATED" ); // qt lexer->addSkipWord( "TQ_OBJECT" ); @@ -614,8 +613,6 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "TQ_REFCOUNT" ); lexer->addSkipWord( "TQ_EXPLICIT" ); lexer->addSkipWord( "QMAC_PASCAL" ); - lexer->addSkipWord( "QT_STATIC_CONST" ); - lexer->addSkipWord( "QT_STATIC_CONST_IMPL" ); lexer->addSkipWord( "TQT_WIN_PAINTER_MEMBERS" ); lexer->addSkipWord( "TQT_NC_MSGBOX" ); lexer->addSkipWord( "TQ_VARIANT_AS", SkipWordAndArguments ); diff --git a/lib/cppparser/errors.cpp b/lib/cppparser/errors.cpp index 5ce5058d..2622e7de 100644 --- a/lib/cppparser/errors.cpp +++ b/lib/cppparser/errors.cpp @@ -20,6 +20,6 @@ #include "errors.h" #include <tdelocale.h> -QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") ); -QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") ); -QT_STATIC_CONST_IMPL Error& Errors::ParseError = Error( 3, -1, i18n("Parse Error before '%1'") ); +const Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") ); +const Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") ); +const Error& Errors::ParseError = Error( 3, -1, i18n("Parse Error before '%1'") ); diff --git a/lib/cppparser/errors.h b/lib/cppparser/errors.h index 26b63f2c..d4e65e0b 100644 --- a/lib/cppparser/errors.h +++ b/lib/cppparser/errors.h @@ -35,9 +35,9 @@ struct Error{ class Errors{ public: - QT_STATIC_CONST Error& InternalError; - QT_STATIC_CONST Error& SyntaxError; - QT_STATIC_CONST Error& ParseError; + static const Error& InternalError; + static const Error& SyntaxError; + static const Error& ParseError; }; diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp index c4eccfd3..9701b944 100644 --- a/lib/cppparser/parser.cpp +++ b/lib/cppparser/parser.cpp @@ -325,7 +325,7 @@ bool Parser::skipCommaExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -377,7 +377,7 @@ bool Parser::skipExpression( AST::Node& node ) { AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); } return true; @@ -428,7 +428,7 @@ bool Parser::parseName( NameAST::Node& node ) return false; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -441,7 +441,7 @@ bool Parser::parseTranslationUnit( TranslationUnitAST::Node& node ) m_problems = 0; TranslationUnitAST::Node tun = CreateNode<TranslationUnitAST>(); - node = tun; + node = std::move(tun); if( lex->lookAhead(0) == Token_comment ) { node->setComment( lex->lookAhead(0).text() ); nextToken(); @@ -539,7 +539,7 @@ bool Parser::parseDeclaration( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -587,7 +587,7 @@ bool Parser::parseLinkageSpecification( DeclarationAST::Node& node ) UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -604,7 +604,7 @@ bool Parser::parseLinkageBody( LinkageBodyAST::Node& node ) nextToken(); LinkageBodyAST::Node lba = CreateNode<LinkageBodyAST>(); - node = lba; + node = std::move(lba); while( !lex->lookAhead(0).isNull() ){ int tk = lex->lookAhead( 0 ); @@ -665,7 +665,7 @@ bool Parser::parseNamespace( DeclarationAST::Node& node ) ast->setNamespaceName( namespaceName ); ast->setAliasName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } else { reportError( i18n("namespace expected") ); @@ -684,7 +684,7 @@ bool Parser::parseNamespace( DeclarationAST::Node& node ) ast->setLinkageBody( linkageBody ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -727,7 +727,7 @@ bool Parser::parseUsing( DeclarationAST::Node& node ) ADVANCE( ';', ";" ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -754,7 +754,7 @@ bool Parser::parseUsingDirective( DeclarationAST::Node& node ) UsingDirectiveAST::Node ast = CreateNode<UsingDirectiveAST>(); ast->setName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -774,7 +774,7 @@ bool Parser::parseOperatorFunctionId( AST::Node& node ) AST::Node op; if( parseOperator(op) ){ AST::Node asn = CreateNode<AST>(); - node = asn; + node = std::move(asn); UPDATE_POS( node, start, lex->index() ); return true; } else { @@ -798,7 +798,7 @@ bool Parser::parseOperatorFunctionId( AST::Node& node ) ; AST::Node asn = CreateNode<AST>(); - node = asn; + node = std::move(asn); UPDATE_POS( node, start, lex->index() ); return true; } @@ -831,7 +831,7 @@ bool Parser::parseTemplateArgumentList( TemplateArgumentListAST::Node& node, boo } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -879,7 +879,7 @@ bool Parser::parseTypedef( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -913,7 +913,7 @@ bool Parser::parseTemplateDeclaration( DeclarationAST::Node& node ) nextToken(); AST::Node n = CreateNode<AST>(); UPDATE_POS( n, startExport, lex->index() ); - exp = n; + exp = std::move(n); } if( lex->lookAhead(0) != Token_template ){ @@ -939,7 +939,7 @@ bool Parser::parseTemplateDeclaration( DeclarationAST::Node& node ) ast->setTemplateParameterList( params ); ast->setDeclaration( def ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1033,7 +1033,7 @@ bool Parser::parseCvQualify( GroupAST::Node& node ) ////kdDebug(9007)<< "-----------------> token = " << lex->lookAhead(0).text() << endl; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1090,7 +1090,7 @@ bool Parser::parseSimpleTypeSpecifier( TypeSpecifierAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1118,7 +1118,7 @@ bool Parser::parsePtrOperator( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1283,7 +1283,7 @@ bool Parser::parseDeclarator( DeclaratorAST::Node& node ) update_pos: UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1380,7 +1380,7 @@ bool Parser::parseAbstractDeclarator( DeclaratorAST::Node& node ) UPDATE_POS: UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1439,7 +1439,7 @@ bool Parser::parseEnumSpecifier( TypeSpecifierAST::Node& node ) UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1470,7 +1470,7 @@ bool Parser::parseTemplateParameterList( TemplateParameterListAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1498,7 +1498,7 @@ bool Parser::parseTemplateParameter( TemplateParameterAST::Node& node ) ok: UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1586,7 +1586,7 @@ bool Parser::parseTypeParameter( TypeParameterAST::Node& node ) UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1615,7 +1615,7 @@ bool Parser::parseStorageClassSpecifier( GroupAST::Node& node ) return false; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1644,7 +1644,7 @@ bool Parser::parseFunctionSpecifier( GroupAST::Node& node ) return false; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1665,7 +1665,7 @@ bool Parser::parseTypeId( AST::Node& node ) parseAbstractDeclarator( decl ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1696,7 +1696,7 @@ bool Parser::parseInitDeclaratorList( InitDeclaratorListAST::Node& node ) ////kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- " << "Parser::parseInitDeclaratorList() -- end" << endl; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1735,7 +1735,7 @@ good: /// @todo add ellipsis UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1844,7 +1844,7 @@ bool Parser::parseParameterDeclarationList( ParameterDeclarationListAST::Node& n } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1887,7 +1887,7 @@ bool Parser::parseParameterDeclaration( ParameterDeclarationAST::Node& node ) ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1905,7 +1905,7 @@ bool Parser::parseClassSpecifier( TypeSpecifierAST::Node& node ) int kind = lex->lookAhead( 0 ); if( kind == Token_class || kind == Token_struct || kind == Token_union ){ AST::Node asn = CreateNode<AST>(); - classKey = asn; + classKey = std::move(asn); nextToken(); UPDATE_POS( classKey, classKeyStart, lex->index() ); } else { @@ -1968,7 +1968,7 @@ bool Parser::parseClassSpecifier( TypeSpecifierAST::Node& node ) nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1984,7 +1984,7 @@ bool Parser::parseAccessSpecifier( AST::Node& node ) case Token_protected: case Token_private: { AST::Node asn = CreateNode<AST>(); - node = asn; + node = std::move(asn); nextToken(); UPDATE_POS( node, start, lex->index() ); return true; @@ -2016,7 +2016,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) ast->addAccess( n ); ADVANCE( ':', ":" ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } else if( parseTypedef(node) ){ return true; @@ -2037,7 +2037,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) } ADVANCE( ':', ":" ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2065,7 +2065,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2115,7 +2115,7 @@ bool Parser::parseElaboratedTypeSpecifier( TypeSpecifierAST::Node& node ) ast->setKind( kind ); ast->setName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2149,7 +2149,7 @@ bool Parser::parseExceptionSpecification( GroupAST::Node& node ) ast->addNode( ellipsis ); nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); } else if( lex->lookAhead(0) == ')' ) { node = CreateNode<GroupAST>(); } else { @@ -2174,7 +2174,7 @@ bool Parser::parseEnumerator( EnumeratorAST::Node& node ) EnumeratorAST::Node ena = CreateNode<EnumeratorAST>(); - node = ena; + node = std::move(ena); AST::Node id = CreateNode<AST>(); UPDATE_POS( id, start, lex->index() ); @@ -2219,7 +2219,7 @@ bool Parser::parseInitDeclarator( InitDeclaratorAST::Node& node ) ast->setDeclarator( decl ); ast->setInitializer( init ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2255,7 +2255,7 @@ bool Parser::parseBaseClause( BaseClauseAST::Node& node ) return false; UPDATE_POS( bca, start, lex->index() ); - node = bca; + node = std::move(bca); return true; } @@ -2346,7 +2346,7 @@ bool Parser::parseTypeIdList( GroupAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2383,7 +2383,7 @@ bool Parser::parseBaseSpecifier( BaseSpecifierAST::Node& node ) ast->setAccess( access ); ast->setName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2491,7 +2491,7 @@ bool Parser::parseUnqualifiedName( ClassOrNamespaceNameAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2526,7 +2526,7 @@ bool Parser::skipExpressionStatement( StatementAST::Node& node ) ExpressionStatementAST::Node ast = CreateNode<ExpressionStatementAST>(); ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2620,7 +2620,7 @@ bool Parser::parseCondition( ConditionAST::Node& node ) ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2629,7 +2629,7 @@ bool Parser::parseCondition( ConditionAST::Node& node ) ast->setDeclarator( decl ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2644,7 +2644,7 @@ bool Parser::parseCondition( ConditionAST::Node& node ) ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2673,7 +2673,7 @@ bool Parser::parseWhileStatement( StatementAST::Node& node ) ast->setCondition( cond ); ast->setStatement( body ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2707,7 +2707,7 @@ bool Parser::parseDoStatement( StatementAST::Node& node ) ast->setStatement( body ); //ast->setCondition( condition ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2743,7 +2743,7 @@ bool Parser::parseForStatement( StatementAST::Node& node ) // ast->setExpression( expression ); ast->setStatement( body ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2768,7 +2768,7 @@ bool Parser::parseForEachStatement( StatementAST::Node& node ) // add here the parser results ast->setStatement( body ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2819,7 +2819,7 @@ bool Parser::parseCompoundStatement( StatementAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2861,7 +2861,7 @@ bool Parser::parseIfStatement( StatementAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2891,7 +2891,7 @@ bool Parser::parseSwitchStatement( StatementAST::Node& node ) ast->setCondition( cond ); ast->setStatement( stmt ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2908,7 +2908,7 @@ bool Parser::parseLabeledStatement( StatementAST::Node& node ) StatementAST::Node stmt; if( parseStatement(stmt) ){ - node = stmt; + node = std::move(stmt); return true; } } @@ -2932,7 +2932,7 @@ bool Parser::parseLabeledStatement( StatementAST::Node& node ) StatementAST::Node stmt; if( parseStatement(stmt) ){ - node = stmt; + node = std::move(stmt); return true; } } @@ -2989,7 +2989,7 @@ bool Parser::parseBlockDeclaration( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3029,7 +3029,7 @@ bool Parser::parseDeclarationStatement( StatementAST::Node& node ) DeclarationStatementAST::Node ast = CreateNode<DeclarationStatementAST>(); ast->setDeclaration( decl ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); ////kdDebug(9007)<< "---------------------> found a block declaration" << endl; return true; @@ -3093,7 +3093,7 @@ bool Parser::parseDeclarationInternal( DeclarationAST::Node& node ) SimpleDeclarationAST::Node ast = CreateNode<SimpleDeclarationAST>(); ast->setInitDeclaratorList( declarators ); ast->setText( toString(start, endSignature) ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; @@ -3111,7 +3111,7 @@ bool Parser::parseDeclarationInternal( DeclarationAST::Node& node ) ast->setInitDeclarator( declarator ); ast->setFunctionBody( funBody ); ast->setText( toString(start, endSignature) ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3128,7 +3128,7 @@ bool Parser::parseDeclarationInternal( DeclarationAST::Node& node ) ast->setInitDeclarator( declarator ); ast->setText( toString(start, endSignature) ); ast->setFunctionBody( funBody ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3158,7 +3158,7 @@ start_decl: if( parseInitDeclaratorList(declarators) ){ ADVANCE( ';', ";" ); DeclarationAST::Node ast = CreateNode<DeclarationAST>(); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3219,7 +3219,7 @@ start_decl: ast->setWinDeclSpec( winDeclSpec ); ast->setInitDeclaratorList( declarators ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); } return true; @@ -3243,7 +3243,7 @@ start_decl: ast->setTypeSpec( spec ); ast->setFunctionBody( funBody ); ast->setInitDeclarator( decl ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3291,7 +3291,7 @@ bool Parser::parseFunctionBody( StatementListAST::Node& node ) nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3379,7 +3379,7 @@ bool Parser::parseTryBlockStatement( StatementAST::Node& node ) ast->setStatement( stmt ); ast->setCatchStatementList( list ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3905,7 +3905,7 @@ bool Parser::parseLogicalOrExpression( AST::Node& node, bool templArgs ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3950,7 +3950,7 @@ bool Parser::parseAssignmentExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3961,7 +3961,7 @@ bool Parser::parseConstantExpression( AST::Node& node ) if( parseConditionalExpression(node) ){ AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } return false; @@ -3978,7 +3978,7 @@ bool Parser::parseExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -4000,7 +4000,7 @@ bool Parser::parseCommaExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -4203,7 +4203,7 @@ bool Parser::parseIdentifierList( GroupAST::Node & node ) ADVANCE( Token_identifier, "identifier" ); } - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } diff --git a/lib/interfaces/KDevCoreIface.cpp b/lib/interfaces/KDevCoreIface.cpp index aa70e01b..c86e3562 100644 --- a/lib/interfaces/KDevCoreIface.cpp +++ b/lib/interfaces/KDevCoreIface.cpp @@ -29,8 +29,8 @@ KDevCoreIface::KDevCoreIface(KDevCore *core) : TQObject(core), DCOPObject("KDevCore"), m_core(core) { - connect( m_core, TQT_SIGNAL(projectOpened()), this, TQT_SLOT(forwardProjectOpened()) ); - connect( m_core, TQT_SIGNAL(projectClosed()), this, TQT_SLOT(forwardProjectClosed()) ); + connect( m_core, TQ_SIGNAL(projectOpened()), this, TQ_SLOT(forwardProjectOpened()) ); + connect( m_core, TQ_SIGNAL(projectClosed()), this, TQ_SLOT(forwardProjectClosed()) ); } diff --git a/lib/interfaces/KDevPartControllerIface.cpp b/lib/interfaces/KDevPartControllerIface.cpp index 1b184453..60c9ef97 100644 --- a/lib/interfaces/KDevPartControllerIface.cpp +++ b/lib/interfaces/KDevPartControllerIface.cpp @@ -28,9 +28,9 @@ KDevPartControllerIface::KDevPartControllerIface(KDevPartController *pc) : TQObject(pc), DCOPObject("KDevPartController"), m_controller(pc) { - connect(pc, TQT_SIGNAL(loadedFile(const KURL &)), this, TQT_SLOT(forwardLoadedFile(const KURL &))); - connect(pc, TQT_SIGNAL(savedFile(const KURL &)), this, TQT_SLOT(forwardSavedFile(const KURL &))); - connect(pc, TQT_SIGNAL(closedFile(const KURL &)), this, TQT_SLOT(forwardClosedFile(const KURL &))); + connect(pc, TQ_SIGNAL(loadedFile(const KURL &)), this, TQ_SLOT(forwardLoadedFile(const KURL &))); + connect(pc, TQ_SIGNAL(savedFile(const KURL &)), this, TQ_SLOT(forwardSavedFile(const KURL &))); + connect(pc, TQ_SIGNAL(closedFile(const KURL &)), this, TQ_SLOT(forwardClosedFile(const KURL &))); } diff --git a/lib/interfaces/extensions/CMakeLists.txt b/lib/interfaces/extensions/CMakeLists.txt index 6a07c77c..73708856 100644 --- a/lib/interfaces/extensions/CMakeLists.txt +++ b/lib/interfaces/extensions/CMakeLists.txt @@ -42,12 +42,12 @@ tde_create_translated_desktop( add_custom_command( OUTPUT codebrowserfrontend.moc.cpp COMMAND - ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h -o codebrowserfrontend.moc.cpp + ${TQMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h -o codebrowserfrontend.moc.cpp DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h ) add_custom_command( OUTPUT kdevversioncontrol.moc.cpp COMMAND - ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h -o kdevversioncontrol.moc.cpp + ${TQMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h -o kdevversioncontrol.moc.cpp DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h ) tde_add_library( kdevextensions STATIC_PIC AUTOMOC diff --git a/lib/interfaces/external/Mainpage.dox b/lib/interfaces/external/Mainpage.dox index 0febd41d..7c97cf16 100644 --- a/lib/interfaces/external/Mainpage.dox +++ b/lib/interfaces/external/Mainpage.dox @@ -10,14 +10,14 @@ GUI Designer integration framework. \section designerintegration Overview of GUI designer integration process Each KPart that wants to act as a GUI Designer must implement @ref KInterfaceDesigner::Designer -interface. It defines necessary Q_SIGNALS to communicate with an IDE and abstract virtual +interface. It defines necessary signals to communicate with an IDE and abstract virtual functions to determine designer type. If a part which can "design" user interface files of a certain mimetype implements this interface and sets itself as a default handler for that mimetype then it becomes automatically integrated into TDevelop IDE. -When a part is embedded into TDevelop shell, its Q_SIGNALS (defined in @ref +When a part is embedded into TDevelop shell, its signals (defined in @ref KInterfaceDesigner::Designer interface): @code void addedFunction(DesignerType type, const TQString &formName, Function function) @@ -26,7 +26,7 @@ KInterfaceDesigner::Designer interface): void editFunction(DesignerType type, const TQString &formName, const TQString &functionName) void editSource(DesignerType type, const TQString &formName); @endcode -are connected to corresponding Q_SLOTS of TDevelop designer integration engine which can be implemented in TDevelop language support plugin. +are connected to corresponding slots of TDevelop designer integration engine which can be implemented in TDevelop language support plugin. Each language support which wants to use integrated designer, must reimplement @code diff --git a/lib/interfaces/katedocumentmanagerinterface.cpp b/lib/interfaces/katedocumentmanagerinterface.cpp index 0afbcc81..e190ed04 100644 --- a/lib/interfaces/katedocumentmanagerinterface.cpp +++ b/lib/interfaces/katedocumentmanagerinterface.cpp @@ -50,7 +50,7 @@ DCOPRef KateDocumentManagerInterface::document( uint n ) DCOPRef KateDocumentManagerInterface::documentWithID( uint id ) { TQString dcopobj = "KateDocument#" + TQString::number(id); - return DCOPRef(kapp->dcopClient()->appId(), dcopobj.latin1() ); + return DCOPRef(tdeApp->dcopClient()->appId(), dcopobj.latin1() ); } DCOPRef KateDocumentManagerInterface::openURL( const KURL &url, const TQString &encoding ) diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h index 282906db..e496576f 100644 --- a/lib/interfaces/kdevcore.h +++ b/lib/interfaces/kdevcore.h @@ -78,15 +78,15 @@ to if you reimplement TQWidget::contextMenuEvent method. -# Connect KDevCore::contextMenu(TQPopupMenu *, const Context *) signal to that slot in the constructor of your plugin:\n @code -connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); +connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); @endcode -# Fill the menu in the slot you created, for example:\n @code if (context->hasType(Context::EditorContext)) { const EditorContext *econtext = static_cast<const EditorContext*>(context); - int id = popup->insertItem(i18n("My Menu Item 1"), this, TQT_SLOT(myMenuAction1())); + int id = popup->insertItem(i18n("My Menu Item 1"), this, TQ_SLOT(myMenuAction1())); popup->setWhatsThis(id, i18n("What's this for my menu item 1")); } else if context->hasType(MyContext)) diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp index 1cc6caa3..2a1b0770 100644 --- a/lib/interfaces/kdevplugincontroller.cpp +++ b/lib/interfaces/kdevplugincontroller.cpp @@ -27,8 +27,17 @@ KDevPluginController::KDevPluginController() TDETrader::OfferList KDevPluginController::query(const TQString &serviceType, const TQString &constraint) { - return TDETrader::self()->query(serviceType, - TQString("%1 and [X-TDevelop-Version] == %2").arg(constraint).arg(TDEVELOP_PLUGIN_VERSION)); + TQString versionConstraint = + TQString::fromLatin1("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION); + + TQString newConstraint; + if (!constraint.isEmpty()) { + newConstraint = TQString("( %1 ) and %2").arg(constraint).arg(versionConstraint); + } else { + newConstraint = versionConstraint; + } + + return TDETrader::self()->query(serviceType, newConstraint); } TDETrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint) diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp index e8616df1..3a49a8c6 100644 --- a/lib/interfaces/kdevproject.cpp +++ b/lib/interfaces/kdevproject.cpp @@ -40,14 +40,14 @@ struct KDevProject::Private { KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name) : KDevPlugin(info, parent, name), d(new KDevProject::Private()) { - connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); - connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); + connect( this, TQ_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQ_SLOT(buildFileMap()) ); + connect( this, TQ_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQ_SLOT(buildFileMap()) ); - connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(slotAddFilesToFileMap(const TQStringList& )) ); - connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(slotRemoveFilesFromFileMap(const TQStringList& )) ); + connect( this, TQ_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQ_SLOT(slotAddFilesToFileMap(const TQStringList& )) ); + connect( this, TQ_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQ_SLOT(slotRemoveFilesFromFileMap(const TQStringList& )) ); d->m_timer = new TQTimer(this); - connect(d->m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBuildFileMap())); + connect(d->m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotBuildFileMap())); d->m_iface = new KDevProjectIface(this); } diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt index 1eb17f35..121f85c2 100644 --- a/lib/util/CMakeLists.txt +++ b/lib/util/CMakeLists.txt @@ -30,7 +30,7 @@ install( FILES tde_add_library( kdevutil STATIC_PIC AUTOMOC SOURCES - blockingkprocess.cpp configwidgetproxy.cpp + blockingtdeprocess.cpp configwidgetproxy.cpp domutil.cpp execcommand.cpp filetemplate.cpp kdeveditorutil.cpp kdevjobtimer.cpp kdevshellwidget.cpp tdescriptactionmanager.cpp diff --git a/lib/util/Makefile.am b/lib/util/Makefile.am index 8bf28091..1f457040 100644 --- a/lib/util/Makefile.am +++ b/lib/util/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces -I$(top_s noinst_LTLIBRARIES = libkdevutil.la -libkdevutil_la_SOURCES = blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp \ +libkdevutil_la_SOURCES = blockingtdeprocess.cpp configwidgetproxy.cpp domutil.cpp \ execcommand.cpp filetemplate.cpp kdeveditorutil.cpp kdevjobtimer.cpp \ kdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp @@ -17,5 +17,5 @@ DOXYGEN_PROJECTNAME = KDevelop Utility Library DOXYGEN_DOCDIRPREFIX = kdev include ../../Doxyfile.am -noinst_HEADERS = blockingkprocess.h kdeveditorutil.h kdevjobtimer.h \ +noinst_HEADERS = blockingtdeprocess.h kdeveditorutil.h kdevjobtimer.h \ kdevshellwidget.h settings.h diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingtdeprocess.cpp index a937c744..f57ae77d 100644 --- a/lib/util/blockingkprocess.cpp +++ b/lib/util/blockingtdeprocess.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include "blockingkprocess.h" +#include "blockingtdeprocess.h" #include <tqapplication.h> #include <tqtimer.h> @@ -22,12 +22,12 @@ BlockingTDEProcess::BlockingTDEProcess(TQObject *parent, const char *name) m_timeoutValue = 60; m_timer = 0L; - connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); - connect(this, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); - connect(this, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); + connect(this, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); + connect(this, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); } BlockingTDEProcess::BlockingTDEProcess() @@ -37,12 +37,12 @@ BlockingTDEProcess::BlockingTDEProcess() m_stdErr = ""; m_timeoutValue = 60; m_timer = 0L; - connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); - connect(this, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); - connect(this, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); + connect(this, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); + connect(this, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); } @@ -55,7 +55,7 @@ bool BlockingTDEProcess::start(RunMode runmode, Communication comm) { m_timeout = false; m_timer = new TQTimer(); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeOut())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeOut())); m_timer->start(m_timeoutValue*1000, true); enter_loop(); delete m_timer; @@ -102,4 +102,4 @@ void BlockingTDEProcess::enter_loop() } -#include "blockingkprocess.moc" +#include "blockingtdeprocess.moc" diff --git a/lib/util/blockingkprocess.h b/lib/util/blockingtdeprocess.h index b5a7e71e..2252f59f 100644 --- a/lib/util/blockingkprocess.h +++ b/lib/util/blockingtdeprocess.h @@ -11,10 +11,10 @@ ***************************************************************************/ -#ifndef BLOCKINGKPROCESS_H -#define BLOCKINGKPROCESS_H +#ifndef BLOCKINGTDEPROCESS_H +#define BLOCKINGTDEPROCESS_H -#include <kprocess.h> +#include <tdeprocess.h> /** * Blocking version of TDEProcess, which stores the stdout. diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp index 3335ce9f..16f578f0 100644 --- a/lib/util/configwidgetproxy.cpp +++ b/lib/util/configwidgetproxy.cpp @@ -34,8 +34,8 @@ ConfigWidgetProxy::ConfigWidgetProxy( KDevCore * core ) { - connect( core, TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget( KDialogBase*)) ); - connect( core, TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(slotProjectConfigWidget( KDialogBase*)) ); + connect( core, TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(slotConfigWidget( KDialogBase*)) ); + connect( core, TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(slotProjectConfigWidget( KDialogBase*)) ); } ConfigWidgetProxy::~ConfigWidgetProxy() @@ -66,8 +66,8 @@ void ConfigWidgetProxy::slotConfigWidget( KDialogBase * dlg ) ++it; } - connect( dlg, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT( slotAboutToShowPage(TQWidget*)) ); - connect( dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotConfigWidgetDestroyed()) ); + connect( dlg, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT( slotAboutToShowPage(TQWidget*)) ); + connect( dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotConfigWidgetDestroyed()) ); } void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg ) @@ -79,8 +79,8 @@ void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg ) ++it; } - connect( dlg, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT( slotAboutToShowPage(TQWidget*)) ); - connect( dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotConfigWidgetDestroyed()) ); + connect( dlg, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT( slotAboutToShowPage(TQWidget*)) ); + connect( dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotConfigWidgetDestroyed()) ); } void ConfigWidgetProxy::slotConfigWidgetDestroyed( ) diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h index 34cadce9..ee9a3fb0 100644 --- a/lib/util/configwidgetproxy.h +++ b/lib/util/configwidgetproxy.h @@ -47,8 +47,8 @@ A typical case looks like this: _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createGlobalConfigPage( i18n("My Part"), GLOBALDOC_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("My Part"), PROJECTDOC_OPTIONS, info()->icon() ); -connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )) ); +connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )) ); ... ... @@ -57,10 +57,10 @@ void MyPart::insertConfigWidget( TQObject const * dlg, TQWidget * page, unsigned { if ( pagenumber == PROJECTDOC_OPTIONS ) { MyPartGlobalSettings * w = new MyPartGlobalSettings( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } else if ( pagenumber == PROJECTDOC_OPTIONS ) { MyPartProjectSettings * w = new MyPartProjectSettings( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } } @endcode diff --git a/lib/util/domutil.cpp b/lib/util/domutil.cpp index 43f8d95a..7027bcfd 100644 --- a/lib/util/domutil.cpp +++ b/lib/util/domutil.cpp @@ -226,7 +226,7 @@ DomPath DomUtil::resolvPathStringExt(const TQString pathstring) DomPath dompath; for (i=0; i<pathParts.count(); i++) { - TQStringList pathElemParts = TQStringList::split('|',pathParts[i],TRUE); + TQStringList pathElemParts = TQStringList::split('|',pathParts[i],true); DomPathElement dompathelem; dompathelem.tagName = pathElemParts[0].simplifyWhiteSpace(); if (pathElemParts.count()>1) diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index 0e617762..0f6c7387 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -19,7 +19,7 @@ #include "execcommand.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <kprogress.h> #include <tdelocale.h> #include <tdemessagebox.h> @@ -39,12 +39,12 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, *proc << executable; *proc << args; - connect( proc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processExited()) ); - connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedStdout(TDEProcess*,char*,int)) ); - connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedStderr(TDEProcess*,char*,int)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processExited()) ); + connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedStdout(TDEProcess*,char*,int)) ); + connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedStderr(TDEProcess*,char*,int)) ); bool ok = proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); @@ -58,8 +58,8 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, } else { progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."), i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false ); - connect( progressDlg, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(cancelClicked()) ); + connect( progressDlg, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(cancelClicked()) ); } } diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp index bb2cb7c6..f5c0e556 100644 --- a/lib/util/filetemplate.cpp +++ b/lib/util/filetemplate.cpp @@ -25,7 +25,7 @@ #include <tqregexp.h> #include <tqtextstream.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kdevplugin.h" #include "kdevproject.h" diff --git a/lib/util/kdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp index b0b78250..db095e55 100644 --- a/lib/util/kdevjobtimer.cpp +++ b/lib/util/kdevjobtimer.cpp @@ -15,7 +15,7 @@ KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name) : TQTimer(parent, name) { m_payload = payload; - connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) ); + connect( this, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()) ); } KDevJobTimer::~KDevJobTimer() @@ -26,7 +26,7 @@ void KDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member { KDevJobTimer * p = new KDevJobTimer( payload ); p->start( msec, true ); - connect( p, TQT_SIGNAL(timeout(void*)), receiver, member ); + connect( p, TQ_SIGNAL(timeout(void*)), receiver, member ); } void KDevJobTimer::slotTimeout() diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp index c7ee9139..8cf5e265 100644 --- a/lib/util/kdevshellwidget.cpp +++ b/lib/util/kdevshellwidget.cpp @@ -16,7 +16,7 @@ #include <tdeparts/part.h> #include <klibloader.h> #include <kde_terminal_interface.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "kdevshellwidget.h" @@ -41,12 +41,12 @@ void KDevShellWidget::activate( ) KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart"); if ( !factory ) return; - m_konsolePart = (KParts::ReadOnlyPart *) factory->create( TQT_TQOBJECT(this), "libkonsolepart", "KParts::ReadOnlyPart" ); + m_konsolePart = (KParts::ReadOnlyPart *) factory->create( this, "libkonsolepart", "KParts::ReadOnlyPart" ); if ( !m_konsolePart ) return; - connect( m_konsolePart, TQT_SIGNAL( processExited(TDEProcess *) ), this, TQT_SLOT( processExited(TDEProcess *) ) ); - connect( m_konsolePart, TQT_SIGNAL( receivedData( const TQString& ) ), this, TQT_SIGNAL( receivedData( const TQString& ) ) ); - connect( m_konsolePart, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed()) ); + connect( m_konsolePart, TQ_SIGNAL( processExited(TDEProcess *) ), this, TQ_SLOT( processExited(TDEProcess *) ) ); + connect( m_konsolePart, TQ_SIGNAL( receivedData( const TQString& ) ), this, TQ_SIGNAL( receivedData( const TQString& ) ) ); + connect( m_konsolePart, TQ_SIGNAL(destroyed()), this, TQ_SLOT(partDestroyed()) ); m_konsolePart->widget()->setFocusPolicy( TQWidget::WheelFocus ); setFocusProxy( m_konsolePart->widget() ); @@ -109,7 +109,7 @@ void KDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate ) // reactivating with a non-working setting (the partDestroyed() // slot will have ran before m_doAutoActivate is set) if ( doAutoActivate ) - TQTimer::singleShot( 3000, this, TQT_SLOT(setAutoReactivateOnCloseDelayed()) ); + TQTimer::singleShot( 3000, this, TQ_SLOT(setAutoReactivateOnCloseDelayed()) ); else m_doAutoActivate = false; } diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp index 8673b58d..8206d4b5 100644 --- a/lib/util/settings.cpp +++ b/lib/util/settings.cpp @@ -11,7 +11,7 @@ #include <tdeconfig.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "settings.h" diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp index c4b44894..f67a289c 100644 --- a/lib/util/tdescriptactionmanager.cpp +++ b/lib/util/tdescriptactionmanager.cpp @@ -21,8 +21,8 @@ #include <tdeparts/part.h> #include <tdeparts/componentfactory.h> #include <tdeapplication.h> -#include <kdesktopfile.h> -#include <kstandarddirs.h> +#include <tdedesktopfile.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdemessagebox.h> @@ -40,9 +40,9 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter m_isValid = false; m_refs = 0; // Read the desktop file - if(KDesktopFile::isDesktopFile(scriptDesktopFile)) + if(TDEDesktopFile::isDesktopFile(scriptDesktopFile)) { - KDesktopFile desktop(scriptDesktopFile, true); + TDEDesktopFile desktop(scriptDesktopFile, true); TQFileInfo scriptPath(scriptDesktopFile); m_scriptFile = scriptPath.dirPath(true) + "/" + desktop.readEntry("X-TDE-ScriptName", ""); @@ -52,7 +52,7 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter TDETrader::OfferList offers = TDETrader::self()->query( "KScriptRunner/KScriptRunner", scriptTypeQuery ); if ( !offers.isEmpty() ) { - m_action = new TDEAction(m_scriptName, TDEShortcut(), this, TQT_SLOT(activate()), ac, "script"); + m_action = new TDEAction(m_scriptName, TDEShortcut(), this, TQ_SLOT(activate()), ac, "script"); m_isValid = true; m_timeout = new TQTimer(this); TQString icon = desktop.readIcon(); @@ -60,7 +60,7 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter if( !icon.isEmpty() ) m_action->setIcon(icon); m_action->setShortcutConfigurable(true); - connect( m_timeout, TQT_SIGNAL(timeout()), TQT_SLOT(cleanup()) ); + connect( m_timeout, TQ_SIGNAL(timeout()), TQ_SLOT(cleanup()) ); } } } @@ -91,7 +91,7 @@ void KScriptAction::activate( ) m_interface->setScript(m_scriptFile); else m_interface->setScript(m_scriptFile, m_scriptMethod); - connect(this, TQT_SIGNAL(done(KScriptClientInterface::Result, const TQVariant &)), this, TQT_SLOT(scriptFinished())); + connect(this, TQ_SIGNAL(done(KScriptClientInterface::Result, const TQVariant &)), this, TQ_SLOT(scriptFinished())); } else { @@ -101,7 +101,7 @@ void KScriptAction::activate( ) } } m_interface->run(parent(), TQVariant()); - m_timeout->start(60000,FALSE); // after 1 minute unload + m_timeout->start(60000,false); // after 1 minute unload m_refs++; } @@ -136,7 +136,7 @@ TQPtrList< TDEAction > KScriptActionManager::scripts( TQObject * interface , con TQStringList scripts; scripts += TDEGlobal::dirs()->findAllResources("data", - TQString(kapp->name())+"/scripts/*.desktop", false, true ); + TQString(tdeApp->name())+"/scripts/*.desktop", false, true ); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { @@ -152,16 +152,16 @@ TQPtrList< TDEAction > KScriptActionManager::scripts( TQObject * interface , con { actions.append(script->action()); m_actions.append(script); - connect(script, TQT_SIGNAL(error( const TQString&)), this, - TQT_SIGNAL(scriptError( const TQString&))); - connect(script, TQT_SIGNAL(warning( const TQString&)), this, - TQT_SIGNAL(scriptWarning( const TQString&))); - connect(script, TQT_SIGNAL(output( const TQString&)), this, - TQT_SIGNAL(scriptOutput( const TQString&))); - connect(script, TQT_SIGNAL(progress( int )), this, - TQT_SIGNAL(scriptProgress(int))); - connect(script, TQT_SIGNAL(done( KScriptClientInterface::Result, const TQVariant &)),this, - TQT_SIGNAL(scriptDone( KScriptClientInterface::Result, const TQVariant &))); + connect(script, TQ_SIGNAL(error( const TQString&)), this, + TQ_SIGNAL(scriptError( const TQString&))); + connect(script, TQ_SIGNAL(warning( const TQString&)), this, + TQ_SIGNAL(scriptWarning( const TQString&))); + connect(script, TQ_SIGNAL(output( const TQString&)), this, + TQ_SIGNAL(scriptOutput( const TQString&))); + connect(script, TQ_SIGNAL(progress( int )), this, + TQ_SIGNAL(scriptProgress(int))); + connect(script, TQ_SIGNAL(done( KScriptClientInterface::Result, const TQVariant &)),this, + TQ_SIGNAL(scriptDone( KScriptClientInterface::Result, const TQVariant &))); } else delete script; diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp index 7e643d66..87db2425 100644 --- a/lib/widgets/flagboxes.cpp +++ b/lib/widgets/flagboxes.cpp @@ -320,7 +320,7 @@ FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter, layout->addWidget(edit); details = new TQPushButton("...", this); details->setMaximumWidth(30); - connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPathDetails())); + connect(details, TQ_SIGNAL(clicked()), this, TQ_SLOT(showPathDetails())); layout->addWidget(details); } @@ -540,7 +540,7 @@ FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditC { details = new TQPushButton("...", this); details->setMaximumWidth(30); - connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showListDetails())); + connect(details, TQ_SIGNAL(clicked()), this, TQ_SLOT(showListDetails())); layout->addWidget(details); } diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index a8520e30..dca4ac56 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -5,7 +5,7 @@ #include <kxmlguiclient.h> #include <tdeaction.h> #include <kstdaction.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdepopupmenu.h> #include <kiconloader.h> @@ -24,54 +24,54 @@ KDevHTMLPart::KDevHTMLPart() { setXMLFile(locate("data", "tdevelop/kdevhtml_partui.rc"), true); - connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)), - this, TQT_SLOT(openURLRequest(const KURL &)) ); + connect(browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)), + this, TQ_SLOT(openURLRequest(const KURL &)) ); - connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* ))); - connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); - connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &))); + connect(this, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(slotStarted(TDEIO::Job* ))); + connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted())); + connect(this, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotCancelled(const TQString &))); TDEActionCollection * actions = actionCollection();// new TDEActionCollection( this ); reloadAction = new TDEAction( i18n( "Reload" ), "reload", 0, - this, TQT_SLOT( slotReload() ), actions, "doc_reload" ); + this, TQ_SLOT( slotReload() ), actions, "doc_reload" ); reloadAction->setWhatsThis(i18n("<b>Reload</b><p>Reloads the current document.")); stopAction = new TDEAction( i18n( "Stop" ), "process-stop", 0, - this, TQT_SLOT( slotStop() ), actions, "doc_stop" ); + this, TQ_SLOT( slotStop() ), actions, "doc_stop" ); stopAction->setWhatsThis(i18n("<b>Stop</b><p>Stops the loading of current document.")); duplicateAction = new TDEAction( i18n( "Duplicate Tab" ), "window-new", 0, - this, TQT_SLOT( slotDuplicate() ), actions, "doc_dup" ); + this, TQ_SLOT( slotDuplicate() ), actions, "doc_dup" ); duplicateAction->setWhatsThis(i18n("<b>Duplicate window</b><p>Opens current document in a new window.")); - printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actions, "print_doc"); - copyAction = KStdAction::copy(this, TQT_SLOT(slotCopy()), actions, "copy_doc_selection"); + printAction = KStdAction::print(this, TQ_SLOT(slotPrint()), actions, "print_doc"); + copyAction = KStdAction::copy(this, TQ_SLOT(slotCopy()), actions, "copy_doc_selection"); - connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(popup(const TQString &, const TQPoint &))); - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect( this, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(popup(const TQString &, const TQPoint &))); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); //BEGIN documentation history stuff m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, - this, TQT_SLOT(slotBack()), + this, TQ_SLOT(slotBack()), actions, "browser_back"); m_backAction->setEnabled( false ); m_backAction->setToolTip(i18n("Back")); m_backAction->setWhatsThis(i18n("<b>Back</b><p>Moves backwards one step in the <b>documentation</b> browsing history.")); - connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotBackAboutToShow())); - connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPopupActivated(int))); + connect(m_backAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotBackAboutToShow())); + connect(m_backAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, - this, TQT_SLOT(slotForward()), + this, TQ_SLOT(slotForward()), actions, "browser_forward"); m_forwardAction->setEnabled( false ); m_forwardAction->setToolTip(i18n("Forward")); m_forwardAction->setWhatsThis(i18n("<b>Forward</b><p>Moves forward one step in the <b>documentation</b> browsing history.")); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotForwardAboutToShow())); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPopupActivated(int))); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotForwardAboutToShow())); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); m_restoring = false; m_Current = m_history.end(); @@ -479,9 +479,9 @@ void KDevHTMLPart::slotCopy( ) TQString text = selectedText(); text.replace( TQChar( 0xa0 ), ' ' ); TQClipboard *cb = TQApplication::clipboard(); - disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); + disconnect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) ); cb->setText(text); - connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); + connect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) ); } void KDevHTMLPart::slotSelectionChanged( ) diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp index 75682116..7a9ed47b 100644 --- a/lib/widgets/kdevtabwidget.cpp +++ b/lib/widgets/kdevtabwidget.cpp @@ -22,8 +22,8 @@ KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(p { m_pTabBar = new KTabBar(this, "tabbar"); setTabBar(m_pTabBar); - connect(m_pTabBar, TQT_SIGNAL(closeWindow(const TQWidget*)), this, TQT_SIGNAL(closeWindow(const TQWidget*))); - connect(m_pTabBar, TQT_SIGNAL(closeOthers(TQWidget*)), this, TQT_SIGNAL(closeOthers(TQWidget*))); + connect(m_pTabBar, TQ_SIGNAL(closeWindow(const TQWidget*)), this, TQ_SIGNAL(closeWindow(const TQWidget*))); + connect(m_pTabBar, TQ_SIGNAL(closeOthers(TQWidget*)), this, TQ_SIGNAL(closeOthers(TQWidget*))); } KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name) @@ -34,8 +34,8 @@ KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name) if (closePixmap.isNull()) closePixmap = SmallIcon("window-close"); - m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, TQT_SLOT(closeWindowSlot())); - m_pPopupMenu->insertItem(i18n("Close &Others"), this, TQT_SLOT(closeOthersSlot())); + m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, TQ_SLOT(closeWindowSlot())); + m_pPopupMenu->insertItem(i18n("Close &Others"), this, TQ_SLOT(closeOthersSlot())); } void KTabBar::closeWindowSlot() diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp index 9690e8a4..a98ce92a 100644 --- a/lib/widgets/ksavealldialog.cpp +++ b/lib/widgets/ksavealldialog.cpp @@ -79,9 +79,9 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co ++it; } - connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) ); - connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(save()) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(saveNone()) ); + connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) ); + connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(save()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(saveNone()) ); } KSaveSelectDialog::~KSaveSelectDialog() {} @@ -159,9 +159,9 @@ KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent setButtonTip( User1, i18n("Lose all modifications") ); setButtonTip( Close, i18n("Cancels the action") ); - connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) ); - connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveAll()) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(revert()) ); + connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) ); + connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(saveAll()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(revert()) ); } KSaveAllDialog::~KSaveAllDialog() diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp index 113b206b..40ddf6c1 100644 --- a/lib/widgets/processlinemaker.cpp +++ b/lib/widgets/processlinemaker.cpp @@ -20,7 +20,7 @@ #include "processlinemaker.h" #include "processlinemaker.moc" -#include <kprocess.h> +#include <tdeprocess.h> ProcessLineMaker::ProcessLineMaker() { @@ -28,11 +28,11 @@ ProcessLineMaker::ProcessLineMaker() ProcessLineMaker::ProcessLineMaker( const TDEProcess* proc ) { - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); } void ProcessLineMaker::slotReceivedStdout( const char *buffer ) diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index f3088c88..8e32c5df 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -24,7 +24,7 @@ #include <tqdir.h> #include <kdebug.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqpainter.h> #include <tqapplication.h> @@ -117,17 +117,17 @@ ProcessWidget::ProcessWidget(TQWidget *parent, const char *name) procLineMaker = new ProcessLineMaker( childproc ); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - this, TQT_SLOT(insertStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - this, TQT_SLOT(insertStderrLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - this, TQT_SLOT(addPartialStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - this, TQT_SLOT(addPartialStderrLine(const TQCString&) )); - - connect(childproc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*) )) ; + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + this, TQ_SLOT(insertStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + this, TQ_SLOT(insertStderrLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + this, TQ_SLOT(addPartialStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + this, TQ_SLOT(addPartialStderrLine(const TQCString&) )); + + connect(childproc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*) )) ; } diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h index a80f3deb..d1c7676a 100644 --- a/lib/widgets/processwidget.h +++ b/lib/widgets/processwidget.h @@ -21,7 +21,7 @@ #define _PROCESSWIDGET_H_ #include <tdelistbox.h> -#include <kprocess.h> +#include <tdeprocess.h> /** @file processwidget.h diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp index 6e9c06b7..951fad34 100644 --- a/lib/widgets/propeditor/pcheckbox.cpp +++ b/lib/widgets/propeditor/pcheckbox.cpp @@ -39,7 +39,7 @@ PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); } TQVariant PCheckBox::value() const @@ -49,9 +49,9 @@ TQVariant PCheckBox::value() const void PCheckBox::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + disconnect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); m_edit->setChecked(value.toBool()); - connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp index 4b6ae5c4..9c42f4a6 100644 --- a/lib/widgets/propeditor/pcolorbutton.cpp +++ b/lib/widgets/propeditor/pcolorbutton.cpp @@ -39,10 +39,10 @@ PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT m_edit = new KColorButton(this); - connect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&))); + connect(m_edit, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updateProperty(const TQColor&))); #else m_edit = new TQPushButton(this); - connect(m_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeColor())); + connect(m_edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeColor())); #endif m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); @@ -78,9 +78,9 @@ void PColorButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect void PColorButton::setValue(const TQVariant& value, bool emitChange) { #ifndef PURE_QT - disconnect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&))); + disconnect(m_edit, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updateProperty(const TQColor&))); m_edit->setColor(value.toColor()); - connect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&))); + connect(m_edit, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updateProperty(const TQColor&))); #else m_color = value.toColor(); m_edit->setText(m_color.name()); diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp index 23c61f46..78fd9dc3 100644 --- a/lib/widgets/propeditor/pcolorcombo.cpp +++ b/lib/widgets/propeditor/pcolorcombo.cpp @@ -34,7 +34,7 @@ PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char * m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); } TQVariant PColorCombo::value() const @@ -44,9 +44,9 @@ TQVariant PColorCombo::value() const void PColorCombo::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setColor(value.toColor()); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp index a0749744..ca42cda6 100644 --- a/lib/widgets/propeditor/pcombobox.cpp +++ b/lib/widgets/propeditor/pcombobox.cpp @@ -45,7 +45,7 @@ void PComboBox::init(bool rw) fillBox(); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); } void PComboBox::fillBox() @@ -68,9 +68,9 @@ void PComboBox::setValue(const TQVariant &value, bool emitChange) { if (!value.isNull()) { - disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setCurrentText(findDescription(value)); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp index 113ec325..563552c3 100644 --- a/lib/widgets/propeditor/pdateedit.cpp +++ b/lib/widgets/propeditor/pdateedit.cpp @@ -33,7 +33,7 @@ PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(updateProperty(const TQDate&))); } TQVariant PDateEdit::value() const @@ -51,9 +51,9 @@ void PDateEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r void PDateEdit::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(updateProperty(const TQDate&))); m_edit->setDate(value.toDate()); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(updateProperty(const TQDate&))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp index 55a0bdcc..8f4c03d3 100644 --- a/lib/widgets/propeditor/pdatetimeedit.cpp +++ b/lib/widgets/propeditor/pdatetimeedit.cpp @@ -32,7 +32,7 @@ PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const ch m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(updateProperty(const TQDateTime&))); } TQVariant PDateTimeEdit::value() const @@ -50,9 +50,9 @@ void PDateTimeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRec void PDateTimeEdit::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(updateProperty(const TQDateTime&))); m_edit->setDateTime(value.toDateTime()); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(updateProperty(const TQDateTime&))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp index 99b0151e..b244935f 100644 --- a/lib/widgets/propeditor/pdoublenuminput.cpp +++ b/lib/widgets/propeditor/pdoublenuminput.cpp @@ -38,10 +38,10 @@ PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, cons #ifndef PURE_QT m_edit = new KDoubleNumInput(-999999.0, 999999.0, 0.0, 0.01, 2, this); m_edit->setLabel(TQString()); - connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); + connect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(updateProperty(double))); #else m_edit = new TQFloatInput(-999999, 999999, 0.01, 2, this ); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); #endif m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); /* m_edit->setMinValue(-999999999); @@ -59,13 +59,13 @@ TQVariant PDoubleNumInput::value() const void PDoubleNumInput::setValue(const TQVariant &value, bool emitChange) { #ifndef PURE_QT - disconnect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(updateProperty(double))); m_edit->setValue(value.toDouble()); - connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); + connect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(updateProperty(double))); #else - disconnect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setValue(int(value.toDouble()*pow(m_edit->digits(),10))); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); #endif if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp index 8932c4ae..7044e6c1 100644 --- a/lib/widgets/propeditor/pfontbutton.cpp +++ b/lib/widgets/propeditor/pfontbutton.cpp @@ -44,7 +44,7 @@ PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char* #endif l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(updateProperty(const TQFont& ))); + connect(m_edit, TQ_SIGNAL(fontSelected(const TQFont& )), this, TQ_SLOT(updateProperty(const TQFont& ))); } TQVariant PFontButton::value() const @@ -66,9 +66,9 @@ void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& void PFontButton::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(fontSelected(const TQFont&)), this, TQT_SLOT(updateProperty(const TQFont&))); + disconnect(m_edit, TQ_SIGNAL(fontSelected(const TQFont&)), this, TQ_SLOT(updateProperty(const TQFont&))); m_edit->setFont(value.toFont()); - connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(updateProperty(const TQFont& ))); + connect(m_edit, TQ_SIGNAL(fontSelected(const TQFont& )), this, TQ_SLOT(updateProperty(const TQFont& ))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp index cb8a80b2..224e4bd0 100644 --- a/lib/widgets/propeditor/pfontcombo.cpp +++ b/lib/widgets/propeditor/pfontcombo.cpp @@ -46,9 +46,9 @@ PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *na #ifdef PURE_QT TQFontDatabase fonts; m_edit->insertStringList(fonts.families()); - connect(m_edit, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(updateProperty(const TQString&))); #else - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); #endif } @@ -63,13 +63,13 @@ TQVariant PFontCombo::value() const void PFontCombo::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); #ifndef PURE_QT m_edit->setCurrentFont(value.toString()); #else m_edit->setCurrentText(value.toString()); #endif - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp index f5e1ecb0..c27a6b74 100644 --- a/lib/widgets/propeditor/plineedit.cpp +++ b/lib/widgets/propeditor/plineedit.cpp @@ -32,7 +32,7 @@ PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); } TQVariant PLineEdit::value() const @@ -42,9 +42,9 @@ TQVariant PLineEdit::value() const void PLineEdit::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); m_edit->setText(value.toString()); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp index 996b1d0e..baa6224b 100644 --- a/lib/widgets/propeditor/plinestyleedit.cpp +++ b/lib/widgets/propeditor/plinestyleedit.cpp @@ -140,7 +140,7 @@ PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const m_edit->insertItem(TQPixmap(dashdot)); m_edit->insertItem(TQPixmap(dashdotdot)); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); } TQVariant PLineStyleEdit::value() const @@ -186,9 +186,9 @@ void PLineStyleEdit::setValue(const TQVariant& value, bool emitChange) return; if ((value.toInt() > 5) || (value.toInt() < 0)) return; - disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setCurrentItem(value.toInt()); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp index 3241f892..0026ec31 100644 --- a/lib/widgets/propeditor/ppixmapedit.cpp +++ b/lib/widgets/propeditor/ppixmapedit.cpp @@ -61,7 +61,7 @@ PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* m_popup->hide(); - connect(m_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateProperty())); + connect(m_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateProperty())); } TQVariant PPixmapEdit::value() const diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp index 987bb31b..0185b2e4 100644 --- a/lib/widgets/propeditor/propertyeditor.cpp +++ b/lib/widgets/propeditor/propertyeditor.cpp @@ -177,10 +177,10 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) header()->setClickEnabled(false); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(updateEditorSize())); - connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(slotClicked(TQListViewItem*))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(updateEditorSize())); + connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(slotClicked(TQListViewItem*))); m_currentEditItem = 0; m_doubleClickForEdit = true; @@ -199,7 +199,7 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) m_undoButton->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); m_undoButton->resize(m_undoButton->height(), m_undoButton->height()); m_undoButton->hide(); - connect(m_undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo())); + connect(m_undoButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(undo())); m_currentEditLayout = new TQGridLayout(m_currentEditArea, 1, 2, 0, 0); // m_currentEditLayout->addWidget(m_undoButton, 0, 1); } @@ -214,7 +214,7 @@ void PropertyEditor::populateProperties(PropertyList *list) if (list == 0) return; m_list = list; - connect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*))); + connect(m_list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(propertyValueChanged(Property*))); const TQValueList<TQPair<TQString, TQValueList<TQString> > >& groups = m_list->propertiesOfGroup(); for (TQValueList<TQPair<TQString, TQValueList<TQString> > >::const_iterator it = groups.begin(); it != groups.end(); ++it) @@ -288,7 +288,7 @@ void PropertyEditor::clearProperties() hideEditor(); - disconnect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*))); + disconnect(m_list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(propertyValueChanged(Property*))); clear(); delete m_list; m_list = 0; @@ -445,8 +445,8 @@ Machine *PropertyEditor::machine(MultiProperty *property) if (m_registeredForType[name] == 0) { m_registeredForType[name] = PropertyMachineFactory::getInstance()->machineForProperty(property); - connect(m_registeredForType[name]->propertyEditor, TQT_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)), - this, TQT_SLOT(propertyChanged(MultiProperty*, const TQVariant&))); + connect(m_registeredForType[name]->propertyEditor, TQ_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)), + this, TQ_SLOT(propertyChanged(MultiProperty*, const TQVariant&))); m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->childrenRect().topLeft()); m_registeredForType[name]->propertyEditor->hide(); } diff --git a/lib/widgets/propeditor/propertylist.cpp b/lib/widgets/propeditor/propertylist.cpp index a5b43a3f..6ef367c2 100644 --- a/lib/widgets/propeditor/propertylist.cpp +++ b/lib/widgets/propeditor/propertylist.cpp @@ -327,7 +327,7 @@ void PropertyBuffer::intersect(const PropertyList *list) // tqWarning("intersect:: removing %s from intersection", it.key().ascii()); removeProperty(it.key()); } - connect(list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(intersectedValueChanged(Property*))); + connect(list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(intersectedValueChanged(Property*))); } void PropertyBuffer::intersectedValueChanged(Property *property) @@ -359,7 +359,7 @@ PropertyBuffer::PropertyBuffer(PropertyList *list) addToGroup(list->m_groupOfProperty[it.data()], mp); m_list[it.key()] = mp; } - connect(list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(intersectedValueChanged(Property*))); + connect(list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(intersectedValueChanged(Property*))); } } diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp index 755041c1..cb15bebb 100644 --- a/lib/widgets/propeditor/pspinbox.cpp +++ b/lib/widgets/propeditor/pspinbox.cpp @@ -34,7 +34,7 @@ PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name) m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); } PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *parent, const char *name) @@ -44,7 +44,7 @@ PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step m_edit = new TQSpinBox(minValue, maxValue, step, this); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); } TQVariant PSpinBox::value() const @@ -54,9 +54,9 @@ TQVariant PSpinBox::value() const void PSpinBox::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setValue(value.toInt()); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp index b6f4b74e..9f2e1364 100644 --- a/lib/widgets/propeditor/pstringlistedit.cpp +++ b/lib/widgets/propeditor/pstringlistedit.cpp @@ -49,7 +49,7 @@ PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, cons pbSelect->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); l->addWidget(pbSelect); - connect(pbSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor())); + connect(pbSelect, TQ_SIGNAL(clicked()), this, TQ_SLOT(showEditor())); } TQVariant PStringListEdit::value() const @@ -87,8 +87,8 @@ void PStringListEdit::showEditor() #endif TQSpacerItem *si = new TQSpacerItem(30, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding); - connect(pbOk, TQT_SIGNAL(clicked()), dia, TQT_SLOT(accept())); - connect(pbCancel, TQT_SIGNAL(clicked()), dia, TQT_SLOT(reject())); + connect(pbOk, TQ_SIGNAL(clicked()), dia, TQ_SLOT(accept())); + connect(pbCancel, TQ_SIGNAL(clicked()), dia, TQ_SLOT(reject())); dh->addItem(si); dh->addWidget(pbOk); diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp index ee91ea48..7b7afec1 100644 --- a/lib/widgets/propeditor/psymbolcombo.cpp +++ b/lib/widgets/propeditor/psymbolcombo.cpp @@ -51,8 +51,8 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char m_select->hide(); #endif - connect(m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectChar())); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_select, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectChar())); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); } TQVariant PSymbolCombo::value() const @@ -67,9 +67,9 @@ void PSymbolCombo::setValue(const TQVariant &value, bool emitChange) { if (!(value.isNull())) { - disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); m_edit->setText(TQChar(value.toInt())); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); if (emitChange) emit propertyChanged(m_property, value); } @@ -89,8 +89,8 @@ void PSymbolCombo::selectChar() KPushButton *pbCancel = new KPushButton(KStdGuiItem::cancel(), dia); TQSpacerItem *si = new TQSpacerItem(30, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding); - connect(pbOk, TQT_SIGNAL(clicked()), dia, TQT_SLOT(accept())); - connect(pbCancel, TQT_SIGNAL(clicked()), dia, TQT_SLOT(reject())); + connect(pbOk, TQ_SIGNAL(clicked()), dia, TQ_SLOT(accept())); + connect(pbCancel, TQ_SIGNAL(clicked()), dia, TQ_SLOT(reject())); dh->addItem(si); dh->addWidget(pbOk); diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp index 047c9997..d2df31e0 100644 --- a/lib/widgets/propeditor/purledit.cpp +++ b/lib/widgets/propeditor/purledit.cpp @@ -38,14 +38,14 @@ PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const c m_edit = new KURLRequester(this); l->addWidget(m_edit); m_edit->setMode((KFile::Mode)mode); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); #else m_edit = new KLineEdit(this); m_select = new TQPushButton("...",this); l->addWidget(m_edit); l->addWidget(m_select); m_mode = mode; - connect( m_select, TQT_SIGNAL(clicked()),this,TQT_SLOT(select())); + connect( m_select, TQ_SIGNAL(clicked()),this,TQ_SLOT(select())); #endif m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } @@ -62,9 +62,9 @@ TQVariant PUrlEdit::value() const void PUrlEdit::setValue(const TQVariant& value, bool emitChange) { #ifndef PURE_QT - disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); m_edit->setURL(value.toString()); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); #else m_edit->setText(value.toString()); #endif diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp index dae82868..2d4bfb57 100644 --- a/lib/widgets/propeditor/pyesnobutton.cpp +++ b/lib/widgets/propeditor/pyesnobutton.cpp @@ -40,7 +40,7 @@ PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); } TQVariant PYesNoButton::value() const @@ -55,10 +55,10 @@ void PYesNoButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect void PYesNoButton::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + disconnect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); m_edit->setDown(value.toBool()); value.toBool() ? m_edit->setText(i18n("Yes")) : m_edit->setText(i18n("No")); - connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp index 683a0931..862de024 100644 --- a/lib/widgets/propeditor/qeditlistbox.cpp +++ b/lib/widgets/propeditor/qeditlistbox.cpp @@ -120,7 +120,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons, if ( buttons & Add ) { servNewButton = new TQPushButton(i18n("&Add"), gb); servNewButton->setEnabled(false); - connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); + connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addItem())); grid->addWidget(servNewButton, row++, 1); } @@ -128,7 +128,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons, if ( buttons & Remove ) { servRemoveButton = new TQPushButton(i18n("&Remove"), gb); servRemoveButton->setEnabled(false); - connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); + connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem())); grid->addWidget(servRemoveButton, row++, 1); } @@ -136,20 +136,20 @@ void QEditListBox::init( bool checkAtEntering, int buttons, if ( buttons & UpDown ) { servUpButton = new TQPushButton(i18n("Move &Up"), gb); servUpButton->setEnabled(false); - connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemUp())); + connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemUp())); servDownButton = new TQPushButton(i18n("Move &Down"), gb); servDownButton->setEnabled(false); - connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemDown())); + connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemDown())); grid->addWidget(servUpButton, row++, 1); grid->addWidget(servDownButton, row++, 1); } - connect(m_lineEdit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(typedSomething(const TQString&))); + connect(m_lineEdit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(typedSomething(const TQString&))); - connect(m_lineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addItem())); - connect(m_listBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int))); + connect(m_lineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addItem())); + connect(m_listBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int))); // maybe supplied lineedit has some text already typedSomething( m_lineEdit->text() ); diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index c54f425c..1f5c6aa3 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -26,7 +26,7 @@ #include "tqapplication.h" #include "tqlineedit.h" #include "tqbitmap.h" -#include "tqeffects_p.h" +#include "private/tqeffects_p.h" #include "tqstringlist.h" #include "tqcombobox.h" #include "tqstyle.h" @@ -38,7 +38,7 @@ class QComboViewData public: QComboViewData( QComboView *cb ): current(0), lView( 0 ), combo( cb ) { - duplicatesEnabled = TRUE; + duplicatesEnabled = true; cb->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); } @@ -46,7 +46,7 @@ public: void updateLinedGeometry(); void setListView( TQListView *l ) { lView = l ; - l->setMouseTracking( TRUE );} + l->setMouseTracking( true );} TQListViewItem *current; int maxCount; @@ -130,7 +130,7 @@ static inline bool checkIndex( const char *method, const char * name, Constructs a combobox with a maximum size and either Motif 2.0 or Windows look and feel. - The input field can be edited if \a rw is TRUE, otherwise the user + The input field can be edited if \a rw is true, otherwise the user may only choose one of the items in the combobox. The \a parent and \a name arguments are passed on to the TQWidget @@ -148,14 +148,14 @@ QComboView::QComboView( bool rw, TQWidget *parent, const char *name ) d->maxCount = INT_MAX; setSizeLimit(10); d->p = AtBottom; - d->autoresize = FALSE; - d->poppedUp = FALSE; - d->arrowDown = FALSE; - d->discardNextMousePress = FALSE; - d->shortClick = FALSE; - d->useCompletion = FALSE; + d->autoresize = false; + d->poppedUp = false; + d->arrowDown = false; + d->discardNextMousePress = false; + d->shortClick = false; + d->useCompletion = false; d->completeAt = 0; - d->completeNow = FALSE; + d->completeNow = false; d->completionTimer = new TQTimer( this ); setFocusPolicy( TQWidget::StrongFocus ); @@ -315,7 +315,7 @@ void QComboView::internalActivate( TQListViewItem * item ) return; } popDownListView(); - d->poppedUp = FALSE; + d->poppedUp = false; d->current = item; @@ -361,7 +361,7 @@ void QComboView::internalHighlight( TQListViewItem * item ) */ void QComboView::internalClickTimeout() { - d->shortClick = FALSE; + d->shortClick = false; } /*! @@ -422,7 +422,7 @@ void QComboView::paintEvent( TQPaintEvent * ) flags |= TQStyle::Style_HasFocus; if ( width() < 5 || height() < 5 ) { - qDrawShadePanel( &p, rect(), g, FALSE, 2, + qDrawShadePanel( &p, rect(), g, false, 2, &g.brush( TQColorGroup::Button ) ); return; } @@ -457,7 +457,7 @@ void QComboView::paintEvent( TQPaintEvent * ) ( re.height() - pix->height() ) / 2, *pix ); } } - p.setClipping( FALSE ); + p.setClipping( false ); } @@ -469,7 +469,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e ) if ( e->button() != TQt::LeftButton ) return; if ( d->discardNextMousePress ) { - d->discardNextMousePress = FALSE; + d->discardNextMousePress = false; return; } TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, @@ -481,18 +481,18 @@ void QComboView::mousePressEvent( TQMouseEvent *e ) arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); if ( childCount() && ( !editable() || arrowRect.contains( e->pos() ) ) ) { - d->arrowPressed = FALSE; - listView()->blockSignals( TRUE ); + d->arrowPressed = false; + listView()->blockSignals( true ); tqApp->sendEvent( listView(), e ); // trigger the listbox's autoscroll - listView()->blockSignals( FALSE ); + listView()->blockSignals( false ); popup(); if ( arrowRect.contains( e->pos() ) ) { - d->arrowPressed = TRUE; - d->arrowDown = TRUE; - repaint( FALSE ); + d->arrowPressed = true; + d->arrowDown = true; + repaint( false ); } - TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout())); - d->shortClick = TRUE; + TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout())); + d->shortClick = true; } } @@ -585,7 +585,7 @@ void QComboView::keyPressEvent( TQKeyEvent *e ) else return; } - d->completionTimer->start( 400, TRUE ); + d->completionTimer->start( 400, true ); } else { e->ignore(); return; @@ -613,7 +613,7 @@ TQString QComboView::currentText() const void QComboView::focusInEvent( TQFocusEvent * e ) { TQWidget::focusInEvent( e ); - d->completeNow = FALSE; + d->completeNow = false; d->completeAt = 0; emit focusGranted(); @@ -625,7 +625,7 @@ void QComboView::focusInEvent( TQFocusEvent * e ) void QComboView::focusOutEvent( TQFocusEvent * e ) { TQWidget::focusOutEvent( e ); - d->completeNow = FALSE; + d->completeNow = false; d->completeAt = 0; emit focusLost(); @@ -726,7 +726,7 @@ void QComboView::popup() lb->triggerUpdate( ); lb->installEventFilter( this ); lb->viewport()->installEventFilter( this ); - d->mouseWasInsidePopup = FALSE; + d->mouseWasInsidePopup = false; // int w = lb->variableWidth() ? lb->sizeHint().width() : width(); int w = width(); int h = listHeight( lb, d->sizeLimit ); @@ -758,12 +758,12 @@ void QComboView::popup() lb->raise(); bool block = lb->signalsBlocked(); - lb->blockSignals( TRUE ); + lb->blockSignals( true ); TQListViewItem *currentLBItem = d->current ; lb->setCurrentItem( currentLBItem ); // set the current item to also be the selected item if it isn't already if ( currentLBItem && currentLBItem->isSelectable() && !currentLBItem->isSelected() ) - lb->setSelected( currentLBItem, TRUE ); + lb->setSelected( currentLBItem, true ); lb->blockSignals( block ); lb->setVScrollBarMode(TQScrollView::Auto); @@ -776,7 +776,7 @@ void QComboView::popup() } else*/ //#endif lb->show(); - d->poppedUp = TRUE; + d->poppedUp = true; } @@ -807,10 +807,10 @@ void QComboView::popDownListView() d->listView()->hide(); d->listView()->setCurrentItem( d->current ); if ( d->arrowDown ) { - d->arrowDown = FALSE; - repaint( FALSE ); + d->arrowDown = false; + repaint( false ); } - d->poppedUp = FALSE; + d->poppedUp = false; } @@ -849,16 +849,16 @@ void QComboView::currentChanged() bool QComboView::eventFilter( TQObject *object, TQEvent *event ) { if ( !event ) - return TRUE; + return true; else if ( object == d->ed ) { if ( event->type() == TQEvent::KeyPress ) { bool isAccepted = ( (TQKeyEvent*)event )->isAccepted(); keyPressEvent( (TQKeyEvent *)event ); if ( ((TQKeyEvent *)event)->isAccepted() ) { - d->completeNow = FALSE; - return TRUE; + d->completeNow = false; + return true; } else if ( ((TQKeyEvent *)event)->key() != Key_End ) { - d->completeNow = TRUE; + d->completeNow = true; d->completeAt = d->ed->cursorPosition(); } if ( isAccepted ) @@ -866,7 +866,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) else ( (TQKeyEvent*)event )->ignore(); } else if ( event->type() == TQEvent::KeyRelease ) { - d->completeNow = FALSE; + d->completeNow = false; keyReleaseEvent( (TQKeyEvent *)event ); return ((TQKeyEvent *)event)->isAccepted(); } else if ( event->type() == TQEvent::FocusIn ) { @@ -877,7 +877,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) if ( !d->ed->text().isNull() && d->ed->cursorPosition() > d->completeAt && d->ed->cursorPosition() == (int)d->ed->text().length() ) { - d->completeNow = FALSE; + d->completeNow = false; TQString ct( d->ed->text() ); TQListViewItem *i = completionIndex( ct, currentItem() ); if ( i ) { @@ -896,7 +896,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) // tqWarning("!d->mouseWasInsidePopup"); TQPoint pos = e->pos(); if ( d->listView()->rect().contains( pos ) ) - d->mouseWasInsidePopup = TRUE; + d->mouseWasInsidePopup = true; // Check if arrow button should toggle if ( d->arrowPressed ) { TQPoint comboPos; @@ -907,20 +907,20 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) arrowRect = TQStyle::visualRect(arrowRect, this); if ( arrowRect.contains( comboPos ) ) { if ( !d->arrowDown ) { - d->arrowDown = TRUE; - repaint( FALSE ); + d->arrowDown = true; + repaint( false ); } } else { if ( d->arrowDown ) { - d->arrowDown = FALSE; - repaint( FALSE ); + d->arrowDown = false; + repaint( false ); } } } } else if ((e->state() & ( TQt::RightButton | TQt::LeftButton | TQt::MidButton ) ) == 0 && style().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { // tqWarning("event filter:: emu"); - TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE ); + TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), true ); // if ( mouseW == d->listView()->viewport() ) { //### if ( mouseW == d->listView()->viewport() ) { TQListViewItem *sel = d->listView()->itemAt(e->pos()); @@ -929,7 +929,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) d->listView()->setCurrentItem(sel); d->listView()->setSelected(sel, true); } - return TRUE; + return true; } } @@ -940,15 +940,15 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) e->pos(), e->button(), e->state() ) ; // will hide popup TQApplication::sendEvent( object, &tmp ); - return TRUE; + return true; } else { if ( d->mouseWasInsidePopup ) { popDownListView(); } else { - d->arrowPressed = FALSE; + d->arrowPressed = false; if ( d->arrowDown ) { - d->arrowDown = FALSE; - repaint( FALSE ); + d->arrowDown = false; + repaint( false ); } } } @@ -957,12 +957,12 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) case TQEvent::MouseButtonPress: if ( !d->listView()->rect().contains( e->pos() ) ) { TQPoint globalPos = d->listView()->mapToGlobal(e->pos()); - if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) { - d->discardNextMousePress = TRUE; + if ( TQApplication::widgetAt( globalPos, true ) == this ) { + d->discardNextMousePress = true; // avoid popping up again } popDownListView(); - return TRUE; + return true; } break; case TQEvent::KeyPress: @@ -975,13 +975,13 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) case Key_Escape: if ( d->poppedUp ) { popDownListView(); - return TRUE; + return true; } break; case Key_Enter: case Key_Return: // work around TQDialog's enter handling - return FALSE; + return false; default: break; } @@ -1083,11 +1083,11 @@ void QComboView::returnPressed() return; TQListViewItem *c = 0; - bool doInsert = TRUE; + bool doInsert = true; if ( !d->duplicatesEnabled ) { c = listView()->findItem(s, 0); if ( c ) - doInsert = FALSE; + doInsert = false; } if ( doInsert ) { @@ -1211,7 +1211,7 @@ void QComboView::setListView( TQListView * newListView ) delete d->listView(); - newListView->reparent( this, WType_Popup, TQPoint(0,0), FALSE ); + newListView->reparent( this, WType_Popup, TQPoint(0,0), false ); d->setListView( newListView ); d->listView()->setFont( font() ); d->listView()->setPalette( palette() ); @@ -1241,16 +1241,16 @@ void QComboView::setListView( TQListView * newListView ) d->listView()->resize( 100, 10 ); */ - connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(internalActivate(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(internalActivate(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(checkState(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(internalHighlight(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(checkState(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(internalHighlight(TQListViewItem*))); } @@ -1320,7 +1320,7 @@ void QComboView::setEditText( const TQString &newText ) void QComboView::setAutoCompletion( bool enable ) { d->useCompletion = enable; - d->completeNow = FALSE; + d->completeNow = false; } @@ -1386,16 +1386,16 @@ void QComboView::setUpListView() d->listView()->header()->hide(); - connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(internalActivate(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(internalActivate(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(checkState(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(internalHighlight(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(checkState(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(internalHighlight(TQListViewItem*))); } @@ -1431,15 +1431,15 @@ void QComboView::setLineEdit( TQLineEdit *edit ) d->ed = edit; if ( edit->parent() != this ) { - edit->reparent( this, TQPoint(0,0), FALSE ); + edit->reparent( this, TQPoint(0,0), false ); edit->setFont( font() ); } - connect (edit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SIGNAL( textChanged( const TQString& ) ) ); - connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); + connect (edit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SIGNAL( textChanged( const TQString& ) ) ); + connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); - edit->setFrame( FALSE ); + edit->setFrame( false ); d->updateLinedGeometry(); edit->installEventFilter( this ); setFocusProxy( edit ); diff --git a/parts/abbrev/abbrevconfigwidgetbase.ui b/parts/abbrev/abbrevconfigwidgetbase.ui index fd04ec23..0597bd4c 100644 --- a/parts/abbrev/abbrevconfigwidgetbase.ui +++ b/parts/abbrev/abbrevconfigwidgetbase.ui @@ -179,12 +179,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">addTemplate()</slot> <slot access="protected">codeChanged()</slot> <slot access="protected">removeTemplate()</slot> <slot access="protected">selectionChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index 80d26599..2de7cfdb 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -23,7 +23,7 @@ #include <kdialogbase.h> #include <tdelocale.h> #include <tdeparts/part.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdevgenericfactory.h> #include <tdeaction.h> #include <tdeconfig.h> @@ -71,20 +71,20 @@ AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &) setInstance(AbbrevFactory::instance()); setXMLFile("kdevabbrev.rc"); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect(core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(configWidget(KDialogBase*))); + connect(core(), TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(configWidget(KDialogBase*))); TDEAction *action; action = new TDEAction( i18n("Expand Text"), CTRL + Key_J, - this, TQT_SLOT(slotExpandText()), + this, TQ_SLOT(slotExpandText()), actionCollection(), "edit_expandtext" ); action->setToolTip( i18n("Expand current word") ); action->setWhatsThis( i18n("<b>Expand current word</b><p>Current word can be completed using the list of similar words in source files.") ); action = new TDEAction( i18n("Expand Abbreviation"), CTRL + Key_L, - this, TQT_SLOT(slotExpandAbbrev()), + this, TQ_SLOT(slotExpandAbbrev()), actionCollection(), "edit_expandabbrev" ); action->setToolTip( i18n("Expand abbreviation") ); action->setWhatsThis( i18n("<b>Expand abbreviation</b><p>Enable and configure abbreviations in <b>TDevelop Settings</b>, <b>Abbreviations</b> tab.") ); @@ -140,14 +140,14 @@ void AbbrevPart::setAutoWordCompletionEnabled( bool enabled ) disconnect( docIface->widget(), 0, this, 0 ); if( m_autoWordCompletionEnabled ){ - connect( docIface->widget(), TQT_SIGNAL(completionAborted()), - this, TQT_SLOT(slotCompletionAborted()) ); - connect( docIface->widget(), TQT_SIGNAL(completionDone()), - this, TQT_SLOT(slotCompletionDone()) ); - connect( docIface->widget(), TQT_SIGNAL(aboutToShowCompletionBox()), - this, TQT_SLOT(slotAboutToShowCompletionBox()) ); - - connect( docIface, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( docIface->widget(), TQ_SIGNAL(completionAborted()), + this, TQ_SLOT(slotCompletionAborted()) ); + connect( docIface->widget(), TQ_SIGNAL(completionDone()), + this, TQ_SLOT(slotCompletionDone()) ); + connect( docIface->widget(), TQ_SIGNAL(aboutToShowCompletionBox()), + this, TQ_SLOT(slotAboutToShowCompletionBox()) ); + + connect( docIface, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); } } void AbbrevPart::load() @@ -243,7 +243,7 @@ void AbbrevPart::configWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Abbreviations"), i18n("Abbreviations"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); AbbrevConfigWidget *w = new AbbrevConfigWidget(this, vbox, "abbrev config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); } @@ -302,7 +302,7 @@ TQValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const TQStrin KTextEditor::CompletionEntry e; e.text = word; entries << e; - map[ word ] = TRUE; + map[ word ] = true; } idx = pos + len + 1; } @@ -317,7 +317,7 @@ TQValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const TQStrin KTextEditor::CompletionEntry e; e.text = word; entries << e; - map[ word ] = TRUE; + map[ word ] = true; } idx = pos + len + 1; } @@ -502,14 +502,14 @@ void AbbrevPart::slotActivePartChanged( KParts::Part* part ) disconnect( part->widget(), 0, this, 0 ); disconnect( doc, 0, this, 0 ); - connect( part->widget(), TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*, TQString*)), - this, TQT_SLOT(slotFilterInsertString(KTextEditor::CompletionEntry*, TQString*)) ); + connect( part->widget(), TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*, TQString*)), + this, TQ_SLOT(slotFilterInsertString(KTextEditor::CompletionEntry*, TQString*)) ); if( autoWordCompletionEnabled() ){ - connect( part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(slotCompletionAborted()) ); - connect( part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(slotCompletionDone()) ); - connect( part->widget(), TQT_SIGNAL(aboutToShowCompletionBox()), this, TQT_SLOT(slotAboutToShowCompletionBox()) ); - connect( doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(slotCompletionAborted()) ); + connect( part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(slotCompletionDone()) ); + connect( part->widget(), TQ_SIGNAL(aboutToShowCompletionBox()), this, TQ_SLOT(slotAboutToShowCompletionBox()) ); + connect( doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); } m_prevLine = -1; diff --git a/parts/abbrev/addtemplatedlg.cpp b/parts/abbrev/addtemplatedlg.cpp index a837c08a..b2c9a090 100644 --- a/parts/abbrev/addtemplatedlg.cpp +++ b/parts/abbrev/addtemplatedlg.cpp @@ -27,8 +27,8 @@ AddTemplateDialog::AddTemplateDialog( TQStringList suffixesList, TQWidget *paren { setFocusProxy( editTemplate ); comboSuffixes->insertStringList(suffixesList); - connect( editTemplate, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT( textChanged())); - connect( editDescription, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT( textChanged())); + connect( editTemplate, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT( textChanged())); + connect( editDescription, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT( textChanged())); buttonOk->setEnabled(false); } diff --git a/parts/abbrev/cpp_keywords b/parts/abbrev/cpp_keywords index 3badf3ba..19bd1a82 100644 --- a/parts/abbrev/cpp_keywords +++ b/parts/abbrev/cpp_keywords @@ -1,9 +1,9 @@ K_DCOP k_dcop -k_dcop_Q_SIGNALS +k_dcop_signals TQ_OBJECT -Q_SIGNALS -Q_SLOTS +signals +slots emit __int64 __asm__ diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 86373504..bbf3e6a5 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -41,8 +41,8 @@ #include <tdeglobalsettings.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <kiconloader.h> #include <tdefiledialog.h> @@ -80,7 +80,7 @@ #include "filetemplate.h" #include "settings.h" -#include "blockingkprocess.h" +#include "blockingtdeprocess.h" #include "profileengine.h" #include "profile.h" @@ -98,17 +98,17 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch m_customOptions = 0L; loadLicenses(); - connect( this, TQT_SIGNAL( selected( const TQString & ) ), this, TQT_SLOT( pageChanged() ) ); + connect( this, TQ_SIGNAL( selected( const TQString & ) ), this, TQ_SLOT( pageChanged() ) ); helpButton()->hide(); templates_listview->header()->hide(); templates_listview->setColumnWidthMode(0, TQListView::Maximum); //to provide horiz scrollbar. m_templatesMenu = new TDEPopupMenu(templates_listview); - m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, TQT_SLOT(addTemplateToFavourites())); + m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, TQ_SLOT(addTemplateToFavourites())); m_favouritesMenu = new TDEPopupMenu(favourites_iconview); - m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, TQT_SLOT(removeFavourite())); + m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, TQ_SLOT(removeFavourite())); m_pathIsValid=false; m_part = part; @@ -116,7 +116,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch m_appsInfo.setAutoDelete(true); m_tempFiles.setAutoDelete(true); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); //config->setGroup("AppWizard"); //templates_tabwidget->setCurrentPage(config->readNumEntry("CurrentTab", 0)); @@ -304,7 +304,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch // How about names like "__" or "123" for project name? Are they legal? TQRegExpValidator *appname_edit_validator; appname_edit_validator = new TQRegExpValidator (appname_regexp, - TQT_TQOBJECT(appname_edit), + appname_edit, "AppNameValidator"); appname_edit->setValidator(appname_edit_validator); @@ -319,7 +319,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch license_combo->setCurrentItem( idx - 1 ); } - connect( license_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(licenseChanged()) ); + connect( license_combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(licenseChanged()) ); m_custom_options_layout = new TQHBoxLayout( custom_options ); m_custom_options_layout->setAutoAdd(true); @@ -913,7 +913,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir) if(!dir.isEmpty()) { // set new location as default project dir? - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); TQDir defPrjDir( config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()) ); TQDir newDir (dir); @@ -1158,7 +1158,7 @@ void AppWizardDialog::removeFavourite() void AppWizardDialog::populateFavourites() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("AppWizard"); //favourites are stored in config as a list of templates and a seperate @@ -1204,7 +1204,7 @@ void AppWizardDialog::done(int r) } } - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("AppWizard"); config->writePathEntry("FavTemplates", templatesList); config->writeEntry("FavNames", iconNamesList); diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui index f9c22c2f..af51e997 100644 --- a/parts/appwizard/appwizarddlgbase.ui +++ b/parts/appwizard/appwizarddlgbase.ui @@ -634,7 +634,7 @@ <forward>class TQListViewItem;</forward> <forward>class TQIconViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected">licenseChanged()</slot> <slot access="protected">destButtonClicked( const TQString & )</slot> <slot access="protected">projectLocationChanged()</slot> @@ -645,7 +645,7 @@ <slot access="protected">templatesContextMenu( TQListViewItem *, const TQPoint &, int )</slot> <slot access="protected">favouritesContextMenu( TQIconViewItem *, const TQPoint & )</slot> <slot>showTemplates(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/appwizard/appwizardfactory.cpp b/parts/appwizard/appwizardfactory.cpp index 5288105d..e2c79aa3 100644 --- a/parts/appwizard/appwizardfactory.cpp +++ b/parts/appwizard/appwizardfactory.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdevplugininfo.h> #include "appwizardfactory.h" diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp index e1a9dbad..0741ef21 100644 --- a/parts/appwizard/appwizardpart.cpp +++ b/parts/appwizard/appwizardpart.cpp @@ -18,10 +18,10 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdevcore.h> #include <kgenericfactory.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaction.h> #include <tqmessagebox.h> @@ -43,7 +43,7 @@ AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringL TDEAction *action; action = new TDEAction( i18n("&New Project..."), "window-new", 0, - this, TQT_SLOT(slotNewProject()), + this, TQ_SLOT(slotNewProject()), actionCollection(), "project_new" ); action->setToolTip( i18n("Generate a new project from a template") ); action->setWhatsThis( i18n("<b>New project</b><p>" @@ -52,7 +52,7 @@ AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringL "application from a set of templates.") ); action = new TDEAction( i18n("&Import Existing Project..."),"wizard", 0, - this, TQT_SLOT(slotImportProject()), + this, TQ_SLOT(slotImportProject()), actionCollection(), "project_import" ); action->setToolTip( i18n("Import existing project") ); action->setWhatsThis( i18n("<b>Import existing project</b><p>Creates a project file for a given directory.") ); @@ -82,7 +82,7 @@ void AppWizardPart::slotImportProject() void AppWizardPart::openFilesAfterGeneration(const KURL::List urlsToOpen) { m_urlsToOpen = urlsToOpen; - connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( openFilesAfterGeneration() ) ); + connect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( openFilesAfterGeneration() ) ); } void AppWizardPart::openFilesAfterGeneration() @@ -90,7 +90,7 @@ void AppWizardPart::openFilesAfterGeneration() for (KURL::List::const_iterator it = m_urlsToOpen.begin(); it != m_urlsToOpen.end(); ++it) partController()->editDocument(*it); m_urlsToOpen.clear(); - disconnect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( openFilesAfterGeneration() ) ); + disconnect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( openFilesAfterGeneration() ) ); } #include "appwizardpart.moc" diff --git a/parts/appwizard/common/admin b/parts/appwizard/common/admin -Subproject 3bdc9fd55ff86f033cc1ffab9178d8453fa1ab2 +Subproject 4185112a621d8c5bc88984b117f434c9560e2cc diff --git a/parts/appwizard/common/gnome/macros/curses.m4 b/parts/appwizard/common/gnome/macros/curses.m4 index 3dd4ffaa..cbeb9edf 100644 --- a/parts/appwizard/common/gnome/macros/curses.m4 +++ b/parts/appwizard/common/gnome/macros/curses.m4 @@ -111,13 +111,6 @@ AC_DEFUN(AC_CHECK_CURSES,[ fi ]) - AC_ARG_WITH(osf1-curses, - [ --with-osf1-curses Used to force OSF/1 curses],[ - if test x$withval = xyes; then - AC_USE_OSF1_CURSES - fi - ]) - AC_ARG_WITH(vcurses, [ --with-vcurses[=incdir] Used to force SysV curses], if test x$withval != xyes; then @@ -164,17 +157,6 @@ AC_DEFUN(AC_USE_SUNOS_CURSES, [ AC_MSG_RESULT(Please note that some screen refreshs may fail) ]) -AC_DEFUN(AC_USE_OSF1_CURSES, [ - AC_MSG_RESULT(Using OSF1 curses) - search_ncurses=false - screen_manager="OSF1 curses" - AC_DEFINE(HAS_CURSES) - has_curses=true - AC_DEFINE(NO_COLOR_CURSES) - AC_DEFINE(USE_SYSV_CURSES) - CURSES_LIBS="-lcurses" -]) - AC_DEFUN(AC_USE_SYSV_CURSES, [ AC_MSG_RESULT(Using SysV curses) AC_DEFINE(HAS_CURSES) diff --git a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 index 7c11a785..86eaca65 100644 --- a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 +++ b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 @@ -28,9 +28,6 @@ if test x$cross_compiling = xyes ; then freebsd*) fu_cv_sys_stat_statfs2_bsize=yes ;; - osf*) - fu_cv_sys_stat_statfs3_osf1=yes - ;; esac fi @@ -111,25 +108,6 @@ fi fi if test -z "$list_mounted_fs"; then -# DEC Alpha running OSF/1. -AC_MSG_CHECKING([for getfsstat function]) -AC_CACHE_VAL(fu_cv_sys_mounted_getsstat, -[AC_TRY_LINK([ -#include <sys/types.h> -#include <sys/mount.h> -#include <sys/fs_types.h>], -[struct statfs *stats; -int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ], -fu_cv_sys_mounted_getsstat=yes, -fu_cv_sys_mounted_getsstat=no)]) -AC_MSG_RESULT($fu_cv_sys_mounted_getsstat) -if test $fu_cv_sys_mounted_getsstat = yes; then -list_mounted_fs=found -AC_DEFINE(MOUNTED_GETFSSTAT) -fi -fi - -if test -z "$list_mounted_fs"; then # AIX. AC_MSG_CHECKING([for mntctl function and struct vmount]) AC_CACHE_VAL(fu_cv_sys_mounted_vmount, @@ -160,27 +138,6 @@ AC_DEFINE(MOUNTED_FREAD_FSTYP) fi fi -if test -z "$list_mounted_fs"; then -# 4.4BSD and DEC OSF/1. -AC_MSG_CHECKING([for getmntinfo function]) -AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo, -[ -ok= -if test $ac_cv_func_getmntinfo = yes; then -AC_EGREP_HEADER(f_type;, sys/mount.h, -ok=yes) -fi -test -n "$ok" \ -&& fu_cv_sys_mounted_getmntinfo=yes \ -|| fu_cv_sys_mounted_getmntinfo=no -]) -AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo) -if test $fu_cv_sys_mounted_getmntinfo = yes; then -list_mounted_fs=found -AC_DEFINE(MOUNTED_GETMNTINFO) -fi -fi - # FIXME: add a test for netbsd-1.1 here if test -z "$list_mounted_fs"; then @@ -243,30 +200,6 @@ fi fi if test $space = no; then -# DEC Alpha running OSF/1 -AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) -AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1, -[AC_TRY_RUN([ -#include <sys/param.h> -#include <sys/types.h> -#include <sys/mount.h> -main () -{ -struct statfs fsd; -fsd.f_fsize = 0; -exit (statfs (".", &fsd, sizeof (struct statfs))); -}], -fu_cv_sys_stat_statfs3_osf1=yes, -fu_cv_sys_stat_statfs3_osf1=no, -fu_cv_sys_stat_statfs3_osf1=no)]) -AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1) -if test $fu_cv_sys_stat_statfs3_osf1 = yes; then -space=yes -AC_DEFINE(STAT_STATFS3_OSF1) -fi -fi - -if test $space = no; then # AIX AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl member (AIX, 4.3BSD)]) diff --git a/parts/appwizard/common/gnome2/macros/curses.m4 b/parts/appwizard/common/gnome2/macros/curses.m4 index 5307e13d..57d701e9 100644 --- a/parts/appwizard/common/gnome2/macros/curses.m4 +++ b/parts/appwizard/common/gnome2/macros/curses.m4 @@ -111,13 +111,6 @@ AC_DEFUN([AC_CHECK_CURSES],[ fi ]) - AC_ARG_WITH(osf1-curses, - [ --with-osf1-curses Used to force OSF/1 curses],[ - if test x$withval = xyes; then - AC_USE_OSF1_CURSES - fi - ]) - AC_ARG_WITH(vcurses, [ --with-vcurses[=incdir] Used to force SysV curses], if test x$withval != xyes; then @@ -164,17 +157,6 @@ AC_DEFUN([AC_USE_SUNOS_CURSES], [ AC_MSG_RESULT(Please note that some screen refreshs may fail) ]) -AC_DEFUN([AC_USE_OSF1_CURSES], [ - AC_MSG_RESULT(Using OSF1 curses) - search_ncurses=false - screen_manager="OSF1 curses" - AC_DEFINE(HAS_CURSES) - has_curses=true - AC_DEFINE(NO_COLOR_CURSES) - AC_DEFINE(USE_SYSV_CURSES) - CURSES_LIBS="-lcurses" -]) - AC_DEFUN([AC_USE_SYSV_CURSES], [ AC_MSG_RESULT(Using SysV curses) AC_DEFINE(HAS_CURSES) diff --git a/parts/appwizard/common/incadmin/config.guess b/parts/appwizard/common/incadmin/config.guess index aed5d7a0..201d615b 100755 --- a/parts/appwizard/common/incadmin/config.guess +++ b/parts/appwizard/common/incadmin/config.guess @@ -216,68 +216,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 exit ;; @@ -481,22 +419,6 @@ EOF m88k:*:3*:R3*) echo m88k-motorola-sysv3 exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -714,19 +636,6 @@ EOF *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit ;; @@ -1080,9 +989,6 @@ EOF Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 @@ -1141,20 +1047,6 @@ EOF SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel@ccMail.Census.GOV> echo i586-unisys-sysv4 diff --git a/parts/appwizard/common/incadmin/config.sub b/parts/appwizard/common/incadmin/config.sub index bc16da11..a44fd184 100755 --- a/parts/appwizard/common/incadmin/config.sub +++ b/parts/appwizard/common/incadmin/config.sub @@ -184,34 +184,6 @@ case $os in -hiux*) os=-hiuxwe2 ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -udk*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; @@ -714,10 +686,6 @@ case $basic_machine in hppa-next) os=-nextstep3 ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; hppro) basic_machine=hppa1.1-hp os=-proelf @@ -929,10 +897,6 @@ case $basic_machine in basic_machine=hppa1.1-hitachi os=-hiuxwe2 ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; parisc) basic_machine=hppa-unknown os=-linux @@ -1339,7 +1303,7 @@ case $os in # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -hpux* | -unos* | -luna* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ @@ -1407,12 +1371,6 @@ case $os in -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1443,13 +1401,6 @@ case $os in -nsk*) os=-nsk ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; -tpf*) os=-tpf ;; @@ -1619,9 +1570,6 @@ case $basic_machine in *-cbm) os=-amigaos ;; - *-dg) - os=-dgux - ;; *-dolphin) os=-sysv3 ;; @@ -1718,9 +1666,6 @@ case $basic_machine in -unos*) vendor=crds ;; - -dgux*) - vendor=dg - ;; -luna*) vendor=omron ;; diff --git a/parts/appwizard/common/incadmin/depcomp b/parts/appwizard/common/incadmin/depcomp index e220f925..9db17ebc 100755 --- a/parts/appwizard/common/incadmin/depcomp +++ b/parts/appwizard/common/incadmin/depcomp @@ -198,8 +198,6 @@ aix) ;; icc) - # Must come before tru64. - # Intel's C compiler understands `-MD -MF file'. However # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c # will fill foo.d with something like @@ -227,43 +225,6 @@ icc) rm -f "$tmpdepfile" ;; -tru64) - # The Tru64 AIX compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - - tmpdepfile1="$object.d" - tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` - if test "$libtool" = yes; then - "$@" -Wc,-MD - else - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - else - tmpdepfile="$tmpdepfile2" - fi - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh index 3f35292a..7de1caf8 100644 --- a/parts/appwizard/common/incadmin/ltmain.sh +++ b/parts/appwizard/common/incadmin/ltmain.sh @@ -88,7 +88,6 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then else case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh # NLS nuisances: We save the old values to restore during execute mode. @@ -2433,10 +2432,6 @@ typedef struct { runtime relocations are performed -- see ld's documentation on pseudo-relocs. */" lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; *) lt_dlsym_const=const ;; esac @@ -2732,7 +2727,6 @@ if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then else case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -3476,7 +3470,6 @@ EOF XFREE (actual_cwrapper_path); XFREE (actual_cwrapper_name); - lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ lt_setenv ("DUALCASE", "1"); /* for MSK sh */ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); @@ -4539,10 +4532,6 @@ func_mode_link () deplibs="$deplibs System.ltframework" continue ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work test "X$arg" = "X-lc" && continue @@ -4565,10 +4554,8 @@ func_mode_link () continue ;; - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot) + arch|-isysroot) compiler_flags="$compiler_flags $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -4748,12 +4735,6 @@ func_mode_link () continue ;; - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler # -r[0-9][0-9]* specifies the processor on the SGI compiler # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler @@ -5674,7 +5655,6 @@ func_mode_link () if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; *-*-sysv4*uw2*) add_dir="-L$dir" ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ *-*-unixware7*) add_dir="-L$dir" ;; @@ -6192,7 +6172,7 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in - darwin|linux|osf|windows|none) + darwin|linux|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age="$number_minor" @@ -6317,26 +6297,6 @@ func_mode_link () versuffix="$major.$age.$revision" ;; - osf) - func_arith $current - $age - major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - qnx) major=".$current" versuffix=".$current" @@ -6496,9 +6456,6 @@ func_mode_link () *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work ;; @@ -6529,9 +6486,7 @@ func_mode_link () pass_all) # Don't check for shared/static. Everything works. # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. + # whether the library exists or not. newdeplibs=$deplibs ;; test_compile) diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index 2ed199f3..3d54ce93 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -523,7 +523,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt def dcopGenerator(target, source, env, for_signature): act=[] act.append('dcopidl '+source[0].path+' > '+target[1].path+'|| ( rm -f '+target[1].path+' ; false)') - act.append('dcopidl2cpp --c++-suffix cpp --no-Q_SIGNALS --no-stub '+target[1].path) + act.append('dcopidl2cpp --c++-suffix cpp --no-signals --no-stub '+target[1].path) return act def dcopEmitter(target, source, env): diff --git a/parts/appwizard/filepropspagebase.ui b/parts/appwizard/filepropspagebase.ui index 00d7f677..11c20e9e 100644 --- a/parts/appwizard/filepropspagebase.ui +++ b/parts/appwizard/filepropspagebase.ui @@ -150,10 +150,10 @@ <tabstop>baseclass_edit</tabstop> <tabstop>implfile_edit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotSelectionChanged()</slot> <slot>slotClassnameChanged(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index 975b9e1f..38b1965e 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -26,16 +26,16 @@ #include <kdebug.h> #include <kdialog.h> #include <tdefiledialog.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcursor.h> #include <tdefile.h> #include <kurlrequester.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "kdevcore.h" #include "kdevversioncontrol.h" @@ -86,12 +86,12 @@ ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *na infrastructureBox->setEnabled(false); setProjectType("c"); - connect( name_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotProjectNameChanged( const TQString & ) ) ); + connect( name_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotProjectNameChanged( const TQString & ) ) ); // scanAvailableVCS(); - connect( fetchModuleButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFetchModulesFromRepository()) ); - connect(urlinput_edit, TQT_SIGNAL(urlSelected(const TQString& )), this, TQT_SLOT(dirChanged())); - connect(urlinput_edit, TQT_SIGNAL(returnPressed(const TQString& )), this, TQT_SLOT(dirChanged())); + connect( fetchModuleButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFetchModulesFromRepository()) ); + connect(urlinput_edit, TQ_SIGNAL(urlSelected(const TQString& )), this, TQ_SLOT(dirChanged())); + connect(urlinput_edit, TQ_SIGNAL(returnPressed(const TQString& )), this, TQ_SLOT(dirChanged())); slotProjectNameChanged( name_edit->text() ); } @@ -332,7 +332,7 @@ void ImportDialog::scanLegacyKDevelopProject(const TQString &fileName) { kdDebug(9010) << "Scanning legacy KDevelop project file " << fileName << endl; - KSimpleConfig config(fileName, true); + TDESimpleConfig config(fileName, true); config.setGroup("General"); author_edit->setText(config.readEntry("author")); email_edit->setText(config.readEntry("email")); @@ -355,7 +355,7 @@ void ImportDialog::scanLegacyStudioProject(const TQString &fileName) kdDebug(9010) << "Scanning legacy studio project file " << fileName << endl; // Not much to do here... - KSimpleConfig config(fileName, true); + TDESimpleConfig config(fileName, true); config.setGroup("kdestudio"); name_edit->setText(config.readEntry("Name")); } @@ -409,7 +409,7 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName) // AC_DEFINE(VERSION, "5.6") TQRegExp ac_define("^AC_DEFINE\\s*\\(\\s*[^,]+,([^\\)]+)"); TQRegExp version("(\\bversion\\b)"); - version.setCaseSensitive(FALSE); + version.setCaseSensitive(false); TQTextStream cstream; // try for configure.in.in, configure.in, then configure.ac @@ -531,8 +531,8 @@ void ImportDialog::slotFetchModulesFromRepository() setCursor( KCursor::waitCursor() ); // setEnabled( false ); - connect( vcs, TQT_SIGNAL(finishedFetching(TQString)), - this, TQT_SLOT(slotFinishedCheckout(TQString)) ); + connect( vcs, TQ_SIGNAL(finishedFetching(TQString)), + this, TQ_SLOT(slotFinishedCheckout(TQString)) ); //restore cursor if we can't fetch repository if ( !vcs->fetchFromRepository() ) diff --git a/parts/appwizard/importdlgbase.ui b/parts/appwizard/importdlgbase.ui index aa778f00..c18beff7 100644 --- a/parts/appwizard/importdlgbase.ui +++ b/parts/appwizard/importdlgbase.ui @@ -346,12 +346,12 @@ will be the author, everything between <tabstop>ok_button</tabstop> <tabstop>cancel_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">dirButtonClicked()</slot> <slot>dirChanged()</slot> <slot access="protected">projectTypeChanged(const TQString &)</slot> <slot access="protected">projectTypeChanged(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/appwizard/misc.cpp b/parts/appwizard/misc.cpp index ddedef60..f549f752 100644 --- a/parts/appwizard/misc.cpp +++ b/parts/appwizard/misc.cpp @@ -18,7 +18,7 @@ #include <sys/types.h> #include <unistd.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> void AppWizardUtil::guessAuthorAndEmail(TQString *author, TQString *email) diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 6f9198b0..df911cc1 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -50,13 +50,13 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) setXMLFile("kdevpart_astyle.rc"); - formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle"); + formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQ_SLOT(beautifySource()), actionCollection(), "edit_astyle"); formatTextAction->setEnabled(false); formatTextAction->setToolTip(i18n("Reformat source")); formatTextAction->setWhatsThis(i18n("<b>Reformat source</b><p>Source reformatting functionality using <b>astyle</b> library. " "Also available in <b>New Class</b> and <b>Subclassing</b> wizards.")); - formatFileAction = new TDEAction(i18n("Format files"), 0, this, TQT_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle"); + formatFileAction = new TDEAction(i18n("Format files"), 0, this, TQ_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle"); formatFileAction->setEnabled(false); formatFileAction->setToolTip(i18n("Format files")); formatFileAction->setWhatsThis(i18n("<b>Fomat files</b><p>Formatting functionality using <b>astyle</b> library. " @@ -68,11 +68,11 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) m_configProxy->createProjectConfigPage(i18n("Formatting"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase* ,TQWidget*,unsigned int)), this, TQT_SLOT(insertConfigWidget(const KDialogBase*,TQWidget*,unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase* ,TQWidget*,unsigned int)), this, TQ_SLOT(insertConfigWidget(const KDialogBase*,TQWidget*,unsigned int))); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(activePartChanged(KParts::Part*))); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); loadGlobal(); //use the globals first, project level will override later.. @@ -88,7 +88,7 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) void AStylePart::loadGlobal() { // kdDebug(9009) << "Load global"<<endl; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("AStyle"); TQString options = config->readEntry("Options","BlockBreak=0,BlockBreakAll=0,BlockIfElse=0,Brackets=Break,BracketsCloseHeaders=0,FStyle=UserDefined,Fill=Tabs,FillCount=4,FillEmptyLines=0,FillForce=0,IndentBlocks=0,IndentBrackets=0,IndentCases=0,IndentClasses=1,IndentLabels=1,IndentNamespaces=1,IndentPreprocessors=0,IndentSwitches=1,KeepBlocks=1,KeepStatements=1,MaxStatement=40,MinConditional=-1,PadOperators=0,PadParenthesesIn=1,PadParenthesesOut=1,PadParenthesesUn=1,"); m_globalExtensions=TQStringList::split(",",config->readEntry("Extensions",defaultFormatExtensions)); @@ -123,7 +123,7 @@ void AStylePart::saveGlobal() // kdDebug(9009) << "project before: " <<iter.key() << "="<< iter.data() << endl; // } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("AStyle"); config->writeEntry("Options",options); config->writeEntry("Extensions",m_globalExtensions.join(",")); @@ -249,13 +249,13 @@ void AStylePart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsi case GLOBALDOC_OPTIONS: { AStyleWidget *w = new AStyleWidget(this, true, page, "astyle config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { AStyleWidget *w = new AStyleWidget(this, false, page, "astyle config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -399,7 +399,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context) if (context->hasType( Context::EditorContext )) { popup->insertSeparator(); - int id = popup->insertItem( i18n("Format selection"), this, TQT_SLOT(beautifySource()) ); + int id = popup->insertItem( i18n("Format selection"), this, TQ_SLOT(beautifySource()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Format</b><p>Formats the current selection, if possible")); } else if ( context->hasType( Context::FileContext )){ @@ -407,7 +407,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context) m_urls = ctx->urls(); popup->insertSeparator(); - int id = popup->insertItem( i18n("Format files"), this, TQT_SLOT(formatFiles()) ); + int id = popup->insertItem( i18n("Format files"), this, TQ_SLOT(formatFiles()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Format files</b><p>Formats selected files if possible")); } diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp index 6959fe7b..67cf8d5c 100644 --- a/parts/astyle/astyle_widget.cpp +++ b/parts/astyle/astyle_widget.cpp @@ -17,40 +17,40 @@ AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, con : AStyleConfig(parent, name), m_part(part), isGlobalWidget(global) { // which style changed - disable the other pages. - connect(StyleGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); - connect(ConfigTabs, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(styleChanged()) ); - - connect(FillingGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); - connect(Fill_ForceTabs, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Fill_TabCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - connect(Fill_SpaceCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - - connect(BracketGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); - connect(Brackets_CloseHeaders, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Indent_Switches, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Cases, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Classes, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Brackets, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Namespaces, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Labels, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Preprocessors, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Continue_MaxStatement, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - connect(Continue_MinConditional, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - - connect(Block_Break, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Block_BreakAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Block_IfElse, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Pad_ParenthesesIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_ParenthesesOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_ParenthesesUn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_Operators, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Keep_Statements, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Keep_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(StyleGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged())); + connect(ConfigTabs, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(styleChanged()) ); + + connect(FillingGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged())); + connect(Fill_ForceTabs, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Fill_TabCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + connect(Fill_SpaceCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + + connect(BracketGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged())); + connect(Brackets_CloseHeaders, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Indent_Switches, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Cases, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Classes, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Brackets, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Namespaces, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Labels, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Blocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Preprocessors, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Continue_MaxStatement, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + connect(Continue_MinConditional, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + + connect(Block_Break, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Block_BreakAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Block_IfElse, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Pad_ParenthesesIn, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Pad_ParenthesesOut, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Pad_ParenthesesUn, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Pad_Operators, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Keep_Statements, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Keep_Blocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); TQStringVariantMap option; diff --git a/parts/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui index 73cf691a..28a3432e 100644 --- a/parts/astyle/astyleconfig.ui +++ b/parts/astyle/astyleconfig.ui @@ -1324,9 +1324,9 @@ multiple single-statement lines.</string> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>allFiles()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/bookmarks/bookmarks_config.cpp b/parts/bookmarks/bookmarks_config.cpp index 36cc05a5..f49b76c8 100644 --- a/parts/bookmarks/bookmarks_config.cpp +++ b/parts/bookmarks/bookmarks_config.cpp @@ -32,7 +32,7 @@ BookmarksConfig::~BookmarksConfig() */ void BookmarksConfig::writeConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Bookmarks"); config->writeEntry("Context", _context ); @@ -49,7 +49,7 @@ void BookmarksConfig::writeConfig() */ void BookmarksConfig::readConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Bookmarks"); _context = config->readPropertyEntry( "Context", 5 ).toInt(); diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index e4dc74a2..a22756df 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -64,19 +64,19 @@ BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringL _editorMap.setAutoDelete( true ); _settingMarks = false; - connect( partController(), TQT_SIGNAL( partAdded( KParts::Part * ) ), this, TQT_SLOT( partAdded( KParts::Part * ) ) ); + connect( partController(), TQ_SIGNAL( partAdded( KParts::Part * ) ), this, TQ_SLOT( partAdded( KParts::Part * ) ) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("Bookmarks"), BOOKMARKSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - connect( _widget, TQT_SIGNAL( removeAllBookmarksForURL( const KURL & ) ), - this, TQT_SLOT( removeAllBookmarksForURL( const KURL & ) ) ); - connect( _widget, TQT_SIGNAL( removeBookmarkForURL( const KURL &, int ) ), - this, TQT_SLOT( removeBookmarkForURL( const KURL &, int ) ) ); + connect( _widget, TQ_SIGNAL( removeAllBookmarksForURL( const KURL & ) ), + this, TQ_SLOT( removeAllBookmarksForURL( const KURL & ) ) ); + connect( _widget, TQ_SIGNAL( removeBookmarkForURL( const KURL &, int ) ), + this, TQ_SLOT( removeBookmarkForURL( const KURL &, int ) ) ); - connect( _marksChangeTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( marksChanged() ) ); + connect( _marksChangeTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( marksChanged() ) ); _config = new BookmarksConfig; _config->readConfig(); @@ -112,10 +112,10 @@ void BookmarksPart::partAdded( KParts::Part * part ) // connect to this editor KTextEditor::Document * doc = static_cast<KTextEditor::Document*>( ro_part ); - connect( doc, TQT_SIGNAL( marksChanged() ), this, TQT_SLOT( marksEvent() ) ); + connect( doc, TQ_SIGNAL( marksChanged() ), this, TQ_SLOT( marksEvent() ) ); // workaround for a katepart oddity where it drops all bookmarks on 'reload' - connect( doc, TQT_SIGNAL( completed() ), this, TQT_SLOT( reload() ) ); + connect( doc, TQ_SIGNAL( completed() ), this, TQ_SLOT( reload() ) ); } } } @@ -490,7 +490,7 @@ void BookmarksPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page if ( pagenumber == BOOKMARKSETTINGSPAGE ) { BookmarkSettings * w = new BookmarkSettings( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } } diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index ac14328b..33354269 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -150,10 +150,10 @@ BookmarksWidget::BookmarksWidget(BookmarksPart *part) setAllColumnsShowFocus( true ); // setSortColumn( -1 ); - connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); } @@ -270,18 +270,18 @@ void BookmarksWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int ) popup.insertTitle( _selectedItem->url().fileName() + i18n(", line ") + TQString::number( _selectedItem->line() +1 ) ); - popup.insertItem( i18n("Remove This Bookmark"), this, TQT_SLOT( doEmitRemoveBookMark() ) ); + popup.insertItem( i18n("Remove This Bookmark"), this, TQ_SLOT( doEmitRemoveBookMark() ) ); } else { popup.insertTitle( _selectedItem->url().fileName() + i18n( ", All" ) ); - popup.insertItem( i18n("Remove These Bookmarks"), this, TQT_SLOT( doEmitRemoveBookMark() ) ); + popup.insertItem( i18n("Remove These Bookmarks"), this, TQ_SLOT( doEmitRemoveBookMark() ) ); } popup.insertSeparator(); - popup.insertItem( i18n( "Collapse All" ), this, TQT_SLOT(collapseAll()) ); - popup.insertItem( i18n( "Expand All" ), this, TQT_SLOT(expandAll()) ); + popup.insertItem( i18n( "Collapse All" ), this, TQ_SLOT(collapseAll()) ); + popup.insertItem( i18n( "Expand All" ), this, TQ_SLOT(expandAll()) ); popup.exec(p); } diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp index c0cc21a2..853eb417 100644 --- a/parts/classview/classtooldlg.cpp +++ b/parts/classview/classtooldlg.cpp @@ -106,21 +106,21 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) layout->addWidget(class_tree, 10); - connect( class_combo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotClassComboChoice(const TQString&)) ); - connect( close_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClose()) ); - connect( access_combo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotAccessComboChoice(const TQString&)) ); - connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents())); - connect( children_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren())); - connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients())); - connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers())); - connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods())); - connect( attributes_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewAttributes())); - - connect( part, TQT_SIGNAL(setLanguageSupport(KDevLanguageSupport*)), - this, TQT_SLOT(setLanguageSupport(KDevLanguageSupport*)) ); + connect( class_combo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotClassComboChoice(const TQString&)) ); + connect( close_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClose()) ); + connect( access_combo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotAccessComboChoice(const TQString&)) ); + connect( parents_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewParents())); + connect( children_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewChildren())); + connect( clients_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewClients())); + connect( suppliers_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewSuppliers())); + connect( methods_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewMethods())); + connect( attributes_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewAttributes())); + + connect( part, TQ_SIGNAL(setLanguageSupport(KDevLanguageSupport*)), + this, TQ_SLOT(setLanguageSupport(KDevLanguageSupport*)) ); m_part->registerClassToolDialog(this); } @@ -136,7 +136,7 @@ void ClassToolDialog::setLanguageSupport(KDevLanguageSupport *ls) { if (ls) { disconnect(ls, 0, this, 0); - connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh())); + connect(ls, TQ_SIGNAL(updatedSourceInfo()), this, TQ_SLOT(refresh())); } else refresh(); @@ -240,7 +240,7 @@ void ClassToolDialog::slotAccessComboChoice(const TQString &str) void ClassToolDialog::slotClose() { delete this; - // TQTimer::singleShot(0, this, TQT_SLOT(delayedClose())); + // TQTimer::singleShot(0, this, TQ_SLOT(delayedClose())); } diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp index 9e052418..aeb7f11a 100644 --- a/parts/classview/classtreebase.cpp +++ b/parts/classview/classtreebase.cpp @@ -40,9 +40,9 @@ TDEPopupMenu *ClassTreeItem::createPopup() TDEPopupMenu *popup = new TDEPopupMenu(); if (features & KDevLanguageSupport::Declarations) - popup->insertItem( i18n("Go to Declaration"), classTree(), TQT_SLOT(slotGotoDeclaration()) ); + popup->insertItem( i18n("Go to Declaration"), classTree(), TQ_SLOT(slotGotoDeclaration()) ); if (m_item->itemType() == PIT_METHOD) - popup->insertItem( i18n("Go to Definition"), classTree(), TQT_SLOT(slotGotoImplementation()) ); + popup->insertItem( i18n("Go to Definition"), classTree(), TQ_SLOT(slotGotoImplementation()) ); TQString title; switch(m_item->itemType()) { @@ -52,13 +52,13 @@ TDEPopupMenu *ClassTreeItem::createPopup() bool hasAddMethod = features & KDevLanguageSupport::AddMethod; bool hasAddAttribute = features & KDevLanguageSupport::AddAttribute; if (hasAddMethod) - popup->insertItem( i18n("Add Method..."), classTree(), TQT_SLOT(slotAddMethod())); + popup->insertItem( i18n("Add Method..."), classTree(), TQ_SLOT(slotAddMethod())); if (hasAddAttribute) - popup->insertItem( i18n("Add Attribute..."), classTree(), TQT_SLOT(slotAddAttribute())); + popup->insertItem( i18n("Add Attribute..."), classTree(), TQ_SLOT(slotAddAttribute())); popup->insertSeparator(); - popup->insertItem( i18n("Parent Classes..."), classTree(), TQT_SLOT(slotClassBaseClasses())); - popup->insertItem( i18n("Child Classes..."), classTree(), TQT_SLOT(slotClassDerivedClasses())); - popup->insertItem( i18n("Class Tool..."), classTree(), TQT_SLOT(slotClassTool())); + popup->insertItem( i18n("Parent Classes..."), classTree(), TQ_SLOT(slotClassBaseClasses())); + popup->insertItem( i18n("Child Classes..."), classTree(), TQ_SLOT(slotClassDerivedClasses())); + popup->insertItem( i18n("Class Tool..."), classTree(), TQ_SLOT(slotClassTool())); } break; case PIT_STRUCT: @@ -459,14 +459,14 @@ ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char * (void) new ClassToolTip(this); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotItemPressed(int, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed( TQListViewItem*)), - TQT_SLOT( slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotItemPressed(int, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed( TQListViewItem*)), + TQ_SLOT( slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); m_part = part; } diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index d068adaa..93110a54 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -161,11 +161,11 @@ ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringL TQWhatsThis::add(m_widget, i18n("<b>Class browser</b><p>" "The class browser shows all namespaces, classes and namespace and class members in a project.")); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); - connect( core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotProjectOpened()) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(languageChanged()), this, TQ_SLOT(slotProjectOpened()) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); } bool ClassViewPart::jumpedToItem( ItemDom item ) { @@ -182,34 +182,34 @@ ClassViewPart::~ClassViewPart() void ClassViewPart::slotProjectOpened( ) { - connect( languageSupport(), TQT_SIGNAL(updatedSourceInfo()), navigator, TQT_SLOT(refresh()) ); - connect( languageSupport(), TQT_SIGNAL(addedSourceInfo(const TQString& )), navigator, TQT_SLOT(addFile(const TQString& ))); + connect( languageSupport(), TQ_SIGNAL(updatedSourceInfo()), navigator, TQ_SLOT(refresh()) ); + connect( languageSupport(), TQ_SIGNAL(addedSourceInfo(const TQString& )), navigator, TQ_SLOT(addFile(const TQString& ))); navigator->refresh(); } void ClassViewPart::slotProjectClosed( ) { // navigator->refresh(); -// disconnect( languageSupport(), TQT_SIGNAL(updatedSourceInfo()), navigator, TQT_SLOT(refresh()) ); +// disconnect( languageSupport(), TQ_SIGNAL(updatedSourceInfo()), navigator, TQ_SLOT(refresh()) ); } void ClassViewPart::setupActions( ) { m_functionsnav = new TDEListViewAction( new KComboView(true, 150, 0, "m_functionsnav_combo", new FunctionCompletion() ), i18n("Functions Navigation"), 0, 0, 0, actionCollection(), "functionsnav_combo", true ); - connect(m_functionsnav->view(), TQT_SIGNAL(activated(TQListViewItem*)), navigator, TQT_SLOT(selectFunctionNav(TQListViewItem*))); + connect(m_functionsnav->view(), TQ_SIGNAL(activated(TQListViewItem*)), navigator, TQ_SLOT(selectFunctionNav(TQListViewItem*))); // m_functionsnav->view()->setEditable(false); - connect(m_functionsnav->view(), TQT_SIGNAL(focusGranted()), navigator, TQT_SLOT(functionNavFocused())); - connect(m_functionsnav->view(), TQT_SIGNAL(focusLost()), navigator, TQT_SLOT(functionNavUnFocused())); + connect(m_functionsnav->view(), TQ_SIGNAL(focusGranted()), navigator, TQ_SLOT(functionNavFocused())); + connect(m_functionsnav->view(), TQ_SIGNAL(focusLost()), navigator, TQ_SLOT(functionNavUnFocused())); m_functionsnav->setToolTip(i18n("Functions in file")); m_functionsnav->setWhatsThis(i18n("<b>Function navigator</b><p>Navigates over functions contained in the file.")); // m_functionsnav->view()->setCurrentText(NAV_NODEFINITION); m_functionsnav->view()->setDefaultText(NAV_NODEFINITION); - new TDEAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" ); + new TDEAction( i18n("Focus Navigator"), 0, this, TQ_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" ); if (langHasFeature(KDevLanguageSupport::Classes)) { - TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia"); + TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQ_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia"); ac->setToolTip(i18n("Class inheritance diagram")); ac->setWhatsThis(i18n("<b>Class inheritance diagram</b><p>Displays inheritance relationship between classes in project. " "Note, it does not display classes outside inheritance hierarchy.")); @@ -242,8 +242,8 @@ void ClassViewPart::activePartChanged( KParts::Part * part) navigator->stopTimer(); if (m_activeView) { - disconnect(m_activeView, TQT_SIGNAL(cursorPositionChanged()), - navigator, TQT_SLOT(slotCursorPositionChanged())); + disconnect(m_activeView, TQ_SIGNAL(cursorPositionChanged()), + navigator, TQ_SLOT(slotCursorPositionChanged())); } kdDebug() << "ClassViewPart::activePartChanged()" << endl; @@ -267,8 +267,8 @@ void ClassViewPart::activePartChanged( KParts::Part * part) } if( m_activeViewCursor ) { - connect(m_activeView, TQT_SIGNAL(cursorPositionChanged()), - navigator, TQT_SLOT(slotCursorPositionChanged()) ); + connect(m_activeView, TQ_SIGNAL(cursorPositionChanged()), + navigator, TQ_SLOT(slotCursorPositionChanged()) ); } } void ClassViewPart::slotFocusNavbar() diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 22b865ef..9d1951be 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -23,7 +23,7 @@ #include "classviewwidget.h" #include <kiconloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kurl.h> #include <tdeaction.h> #include <tdeactionclasses.h> @@ -59,11 +59,11 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part ) m_projectItem = 0; - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( m_part->core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( m_part->core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); - connect( m_part->core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotProjectOpened()) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) ); + connect( m_part->core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( m_part->core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); + connect( m_part->core(), TQ_SIGNAL(languageChanged()), this, TQ_SLOT(slotProjectOpened()) ); TQStringList lst; lst << i18n( "Group by Directories" ) << i18n( "Plain List" ) << i18n( "Java Like Mode" ); @@ -71,28 +71,28 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part ) m_actionViewMode->setItems( lst ); m_actionViewMode->setWhatsThis(i18n("<b>View mode</b><p>Class browser items can be grouped by directories, listed in a plain or java like view.")); - m_actionNewClass = new TDEAction( i18n("New Class..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotNewClass()), + m_actionNewClass = new TDEAction( i18n("New Class..."), TDEShortcut(), this, TQ_SLOT(slotNewClass()), m_part->actionCollection(), "classview_new_class" ); m_actionNewClass->setWhatsThis(i18n("<b>New class</b><p>Calls the <b>New Class</b> wizard.")); - m_actionCreateAccessMethods = new TDEAction( i18n("Create get/set Methods"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); + m_actionCreateAccessMethods = new TDEAction( i18n("Create get/set Methods"), TDEShortcut(), this, TQ_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); - m_actionAddMethod = new TDEAction( i18n("Add Method..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddMethod()), + m_actionAddMethod = new TDEAction( i18n("Add Method..."), TDEShortcut(), this, TQ_SLOT(slotAddMethod()), m_part->actionCollection(), "classview_add_method" ); m_actionAddMethod->setWhatsThis(i18n("<b>Add method</b><p>Calls the <b>New Method</b> wizard.")); - m_actionAddAttribute = new TDEAction( i18n("Add Attribute..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddAttribute()), + m_actionAddAttribute = new TDEAction( i18n("Add Attribute..."), TDEShortcut(), this, TQ_SLOT(slotAddAttribute()), m_part->actionCollection(), "classview_add_attribute" ); m_actionAddAttribute->setWhatsThis(i18n("<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard.")); - m_actionOpenDeclaration = new TDEAction( i18n("Open Declaration"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenDeclaration()), + m_actionOpenDeclaration = new TDEAction( i18n("Open Declaration"), TDEShortcut(), this, TQ_SLOT(slotOpenDeclaration()), m_part->actionCollection(), "classview_open_declaration" ); m_actionOpenDeclaration->setWhatsThis(i18n("<b>Open declaration</b><p>Opens a file where the selected item is declared and jumps to the declaration line.")); - m_actionOpenImplementation = new TDEAction( i18n("Open Implementation"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenImplementation()), + m_actionOpenImplementation = new TDEAction( i18n("Open Implementation"), TDEShortcut(), this, TQ_SLOT(slotOpenImplementation()), m_part->actionCollection(), "classview_open_implementation" ); m_actionOpenImplementation->setWhatsThis(i18n("<b>Open implementation</b><p>Opens a file where the selected item is defined (implemented) and jumps to the definition line.")); - m_actionFollowEditor = new TDEToggleAction( i18n("Follow Editor"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); + m_actionFollowEditor = new TDEToggleAction( i18n("Follow Editor"), TDEShortcut(), this, TQ_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); TDEConfig* config = m_part->instance()->config(); config->setGroup( "General" ); @@ -218,12 +218,12 @@ void ClassViewWidget::slotProjectOpened( ) m_projectDirectoryLength = m_projectDirectory.length() + 1; - connect( m_part->languageSupport(), TQT_SIGNAL(updatedSourceInfo()), - this, TQT_SLOT(refresh()) ); - connect( m_part->languageSupport(), TQT_SIGNAL(aboutToRemoveSourceInfo(const TQString&)), - this, TQT_SLOT(removeFile(const TQString&)) ); - connect( m_part->languageSupport(), TQT_SIGNAL(addedSourceInfo(const TQString&)), - this, TQT_SLOT(insertFile(const TQString&)) ); + connect( m_part->languageSupport(), TQ_SIGNAL(updatedSourceInfo()), + this, TQ_SLOT(refresh()) ); + connect( m_part->languageSupport(), TQ_SIGNAL(aboutToRemoveSourceInfo(const TQString&)), + this, TQ_SLOT(removeFile(const TQString&)) ); + connect( m_part->languageSupport(), TQ_SIGNAL(addedSourceInfo(const TQString&)), + this, TQ_SLOT(insertFile(const TQString&)) ); } void ClassViewWidget::slotProjectClosed( ) diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp index 1e3fa8e0..f4b059e7 100644 --- a/parts/classview/digraphview.cpp +++ b/parts/classview/digraphview.cpp @@ -20,8 +20,8 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> #include <tdetempfile.h> #include <tdeversion.h> diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp index 32d05059..3059f00e 100644 --- a/parts/classview/hierarchydlg.cpp +++ b/parts/classview/hierarchydlg.cpp @@ -66,22 +66,22 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part ) combo_layout->addWidget(close_button); layout->addWidget(splitter); - connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)), - this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) ); - connect( class_combo, TQT_SIGNAL(activated(TQListViewItem*)), - this, TQT_SLOT(slotClassComboChoice(TQListViewItem*)) ); - connect( namespace_combo, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotNamespaceComboChoice(const TQString&)) ); - connect( class_combo, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotClassComboChoice(const TQString&)) ); - connect( close_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(hide()) ); - connect( save_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(save()) ); - connect( refresh_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(refresh()) ); - connect( digraph, TQT_SIGNAL(selected(const TQString&)), - this, TQT_SLOT(classSelected(const TQString&)) ); + connect( namespace_combo, TQ_SIGNAL(activated(TQListViewItem*)), + this, TQ_SLOT(slotNamespaceComboChoice(TQListViewItem*)) ); + connect( class_combo, TQ_SIGNAL(activated(TQListViewItem*)), + this, TQ_SLOT(slotClassComboChoice(TQListViewItem*)) ); + connect( namespace_combo, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotNamespaceComboChoice(const TQString&)) ); + connect( class_combo, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotClassComboChoice(const TQString&)) ); + connect( close_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(hide()) ); + connect( save_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(save()) ); + connect( refresh_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(refresh()) ); + connect( digraph, TQ_SIGNAL(selected(const TQString&)), + this, TQ_SLOT(classSelected(const TQString&)) ); m_part = part; // m_part->registerHierarchyDialog(this); @@ -157,7 +157,7 @@ void HierarchyDialog::refresh() void HierarchyDialog::setLanguageSupport(KDevLanguageSupport *ls) { if (ls) - connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh())); + connect(ls, TQ_SIGNAL(updatedSourceInfo()), this, TQ_SLOT(refresh())); else refresh(); } diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index 694aa0d4..5556446c 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -111,18 +111,18 @@ Navigator::Navigator(ClassViewPart *parent, const char *name) m_navNoDefinition = true; m_actionSyncWithEditor = new TDEAction( i18n("Sync ClassView"), "view_tree", TDEShortcut(), this, - TQT_SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" ); + TQ_SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" ); TDEAction * action = new TDEAction( i18n("Jump to next function"), CTRL+ALT+Key_PageDown, this, - TQT_SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" ); + TQ_SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" ); action->plug( &m_dummyActionWidget ); action = new TDEAction( i18n("Jump to previous function"), CTRL+ALT+Key_PageUp, this, - TQT_SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" ); + TQ_SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" ); action->plug( &m_dummyActionWidget ); m_syncTimer = new TQTimer(this); - connect(m_syncTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(syncFunctionNav())); + connect(m_syncTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(syncFunctionNav())); } Navigator::~Navigator() @@ -198,7 +198,7 @@ void Navigator::slotCursorPositionChanged() //FIXME: we assume that background parser delay is set globally in tdeveloprc file //for all available language supports //this is reasonable assumption because problem reporter should be the same for all languages - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "General Options" ); int m_delay = config->readNumEntry( "BgParserDelay", 500 ); diff --git a/parts/ctags2/ctags2_createtagfile.h b/parts/ctags2/ctags2_createtagfile.h index 886332e7..e0a51ba2 100644 --- a/parts/ctags2/ctags2_createtagfile.h +++ b/parts/ctags2/ctags2_createtagfile.h @@ -22,7 +22,7 @@ TQ_OBJECT public: - CreateTagFile(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreateTagFile(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~CreateTagFile(); TQString name(); TQString tagsfilePath(); diff --git a/parts/ctags2/ctags2_createtagfilebase.ui b/parts/ctags2/ctags2_createtagfilebase.ui index 111fbf94..797414c5 100644 --- a/parts/ctags2/ctags2_createtagfilebase.ui +++ b/parts/ctags2/ctags2_createtagfilebase.ui @@ -135,10 +135,10 @@ <slot>validate()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>createTagFile()</slot> <slot>validate()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 1333ac54..80cee6e5 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -23,7 +23,7 @@ #include <tdetexteditor/document.h> #include <tdetexteditor/editinterface.h> #include <tdetexteditor/viewcursorinterface.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <kstringhandler.h> #include <kdialogbase.h> @@ -81,18 +81,18 @@ CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) m_widget->setCaption(i18n("CTags Lookup")); mainWindow()->embedOutputView( m_widget, i18n( "CTags" ), i18n( "CTags lookup results" ) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("CTags"), CTAGSSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - - new TDEAction( i18n("Lookup Current Text"), 0, CTRL+Key_Underscore, this, TQT_SLOT(slotLookup()), actionCollection(), "ctags_lookup_shortcut"); - new TDEAction( i18n("Lookup Current Text as Declaration"), 0, CTRL+Key_Semicolon, this, TQT_SLOT(slotLookupDeclaration()), actionCollection(), "ctags_declaration_shortcut"); - new TDEAction( i18n("Lookup Current Text as Definition"), 0, CTRL+Key_Colon, this, TQT_SLOT(slotLookupDefinition()), actionCollection(), "ctags_definition_shortcut"); - new TDEAction( i18n("Jump to Next Match"), 0, 0, this, TQT_SLOT(slotGoToNext()), actionCollection(), "ctags_jump_to_next"); - new TDEAction( i18n("Open Lookup Dialog"), 0, 0, this, TQT_SLOT(slotOpenLookup()), actionCollection(), "ctags_input_shortcut"); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + + new TDEAction( i18n("Lookup Current Text"), 0, CTRL+Key_Underscore, this, TQ_SLOT(slotLookup()), actionCollection(), "ctags_lookup_shortcut"); + new TDEAction( i18n("Lookup Current Text as Declaration"), 0, CTRL+Key_Semicolon, this, TQ_SLOT(slotLookupDeclaration()), actionCollection(), "ctags_declaration_shortcut"); + new TDEAction( i18n("Lookup Current Text as Definition"), 0, CTRL+Key_Colon, this, TQ_SLOT(slotLookupDefinition()), actionCollection(), "ctags_definition_shortcut"); + new TDEAction( i18n("Jump to Next Match"), 0, 0, this, TQ_SLOT(slotGoToNext()), actionCollection(), "ctags_jump_to_next"); + new TDEAction( i18n("Open Lookup Dialog"), 0, 0, this, TQ_SLOT(slotOpenLookup()), actionCollection(), "ctags_input_shortcut"); } @@ -111,8 +111,8 @@ void CTags2Part::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, u if ( pagenumber == CTAGSSETTINGSPAGE ) { CTags2SettingsWidget * w = new CTags2SettingsWidget( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); - connect( w, TQT_SIGNAL(newTagsfileName(const TQString& )), this, TQT_SLOT(updateTagsfileName(const TQString& )) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); + connect( w, TQ_SIGNAL(newTagsfileName(const TQString& )), this, TQ_SLOT(updateTagsfileName(const TQString& )) ); } } @@ -147,7 +147,7 @@ bool CTags2Part::createTagsFile(const TQString& tagFile, const TQString& dir) */ // get name of the ctags binary - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "CTAGS" ); TQString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace(); if ( ctagsBinary.isEmpty() ) @@ -180,7 +180,7 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context) if (ident.isEmpty()) return; - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "CTAGS" ); bool showDeclaration = config->readBoolEntry( "ShowDeclaration", true ); bool showDefinition = config->readBoolEntry( "ShowDefinition", true ); @@ -194,13 +194,13 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); if ( showDeclaration ) - popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) ); + popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQ_SLOT(slotGotoDeclaration()) ); if ( showDefinition ) - popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQT_SLOT(slotGotoDefinition()) ); + popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQ_SLOT(slotGotoDefinition()) ); if ( showLookup ) - popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQT_SLOT(slotGotoTag()) ); + popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQ_SLOT(slotGotoTag()) ); } } @@ -223,7 +223,7 @@ void CTags2Part::gotoTagForTypes( TQStringList const & types ) if ( list.count() < 1 ) return; - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("CTAGS"); bool jumpToFirst = config->readBoolEntry( "JumpToFirst", false ); diff --git a/parts/ctags2/ctags2_selecttagfile.h b/parts/ctags2/ctags2_selecttagfile.h index 4593ca90..20f89b49 100644 --- a/parts/ctags2/ctags2_selecttagfile.h +++ b/parts/ctags2/ctags2_selecttagfile.h @@ -19,7 +19,7 @@ class SelectTagFile : public SelectTagFileBase { public: - SelectTagFile( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SelectTagFile( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~SelectTagFile(); TQString name(); TQString tagsfilePath(); diff --git a/parts/ctags2/ctags2_selecttagfilebase.ui b/parts/ctags2/ctags2_selecttagfilebase.ui index 5a048cab..e25f4cd9 100644 --- a/parts/ctags2/ctags2_selecttagfilebase.ui +++ b/parts/ctags2/ctags2_selecttagfilebase.ui @@ -116,9 +116,9 @@ <slot>validate()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>validate()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp index 96837e98..3d33b6a7 100644 --- a/parts/ctags2/ctags2_settingswidget.cpp +++ b/parts/ctags2/ctags2_settingswidget.cpp @@ -73,7 +73,7 @@ void CTags2SettingsWidget::loadSettings() TQStringList activeTagsFiles = DomUtil::readListEntry(dom, "/ctagspart/activeTagsFiles", "file"); - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "CTAGS" ); showDeclarationBox->setChecked( config->readBoolEntry( "ShowDeclaration", true ) ); showDefinitionBox->setChecked( config->readBoolEntry( "ShowDefinition", true ) ); @@ -102,7 +102,7 @@ void CTags2SettingsWidget::storeSettings() DomUtil::writeEntry( dom, "/ctagspart/customArguments", tagfileCustomEdit->text() ); DomUtil::writeEntry( dom, "/ctagspart/customTagfilePath", tagfilePath->url() ); - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "CTAGS" ); config->writeEntry( "ShowDeclaration", showDeclarationBox->isChecked() ); config->writeEntry( "ShowDefinition", showDefinitionBox->isChecked() ); diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui index a4bd5378..98273191 100644 --- a/parts/ctags2/ctags2_settingswidgetbase.ui +++ b/parts/ctags2/ctags2_settingswidgetbase.ui @@ -361,13 +361,13 @@ <slot>clear()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>createNewTagSlot()</slot> <slot>addNewTagFile()</slot> <slot>removeTagFile()</slot> <slot>moveUpTagFile()</slot> <slot>moveDownTagFile()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp index 4225e83a..7db053d0 100644 --- a/parts/ctags2/ctags2_widget.cpp +++ b/parts/ctags2/ctags2_widget.cpp @@ -52,10 +52,10 @@ CTags2Widget::CTags2Widget( CTags2Part * part, const char* name, WFlags fl) output_view->setColumnWidthMode(2,TQListView::Maximum); _typeTimeout = new TQTimer( this ); - connect( _typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(line_edit_changed()) ); + connect( _typeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(line_edit_changed()) ); - connect( output_view, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(itemExecuted(TQListViewItem*)) ); - connect( output_view, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(itemExecuted(TQListViewItem*)) ); + connect( output_view, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(itemExecuted(TQListViewItem*)) ); + connect( output_view, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(itemExecuted(TQListViewItem*)) ); updateDBDateLabel(); } diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui index 0379142f..919ca946 100644 --- a/parts/ctags2/ctags2_widgetbase.ui +++ b/parts/ctags2/ctags2_widgetbase.ui @@ -168,11 +168,11 @@ <tabstop>input_edit</tabstop> <tabstop>output_view</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private">line_edit_changed_delayed()</slot> <slot access="private">line_edit_changed()</slot> <slot access="private">regeneratebutton_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index eb2063c4..480a2da5 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -19,7 +19,7 @@ #include <kdevgenericfactory.h> #include <tdeaction.h> #include <tdefiledialog.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeio/jobclasses.h> #include <tdeio/job.h> #include <tdeparts/part.h> @@ -58,13 +58,13 @@ DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &) mainWindow()->setViewAvailable( diffWidget, false ); TDEAction *action = new TDEAction( i18n("Difference Viewer..."), 0, - this, TQT_SLOT(slotExecDiff()), + this, TQ_SLOT(slotExecDiff()), actionCollection(), "tools_diff" ); action->setToolTip(i18n("Difference viewer")); action->setWhatsThis(i18n("<b>Difference viewer</b><p>Shows the contents of a patch file.")); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); } static bool urlIsEqual(const KURL &a, const KURL &b) @@ -121,7 +121,7 @@ void DiffPart::contextMenu( TQPopupMenu* popup, const Context* context ) if ( partController()->documentState( rw_part->url() ) != Clean ) { int id = popup->insertItem( i18n( "Difference to Disk File" ), - this, TQT_SLOT(localDiff()) ); + this, TQ_SLOT(localDiff()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Difference to disk file</b><p>Shows the difference between " "the file contents in this editor and the file contents on disk.")); } @@ -155,14 +155,14 @@ void DiffPart::localDiff() *proc << "-u" << popupFile.path() << "-"; proc->setWorkingDirectory( popupFile.directory() ); - connect( proc, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(processExited( TDEProcess* )) ); - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) ); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) ); - connect( proc, TQT_SIGNAL(wroteStdin( TDEProcess* )), - this, TQT_SLOT(wroteStdin( TDEProcess* )) ); + connect( proc, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(processExited( TDEProcess* )) ); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStdout( TDEProcess*, char*, int )) ); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStderr( TDEProcess*, char*, int )) ); + connect( proc, TQ_SIGNAL(wroteStdin( TDEProcess* )), + this, TQ_SLOT(wroteStdin( TDEProcess* )) ); if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { KMessageBox::error( 0, i18n( "Could not invoke the \"diff\" command." ) ); diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index b52b8b25..2b7e5fc7 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -44,7 +44,7 @@ TQStringList KDiffTextEdit::extPartsTranslated; KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name ) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "Diff" ); _highlight = config->readBoolEntry( "Highlight", true ); @@ -53,7 +53,7 @@ KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( KDiffTextEdit::~KDiffTextEdit() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "Diff" ); config->writeEntry( "Highlight", _highlight ); @@ -78,19 +78,19 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) } if ( !extPartsTranslated.isEmpty() ) popup->insertSeparator( i ); - connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) ); + connect( popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupActivated(int)) ); - popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); + popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQ_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); popup->setItemEnabled( POPUP_BASE - 2, length() > 0 ); popup->insertSeparator( 1 ); - popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); + popup->insertItem( i18n( "Highlight Syntax" ), this, TQ_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); popup->setItemChecked( POPUP_BASE - 1, _highlight ); popup->insertSeparator( 3 ); popup->insertSeparator(); - popup->insertItem( i18n("Hide view"), parent(), TQT_SLOT(hideView()) ); + popup->insertItem( i18n("Hide view"), parent(), TQ_SLOT(hideView()) ); return popup; } @@ -190,7 +190,7 @@ DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFl te->setReadOnly( true ); te->setTextFormat( TQTextEdit::PlainText ); // te->setMinimumSize( 300, 200 ); - connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); + connect( te, TQ_SIGNAL(externalPartRequested(const TQString&)), this, TQ_SLOT(loadExtPart(const TQString&)) ); TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->addWidget( te ); @@ -229,7 +229,7 @@ void DiffWidget::loadExtPart( const TQString& partName ) if ( !extService ) return; - extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, TQT_TQOBJECT(this), 0 ); + extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, this, 0 ); if ( !extPart || !extPart->widget() ) return; @@ -309,10 +309,10 @@ void DiffWidget::openURL( const KURL& url ) if ( !job ) return; - connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), - this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotFinished()) ); + connect( job, TQ_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), + this, TQ_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotFinished()) ); } void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) @@ -321,9 +321,9 @@ void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) if ( !te->isVisible() ) { - popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) ); + popup->insertItem( i18n("Display &Raw Output"), this, TQ_SLOT(showTextEdit()) ); popup->insertSeparator(); - popup->insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) ); + popup->insertItem( i18n("Hide view"), this, TQ_SLOT(hideView()) ); } popup->exec( TQCursor::pos() ); diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp index fd235a0a..e0f3cccf 100644 --- a/parts/distpart/distpart_part.cpp +++ b/parts/distpart/distpart_part.cpp @@ -46,7 +46,7 @@ DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringLis setXMLFile("kdevpart_distpart.rc"); m_action = new TDEAction( i18n("Distribution && Publishing"), "package", 0, - this, TQT_SLOT(show()), + this, TQ_SLOT(show()), actionCollection(), "make_dist" ); m_action->setToolTip(i18n("Make source and binary distribution")); @@ -58,8 +58,8 @@ DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringLis m_dialog = new DistpartDialog(this, m_dlg ); m_dlg->setMainWidget(m_dialog); - connect( m_dlg, TQT_SIGNAL(okClicked()), m_dialog, TQT_SLOT(slotokayPushButtonPressed())); - connect( m_dlg, TQT_SIGNAL(cancelClicked()), m_dialog, TQT_SLOT(slotcancelPushButtonPressed())); + connect( m_dlg, TQ_SIGNAL(okClicked()), m_dialog, TQ_SLOT(slotokayPushButtonPressed())); + connect( m_dlg, TQ_SIGNAL(cancelClicked()), m_dialog, TQ_SLOT(slotcancelPushButtonPressed())); // Package types //RpmPackage = new SpecSupport(this); //LsmPackage = new LsmSupport(this); diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui index 63cad280..1d287ca8 100644 --- a/parts/distpart/distpart_ui.ui +++ b/parts/distpart/distpart_ui.ui @@ -1193,14 +1193,14 @@ Build Files</string> <tabstop>uploadRemoveToolButton</tabstop> <tabstop>uploadFileListBox</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotbuildAllPushButtonPressed()</slot> <slot>slotexportSPECPushButtonPressed()</slot> <slot>slotimportSPECPushButtonPressed()</slot> <slot>slotSrcPackagePushButtonPressed()</slot> <slot>slotAddFileButtonPressed()</slot> <slot>slotRemoveFile(TQListBoxItem *item)</slot> -</Q_SLOTS> +</slots> <pixmapfunction>DesktopIcon</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index c628fe26..0e583af3 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -23,7 +23,7 @@ #include <klibloader.h> #include <kurl.h> #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdefiledialog.h> #include <tdeio/netaccess.h> #include <tdelocale.h> @@ -55,39 +55,39 @@ DistpartDialog::DistpartDialog(DistpartPart *part, TQWidget *parent) :distpart_ui(parent, "dist_widget"), m_part(part) { m_spec = new SpecSupport(m_part); - connect( customProjectCheckBox, TQT_SIGNAL(toggled(bool) ), - this, TQT_SLOT(slotcustomProjectCheckBoxChanged())); - connect( uploadCustomCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotuploadCustomCheckBoxChanged())); - -// connect( okayPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotokayPushButtonPressed())); -// connect( cancelPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotcancelPushButtonPressed())); -/* connect(help_PushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slothelp_PushButtonPressed()));*/ - connect( createSrcArchPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotcreateSrcArchPushButtonPressed())); - connect( resetSrcPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotresetSrcPushButtonPressed())); - - connect( genHTMLPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotgenHTMLPushButtonPressed())); - connect( resetHTMLPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotresetHTMLPushButtonPressed())); - connect( uploadSubmitPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotuploadSubmitPushButtonPressed())); - connect( uploadResetPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotuploadResetPushButtonPressed())); - connect( uploadAddFileToolButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotuploadAddFileToolButtonPressed())); - connect( uploadRemoveToolButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotuploadRemoveToolButtonPressed())); - connect ( srcDistFileListBox, TQT_SIGNAL(clicked(TQListBoxItem*)), this, TQT_SLOT(slotRemoveFile(TQListBoxItem*))); -// connect( buildAllPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotbuildAllPushButtonPressed() )); -// connect( exportSPECPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotexportSPECPushButtonPressed( ) ) ); -// connect( srcPackagePushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotsrcPackagePushButtonPressed() ) ); -// connect( importSPECPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotimportSPECPushButtonPressed() ) ); + connect( customProjectCheckBox, TQ_SIGNAL(toggled(bool) ), + this, TQ_SLOT(slotcustomProjectCheckBoxChanged())); + connect( uploadCustomCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotuploadCustomCheckBoxChanged())); + +// connect( okayPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotokayPushButtonPressed())); +// connect( cancelPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotcancelPushButtonPressed())); +/* connect(help_PushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slothelp_PushButtonPressed()));*/ + connect( createSrcArchPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotcreateSrcArchPushButtonPressed())); + connect( resetSrcPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotresetSrcPushButtonPressed())); + + connect( genHTMLPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotgenHTMLPushButtonPressed())); + connect( resetHTMLPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotresetHTMLPushButtonPressed())); + connect( uploadSubmitPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotuploadSubmitPushButtonPressed())); + connect( uploadResetPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotuploadResetPushButtonPressed())); + connect( uploadAddFileToolButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotuploadAddFileToolButtonPressed())); + connect( uploadRemoveToolButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotuploadRemoveToolButtonPressed())); + connect ( srcDistFileListBox, TQ_SIGNAL(clicked(TQListBoxItem*)), this, TQ_SLOT(slotRemoveFile(TQListBoxItem*))); +// connect( buildAllPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotbuildAllPushButtonPressed() )); +// connect( exportSPECPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotexportSPECPushButtonPressed( ) ) ); +// connect( srcPackagePushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotsrcPackagePushButtonPressed() ) ); +// connect( importSPECPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotimportSPECPushButtonPressed() ) ); loadSettings(); diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp index 06a0bb67..8845744d 100644 --- a/parts/distpart/specsupport.cpp +++ b/parts/distpart/specsupport.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqfile.h> #include <tqdir.h> #include <tqerrormessage.h> @@ -53,14 +53,14 @@ SpecSupport::SpecSupport(DistpartPart *part) : packageBase(), m_part(part) { // // // -// connect(buildAllPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotbuildAllPushButtonPressed())); -// connect(exportSPECPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotexportSPECPushButtonPressed())); -// connect(importSPECPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotimportSPECPushButtonPressed())); -// connect(srcPackagePushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotsrcPackagePushButtonPressed())); +// connect(buildAllPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotbuildAllPushButtonPressed())); +// connect(exportSPECPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotexportSPECPushButtonPressed())); +// connect(importSPECPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotimportSPECPushButtonPressed())); +// connect(srcPackagePushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotsrcPackagePushButtonPressed())); parseDotRpmmacros(); } diff --git a/parts/documentation/addcatalogdlg.h b/parts/documentation/addcatalogdlg.h index 461bf56d..4353e1b8 100644 --- a/parts/documentation/addcatalogdlg.h +++ b/parts/documentation/addcatalogdlg.h @@ -31,7 +31,7 @@ class AddCatalogDlg: public AddCatalogDlgBase TQ_OBJECT public: - AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0); ~AddCatalogDlg(); TQString title() const; diff --git a/parts/documentation/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui index b88906eb..2734918d 100644 --- a/parts/documentation/addcatalogdlgbase.ui +++ b/parts/documentation/addcatalogdlgbase.ui @@ -189,10 +189,10 @@ <slot>locationURLChanged(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>locationURLChanged( const TQString & )</slot> <slot>docTypeChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index 4ec63094..8ac25005 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -24,7 +24,7 @@ #include <tqpoint.h> #include <klineedit.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdialog.h> #include <kpushbutton.h> @@ -133,16 +133,16 @@ BookmarkView::BookmarkView(DocumentationWidget *parent, const char *name) showBookmarks(); - connect(m_view, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); - connect(m_addButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(addBookmark())); - connect(m_editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editBookmark())); - connect(m_removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeBookmark())); + connect(m_view, TQ_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); + connect(m_addButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(addBookmark())); + connect(m_editButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editBookmark())); + connect(m_removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeBookmark())); - connect(m_widget->part(), TQT_SIGNAL(bookmarkLocation(const TQString&, const KURL& )), - this, TQT_SLOT(addBookmark(const TQString&, const KURL& ))); - connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); + connect(m_widget->part(), TQ_SIGNAL(bookmarkLocation(const TQString&, const KURL& )), + this, TQ_SLOT(addBookmark(const TQString&, const KURL& ))); + connect(m_view, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } BookmarkView::~BookmarkView() diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index 3c07369c..d77126b1 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -47,10 +47,10 @@ ContentsView::ContentsView(DocumentationWidget *parent, const char *name) m_view->setSorting(-1); m_view->setAllColumnsShowFocus( true ); - connect(m_view, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); - connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); + connect(m_view, TQ_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); + connect(m_view, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } ContentsView::~ContentsView() diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp index 55b108ec..47b0c0f0 100644 --- a/parts/documentation/docconfiglistview.cpp +++ b/parts/documentation/docconfiglistview.cpp @@ -40,10 +40,10 @@ DocConfigListView::DocConfigListView(TQWidget *parent, const char *name) setResizeMode( TQListView::LastColumn ); setSorting(3); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(itemClicked(TQListViewItem*, const TQPoint&, int ))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(itemDoubleClicked(TQListViewItem*, const TQPoint&, int ))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(itemClicked(TQListViewItem*, const TQPoint&, int ))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(itemDoubleClicked(TQListViewItem*, const TQPoint&, int ))); } DocConfigListView::~DocConfigListView() diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 8dd6c0b8..22b57fec 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -30,8 +30,8 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <kurlrequester.h> #include <tdefontcombo.h> @@ -64,19 +64,19 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, { (*it)->loadCatalogConfiguration( m_View ); } - connect( m_View, TQT_SIGNAL(itemActivated()), this, TQT_SLOT(editCollectionButtonClicked()) ); + connect( m_View, TQ_SIGNAL(itemActivated()), this, TQ_SLOT(editCollectionButtonClicked()) ); TDEConfig *config = m_part->config(); //read full text search settings config->setGroup("htdig"); - TQString databaseDir = kapp->dirs()->saveLocation("data", + TQString databaseDir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); databaseDirEdit->setURL(config->readPathEntry("databaseDir", databaseDir)); - htdigbinEdit->setURL(config->readPathEntry("htdigbin", kapp->dirs()->findExe("htdig"))); - htmergebinEdit->setURL(config->readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge"))); - htsearchbinEdit->setURL(config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch"))); - if (config->readBoolEntry("IsSetup", false) == false) + htdigbinEdit->setURL(config->readPathEntry("htdigbin", tdeApp->dirs()->findExe("htdig"))); + htmergebinEdit->setURL(config->readPathEntry("htmergebin", tdeApp->dirs()->findExe("htmerge"))); + htsearchbinEdit->setURL(config->readPathEntry("htsearchbin", tdeApp->dirs()->findExe("htsearch"))); + if (!config->readBoolEntry("IsSetup", false)) { TQFileInfo fi(htsearchbinEdit->url()); if (!fi.exists()) @@ -104,7 +104,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, useAssistant_box->setChecked(m_part->isAssistantUsed()); // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant - if ( kapp->instanceName().find("kdevassistant") != -1 ) + if ( tdeApp->instanceName().find("kdevassistant") != -1 ) useAssistant_box->hide(); //font sizes and zoom levels diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui index 5d2d4038..2befa99f 100644 --- a/parts/documentation/docglobalconfigwidgetbase.ui +++ b/parts/documentation/docglobalconfigwidgetbase.ui @@ -557,7 +557,7 @@ <tabstop>info_box</tabstop> <tabstop>man_box</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>addCollectionButtonClicked()</slot> <slot>editCollectionButtonClicked()</slot> <slot>removeCollectionButtonClicked()</slot> @@ -565,7 +565,7 @@ <slot>collectionsBoxCurrentChanged( int )</slot> <slot>updateConfig()</slot> <slot>updateIndex()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/parts/documentation/docprojectconfigwidgetbase.ui b/parts/documentation/docprojectconfigwidgetbase.ui index 8914aaa1..a882bc77 100644 --- a/parts/documentation/docprojectconfigwidgetbase.ui +++ b/parts/documentation/docprojectconfigwidgetbase.ui @@ -140,9 +140,9 @@ <tabstop>catalogURL</tabstop> <tabstop>docSystemCombo</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>changeDocSystem(const TQString &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 1d284a64..0bac7045 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -87,11 +87,11 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("Documentation"), GLOBALDOC_OPTIONS, info()->icon() ); m_configProxy->createProjectConfigPage(i18n("Project Documentation"), PROJECTDOC_OPTIONS, info()->icon() ); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); m_widget = new DocumentationWidget(this); m_widget->setIcon(SmallIcon(info()->icon())); @@ -109,7 +109,7 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T setupActions(); checkLastVersion(); - TQTimer::singleShot(5, this, TQT_SLOT(init())); + TQTimer::singleShot(5, this, TQ_SLOT(init())); new KDevDocumentationIface(this); } @@ -147,7 +147,7 @@ void DocumentationPart::loadDocumentationPlugins() { kdDebug() << " success" << endl; docPlugin->init(m_widget->contents()); - connect(this, TQT_SIGNAL(indexSelected(IndexBox* )), docPlugin, TQT_SLOT(createIndex(IndexBox* ))); + connect(this, TQ_SIGNAL(indexSelected(IndexBox* )), docPlugin, TQ_SLOT(createIndex(IndexBox* ))); m_plugins.append(docPlugin); } } @@ -172,13 +172,13 @@ void DocumentationPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *pag case GLOBALDOC_OPTIONS: { DocGlobalConfigWidget *w1 = new DocGlobalConfigWidget(this, m_widget, page, "doc config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w1, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { DocProjectConfigWidget *w1 = new DocProjectConfigWidget(this, page, "doc project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w1, TQ_SLOT(accept())); break; } } @@ -199,7 +199,7 @@ bool DocumentationPart::configure(int page) DocGlobalConfigWidget *w1 = new DocGlobalConfigWidget(this, m_widget, dlg.plainPage()); l->addWidget(w1); w1->docTab->setCurrentPage(page); - connect(&dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + connect(&dlg, TQ_SIGNAL(okClicked()), w1, TQ_SLOT(accept())); return (dlg.exec() == TQDialog::Accepted); } @@ -211,7 +211,7 @@ void DocumentationPart::setupActions() TDEAction *action; action = new TDEAction(i18n("&Search in Documentation..."), CTRL+ALT+Key_S, - this, TQT_SLOT(searchInDocumentation()), + this, TQ_SLOT(searchInDocumentation()), actionCollection(), "help_search_in_doc" ); action->setToolTip(i18n("Full text search in the documentation")); action->setWhatsThis(i18n("<b>Search in documentation</b><p>" @@ -222,7 +222,7 @@ void DocumentationPart::setupActions() "configuration dialog of the documentation plugin.")); action = new TDEAction(i18n("&Look in Documentation Index..."), CTRL+ALT+Key_I, - this, TQT_SLOT(lookInDocumentationIndex()), + this, TQ_SLOT(lookInDocumentationIndex()), actionCollection(), "help_look_in_index" ); action->setToolTip(i18n("Look in the documentation index")); action->setWhatsThis(i18n("<b>Look in documentation index</b><p>" @@ -231,19 +231,19 @@ void DocumentationPart::setupActions() "the documentation index.")); action = new TDEAction(i18n("Man Page..."), 0, - this, TQT_SLOT(manPage()), + this, TQ_SLOT(manPage()), actionCollection(), "help_manpage" ); action->setToolTip(i18n("Show a manpage")); action->setWhatsThis(i18n("<b>Show a manpage</b><p>Opens a man page using embedded viewer.")); action = new TDEAction(i18n("Info Page..."), 0, - this, TQT_SLOT(infoPage()), + this, TQ_SLOT(infoPage()), actionCollection(), "help_infopage"); action->setToolTip(i18n("Show an infopage")); action->setWhatsThis(i18n("<b>Show an infopage</b><p>Opens an info page using embedded viewer.")); action = new TDEAction(i18n("Find Documentation..."), 0, - this, TQT_SLOT(findInDocumentation()), + this, TQ_SLOT(findInDocumentation()), actionCollection(), "help_find_documentation"); action->setToolTip(i18n("Find Documentation")); action->setWhatsThis(i18n("<b>Find documentation</b><p>" @@ -467,7 +467,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) int id = -1; if (hasContextFeature(Finder)) { id = popup->insertItem(i18n("Find Documentation: %1").arg(squeezed), - this, TQT_SLOT(contextFindDocumentation())); + this, TQ_SLOT(contextFindDocumentation())); popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>" "Opens the documentation finder tab and searches " "all possible sources of documentation like " @@ -476,7 +476,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) } if (hasContextFeature(IndexLookup)) { id = popup->insertItem(i18n("Look in Documentation Index: %1").arg(squeezed), - this, TQT_SLOT(contextLookInDocumentationIndex())); + this, TQ_SLOT(contextLookInDocumentationIndex())); popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>" "Opens the documentation index tab. It allows " "a term to be entered which will be looked for in " @@ -484,7 +484,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) } if (hasContextFeature(FullTextSearch)) { id = popup->insertItem(i18n("Search in Documentation: %1").arg(squeezed), - this, TQT_SLOT(contextSearchInDocumentation())); + this, TQ_SLOT(contextSearchInDocumentation())); popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches " "for a term under the cursor in " "the documentation. For this to work, " @@ -493,12 +493,12 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) } if (hasContextFeature(GotoMan)) { id = popup->insertItem(i18n("Goto Manpage: %1").arg(squeezed), - this, TQT_SLOT(contextManPage())); + this, TQ_SLOT(contextManPage())); popup->setWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor.")); } if (hasContextFeature(GotoInfo)) { id = popup->insertItem( i18n("Goto Infopage: %1").arg(squeezed), - this, TQT_SLOT(contextInfoPage()) ); + this, TQ_SLOT(contextInfoPage()) ); popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor.")); } if (id != -1) @@ -676,7 +676,7 @@ TQCString DocumentationPart::startAssistant() bool DocumentationPart::isAssistantUsed() const { // hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant - if ( kapp->instanceName().find("kdevassistant") != -1 ) + if ( tdeApp->instanceName().find("kdevassistant") != -1 ) { return false; } @@ -688,7 +688,7 @@ void DocumentationPart::setAssistantUsed(bool b) { m_assistantUsed = b; //use global config to store different settings for kdevassistant and tdevelop - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Documentation"); config->writeEntry("UseAssistant", isAssistantUsed()); } @@ -736,7 +736,7 @@ void DocumentationPart::callAssistant(const TQCString &interface, const TQCStrin void DocumentationPart::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Documentation"); m_assistantUsed = config->readBoolEntry("UseAssistant", false); diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index b1ab69ca..3430c440 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -64,12 +64,12 @@ DocumentationWidget::DocumentationWidget(DocumentationPart *part) m_bookmarks = new BookmarkView(this); m_tab->addItem(m_bookmarks, i18n("Bookmarks")); - connect(m_tab, TQT_SIGNAL(currentChanged(int)), this, TQT_SLOT(tabChanged(int))); + connect(m_tab, TQ_SIGNAL(currentChanged(int)), this, TQ_SLOT(tabChanged(int))); } DocumentationWidget::~DocumentationWidget() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Documentation"); config->writeEntry("LastPage", m_tab->currentIndex()); } diff --git a/parts/documentation/editcatalogdlg.h b/parts/documentation/editcatalogdlg.h index 5aaa6eed..71f1c4a7 100644 --- a/parts/documentation/editcatalogdlg.h +++ b/parts/documentation/editcatalogdlg.h @@ -30,7 +30,7 @@ class EditCatalogDlg : public EditCatalogBase public: EditCatalogDlg(DocumentationPlugin *plugin, - TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0); ~EditCatalogDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui index 7315092b..34769563 100644 --- a/parts/documentation/editcatalogdlgbase.ui +++ b/parts/documentation/editcatalogdlgbase.ui @@ -178,9 +178,9 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>locationURLChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index 85365f69..72563413 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -26,7 +26,7 @@ #include <tqstringlist.h> #include <klineedit.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelistbox.h> #include <kdevpartcontroller.h> @@ -46,20 +46,20 @@ FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* na man_item(0), info_item(0), index_item(0), google_item(0), contents_item(0), last_item(0), m_widget(parent) { - TQWidget* tmp = TQT_TQWIDGET(TQApplication::desktop()); + TQWidget* tmp = TQApplication::desktop(); setGeometry(tmp->width()/2 - width()/2, tmp->height()/2 - height()/2, width(), height()); - proc_man = new TDEProcess( TQT_TQOBJECT(this) ); - proc_info = new TDEProcess( TQT_TQOBJECT(this) ); - - connect( proc_man, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(procManExited( TDEProcess* )) ); - connect( proc_man, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)), - this, TQT_SLOT(procManReadStdout( TDEProcess*, char*, int)) ); - - connect( proc_info, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(procInfoExited( TDEProcess* )) ); - connect( proc_info, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)), - this, TQT_SLOT(procInfoReadStdout( TDEProcess*, char*, int)) ); + proc_man = new TDEProcess( this ); + proc_info = new TDEProcess( this ); + + connect( proc_man, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(procManExited( TDEProcess* )) ); + connect( proc_man, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int)), + this, TQ_SLOT(procManReadStdout( TDEProcess*, char*, int)) ); + + connect( proc_info, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(procInfoExited( TDEProcess* )) ); + connect( proc_info, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int)), + this, TQ_SLOT(procInfoReadStdout( TDEProcess*, char*, int)) ); result_list->header()->hide(); result_list->setSorting(-1); diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp index ef0deaca..ee8fd976 100644 --- a/parts/documentation/find_documentation_options.cpp +++ b/parts/documentation/find_documentation_options.cpp @@ -108,7 +108,7 @@ void FindDocumentationOptions::sourceMoveUp() void FindDocumentationOptions::writeOptions() { - config = kapp->config(); + config = tdeApp->config(); config->setGroup("DocumentationFinder"); config->writeEntry("goto_first_match", goto_first_match->isChecked()); @@ -151,7 +151,7 @@ void FindDocumentationOptions::writeOptions() void FindDocumentationOptions::readOptions() { - config = kapp->config(); + config = tdeApp->config(); config->setGroup("DocumentationFinder"); source_list->clear(); diff --git a/parts/documentation/find_documentation_options.h b/parts/documentation/find_documentation_options.h index d12e748b..b1d0cea9 100644 --- a/parts/documentation/find_documentation_options.h +++ b/parts/documentation/find_documentation_options.h @@ -31,7 +31,7 @@ class FindDocumentationOptions : public FindDocumentationOptionsBase TQ_OBJECT public: - FindDocumentationOptions(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE); + FindDocumentationOptions(TQWidget* parent = 0, const char* name = 0, bool modal = false); ~FindDocumentationOptions(); /*$PUBLIC_FUNCTIONS$*/ virtual bool isContents( TQCheckListItem * item ); diff --git a/parts/documentation/find_documentation_optionsbase.ui b/parts/documentation/find_documentation_optionsbase.ui index 3dd843f6..2a31e034 100644 --- a/parts/documentation/find_documentation_optionsbase.ui +++ b/parts/documentation/find_documentation_optionsbase.ui @@ -204,9 +204,9 @@ sources and change their priority here.</string> <slot>sourceMoveDown()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>sourceMoveUp()</slot> <slot>sourceMoveDown()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui index d7a4e46a..4e917917 100644 --- a/parts/documentation/find_documentationbase.ui +++ b/parts/documentation/find_documentationbase.ui @@ -148,7 +148,7 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>clickOptions()</slot> <slot>setSearchTerm( const TQString & term )</slot> <slot>startSearch()</slot> @@ -161,7 +161,7 @@ <slot>procInfoReadFromStdout()</slot> <slot>clickOnItem( TQListViewItem * item )</slot> <slot>buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int c )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="1" margin="1"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp index f414e288..6024bdac 100644 --- a/parts/documentation/indexview.cpp +++ b/parts/documentation/indexview.cpp @@ -52,11 +52,11 @@ IndexView::IndexView(DocumentationWidget *parent, const char *name) m_index = new IndexBox(this); l->addWidget(m_index); - connect(m_index, TQT_SIGNAL(executed(TQListBoxItem* )), this, TQT_SLOT(searchInIndex(TQListBoxItem* ))); - connect(m_index, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem*, const TQPoint& )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListBoxItem*, const TQPoint& ))); - connect(m_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(searchInIndex())); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(showIndex(const TQString&))); + connect(m_index, TQ_SIGNAL(executed(TQListBoxItem* )), this, TQ_SLOT(searchInIndex(TQListBoxItem* ))); + connect(m_index, TQ_SIGNAL(mouseButtonPressed(int, TQListBoxItem*, const TQPoint& )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListBoxItem*, const TQPoint& ))); + connect(m_edit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(searchInIndex())); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(showIndex(const TQString&))); m_edit->installEventFilter(this); } diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 7eedf73a..3b45e00a 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -24,7 +24,7 @@ #include <tqheader.h> #include <tqtextstream.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdeconfig.h> #include <kdebug.h> @@ -685,7 +685,7 @@ ProjectDocumentationPlugin::ProjectDocumentationPlugin(DocumentationPlugin *docP kdDebug() << "ProjectDocumentationPlugin::ProjectDocumentationPlugin for type " << type << endl; m_watch = new KDirWatch(this); - connect(m_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(reinit())); + connect(m_watch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(reinit())); m_watch->startScan(); } diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp index 2710fe25..793c5437 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp @@ -30,7 +30,7 @@ #include <tdeaboutdata.h> #include <tdeconfig.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdevgenericfactory.h> #include <kdevplugininfo.h> diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp index 239fc2ef..3100a5f3 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp @@ -32,7 +32,7 @@ #include <tdeaboutdata.h> #include <tdeconfig.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <urlutil.h> #include <kdevgenericfactory.h> diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp index d0a00eb6..8ec45be5 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp @@ -31,7 +31,7 @@ #include <tdeconfig.h> #include <tdelocale.h> #include <tdelistview.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <urlutil.h> #include <kdevgenericfactory.h> diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index 787a8f32..840982ba 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <kurl.h> #include <kmimemagic.h> diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index 952228c4..d182315b 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -17,11 +17,11 @@ #include "kchmpart.h" #include <tqstring.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaboutdata.h> extern "C" @@ -101,8 +101,8 @@ bool KChmPart::openFile() m_htmlData.truncate(0); m_job = TDEIO::get( TQString("chm:")+m_file+"/", true, false ); - connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( jobDone( TDEIO::Job * ) ) ); + connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQ_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( jobDone( TDEIO::Job * ) ) ); return true; } diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 080254ae..26529239 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -36,9 +36,9 @@ #include <kcombobox.h> #include <tdelocale.h> #include <kdialog.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdemessagebox.h> #include <kdebug.h> @@ -102,13 +102,13 @@ SearchView::SearchView(DocumentationPart *part, TQWidget *parent, const char *na m_view->setAllColumnsShowFocus(true); m_view->setResizeMode( TQListView::LastColumn ); - connect(m_configButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateConfig())); - connect(m_indexButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateIndex())); - connect(m_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(search())); - connect(m_goSearchButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(search())); - connect(m_view, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(executed(TQListViewItem*))); - connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); + connect(m_configButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateConfig())); + connect(m_indexButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateIndex())); + connect(m_edit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(search())); + connect(m_goSearchButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(search())); + connect(m_view, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(executed(TQListViewItem*))); + connect(m_view, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } SearchView::~SearchView() @@ -143,7 +143,7 @@ void SearchView::search() { TDEConfig *config = m_part->config(); config->setGroup("htdig"); - if (config->readBoolEntry("IsSetup", false) == false) + if (!config->readBoolEntry("IsSetup", false)) { KMessageBox::information(this, i18n("Full text search has to be set up before usage.")); if (!m_part->configure(1)) @@ -152,7 +152,7 @@ void SearchView::search() updateIndex(); return; } - TQString exe = config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch")); + TQString exe = config->readPathEntry("htsearchbin", tdeApp->dirs()->findExe("htsearch")); if (exe.isEmpty()) { KMessageBox::error(this, i18n("Cannot find the htsearch executable.\nIt is part of the ht://Dig package that is used by TDevelop to perform full text search. Please install ht://Dig and use Documentation page in Configure TDevelop dialog to set the htsearch location.")); @@ -160,7 +160,7 @@ void SearchView::search() return; } - TQString indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + TQString indexdir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); TQDir d; if (indexdir.isEmpty() || !TQFile::exists(indexdir + "/htdig.conf")) { @@ -177,7 +177,7 @@ void SearchView::search() } } - TQString savedir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + TQString savedir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); if (!d.exists(savedir)) d.mkdir(savedir); @@ -188,17 +188,17 @@ void SearchView::search() .arg("builtin-short") .arg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score"); - kdDebug(9002) << "starting kprocess" << endl; + kdDebug(9002) << "starting tdeprocess" << endl; kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl; TDEProcess *proc = new TDEProcess; - TQString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png"); + TQString picdir = tdeApp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png"); proc->setEnvironment("PICDIR", picdir); *proc << exe << "-c" << (indexdir + "/htdig.conf") << query; - connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)), - this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int)) ); - connect( proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htsearchExited(TDEProcess *)) ); + connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)), + this, TQ_SLOT(htsearchStdout(TDEProcess *,char*,int)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htsearchExited(TDEProcess *)) ); searchResult = ""; @@ -213,12 +213,12 @@ void SearchView::search() // While receiving data from the subprocess, we want // to block the user interface, but still get repaint // events. Hack taken from NetAccess... - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQWidget blocker(0, 0, WType_Dialog | WShowModal); tqt_enter_modal(&blocker); - kapp->enter_loop(); + tdeApp->enter_loop(); tqt_leave_modal(&blocker); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); if (!proc->normalExit() || proc->exitStatus() != 0) { @@ -254,7 +254,7 @@ void SearchView::htsearchStdout(TDEProcess *, char *buffer, int len) void SearchView::htsearchExited(TDEProcess *) { - kapp->exit_loop(); + tdeApp->exit_loop(); } void SearchView::analyseSearchResults() diff --git a/parts/documentation/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui index fe558f89..a2931c19 100644 --- a/parts/documentation/selecttopicbase.ui +++ b/parts/documentation/selecttopicbase.ui @@ -129,8 +129,8 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>newSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index c99c4a2c..6642c5d2 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -32,8 +32,8 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include <tdeversion.h> #include <kprogress.h> @@ -45,7 +45,7 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) { proc = 0; - indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + indexdir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); TQDir d; d.mkdir(indexdir); TDEConfig config("kdevdocumentation", true); @@ -88,9 +88,9 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) setState(0); setMinimumWidth(300); - connect(this, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked())); - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedStart())); + connect(this, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelClicked())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(okClicked())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedStart())); } ProgressDialog::~ProgressDialog() @@ -170,14 +170,14 @@ void ProgressDialog::addDir(const TQString &dir) if (*it != "." && *it != "..") { addDir(dir + "/" + *it); - kapp->processEvents(); + tdeApp->processEvents(); } if (procdone) { return; } } - kapp->processEvents(); + tdeApp->processEvents(); } void ProgressDialog::scanDirectories() @@ -268,8 +268,8 @@ void ProgressDialog::startHtdigProcess(bool initial) if (initial) { *proc << "-i"; } - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htdigExited(TDEProcess *))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htdigExited(TDEProcess *))); htdigRunning = true; @@ -302,7 +302,7 @@ bool ProgressDialog::generateIndex() // run htdig TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); - exe = config.readPathEntry("htdigbin", kapp->dirs()->findExe("htdig")); + exe = config.readPathEntry("htdigbin", tdeApp->dirs()->findExe("htdig")); if (exe.isEmpty()) { done(1); @@ -368,7 +368,7 @@ void ProgressDialog::htdigExited(TDEProcess *proc) TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); // run htmerge ----------------------------------------------------- - exe = config.readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge")); + exe = config.readPathEntry("htmergebin", tdeApp->dirs()->findExe("htmerge")); if (exe.isEmpty()) { done(1); @@ -387,8 +387,8 @@ void ProgressDialog::startHtmergeProcess() kdDebug(9002) << "Running htmerge" << endl; - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htmergeExited(TDEProcess *))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htmergeExited(TDEProcess *))); htmergeRunning = true; diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp index 4299c300..23d17247 100644 --- a/parts/doxygen/config.cpp +++ b/parts/doxygen/config.cpp @@ -71,15 +71,6 @@ bool portable_fileSystemIsCaseSensitive() #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include <io.h> -#include <stdlib.h> -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else @@ -627,7 +618,7 @@ void ConfigOption::writeStringValue(TQTextStream &t,TQCString &s) { const char *p=s.data(); char c; - bool needsEscaping=FALSE; + bool needsEscaping=false; if (p) { while ((c=*p++)!=0 && !needsEscaping) @@ -653,12 +644,12 @@ void ConfigOption::writeStringValue(TQTextStream &t,TQCString &s) void ConfigOption::writeStringList(TQTextStream &t,TQStrList &l) { const char *p = l.first(); - bool first=TRUE; + bool first=true; while (p) { TQCString s=p; if (!first) t << " "; - first=FALSE; + first=false; writeStringValue(t,s); p = l.next(); if (p) t << " \\" << endl; @@ -692,11 +683,11 @@ void ConfigBool::convertStrToVal() { if (val=="yes" || val=="true" || val=="1") { - m_value=TRUE; + m_value=true; } else if (val=="no" || val=="false" || val=="0") { - m_value=FALSE; + m_value=false; } else { @@ -1449,12 +1440,12 @@ YY_RULE_SETUP TQCString bs=yytext; bs=bs.upper(); if (bs=="YES" || bs=="1") - *b=TRUE; + *b=true; else if (bs=="NO" || bs=="0") - *b=FALSE; + *b=false; else { - *b=FALSE; + *b=false; config_warn("Warning: Invalid value `%s' for " "boolean tag in line %d, file %s; use YES or NO\n", bs.data(),yyLineNr,yyFileName.data()); @@ -2402,7 +2393,7 @@ static void writeStringValue(TQTextStream &t,TQCString &s) { const char *p=s.data(); char c; - bool hasBlanks=FALSE; + bool hasBlanks=false; if (p) { while ((c=*p++)!=0 && !hasBlanks) hasBlanks = (c==' ' || c=='\n' || c=='\t'); @@ -2416,15 +2407,15 @@ static void writeStringValue(TQTextStream &t,TQCString &s) static void writeStringList(TQTextStream &t,TQStrList &l) { const char *p = l.first(); - bool first=TRUE; + bool first=true; while (p) { char c; const char *s=p; - bool hasBlanks=FALSE; + bool hasBlanks=false; while ((c=*p++)!=0 && !hasBlanks) hasBlanks = (c==' ' || c=='\n' || c=='\t'); if (!first) t << " "; - first=FALSE; + first=false; if (hasBlanks) t << "\"" << s << "\""; else t << s; p = l.next(); if (p) t << " \\" << endl; @@ -2492,7 +2483,7 @@ static void substEnvVarsInStrList(TQStrList &sl) while (s) { TQCString result(s); - // an argument with quotes will have an extra space at the end, so wasQuoted will be TRUE. + // an argument with quotes will have an extra space at the end, so wasQuoted will be true. bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1); // here we strip the quote again substEnvVarsInString(result); @@ -2808,7 +2799,7 @@ void Config::check() } else { - dotPath=TQFile::encodeName( dp.dirPath(TRUE)+"/" ); + dotPath=TQFile::encodeName( dp.dirPath(true)+"/" ); #if defined(_WIN32) // convert slashes uint i=0,l=dotPath.length(); for (i=0;i<l;i++) if (dotPath.at(i)=='/') dotPath.at(i)='\\'; @@ -2832,7 +2823,7 @@ void Config::check() } else { - mscgenPath=TQFile::encodeName( dp.dirPath(TRUE)+"/" ); + mscgenPath=TQFile::encodeName( dp.dirPath(true)+"/" ); #if defined(_WIN32) // convert slashes uint i=0,l=mscgenPath.length(); for (i=0;i<l;i++) if (mscgenPath.at(i)=='/') mscgenPath.at(i)='\\'; @@ -2956,13 +2947,9 @@ void Config::check() #undef PUTENV #undef SEP -#if defined(_WIN32) && (__BORLANDC__ < 0x0550) -#define PUTENV _putenv -#define SEP ";" -#else #define PUTENV putenv #define SEP ":" -#endif + // check TQHP creation requirements if (Config_getBool("GENERATE_TQHP")) { @@ -3022,7 +3009,7 @@ void Config::check() { // don't show inline info for Java output, since Java has no inline // concept. - Config_getBool("INLINE_INFO")=FALSE; + Config_getBool("INLINE_INFO")=false; } int &depth = Config_getInt("MAX_DOT_GRAPH_DEPTH"); @@ -3072,10 +3059,10 @@ void Config::check() "%s%s%s%s",s1,s2,s3,s4 ); - Config_getBool("INLINE_INHERITED_MEMB") = FALSE; - Config_getBool("INHERIT_DOCS") = FALSE; - Config_getBool("HIDE_SCOPE_NAMES") = TRUE; - Config_getBool("EXTRACT_PRIVATE") = TRUE; + Config_getBool("INLINE_INHERITED_MEMB") = false; + Config_getBool("INHERIT_DOCS") = false; + Config_getBool("HIDE_SCOPE_NAMES") = true; + Config_getBool("EXTRACT_PRIVATE") = true; } } @@ -3093,7 +3080,7 @@ void Config::init() void Config::create() { if (m_initialized) return; - m_initialized = TRUE; + m_initialized = true; ConfigString *cs; ConfigEnum *ce; @@ -3142,7 +3129,7 @@ void Config::create() "Enabling this option can be useful when feeding doxygen a huge amount of \n" "source files, where putting all generated files in the same directory would \n" "otherwise cause performance problems for the file system. \n", - FALSE + false ); ce = addEnum( "OUTPUT_LANGUAGE", @@ -3273,9 +3260,9 @@ void Config::create() "whereas setting the tag to NO uses a Unix-style encoding (the default for \n" "all platforms other than Windows).\n", #if defined(_WIN32) || defined(__CYGWIN__) - TRUE + true #else - FALSE + false #endif ); #endif @@ -3287,7 +3274,7 @@ void Config::create() "include brief member descriptions after the members that are listed in \n" "the file and class documentation (similar to JavaDoc). \n" "Set to NO to disable this. \n", - TRUE + true ); cb = addBool( "REPEAT_BRIEF", @@ -3295,7 +3282,7 @@ void Config::create() "the brief description of a member or function before the detailed description. \n" "Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the \n" "brief descriptions will be completely suppressed. \n", - TRUE + true ); cl = addList( "ABBREVIATE_BRIEF", @@ -3314,7 +3301,7 @@ void Config::create() "If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then \n" "Doxygen will generate a detailed section even if there is only a brief \n" "description. \n", - FALSE + false ); cb = addBool( "INLINE_INHERITED_MEMB", @@ -3322,14 +3309,14 @@ void Config::create() "inherited members of a class in the documentation of that class as if those \n" "members were ordinary class members. Constructors, destructors and assignment \n" "operators of the base classes will not be shown. \n", - FALSE + false ); cb = addBool( "FULL_PATH_NAMES", "If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full \n" "path before files name in the file list and in the header files. If set \n" "to NO the shortest path that makes the file name unique will be used. \n", - TRUE + true ); cl = addList( "STRIP_FROM_PATH", @@ -3355,7 +3342,7 @@ void Config::create() "If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter \n" "(but less readable) file names. This can be useful is your file systems \n" "doesn't support long names like on DOS, Mac, or CD-ROM. \n", - FALSE + false ); cb = addBool( "JAVADOC_AUTOBRIEF", @@ -3364,7 +3351,7 @@ void Config::create() "comment as the brief description. If set to NO, the JavaDoc \n" "comments will behave just like regular TQt-style comments \n" "(thus requiring an explicit @brief command for a brief description.) \n", - FALSE + false ); cb = addBool( "TQT_AUTOBRIEF", @@ -3373,7 +3360,7 @@ void Config::create() "comment as the brief description. If set to NO, the comments \n" "will behave just like regular TQt-style comments (thus requiring \n" "an explicit \\brief command for a brief description.) \n", - FALSE + false ); cb = addBool( "MULTILINE_CPP_IS_BRIEF", @@ -3382,7 +3369,7 @@ void Config::create() "comments) as a brief description. This used to be the default behaviour. \n" "The new default is to treat a multi-line C++ comment block as a detailed \n" "description. Set this tag to YES if you prefer the old behaviour instead. \n", - FALSE + false ); //cb = addBool( // "DETAILS_AT_TOP", @@ -3390,21 +3377,21 @@ void Config::create() // "will output the detailed description near the top, like JavaDoc.\n" // "If set to NO, the detailed description appears after the member \n" // "documentation. \n", - // FALSE + // false // ); cb = addBool( "INHERIT_DOCS", "If the INHERIT_DOCS tag is set to YES (the default) then an undocumented \n" "member inherits the documentation from any documented member that it \n" "re-implements. \n", - TRUE + true ); cb = addBool( "SEPARATE_MEMBER_PAGES", "If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce \n" "a new page for each member. If set to NO, the documentation of a member will \n" "be part of the file/class/namespace that contains it.\n", - FALSE + false ); ci = addInt( "TAB_SIZE", @@ -3427,7 +3414,7 @@ void Config::create() "sources only. Doxygen will then generate output that is more tailored for C. \n" "For instance, some of the names that are used will be different. The list \n" "of all members will be omitted, etc. \n", - FALSE + false ); cb = addBool( "OPTIMIZE_OUTPUT_JAVA", @@ -3435,21 +3422,21 @@ void Config::create() "sources only. Doxygen will then generate output that is more tailored for \n" "Java. For instance, namespaces will be presented as packages, qualified \n" "scopes will look different, etc. \n", - FALSE + false ); cb = addBool( "OPTIMIZE_FOR_FORTRAN", "Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran \n" "sources only. Doxygen will then generate output that is more tailored for \n" "Fortran. \n", - FALSE + false ); cb = addBool( "OPTIMIZE_OUTPUT_VHDL", "Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL \n" "sources. Doxygen will then generate output that is tailored for \n" "VHDL. \n", - FALSE + false ); cl = addList( "EXTENSION_MAPPING", "Doxygen selects the parser to use depending on the extension of the files it parses. \n" @@ -3469,20 +3456,20 @@ void Config::create() "definitions whose arguments contain STL classes (e.g. func(std::string); v.s. \n" "func(std::string) {}). This also make the inheritance and collaboration \n" "diagrams that involve STL classes more complete and accurate. \n", - FALSE + false ); cb = addBool( "CPP_CLI_SUPPORT", "If you use Microsoft's C++/CLI language, you should set this option to YES to\n" "enable parsing support.\n", - FALSE + false ); cb = addBool( "SIP_SUPPORT", "Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. \n" "Doxygen will parse them like normal C++ but will assume all classes use public \n" "instead of private inheritance when no explicit protection keyword is present. \n", - FALSE + false ); cb = addBool( "IDL_PROPERTY_SUPPORT", "For Microsoft's IDL there are propget and propput attributes to indicate getter \n" @@ -3491,7 +3478,7 @@ void Config::create() "documentation. This will only work if the methods are indeed getting or \n" "setting a simple type. If this is not the case, or you want to show the \n" "methods anyway, you should set this option to NO. \n", - TRUE + true ); cb = addBool( "DISTRIBUTE_GROUP_DOC", @@ -3499,7 +3486,7 @@ void Config::create() "tag is set to YES, then doxygen will reuse the documentation of the first \n" "member in the group (if any) for the other members of the group. By default \n" "all members of a group must be documented explicitly.\n", - FALSE + false ); cb = addBool( "SUBGROUPING", @@ -3508,7 +3495,7 @@ void Config::create() "subgroup of that type (e.g. under the Public Functions section). Set it to \n" "NO to prevent subgrouping. Alternatively, this can be done per class using \n" "the \\nosubgrouping command. \n", - TRUE + true ); cb = addBool( "TYPEDEF_HIDES_STRUCT", "When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum \n" @@ -3518,7 +3505,7 @@ void Config::create() "namespace, or class. And the struct will be named TypeS. This can typically \n" "be useful for C code in case the coding convention dictates that all compound \n" "types are typedef'ed and only the typedef is referenced, never the tag name.\n", - FALSE + false ); ci = addInt( "SYMBOL_CACHE_SIZE", @@ -3547,26 +3534,26 @@ void Config::create() "documentation are documented, even if no documentation was available. \n" "Private class members and static file members will be hidden unless \n" "the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES \n", - FALSE + false ); cb = addBool( "EXTRACT_PRIVATE", "If the EXTRACT_PRIVATE tag is set to YES all private members of a class \n" "will be included in the documentation. \n", - FALSE + false ); cb = addBool( "EXTRACT_STATIC", "If the EXTRACT_STATIC tag is set to YES all static members of a file \n" "will be included in the documentation. \n", - FALSE + false ); cb = addBool( "EXTRACT_LOCAL_CLASSES", "If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) \n" "defined locally in source files will be included in the documentation. \n" "If set to NO only classes defined in header files are included. \n", - TRUE + true ); cb = addBool( "EXTRACT_LOCAL_METHODS", @@ -3574,7 +3561,7 @@ void Config::create() "methods, which are defined in the implementation section but not in \n" "the interface are included in the documentation. \n" "If set to NO (the default) only methods in the interface are included. \n", - FALSE + false ); cb = addBool( "EXTRACT_ANON_NSPACES", @@ -3583,7 +3570,7 @@ void Config::create() "'anonymous_namespace{file}', where file will be replaced with the base \n" "name of the file that contains the anonymous namespace. By default \n" "anonymous namespace are hidden. \n", - FALSE + false ); cb = addBool( "HIDE_UNDOC_MEMBERS", @@ -3592,7 +3579,7 @@ void Config::create() "If set to NO (the default) these members will be included in the \n" "various overviews, but no documentation section is generated. \n" "This option has no effect if EXTRACT_ALL is enabled. \n", - FALSE + false ); cb = addBool( "HIDE_UNDOC_CLASSES", @@ -3600,7 +3587,7 @@ void Config::create() "undocumented classes that are normally visible in the class hierarchy. \n" "If set to NO (the default) these classes will be included in the various \n" "overviews. This option has no effect if EXTRACT_ALL is enabled. \n", - FALSE + false ); cb = addBool( "HIDE_FRIEND_COMPOUNDS", @@ -3608,7 +3595,7 @@ void Config::create() "friend (class|struct|union) declarations. \n" "If set to NO (the default) these declarations will be included in the \n" "documentation. \n", - FALSE + false ); cb = addBool( "HIDE_IN_BODY_DOCS", @@ -3616,7 +3603,7 @@ void Config::create() "documentation blocks found inside the body of a function. \n" "If set to NO (the default) these blocks will be appended to the \n" "function's detailed documentation block. \n", - FALSE + false ); cb = addBool( "INTERNAL_DOCS", @@ -3624,7 +3611,7 @@ void Config::create() "that is typed after a \\internal command is included. If the tag is set \n" "to NO (the default) then the documentation will be excluded. \n" "Set it to YES to include the internal documentation. \n", - FALSE + false ); cb = addBool( "CASE_SENSE_NAMES", @@ -3640,20 +3627,20 @@ void Config::create() "If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen \n" "will show members with their full class and namespace scopes in the \n" "documentation. If set to YES the scope will be hidden. \n", - FALSE + false ); cb = addBool( "SHOW_INCLUDE_FILES", "If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen \n" "will put a list of the files that are included by a file in the documentation \n" "of that file. \n", - TRUE + true ); cb = addBool( "INLINE_INFO", "If the INLINE_INFO tag is set to YES (the default) then a tag [inline] \n" "is inserted in the documentation for inline members. \n", - TRUE + true ); cb = addBool( "SORT_MEMBER_DOCS", @@ -3661,7 +3648,7 @@ void Config::create() "will sort the (detailed) documentation of file and class members \n" "alphabetically by member name. If set to NO the members will appear in \n" "declaration order. \n", - TRUE + true ); cb = addBool( "SORT_BRIEF_DOCS", @@ -3669,14 +3656,14 @@ void Config::create() "brief documentation of file, namespace and class members alphabetically \n" "by member name. If set to NO (the default) the members will appear in \n" "declaration order. \n", - FALSE + false ); cb = addBool( "SORT_GROUP_NAMES", "If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the \n" "hierarchy of group names into alphabetical order. If set to NO (the default) \n" "the group names will appear in their defined order. \n", - FALSE + false ); cb = addBool( "SORT_BY_SCOPE_NAME", @@ -3687,7 +3674,7 @@ void Config::create() "Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.\n" "Note: This option applies only to the class list, not to the \n" "alphabetical list.\n", - FALSE + false ); cb = addBool( @@ -3695,28 +3682,28 @@ void Config::create() "The GENERATE_TODOLIST tag can be used to enable (YES) or \n" "disable (NO) the todo list. This list is created by putting \\todo \n" "commands in the documentation.\n", - TRUE + true ); cb = addBool( "GENERATE_TESTLIST", "The GENERATE_TESTLIST tag can be used to enable (YES) or \n" "disable (NO) the test list. This list is created by putting \\test \n" "commands in the documentation.\n", - TRUE + true ); cb = addBool( "GENERATE_BUGLIST", "The GENERATE_BUGLIST tag can be used to enable (YES) or \n" "disable (NO) the bug list. This list is created by putting \\bug \n" "commands in the documentation.\n", - TRUE + true ); cb = addBool( "GENERATE_DEPRECATEDLIST", "The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or \n" "disable (NO) the deprecated list. This list is created by putting \n" "\\deprecated commands in the documentation.\n", - TRUE + true ); cl = addList( "ENABLED_SECTIONS", @@ -3739,28 +3726,28 @@ void Config::create() "Set the SHOW_USED_FILES tag to NO to disable the list of files generated \n" "at the bottom of the documentation of classes and structs. If set to YES the \n" "list will mention the files that were used to generate the documentation. \n", - TRUE + true ); cb = addBool( "SHOW_DIRECTORIES", "If the sources in your project are distributed over multiple directories \n" "then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy \n" "in the documentation. The default is NO.\n", - FALSE + false ); cb = addBool( "SHOW_FILES", "Set the SHOW_FILES tag to NO to disable the generation of the Files page.\n" "This will remove the Files entry from the Quick Index and from the \n" "Folder Tree View (if specified). The default is YES.\n", - TRUE + true ); cb = addBool( "SHOW_NAMESPACES", "Set the SHOW_NAMESPACES tag to NO to disable the generation of the \n" "Namespaces page. This will remove the Namespaces entry from the Quick Index\n" "and from the Folder Tree View (if specified). The default is YES.\n", - TRUE + true ); cs = addString( "FILE_VERSION_FILTER", "The FILE_VERSION_FILTER tag can be used to specify a program or script that \n" @@ -3792,21 +3779,21 @@ void Config::create() "QUIET", "The QUIET tag can be used to turn on/off the messages that are generated \n" "by doxygen. Possible values are YES and NO. If left blank NO is used. \n", - FALSE + false ); cb = addBool( "WARNINGS", "The WARNINGS tag can be used to turn on/off the warning messages that are \n" "generated by doxygen. Possible values are YES and NO. If left blank \n" "NO is used. \n", - TRUE + true ); cb = addBool( "WARN_IF_UNDOCUMENTED", "If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings \n" "for undocumented members. If EXTRACT_ALL is set to YES then this flag will \n" "automatically be disabled. \n", - TRUE + true ); cb = addBool( "WARN_IF_DOC_ERROR", @@ -3814,7 +3801,7 @@ void Config::create() "potential errors in the documentation, such as not documenting some \n" "parameters in a documented function, or documenting parameters that \n" "don't exist or using markup commands wrongly. \n", - TRUE + true ); cb = addBool( "WARN_NO_PARAMDOC", "This WARN_NO_PARAMDOC option can be abled to get warnings for \n" @@ -3822,7 +3809,7 @@ void Config::create() "or return value. If set to NO (the default) doxygen will only warn about \n" "wrong or incomplete parameter documentation, but not about the absence of \n" "documentation.\n", - FALSE + false ); cs = addString( "WARN_FORMAT", @@ -3874,7 +3861,7 @@ void Config::create() "The RECURSIVE tag can be used to turn specify whether or not subdirectories \n" "should be searched for input files as well. Possible values are YES and NO. \n" "If left blank NO is used. \n", - FALSE + false ); cl = addList( "EXCLUDE", @@ -3887,7 +3874,7 @@ void Config::create() "The EXCLUDE_SYMLINKS tag can be used select whether or not files or \n" "directories that are symbolic links (a Unix filesystem feature) are excluded \n" "from the input. \n", - FALSE + false ); cl->setWidgetType(ConfigList::FileAndDir); cl = addList( @@ -3926,7 +3913,7 @@ void Config::create() "searched for input files to be used with the \\include or \\dontinclude \n" "commands irrespective of the value of the RECURSIVE tag. \n" "Possible values are YES and NO. If left blank NO is used. \n", - FALSE + false ); cl = addList( "IMAGE_PATH", @@ -3961,7 +3948,7 @@ void Config::create() "If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using \n" "INPUT_FILTER) will be used to filter the input files when producing source \n" "files to browse (i.e. when SOURCE_BROWSER is set to YES). \n", - FALSE + false ); //----------------------------------------------------------------------------------------------- addInfo( "Source Browser","configuration options related to source browsing"); @@ -3972,39 +3959,39 @@ void Config::create() "be generated. Documented entities will be cross-referenced with these sources. \n" "Note: To get rid of all source code in the generated output, make sure also \n" "VERBATIM_HEADERS is set to NO. \n", - FALSE + false ); cb = addBool( "INLINE_SOURCES", "Setting the INLINE_SOURCES tag to YES will include the body \n" "of functions and classes directly in the documentation. \n", - FALSE + false ); cb = addBool( "STRIP_CODE_COMMENTS", "Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct \n" "doxygen to hide any special comment blocks from generated source code \n" "fragments. Normal C and C++ comments will always remain visible. \n", - TRUE + true ); cb = addBool( "REFERENCED_BY_RELATION", "If the REFERENCED_BY_RELATION tag is set to YES \n" "then for each documented function all documented \n" "functions referencing it will be listed. \n", - FALSE + false ); cb = addBool( "REFERENCES_RELATION", "If the REFERENCES_RELATION tag is set to YES \n" "then for each documented function all documented entities \n" "called/used by that function will be listed. \n", - FALSE + false ); cb = addBool( "REFERENCES_LINK_SOURCE", "If the REFERENCES_LINK_SOURCE tag is set to YES (the default)\n" "and SOURCE_BROWSER tag is set to YES, then the hyperlinks from\n" "functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will\n" "link to the source code. Otherwise they will link to the documentstion.\n", - TRUE + true ); cb = addBool( "USE_HTAGS", @@ -4013,7 +4000,7 @@ void Config::create() "built-in source browser. The htags tool is part of GNU's global source \n" "tagging system (see http://www.gnu.org/software/global/global.html). You \n" "will need version 4.8.6 or higher. \n", - FALSE + false ); cb->addDependency("SOURCE_BROWSER"); cb = addBool( @@ -4021,7 +4008,7 @@ void Config::create() "If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen \n" "will generate a verbatim copy of the header file for each class for \n" "which an include is specified. Set to NO to disable this. \n", - TRUE + true ); //----------------------------------------------------------------------------------------------- @@ -4033,7 +4020,7 @@ void Config::create() "If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index \n" "of all compounds will be generated. Enable this if the project \n" "contains a lot of classes, structs, unions or interfaces. \n", - FALSE + false ); ci = addInt( "COLS_IN_ALPHA_INDEX", @@ -4056,7 +4043,7 @@ void Config::create() "GENERATE_HTML", "If the GENERATE_HTML tag is set to YES (the default) Doxygen will \n" "generate HTML output. \n", - TRUE + true ); cs = addString( "HTML_OUTPUT", @@ -4107,7 +4094,7 @@ void Config::create() "If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, \n" "files or namespaces will be aligned in HTML using tables. If set to \n" "NO a bullet list will be used. \n", - TRUE + true ); cb->addDependency("GENERATE_HTML"); cb = addBool( @@ -4117,7 +4104,7 @@ void Config::create() "page has loaded. For this to work a browser that supports \n" "JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox \n" "Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). \n", - FALSE + false ); cb->addDependency("GENERATE_HTML"); @@ -4136,7 +4123,7 @@ void Config::create() "it at startup. \n" "See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html " "for more information. \n", - FALSE + false ); cb->addDependency("GENERATE_HTML"); cs = addString( @@ -4168,7 +4155,7 @@ void Config::create() "will be generated that can be used as input for tools like the \n" "Microsoft HTML help workshop to generate a compiled HTML help file (.chm) \n" "of the generated HTML documentation. \n", - FALSE + false ); cb->addDependency("GENERATE_HTML"); cs = addString( @@ -4224,7 +4211,7 @@ void Config::create() "If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag \n" "controls if a separate .chi index file is generated (YES) or that \n" "it should be included in the master .chm file (NO).\n", - FALSE + false ); cb->addDependency("GENERATE_HTML"); cs = addString( @@ -4239,14 +4226,14 @@ void Config::create() "If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag \n" "controls whether a binary table of contents is generated (YES) or a \n" "normal table of contents (NO) in the .chm file.\n", - FALSE + false ); cb->addDependency("GENERATE_HTML"); cb = addBool( "TOC_EXPAND", "The TOC_EXPAND flag can be set to YES to add extra items for group members \n" "to the contents of the HTML help documentation and to the tree view. \n", - FALSE + false ); cb->addDependency("GENERATE_HTML"); @@ -4260,7 +4247,7 @@ void Config::create() "are set, an additional index file will be generated that can be used as input for \n" "TQt's qhelpgenerator to generate a TQt Compressed Help (.qch) of the generated \n" "HTML documentation. \n", - FALSE + false ); cb->addDependency("GENERATE_HTML"); cs = addString( @@ -4330,7 +4317,7 @@ void Config::create() "The DISABLE_INDEX tag can be used to turn on/off the condensed index at \n" "top of each HTML page. The value NO (the default) enables the index and \n" "the value YES disables it. \n", - FALSE + false ); cb->addDependency("GENERATE_HTML"); ci = addInt( @@ -4389,7 +4376,7 @@ void Config::create() "GENERATE_LATEX", "If the GENERATE_LATEX tag is set to YES (the default) Doxygen will \n" "generate Latex output. \n", - TRUE + true ); cs = addString( "LATEX_OUTPUT", @@ -4432,7 +4419,7 @@ void Config::create() "If the COMPACT_LATEX tag is set to YES Doxygen generates more compact \n" "LaTeX documents. This may be useful for small projects and may help to \n" "save some trees in general. \n", - FALSE + false ); cb->addDependency("GENERATE_LATEX"); ce = addEnum( @@ -4469,7 +4456,7 @@ void Config::create() "is prepared for conversion to pdf (using ps2pdf). The pdf file will \n" "contain links (just like the HTML output) instead of page references \n" "This makes the output suitable for online browsing using a pdf viewer. \n", - TRUE + true ); cb->addDependency("GENERATE_LATEX"); cb = addBool( @@ -4477,7 +4464,7 @@ void Config::create() "If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of \n" "plain latex in the generated Makefile. Set this option to YES to get a \n" "higher quality PDF documentation. \n", - TRUE + true ); cb->addDependency("GENERATE_LATEX"); cb = addBool( @@ -4486,7 +4473,7 @@ void Config::create() "command to the generated LaTeX files. This will instruct LaTeX to keep \n" "running if errors occur, instead of asking the user for help. \n" "This option is also used when generating formulas in HTML. \n", - FALSE + false ); cb->addDependency("GENERATE_LATEX"); cb = addBool( @@ -4494,7 +4481,7 @@ void Config::create() "If LATEX_HIDE_INDICES is set to YES then doxygen will not \n" "include the index chapters (such as File Index, Compound Index, etc.) \n" "in the output. \n", - FALSE + false ); cb->addDependency("GENERATE_LATEX"); //----------------------------------------------------------------------------------------------- @@ -4505,7 +4492,7 @@ void Config::create() "If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output \n" "The RTF output is optimized for Word 97 and may not look very pretty with \n" "other RTF readers or editors.\n", - FALSE + false ); cs = addString( "RTF_OUTPUT", @@ -4531,7 +4518,7 @@ void Config::create() "If the COMPACT_RTF tag is set to YES Doxygen generates more compact \n" "RTF documents. This may be useful for small projects and may help to \n" "save some trees in general. \n", - FALSE + false ); cb->addDependency("GENERATE_RTF"); cb = addBool( @@ -4542,7 +4529,7 @@ void Config::create() "This makes the output suitable for online browsing using WORD or other \n" "programs which support those fields. \n" "Note: wordpad (write) and others do not support links. \n", - FALSE + false ); cb->addDependency("GENERATE_RTF"); cs = addString( @@ -4568,7 +4555,7 @@ void Config::create() "GENERATE_MAN", "If the GENERATE_MAN tag is set to YES (the default) Doxygen will \n" "generate man pages \n", - FALSE + false ); cs = addString( "MAN_OUTPUT", @@ -4593,7 +4580,7 @@ void Config::create() "documented in the real man page(s). These additional files \n" "only source the real man page, but without them the man command \n" "would be unable to find the correct page. The default is NO. \n", - FALSE + false ); cb->addDependency("GENERATE_MAN"); //----------------------------------------------------------------------------------------------- @@ -4604,7 +4591,7 @@ void Config::create() "If the GENERATE_XML tag is set to YES Doxygen will \n" "generate an XML file that captures the structure of \n" "the code including all documentation. \n", - FALSE + false ); cs = addString( "XML_OUTPUT", @@ -4635,7 +4622,7 @@ void Config::create() "dump the program listings (including syntax highlighting \n" "and cross-referencing information) to the XML output. Note that \n" "enabling this will significantly increase the size of the XML output. \n", - TRUE + true ); cb->addDependency("GENERATE_XML"); @@ -4650,7 +4637,7 @@ void Config::create() "documentation. Note that this feature is still experimental \n" "and incomplete at the moment. \n", - FALSE ); + false ); //----------------------------------------------------------------------------------------------- addInfo( "PerlMod","configuration options related to the Perl module output"); //----------------------------------------------------------------------------------------------- @@ -4661,14 +4648,14 @@ void Config::create() "the code including all documentation. Note that this \n" "feature is still experimental and incomplete at the \n" "moment. \n", - FALSE + false ); cb = addBool( "PERLMOD_LATEX", "If the PERLMOD_LATEX tag is set to YES Doxygen will generate \n" "the necessary Makefile rules, Perl scripts and LaTeX code to be able \n" "to generate PDF and DVI output from the Perl module output. \n", - FALSE + false ); cb->addDependency("GENERATE_PERLMOD"); cb = addBool( @@ -4678,7 +4665,7 @@ void Config::create() "if you want to understand what is going on. On the other hand, if this \n" "tag is set to NO the size of the Perl module output will be much smaller \n" "and Perl will parse it just the same. \n", - TRUE + true ); cb->addDependency("GENERATE_PERLMOD"); cs = addString( @@ -4698,7 +4685,7 @@ void Config::create() "If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will \n" "evaluate all C-preprocessor directives found in the sources and include \n" "files. \n", - TRUE + true ); cb = addBool( "MACRO_EXPANSION", @@ -4706,7 +4693,7 @@ void Config::create() "names in the source code. If set to NO (the default) only conditional \n" "compilation will be performed. Macro expansion can be done in a controlled \n" "way by setting EXPAND_ONLY_PREDEF to YES. \n", - FALSE + false ); cb->addDependency("ENABLE_PREPROCESSING"); cb = addBool( @@ -4714,14 +4701,14 @@ void Config::create() "If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES \n" "then the macro expansion is limited to the macros specified with the \n" "PREDEFINED and EXPAND_AS_DEFINED tags. \n", - FALSE + false ); cb->addDependency("ENABLE_PREPROCESSING"); cb = addBool( "SEARCH_INCLUDES", "If the SEARCH_INCLUDES tag is set to YES (the default) the includes files \n" "in the INCLUDE_PATH (see below) will be search if a #include is found. \n", - TRUE + true ); cb->addDependency("ENABLE_PREPROCESSING"); cl = addList( @@ -4766,7 +4753,7 @@ void Config::create() "on a line, have an all uppercase name, and do not end with a semicolon. Such \n" "function macros are typically used for boiler-plate code, and will confuse \n" "the parser if not removed. \n", - TRUE + true ); cb->addDependency("ENABLE_PREPROCESSING"); //----------------------------------------------------------------------------------------------- @@ -4801,14 +4788,14 @@ void Config::create() "If the ALLEXTERNALS tag is set to YES all external classes will be listed \n" "in the class index. If set to NO only the inherited external classes \n" "will be listed. \n", - FALSE + false ); cb = addBool( "EXTERNAL_GROUPS", "If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed \n" "in the modules index. If set to NO, only the current project's groups will \n" "be listed. \n", - TRUE + true ); cs = addString( "PERL_PATH", @@ -4829,7 +4816,7 @@ void Config::create() "this option is superseded by the HAVE_DOT option below. This is only a \n" "fallback. It is recommended to install and use dot, since it yields more \n" "powerful graphs. \n", - TRUE + true ); cs = addString( "MSCGEN_PATH", "You can define message sequence charts within doxygen comments using the \\msc \n" @@ -4844,7 +4831,7 @@ void Config::create() "If set to YES, the inheritance and collaboration graphs will hide \n" "inheritance and usage relations if the target is undocumented \n" "or is not a class. \n", - TRUE + true ); cb = addBool( "HAVE_DOT", @@ -4852,7 +4839,7 @@ void Config::create() "available from the path. This tool is part of Graphviz, a graph visualization \n" "toolkit from AT&T and Lucent Bell Labs. The other options in this section \n" "have no effect if this option is set to NO (the default) \n", - FALSE + false ); cs = addString( "DOT_FONTNAME", "By default doxygen will write a font called FreeSans.ttf to the output \n" @@ -4885,7 +4872,7 @@ void Config::create() "will generate a graph for each documented class showing the direct and \n" "indirect inheritance relations. Setting this tag to YES will force the \n" "the CLASS_DIAGRAMS tag to NO.\n", - TRUE + true ); cb->addDependency("HAVE_DOT"); cb = addBool( @@ -4894,14 +4881,14 @@ void Config::create() "will generate a graph for each documented class showing the direct and \n" "indirect implementation dependencies (inheritance, containment, and \n" "class references variables) of the class with other documented classes. \n", - TRUE + true ); cb->addDependency("HAVE_DOT"); cb = addBool( "GROUP_GRAPHS", "If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen \n" "will generate a graph for groups, showing the direct groups dependencies\n", - TRUE + true ); cb->addDependency("HAVE_DOT"); cb = addBool( @@ -4909,14 +4896,14 @@ void Config::create() "If the UML_LOOK tag is set to YES doxygen will generate inheritance and \n" "collaboration diagrams in a style similar to the OMG's Unified Modeling \n" "Language. \n", - FALSE + false ); cb->addDependency("HAVE_DOT"); cb = addBool( "TEMPLATE_RELATIONS", "If set to YES, the inheritance and collaboration graphs will show the \n" "relations between templates and their instances. \n", - FALSE + false ); cb->addDependency("HAVE_DOT"); cb = addBool( @@ -4925,7 +4912,7 @@ void Config::create() "tags are set to YES then doxygen will generate a graph for each documented \n" "file showing the direct and indirect include dependencies of the file with \n" "other documented files. \n", - TRUE + true ); cb->addDependency("HAVE_DOT"); cb = addBool( @@ -4934,7 +4921,7 @@ void Config::create() "HAVE_DOT tags are set to YES then doxygen will generate a graph for each \n" "documented header file showing the documented files that directly or \n" "indirectly include this file. \n", - TRUE + true ); cb->addDependency("HAVE_DOT"); cb = addBool( @@ -4944,7 +4931,7 @@ void Config::create() "or class method. Note that enabling this option will significantly increase \n" "the time of a run. So in most cases it will be better to enable call graphs \n" "for selected functions only using the \\callgraph command.\n", - FALSE + false ); cb->addDependency("HAVE_DOT"); cb = addBool( @@ -4954,14 +4941,14 @@ void Config::create() "or class method. Note that enabling this option will significantly increase \n" "the time of a run. So in most cases it will be better to enable caller \n" "graphs for selected functions only using the \\callergraph command.\n", - FALSE + false ); cb->addDependency("HAVE_DOT"); cb = addBool( "GRAPHICAL_HIERARCHY", "If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen \n" "will graphical hierarchy of all classes instead of a textual one. \n", - TRUE + true ); cb->addDependency("HAVE_DOT"); cb = addBool( @@ -4970,7 +4957,7 @@ void Config::create() "then doxygen will show the dependencies a directory has on other directories \n" "in a graphical way. The dependency relations are determined by the #include\n" "relations between the files in the directories.\n", - TRUE + true ); cb->addDependency("HAVE_DOT"); ce = addEnum( @@ -5032,7 +5019,7 @@ void Config::create() "seem to support this out of the box. Warning: Depending on the platform used, \n" "enabling this option may lead to badly anti-aliased labels on the edges of \n" "a graph (i.e. they become hard to read). \n", - FALSE + false ); cb->addDependency("HAVE_DOT"); cb = addBool( @@ -5041,7 +5028,7 @@ void Config::create() "files in one run (i.e. multiple -o and -T options on the command line). This \n" "makes dot run faster, but since only newer versions of dot (>1.8.10) \n" "support this, this feature is disabled by default. \n", - FALSE + false ); cb->addDependency("HAVE_DOT"); cb = addBool( @@ -5049,7 +5036,7 @@ void Config::create() "If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will \n" "generate a legend page explaining the meaning of the various boxes and \n" "arrows in the dot generated graphs. \n", - TRUE + true ); cb->addDependency("HAVE_DOT"); cb = addBool( @@ -5057,7 +5044,7 @@ void Config::create() "If the DOT_CLEANUP tag is set to YES (the default) Doxygen will \n" "remove the intermediate dot files that are used to generate \n" "the various graphs. \n", - TRUE + true ); cb->addDependency("HAVE_DOT"); @@ -5068,7 +5055,7 @@ void Config::create() "SEARCHENGINE", "The SEARCHENGINE tag specifies whether or not a search engine should be \n" "used. If set to NO the values of all tags below this one will be ignored. \n", - FALSE + false ); addObsolete("CGI_NAME"); addObsolete("CGI_URL"); @@ -5085,7 +5072,7 @@ static TQCString configFileToString(const char *name) if (name==0 || name[0]==0) return 0; TQFile f; - bool fileOpened=FALSE; + bool fileOpened=false; if (name[0]=='-' && name[1]==0) // read from stdin { fileOpened=f.open(IO_ReadOnly,stdin); @@ -5145,14 +5132,14 @@ bool Config::parseString(const char *fn,const char *str) inputPosition = 0; yyFileName = fn; yyLineNr = 1; - includeStack.setAutoDelete(TRUE); + includeStack.setAutoDelete(true); includeStack.clear(); includeDepth = 0; configYYrestart( configYYin ); BEGIN( Start ); configYYlex(); inputString = 0; - return TRUE; + return true; } bool Config::parse(const char *fn) diff --git a/parts/doxygen/config.h b/parts/doxygen/config.h index 2486956e..d48e9888 100644 --- a/parts/doxygen/config.h +++ b/parts/doxygen/config.h @@ -505,7 +505,7 @@ class Config /*! @} */ /*! Writes a template configuration to stream \a t. If \a shortIndex - * is \c TRUE the description of each configuration option will + * is \c true the description of each configuration option will * be omitted. */ void writeTemplate(TQTextStream &t,bool shortIndex,bool updateOnly); @@ -533,13 +533,13 @@ class Config void init(); /*! Parse a configuration data in string \a str. - * \returns TRUE if successful, or FALSE if the string could not be + * \returns true if successful, or false if the string could not be * parsed. */ bool parseString(const char *fn,const char *str); /*! Parse a configuration file with name \a fn. - * \returns TRUE if successful, FALSE if the file could not be + * \returns true if successful, false if the file could not be * opened or read. */ bool parse(const char *fn); @@ -556,9 +556,9 @@ class Config m_options = new TQPtrList<ConfigOption>; m_obsolete = new TQPtrList<ConfigOption>; m_dict = new TQDict<ConfigOption>(257); - m_options->setAutoDelete(TRUE); - m_obsolete->setAutoDelete(TRUE); - m_initialized = FALSE; + m_options->setAutoDelete(true); + m_obsolete->setAutoDelete(true); + m_initialized = false; create(); } ~Config() diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp index b880b6f2..1f2a36c4 100644 --- a/parts/doxygen/doxygenconfigwidget.cpp +++ b/parts/doxygen/doxygenconfigwidget.cpp @@ -68,7 +68,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par sm // type ); TQWhatsThis::add(inputString, option->docs().simplifyWhiteSpace()); - connect(inputString, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputString, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(), inputString); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -86,7 +86,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par for (sli.toFirst(); sli.current(); ++sli) inputString->addValue(sli.current()); TQWhatsThis::add(inputString, option->docs().simplifyWhiteSpace()); - connect(inputString, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputString, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(),inputString); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -109,7 +109,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par lm // type ); TQWhatsThis::add(inputStrList, option->docs().simplifyWhiteSpace()); - connect(inputStrList, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputStrList, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(),inputStrList); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -124,7 +124,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par *((ConfigBool *)option)->valueRef() // variable ); TQWhatsThis::add(inputBool, option->docs().simplifyWhiteSpace()); - connect(inputBool, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputBool, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(), inputBool); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -140,7 +140,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par ((ConfigInt *)option)->maxVal() // max value ); TQWhatsThis::add(inputInt, option->docs().simplifyWhiteSpace()); - connect(inputInt, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputInt, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(), inputInt); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -153,7 +153,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par TQDictIterator<TQObject> di(*m_switches); for (; di.current(); ++di) { TQObject *obj = di.current(); - connect(obj, TQT_SIGNAL(toggle(const TQString&, bool)), this, TQT_SLOT(toggle(const TQString&, bool))); + connect(obj, TQ_SIGNAL(toggle(const TQString&, bool)), this, TQ_SLOT(toggle(const TQString&, bool))); // UGLY HACK: assumes each item depends on a boolean without checking! emit toggle(di.currentKey(), ((InputBool *)obj)->getState()); } @@ -226,7 +226,7 @@ void DoxygenConfigWidget::init() TQDictIterator<TQObject> dio(*m_switches); for (; dio.current(); ++dio) { TQObject *obj = dio.current(); - connect(obj, TQT_SIGNAL(toggle(const TQString&, bool)), this, TQT_SLOT(toggle(const TQString&, bool))); + connect(obj, TQ_SIGNAL(toggle(const TQString&, bool)), this, TQ_SLOT(toggle(const TQString&, bool))); // UGLY HACK: assumes each item depends on a boolean without checking! emit toggle(dio.currentKey(), ((InputBool *)obj)->getState()); } diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index 36d41e8d..863f6176 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -59,32 +59,32 @@ DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList TDEAction *action; action = new TDEAction( i18n("Build API Documentation"), 0, - this, TQT_SLOT(slotDoxygen()), + this, TQ_SLOT(slotDoxygen()), actionCollection(), "build_doxygen" ); action->setToolTip(i18n("Build API documentation")); action->setWhatsThis(i18n("<b>Build API documentation</b><p>Runs doxygen on a project Doxyfile to generate API documentation. " "If the search engine is enabled in Doxyfile, this also runs doxytag to create it.")); action = new TDEAction( i18n("Clean API Documentation"), 0, - this, TQT_SLOT(slotDoxClean()), + this, TQ_SLOT(slotDoxClean()), actionCollection(), "clean_doxygen" ); action->setToolTip(i18n("Clean API documentation")); action->setWhatsThis(i18n("<b>Clean API documentation</b><p>Removes all generated by doxygen files.")); -// connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); +// connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("Doxygen"), PROJECTOPTIONS, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - m_actionDocumentFunction = new TDEAction(i18n("Document Current Function"), 0, CTRL+SHIFT+Key_S, this, TQT_SLOT(slotDocumentFunction()), actionCollection(), "edit_document_function"); + m_actionDocumentFunction = new TDEAction(i18n("Document Current Function"), 0, CTRL+SHIFT+Key_S, this, TQ_SLOT(slotDocumentFunction()), actionCollection(), "edit_document_function"); m_actionDocumentFunction->setToolTip( i18n("Create a documentation template above a function")); m_actionDocumentFunction->setWhatsThis(i18n("<b>Document Current Function</b><p>Creates a documentation template according to a function's signature above a function definition/declaration.")); m_tmpDir.setAutoDelete(true); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part* ))); - m_actionPreview = new TDEAction(i18n("Preview Doxygen Output"), 0, CTRL+ALT+Key_P, this, TQT_SLOT(slotRunPreview()), actionCollection(), "show_preview_doxygen_output"); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part* ))); + m_actionPreview = new TDEAction(i18n("Preview Doxygen Output"), 0, CTRL+ALT+Key_P, this, TQ_SLOT(slotRunPreview()), actionCollection(), "show_preview_doxygen_output"); m_actionPreview->setToolTip( i18n("Show a preview of the Doxygen output of this file") ); m_actionPreview->setWhatsThis( i18n("<b>Preview Doxygen output</b><p>Runs Doxygen over the current file and shows the created index.html.") ); @@ -116,7 +116,7 @@ void DoxygenPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, adjustDoxyfile(); DoxygenConfigWidget *w = new DoxygenConfigWidget(project()->projectDirectory() + "/Doxyfile", page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } } @@ -249,10 +249,10 @@ void DoxygenPart::slotDoxygen() { // get input files outputDirectory = Config_getString("OUTPUT_DIRECTORY"); - if ( outputDirectory.isEmpty() == false ) + if ( !outputDirectory.isEmpty() ) outputDirectory += "/"; htmlDirectory = Config_getString("HTML_OUTPUT"); - if ( htmlDirectory.isEmpty() == true ) + if ( htmlDirectory.isEmpty() ) htmlDirectory = "html"; htmlDirectory.prepend(outputDirectory); } @@ -474,7 +474,7 @@ void DoxygenPart::slotRunPreview( ) if (pStyle != 0 && !stylesheet.isNull()) *pStyle->valueRef() = stylesheet; - connect(appFrontend, TQT_SIGNAL(processExited()), this, TQT_SLOT(slotPreviewProcessExited())); + connect(appFrontend, TQ_SIGNAL(processExited()), this, TQ_SLOT(slotPreviewProcessExited())); appFrontend->startAppCommand("", "doxygen \"" + file.name() + "\"", false); } diff --git a/parts/doxygen/doxygenpart.h b/parts/doxygen/doxygenpart.h index 47d215ca..ea734510 100644 --- a/parts/doxygen/doxygenpart.h +++ b/parts/doxygen/doxygenpart.h @@ -16,7 +16,7 @@ #include <tqguardedptr.h> #include <kdialogbase.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <ktempdir.h> #include <tqstring.h> diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp index 1194d0bc..703525f3 100644 --- a/parts/doxygen/input.cpp +++ b/parts/doxygen/input.cpp @@ -121,7 +121,7 @@ InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent layout->addWidget(cb); layout->addStretch(1); - connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool))); + connect( cb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(valueChanged(bool))); } @@ -165,7 +165,7 @@ InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal layout->addWidget(sp); layout->addStretch(1); - connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); + connect(sp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int))); } @@ -226,13 +226,13 @@ InputString::InputString(const TQString & label, } if (le) - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(textChanged(const TQString&)) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(textChanged(const TQString&)) ); if (br) - connect( br, TQT_SIGNAL(clicked()), this, TQT_SLOT(browse()) ); + connect( br, TQ_SIGNAL(clicked()), this, TQ_SLOT(browse()) ); if (com) - connect( com, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(textChanged(const TQString &)) ); + connect( com, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(textChanged(const TQString &)) ); } InputString::~InputString() @@ -376,22 +376,22 @@ InputStrList::InputStrList(const TQString & label, layout->addWidget(dw, 0, 1); layout->addWidget(lb, 1, 1); - connect( le, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(addString()) ); - connect( add, TQT_SIGNAL(clicked()), - this, TQT_SLOT(addString()) ); - connect( del, TQT_SIGNAL(clicked()), - this, TQT_SLOT(delString()) ); - connect( upd, TQT_SIGNAL(clicked()), - this, TQT_SLOT(updateString()) ); + connect( le, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(addString()) ); + connect( add, TQ_SIGNAL(clicked()), + this, TQ_SLOT(addString()) ); + connect( del, TQ_SIGNAL(clicked()), + this, TQ_SLOT(delString()) ); + connect( upd, TQ_SIGNAL(clicked()), + this, TQ_SLOT(updateString()) ); if (brFile) - connect( brFile, TQT_SIGNAL(clicked()), - this, TQT_SLOT(browseFiles()) ); + connect( brFile, TQ_SIGNAL(clicked()), + this, TQ_SLOT(browseFiles()) ); if (brDir) - connect( brDir, TQT_SIGNAL(clicked()), - this, TQT_SLOT(browseDir()) ); - connect( lb, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT(selectText(const TQString &)) ); + connect( brDir, TQ_SIGNAL(clicked()), + this, TQ_SLOT(browseDir()) ); + connect( lb, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT(selectText(const TQString &)) ); strList = sl; } diff --git a/parts/doxygen/input.h b/parts/doxygen/input.h index ae4a2d55..97599f37 100644 --- a/parts/doxygen/input.h +++ b/parts/doxygen/input.h @@ -44,7 +44,7 @@ public: void init(); virtual void setEnabled(bool b); - virtual TQObject *qobject() { return TQT_TQOBJECT(this); } + virtual TQObject *qobject() { return this; } virtual bool getState() const { return state; } signals: @@ -73,7 +73,7 @@ public: void init(); virtual void setEnabled(bool); - TQObject *qobject() { return TQT_TQOBJECT(this); } + TQObject *qobject() { return this; } signals: void changed(); @@ -109,7 +109,7 @@ public: void init(); void addValue(const char *s); void setEnabled(bool); - TQObject *qobject() { return TQT_TQOBJECT(this); } + TQObject *qobject() { return this; } signals: void changed(); @@ -149,7 +149,7 @@ public: void init(); void setEnabled(bool); - TQObject *qobject() { return TQT_TQOBJECT(this); } + TQObject *qobject() { return this; } signals: void changed(); diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp index c8c1676b..6ee3733d 100644 --- a/parts/filecreate/addglobaldlg.cpp +++ b/parts/filecreate/addglobaldlg.cpp @@ -25,7 +25,7 @@ * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFlags fl ) : TQDialog( parent, name, modal, fl ) @@ -33,24 +33,24 @@ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFla { if ( !name ) setName( "AddGlobalDlg" ); - setSizeGripEnabled( TRUE ); + setSizeGripEnabled( true ); AddGlobalDlgLayout = new TQGridLayout( this, 1, 1, 11, 6, "AddGlobalDlgLayout"); Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); buttonHelp = new KPushButton( this, "buttonHelp" ); - buttonHelp->setAutoDefault( TRUE ); + buttonHelp->setAutoDefault( true ); Layout1->addWidget( buttonHelp ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); Layout1->addItem( spacer ); buttonOk = new KPushButton( this, "buttonOk" ); - buttonOk->setAutoDefault( TRUE ); - buttonOk->setDefault( TRUE ); + buttonOk->setAutoDefault( true ); + buttonOk->setDefault( true ); Layout1->addWidget( buttonOk ); buttonCancel = new KPushButton( this, "buttonCancel" ); - buttonCancel->setAutoDefault( TRUE ); + buttonCancel->setAutoDefault( true ); Layout1->addWidget( buttonCancel ); AddGlobalDlgLayout->addLayout( Layout1, 1, 0 ); @@ -62,8 +62,8 @@ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFla fcglobal_view->addColumn( i18n( "Icon" ) ); fcglobal_view->addColumn( i18n( "Description" ) ); fcglobal_view->setResizePolicy( TQListView::AutoOne ); - fcglobal_view->setAllColumnsShowFocus( TRUE ); - fcglobal_view->setRootIsDecorated( TRUE ); + fcglobal_view->setAllColumnsShowFocus( true ); + fcglobal_view->setRootIsDecorated( true ); fcglobal_view->setResizeMode( TQListView::AllColumns ); AddGlobalDlgLayout->addWidget( fcglobal_view, 0, 0 ); @@ -71,8 +71,8 @@ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFla resize( TQSize(511, 282).expandedTo(minimumSizeHint()) ); // signals and slots connections - connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); } /* diff --git a/parts/filecreate/addglobaldlg.h b/parts/filecreate/addglobaldlg.h index 762296e7..59fb33d7 100644 --- a/parts/filecreate/addglobaldlg.h +++ b/parts/filecreate/addglobaldlg.h @@ -26,7 +26,7 @@ class AddGlobalDlg : public TQDialog public: - AddGlobalDlg( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + AddGlobalDlg( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~AddGlobalDlg(); TQPushButton* buttonHelp; diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp index 024891a9..d5427fab 100644 --- a/parts/filecreate/fcconfigwidget.cpp +++ b/parts/filecreate/fcconfigwidget.cpp @@ -20,7 +20,7 @@ #include <klineedit.h> #include <tqlabel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/netaccess.h> #include <kurlrequester.h> #include <kicondialog.h> @@ -42,8 +42,8 @@ FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name): FCConfigWidgetBase(parent, name), m_part(part), m_global(global) { - fc_view->setSorting(-1, FALSE); - fcglobal_view->setSorting(-1, FALSE); + fc_view->setSorting(-1, false); + fcglobal_view->setSorting(-1, false); if (m_global) { diff --git a/parts/filecreate/fcconfigwidgetbase.ui b/parts/filecreate/fcconfigwidgetbase.ui index be039483..7c710cb5 100644 --- a/parts/filecreate/fcconfigwidgetbase.ui +++ b/parts/filecreate/fcconfigwidgetbase.ui @@ -520,7 +520,7 @@ <variables> <variable>AddGlobalDlg *global_dlg;</variable> </variables> -<Q_SLOTS> +<slots> <slot>removetemplate_button_clicked()</slot> <slot>copyToProject_button_clicked()</slot> <slot>newtype_button_clicked()</slot> @@ -534,7 +534,7 @@ <slot>edit_template_contents_button_clicked()</slot> <slot>edit_template_content_button_clicked()</slot> <slot>edit_type_content_button_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/filecreate/fctemplateedit.cpp b/parts/filecreate/fctemplateedit.cpp index b019ddb9..878d7c7a 100644 --- a/parts/filecreate/fctemplateedit.cpp +++ b/parts/filecreate/fctemplateedit.cpp @@ -14,8 +14,8 @@ FCTemplateEdit::FCTemplateEdit(TQWidget *parent, const char *name): FCTemplateEditBase(parent, name) { - connect( templatename_edit, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT( slotTemplateNameChanged( ))); + connect( templatename_edit, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT( slotTemplateNameChanged( ))); slotTemplateNameChanged(); } diff --git a/parts/filecreate/fctemplateeditbase.ui b/parts/filecreate/fctemplateeditbase.ui index 6e34899d..a208ab49 100644 --- a/parts/filecreate/fctemplateeditbase.ui +++ b/parts/filecreate/fctemplateeditbase.ui @@ -176,9 +176,9 @@ <tabstop>ok_button</tabstop> <tabstop>cancel_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/filecreate/fctemplateeditbase.ui.h b/parts/filecreate/fctemplateeditbase.ui.h index 5750f988..66296b44 100644 --- a/parts/filecreate/fctemplateeditbase.ui.h +++ b/parts/filecreate/fctemplateeditbase.ui.h @@ -22,5 +22,5 @@ void FCTemplateEditBase::init() { - templatename_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), TQT_TQOBJECT(this))); + templatename_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this)); } diff --git a/parts/filecreate/fctypeedit.cpp b/parts/filecreate/fctypeedit.cpp index 5ee4eb0d..63d73248 100644 --- a/parts/filecreate/fctypeedit.cpp +++ b/parts/filecreate/fctypeedit.cpp @@ -16,8 +16,8 @@ FCTypeEdit::FCTypeEdit(TQWidget *parent, char *name) : FCTypeEditBase(parent, name) { - connect( typeext_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged())); - connect( typename_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged( ))); + connect( typeext_edit, TQ_SIGNAL( textChanged ( const TQString & )),this, TQ_SLOT( slotTypeEditTextChanged())); + connect( typename_edit, TQ_SIGNAL( textChanged ( const TQString & )),this, TQ_SLOT( slotTypeEditTextChanged( ))); slotTypeEditTextChanged( ); } diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui index 53fe4203..62198bda 100644 --- a/parts/filecreate/fctypeeditbase.ui +++ b/parts/filecreate/fctypeeditbase.ui @@ -263,9 +263,9 @@ <tabstop>ok_button</tabstop> <tabstop>cancel_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/filecreate/fctypeeditbase.ui.h b/parts/filecreate/fctypeeditbase.ui.h index 07576b6b..0ddc4f1e 100644 --- a/parts/filecreate/fctypeeditbase.ui.h +++ b/parts/filecreate/fctypeeditbase.ui.h @@ -22,5 +22,5 @@ void FCTypeEditBase::init() { - typeext_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), TQT_TQOBJECT(this))); + typeext_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this)); } diff --git a/parts/filecreate/file-templates/ui-mainwin b/parts/filecreate/file-templates/ui-mainwin index 5ce4dec8..62d6d51a 100644 --- a/parts/filecreate/file-templates/ui-mainwin +++ b/parts/filecreate/file-templates/ui-mainwin @@ -400,7 +400,7 @@ <slot>helpAbout()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>fileNew()</slot> <slot>fileOpen()</slot> <slot>fileSave()</slot> @@ -416,6 +416,6 @@ <slot>helpIndex()</slot> <slot>helpContents()</slot> <slot>helpAbout()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/filecreate/filecreate_filedialog.cpp b/parts/filecreate/filecreate_filedialog.cpp index 3aa86c96..0a500dd5 100644 --- a/parts/filecreate/filecreate_filedialog.cpp +++ b/parts/filecreate/filecreate_filedialog.cpp @@ -30,8 +30,8 @@ namespace FileCreate { m_extraWidget = extraWidget; m_typeChooser = dynamic_cast<TypeChooser*>(extraWidget); - connect(this, TQT_SIGNAL(filterChanged(const TQString &)), this, TQT_SLOT(slotActionFilterChanged(const TQString &)) ); - connect(locationEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotActionTextChanged(const TQString &)) ); + connect(this, TQ_SIGNAL(filterChanged(const TQString &)), this, TQ_SLOT(slotActionFilterChanged(const TQString &)) ); + connect(locationEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotActionTextChanged(const TQString &)) ); } diff --git a/parts/filecreate/filecreate_newfile.cpp b/parts/filecreate/filecreate_newfile.cpp index f1a69059..52c01b42 100644 --- a/parts/filecreate/filecreate_newfile.cpp +++ b/parts/filecreate/filecreate_newfile.cpp @@ -62,7 +62,7 @@ namespace FileCreate { m_addToProject->setChecked( true ); m_urlreq->setMode((int) KFile::Directory); - connect( m_filename, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotFileNameChanged(const TQString & ) ) ); + connect( m_filename, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotFileNameChanged(const TQString & ) ) ); slotFileNameChanged( m_filename->text() ); } diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index a1529097..a806f54f 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -22,7 +22,7 @@ #include <kdevgenericfactory.h> #include <tdefiledialog.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <tdeaction.h> #include <tdeapplication.h> @@ -68,23 +68,23 @@ FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStrin setInstance(FileCreateFactory::instance()); setXMLFile("kdevpart_filecreate.rc"); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Templates"), PROJECTSETTINGSPAGE, info()->icon() ); _configProxy->createGlobalConfigPage( i18n("File Templates"), GLOBALSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - TDEToolBarPopupAction * newAction = new TDEToolBarPopupAction( i18n("&New"), "document-new", CTRL+TQt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new"); + TDEToolBarPopupAction * newAction = new TDEToolBarPopupAction( i18n("&New"), "document-new", CTRL+TQt::Key_N, this, TQ_SLOT(slotNewFile()), actionCollection(), "file_new"); newAction->setWhatsThis( i18n("<b>New file</b><p>Creates a new file. Also adds it the project if the <b>Add to project</b> checkbox is turned on.") ); newAction->setToolTip( i18n("Create a new file") ); m_newPopupMenu = newAction->popupMenu(); - connect(m_newPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowNewPopupMenu())); + connect(m_newPopupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShowNewPopupMenu())); - TQTimer::singleShot( 0, this, TQT_SLOT(slotGlobalInitialize()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotGlobalInitialize()) ); } @@ -105,14 +105,14 @@ void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, TQWidget * pag case PROJECTSETTINGSPAGE: { FCConfigWidget* w = new FCConfigWidget( this, false, page, "filecreate config widget" ); - connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) ); + connect( dlg, TQ_SIGNAL( okClicked( ) ), w, TQ_SLOT( accept( ) ) ); } break; case GLOBALSETTINGSPAGE: { FCConfigWidget *w = new FCConfigWidget( this, true, page, "filecreate config widget" ); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); } break; } @@ -136,7 +136,7 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() filetype->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall, TDEIcon::DefaultState, NULL, true); m_newPopupMenu->insertItem(iconPix, filetype->name(), this, - TQT_SLOT(slotNewFilePopup(int)), 0, ++id ); + TQ_SLOT(slotNewFilePopup(int)), 0, ++id ); m_newPopupMenu->setItemParameter( id, filetype->id() ); } else { @@ -151,7 +151,7 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() subtype->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall, TDEIcon::DefaultState, NULL, true); subMenu->insertItem(iconPix, subtype->name(), this, - TQT_SLOT(slotNewFilePopup(int)), 0, ++id ); + TQ_SLOT(slotNewFilePopup(int)), 0, ++id ); subMenu->setItemParameter( id, subtype->id() ); } } @@ -187,7 +187,7 @@ void FileCreatePart::slotNewFile() { } void FileCreatePart::slotProjectOpened() { - TQTimer::singleShot( 0, this, TQT_SLOT(slotInitialize()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotInitialize()) ); } void FileCreatePart::addFileType(const TQString & filename) { @@ -207,7 +207,7 @@ void FileCreatePart::addFileType(const TQString & filename) { void FileCreatePart::slotProjectClosed() { m_filetypes.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotGlobalInitialize()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotGlobalInitialize()) ); } void FileCreatePart::slotFiletypeSelected(const FileType * filetype) { diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp index 4638725c..118e3606 100644 --- a/parts/filecreate/filecreate_widget2.cpp +++ b/parts/filecreate/filecreate_widget2.cpp @@ -88,7 +88,7 @@ namespace FileCreate { void FriendlyWidget::refresh() { - disconnect( this, TQT_SIGNAL(currentChanged(int,int)), this, TQT_SLOT(slotCellSelected(int,int)) ); + disconnect( this, TQ_SIGNAL(currentChanged(int,int)), this, TQ_SLOT(slotCellSelected(int,int)) ); empty(); @@ -117,7 +117,7 @@ namespace FileCreate { resizeCells(); if (currentSelection()>-1) removeSelection(currentSelection()); - connect( this, TQT_SIGNAL(currentChanged(int,int)), this, TQT_SLOT(slotCellSelected(int,int)) ); + connect( this, TQ_SIGNAL(currentChanged(int,int)), this, TQ_SLOT(slotCellSelected(int,int)) ); } @@ -165,7 +165,7 @@ namespace FileCreate { } m_selected = typeForRow.contains(row) ? typeForRow[row] : NULL; - TQTimer::singleShot(0, this, TQT_SLOT(slotDoSelection()) ); + TQTimer::singleShot(0, this, TQ_SLOT(slotDoSelection()) ); } diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp index caf1ac74..a86d3155 100644 --- a/parts/filecreate/filecreate_widget3.cpp +++ b/parts/filecreate/filecreate_widget3.cpp @@ -46,7 +46,7 @@ namespace FileCreate { "Globally available file types are listed and can be configured in TDevelop settings dialog, <b>New File Wizard</b> tab.")); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotTypeSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotTypeSelected(TQListViewItem*)) ); } diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp index 49141dc0..d8af5988 100644 --- a/parts/filelist/filelist_widget.cpp +++ b/parts/filelist/filelist_widget.cpp @@ -45,26 +45,26 @@ FileListWidget::FileListWidget(ProjectviewPart *part, TQWidget *parent) setSelectionMode( TQListView::Extended ); -// connect( _part->partController(), TQT_SIGNAL( partAdded(KParts::Part*) ), this, TQT_SLOT(partAdded(KParts::Part*)) ); -// connect( _part->partController(), TQT_SIGNAL( partRemoved(KParts::Part*) ), this, TQT_SLOT(partRemoved()) ); - connect( _part->partController(), TQT_SIGNAL( partAdded(KParts::Part*) ), this, TQT_SLOT(startRefreshTimer()) ); - connect( _part->partController(), TQT_SIGNAL( partRemoved(KParts::Part*) ), this, TQT_SLOT(startRefreshTimer()) ); - connect( _part->partController(), TQT_SIGNAL( activePartChanged(KParts::Part*) ), this, TQT_SLOT( activePartChanged(KParts::Part* )) ); +// connect( _part->partController(), TQ_SIGNAL( partAdded(KParts::Part*) ), this, TQ_SLOT(partAdded(KParts::Part*)) ); +// connect( _part->partController(), TQ_SIGNAL( partRemoved(KParts::Part*) ), this, TQ_SLOT(partRemoved()) ); + connect( _part->partController(), TQ_SIGNAL( partAdded(KParts::Part*) ), this, TQ_SLOT(startRefreshTimer()) ); + connect( _part->partController(), TQ_SIGNAL( partRemoved(KParts::Part*) ), this, TQ_SLOT(startRefreshTimer()) ); + connect( _part->partController(), TQ_SIGNAL( activePartChanged(KParts::Part*) ), this, TQ_SLOT( activePartChanged(KParts::Part* )) ); - connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); - connect( _part->partController(), TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)), - this, TQT_SLOT(documentChangedState(const KURL&, DocumentState )) ); + connect( _part->partController(), TQ_SIGNAL(documentChangedState(const KURL &, DocumentState)), + this, TQ_SLOT(documentChangedState(const KURL&, DocumentState )) ); - connect( _part->partController(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart * )), this, TQT_SLOT(refreshFileList()) ); + connect( _part->partController(), TQ_SIGNAL(partURLChanged(KParts::ReadOnlyPart * )), this, TQ_SLOT(refreshFileList()) ); setItemMargin(10); - connect( &m_refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(refreshFileList()) ); + connect( &m_refreshTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(refreshFileList()) ); startRefreshTimer(); } @@ -226,9 +226,9 @@ void FileListWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int ) { TDEPopupMenu popup; popup.insertTitle( i18n("File List") ); - popup.insertItem( i18n("Close Selected"), this, TQT_SLOT(closeSelectedFiles()) ); - popup.insertItem( i18n("Save Selected"), this, TQT_SLOT(saveSelectedFiles()) ); - popup.insertItem( i18n("Reload Selected"), this, TQT_SLOT(reloadSelectedFiles()) ); + popup.insertItem( i18n("Close Selected"), this, TQ_SLOT(closeSelectedFiles()) ); + popup.insertItem( i18n("Save Selected"), this, TQ_SLOT(saveSelectedFiles()) ); + popup.insertItem( i18n("Reload Selected"), this, TQ_SLOT(reloadSelectedFiles()) ); FileContext context( getSelectedURLs() ); _part->core()->fillContextMenu( &popup, &context ); diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp index c982350e..4cb2338c 100644 --- a/parts/filelist/projectviewconfig.cpp +++ b/parts/filelist/projectviewconfig.cpp @@ -28,7 +28,7 @@ ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name) : ProjectviewConfigBase(parent, name) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("File List Plugin"); inToolview->setChecked(config->readBoolEntry("ToolbarInToolview", true)); onlyProject->setChecked(config->readBoolEntry("OnlyProjectFiles", false)); @@ -37,7 +37,7 @@ ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name) void ProjectviewConfig::accept() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("File List Plugin"); config->writeEntry("ToolbarInToolview", inToolview->isChecked()); config->writeEntry("OnlyProjectFiles", onlyProject->isChecked()); diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 8db2a727..39d309ef 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -79,16 +79,16 @@ ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStr m_configProxy->createGlobalConfigPage(i18n("File List"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("File List"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("File List Plugin"); if (config->readBoolEntry("ToolbarInToolview", true)) { @@ -98,7 +98,7 @@ ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStr setClientBuilder(m_guibuilder); } m_restored = false; - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } ProjectviewPart::~ProjectviewPart() @@ -277,21 +277,21 @@ void ProjectviewPart::setupActions() { m_openPrjViewAction = new TDESelectAction(i18n("Open Session..."), 0, actionCollection(), "viewsession_open"); - connect(m_openPrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotOpenProjectView(const TQString &))); + connect(m_openPrjViewAction, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotOpenProjectView(const TQString &))); m_openPrjViewAction->setToolTip(i18n("Open Session")); - m_savePrjViewAction = new TDEAction(i18n("Save Session"), "document-save", 0, this, TQT_SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save"); + m_savePrjViewAction = new TDEAction(i18n("Save Session"), "document-save", 0, this, TQ_SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save"); - m_newPrjViewAction = new TDEAction(i18n("New Session..."), "document-new", 0, this, TQT_SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new"); + m_newPrjViewAction = new TDEAction(i18n("New Session..."), "document-new", 0, this, TQ_SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new"); m_deletePrjViewAction = new TDESelectAction(i18n("Delete Session"), "edit-delete", 0, actionCollection(), "viewsession_delete"); - connect(m_deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotDeleteProjectView(const TQString &))); + connect(m_deletePrjViewAction, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotDeleteProjectView(const TQString &))); m_deletePrjViewAction->setToolTip(i18n("Delete Session")); - m_deleteCurrentPrjViewAction = new TDEAction(i18n("Delete Session"), "edit-delete", 0, this, TQT_SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent"); + m_deleteCurrentPrjViewAction = new TDEAction(i18n("Delete Session"), "edit-delete", 0, this, TQ_SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent"); m_deleteCurrentPrjViewAction->setToolTip(i18n("Delete Session")); @@ -306,13 +306,13 @@ void ProjectviewPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, case PROJECTDOC_OPTIONS: { ProjectviewProjectConfig *w = new ProjectviewProjectConfig(this, page, "project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case GLOBALDOC_OPTIONS: { ProjectviewConfig *w = new ProjectviewConfig(page, "global config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -332,7 +332,7 @@ void ProjectviewPart::contextMenu(TQPopupMenu */*popup*/, const Context */*conte // // or create menu items on the fly // // int id = -1; // // id = popup->insertItem(i18n("Do Something Here"), -// // this, TQT_SLOT(doSomething())); +// // this, TQ_SLOT(doSomething())); // // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do." // } // else if (context->hasType(Context::FileContext)) @@ -382,7 +382,7 @@ void ProjectviewPart::projectClosed() void ProjectviewPart::slotOpenProjectView(const TQString &view) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("File List Plugin"); bool onlyProject = config->readBoolEntry("OnlyProjectFiles", false); bool closeOpenFiles = config->readBoolEntry("CloseOpenFiles", true); @@ -535,7 +535,7 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName) void ProjectviewPart::writeConfig() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->deleteGroup("ProjectViews", true); config->setGroup("ProjectViews"); @@ -559,7 +559,7 @@ void ProjectviewPart::writeConfig() void ProjectviewPart::readConfig() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); TQMap<TQString, TQString> entries = config->entryMap("ProjectViews"); m_projectViews.clear(); diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index de9b5fef..7d5361b7 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -9,7 +9,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktextbrowser.h> #include <tdeconfig.h> #include <tdefileitem.h> @@ -41,11 +41,11 @@ FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQS m_filetree = new KDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" ); - connect( m_filetree->dirOperator(), TQT_SIGNAL(fileSelected(const KFileItem*)), - this, TQT_SLOT(fileSelected(const KFileItem*))); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( m_filetree->dirOperator(), TQ_SIGNAL(fileSelected(const KFileItem*)), + this, TQ_SLOT(fileSelected(const KFileItem*))); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(slotConfigWidget(KDialogBase*)) ); m_filetree->setCaption( i18n("File Selector") ); m_filetree->setIcon( SmallIcon( info()->icon() ) ); @@ -54,7 +54,7 @@ FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQS m_filetree->readConfig( instance()->config(), "fileselector" ); - m_newFileAction = new TDEAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQT_SLOT(newFile()), this, "new_file"); + m_newFileAction = new TDEAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQ_SLOT(newFile()), this, "new_file"); } FileSelectorPart::~FileSelectorPart() @@ -84,7 +84,7 @@ void FileSelectorPart::slotConfigWidget( KDialogBase * dlg ) { TQVBox* vbox = dlg->addVBoxPage( i18n("File Selector"), i18n("File Selector"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); KFSConfigPage* page = new KFSConfigPage( vbox, 0, m_filetree ); - connect( dlg, TQT_SIGNAL( okClicked( ) ), page, TQT_SLOT( apply( ) ) ); + connect( dlg, TQ_SIGNAL( okClicked( ) ), page, TQ_SLOT( apply( ) ) ); // ### implement reload } diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 30b56f9d..3a57dc96 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -173,41 +173,41 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main filter = new KHistoryCombo( true, filterBox, "filter"); filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); - connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); + connect( btnFilter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( btnFilterClick() ) ); lo->addWidget(filterBox); - connect( filter, TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT( slotFilterChange(const TQString&) ) ); - connect( filter, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotFilterChange(const TQString&) ) ); - connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ), - filter, TQT_SLOT( addToHistory(const TQString&) ) ); + connect( filter, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQ_SIGNAL( returnPressed(const TQString&) ), + filter, TQ_SLOT( addToHistory(const TQString&) ) ); // tdeaction for the dir sync method acSyncDir = new TDEAction( i18n("Current Document Directory"), "dirsynch", 0, - TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); + this, TQ_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); toolbar->setIconText( TDEToolBar::IconOnly ); toolbar->setIconSize( 16 ); toolbar->setEnableContextMenu( false ); - connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( cmbPathActivated( const KURL& ) )); - connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )), - this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) )); - connect(dir, TQT_SIGNAL(urlEntered(const KURL&)), - this, TQT_SLOT(dirUrlEntered(const KURL&)) ); + connect( cmbPath, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( cmbPathActivated( const KURL& ) )); + connect( cmbPath, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect(dir, TQ_SIGNAL(urlEntered(const KURL&)), + this, TQ_SLOT(dirUrlEntered(const KURL&)) ); - connect(dir, TQT_SIGNAL(finishedLoading()), - this, TQT_SLOT(dirFinishedLoading()) ); + connect(dir, TQ_SIGNAL(finishedLoading()), + this, TQ_SLOT(dirFinishedLoading()) ); // enable dir sync button if current doc has a valid URL - connect ( partController, TQT_SIGNAL(activePartChanged(KParts::Part*) ), - this, TQT_SLOT(viewChanged() ) ); + connect ( partController, TQ_SIGNAL(activePartChanged(KParts::Part*) ), + this, TQ_SLOT(viewChanged() ) ); // Connect the bookmark handler - connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), - this, TQT_SLOT( setDir( const TQString& ) ) ); + connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )), + this, TQ_SLOT( setDir( const TQString& ) ) ); waitingUrl = TQString(); @@ -250,13 +250,13 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) cmbPath->setMaxItems( config->readNumEntry( "pathcombo history len", 9 ) ); cmbPath->setURLs( config->readPathListEntry("dir history") ); // if we restore history - if ( config->readBoolEntry( "restore location", true ) || kapp->isRestored() ) + if ( config->readBoolEntry( "restore location", true ) || tdeApp->isRestored() ) { TQString loc( config->readPathEntry( "location" ) ); if ( ! loc.isEmpty() ) { waitingDir = loc; - TQTimer::singleShot(0, this, TQT_SLOT(initialDirChangeHack())); + TQTimer::singleShot(0, this, TQ_SLOT(initialDirChangeHack())); } } @@ -266,7 +266,7 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) filter->setHistoryItems( config->readListEntry("filter history"), true ); lastFilter = config->readEntry( "last filter" ); TQString flt(""); - if ( config->readBoolEntry( "restore last filter", true ) || kapp->isRestored() ) + if ( config->readBoolEntry( "restore last filter", true ) || tdeApp->isRestored() ) flt = config->readEntry("current filter"); filter->lineEdit()->setText( flt ); slotFilterChange( flt ); @@ -275,11 +275,11 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) // connect events as needed /// @todo - solve startup problem: no need to set location for each doc opened! if ( autoSyncEvents & DocumentChanged ) - connect( partController, TQT_SIGNAL( viewChanged() ), this, TQT_SLOT( autoSync() ) ); + connect( partController, TQ_SIGNAL( viewChanged() ), this, TQ_SLOT( autoSync() ) ); if ( autoSyncEvents & DocumentOpened ) - connect( partController, TQT_SIGNAL( partAdded(KParts::Part*) ), - this, TQT_SLOT( autoSync(KParts::Part*) ) ); + connect( partController, TQ_SIGNAL( partAdded(KParts::Part*) ), + this, TQ_SLOT( autoSync(KParts::Part*) ) ); } @@ -590,10 +590,10 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect acSel->setAvailableLabel( i18n("A&vailable actions:") ); acSel->setSelectedLabel( i18n("S&elected actions:") ); lo->addWidget( gbToolbar ); - connect( acSel, TQT_SIGNAL( added( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); - connect( acSel, TQT_SIGNAL( removed( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); - connect( acSel, TQT_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); - connect( acSel, TQT_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); + connect( acSel, TQ_SIGNAL( added( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) ); + connect( acSel, TQ_SIGNAL( removed( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) ); + connect( acSel, TQ_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) ); + connect( acSel, TQ_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) ); // Sync TQGroupBox *gbSync = new TQGroupBox( 1, TQt::Horizontal, i18n("Auto Synchronization"), this ); @@ -601,9 +601,9 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect cbSyncOpen = new TQCheckBox( i18n("When a document is o&pened"), gbSync ); cbSyncShow = new TQCheckBox( i18n("When the file selector becomes visible"), gbSync ); lo->addWidget( gbSync ); - connect( cbSyncActive, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); - connect( cbSyncOpen, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); - connect( cbSyncShow, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cbSyncActive, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); + connect( cbSyncOpen, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); + connect( cbSyncShow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); // Histories TQHBox *hbPathHist = new TQHBox ( this ); @@ -611,22 +611,22 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect sbPathHistLength = new TQSpinBox( hbPathHist ); lbPathHist->setBuddy( sbPathHistLength ); lo->addWidget( hbPathHist ); - connect( sbPathHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( sbPathHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); TQHBox *hbFilterHist = new TQHBox ( this ); TQLabel *lbFilterHist = new TQLabel( i18n("Remember &filters:"), hbFilterHist ); sbFilterHistLength = new TQSpinBox( hbFilterHist ); lbFilterHist->setBuddy( sbFilterHistLength ); lo->addWidget( hbFilterHist ); - connect( sbFilterHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( sbFilterHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); // Session TQGroupBox *gbSession = new TQGroupBox( 1, TQt::Horizontal, i18n("Session"), this ); cbSesLocation = new TQCheckBox( i18n("Restore loca&tion"), gbSession ); cbSesFilter = new TQCheckBox( i18n("Restore last f&ilter"), gbSession ); lo->addWidget( gbSession ); - connect( cbSesLocation, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); - connect( cbSesFilter, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cbSesLocation, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); + connect( cbSesFilter, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); // make it look nice lo->addStretch( 1 ); @@ -713,16 +713,16 @@ void KFSConfigPage::apply() s |= KDevFileSelector::GotVisible; fileSelector->autoSyncEvents = s; // reset connections - disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync() ) ); + disconnect( fileSelector->partController, 0, fileSelector, TQ_SLOT( autoSync() ) ); disconnect( fileSelector->partController, 0, - fileSelector, TQT_SLOT( autoSync( KParts::Part *) ) ); + fileSelector, TQ_SLOT( autoSync( KParts::Part *) ) ); if ( s & KDevFileSelector::DocumentChanged ) - connect( fileSelector->partController, TQT_SIGNAL( viewChanged() ), - fileSelector, TQT_SLOT( autoSync() ) ); + connect( fileSelector->partController, TQ_SIGNAL( viewChanged() ), + fileSelector, TQ_SLOT( autoSync() ) ); if ( s & KDevFileSelector::DocumentOpened ) connect( fileSelector->partController, - TQT_SIGNAL( partAdded(KParts::Part *) ), - fileSelector, TQT_SLOT( autoSync(KParts::Part *) ) ); + TQ_SIGNAL( partAdded(KParts::Part *) ), + fileSelector, TQ_SLOT( autoSync(KParts::Part *) ) ); // histories fileSelector->cmbPath->setMaxItems( sbPathHistLength->value() ); diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp index 935b9d86..184983a6 100644 --- a/parts/fileselector/kbookmarkhandler.cpp +++ b/parts/fileselector/kbookmarkhandler.cpp @@ -27,7 +27,7 @@ #include <kbookmarkimporter.h> #include <tdepopupmenu.h> #include <ksavefile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdediroperator.h> #include <tdeaction.h> diff --git a/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp index 283731c2..488897e5 100644 --- a/parts/fileselector/tdeactionselector.cpp +++ b/parts/fileselector/tdeactionselector.cpp @@ -98,18 +98,18 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) loadIcons(); - connect( d->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonAddClicked()) ); - connect( d->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonRemoveClicked()) ); - connect( d->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonUpClicked()) ); - connect( d->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonDownClicked()) ); - connect( d->availableListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->selectedListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->availableListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); - connect( d->selectedListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonAddClicked()) ); + connect( d->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonRemoveClicked()) ); + connect( d->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonUpClicked()) ); + connect( d->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonDownClicked()) ); + connect( d->availableListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->selectedListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->availableListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->selectedListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); d->availableListBox->installEventFilter( this ); d->selectedListBox->installEventFilter( this ); diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp index c11c9c81..97947ea4 100644 --- a/parts/fileview/addfilegroupdlg.cpp +++ b/parts/fileview/addfilegroupdlg.cpp @@ -27,14 +27,14 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString title_edit = new KLineEdit(old_title, this); title_edit->setFocus(); title_label->setBuddy(title_edit); - connect( title_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + connect( title_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged() ) ); TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this); pattern_edit = new KLineEdit(old_pattern, this); pattern_label->setBuddy(pattern_edit); TQFontMetrics fm(pattern_edit->fontMetrics()); pattern_edit->setMinimumWidth(fm.width('X')*35); - connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + connect( pattern_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged() ) ); TQVBoxLayout *layout = new TQVBoxLayout(this, 10); TQGridLayout *grid = new TQGridLayout(2, 2); @@ -54,8 +54,8 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( m_pOk, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotTextChanged(); diff --git a/parts/fileview/filegroupsconfigwidgetbase.ui b/parts/fileview/filegroupsconfigwidgetbase.ui index 01574b69..5abee50c 100644 --- a/parts/fileview/filegroupsconfigwidgetbase.ui +++ b/parts/fileview/filegroupsconfigwidgetbase.ui @@ -217,13 +217,13 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">addGroup()</slot> <slot access="protected">editGroup()</slot> <slot access="protected">removeGroup()</slot> <slot access="protected">moveUp()</slot> <slot access="protected">moveDown()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp index 91b1a0bc..3b3ffa21 100644 --- a/parts/fileview/filegroupspart.cpp +++ b/parts/fileview/filegroupspart.cpp @@ -52,19 +52,19 @@ FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStrin _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Groups"), FILEGROUPS_OPTIONS, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); // File groups - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), - m_filegroups, TQT_SLOT(addFiles(const TQStringList&)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), - m_filegroups, TQT_SLOT(removeFiles(const TQStringList&)) ); -/* connect( project(), TQT_SIGNAL(addedFileToProject(const TQString&)), - m_filegroups, TQT_SLOT(addFile(const TQString&)) ); - connect( project(), TQT_SIGNAL(removedFileFromProject(const TQString&)), - m_filegroups, TQT_SLOT(removeFile(const TQString&)) );*/ + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), + m_filegroups, TQ_SLOT(addFiles(const TQStringList&)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), + m_filegroups, TQ_SLOT(removeFiles(const TQStringList&)) ); +/* connect( project(), TQ_SIGNAL(addedFileToProject(const TQString&)), + m_filegroups, TQ_SLOT(addFile(const TQString&)) ); + connect( project(), TQ_SIGNAL(removedFileFromProject(const TQString&)), + m_filegroups, TQ_SLOT(removeFile(const TQString&)) );*/ m_filegroups->refresh(); } @@ -84,7 +84,7 @@ void FileGroupsPart::refresh() // This method may be called from m_filetree's slot, // so we make sure not to modify the list view during // the execution of the slot - TQTimer::singleShot(0, m_filegroups, TQT_SLOT(refresh())); + TQTimer::singleShot(0, m_filegroups, TQ_SLOT(refresh())); } void FileGroupsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ) @@ -92,6 +92,6 @@ void FileGroupsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * pag if ( pagenumber == FILEGROUPS_OPTIONS ) { FileGroupsConfigWidget *w = new FileGroupsConfigWidget(this, page, "file groups config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } } diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index b99427ec..9a45dc66 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -171,20 +171,20 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) // addColumn(i18n("Location")); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); m_actionToggleShowNonProjectFiles = new TDEToggleAction( i18n("Show Non Project Files"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowNonProjectFiles()), TQT_TQOBJECT(this), "actiontoggleshowshownonprojectfiles" ); + this, TQ_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files")); m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("<b>Show non project files</b><p>Shows files that do not belong to a project in a file tree.")); m_actionToggleDisplayLocation = new TDEToggleAction( i18n("Display Location Column"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisplayLocation()), TQT_TQOBJECT(this), "actiontoggleshowlocation" ); + this, TQ_SLOT(slotToggleDisplayLocation()), this, "actiontoggleshowlocation" ); m_actionToggleDisplayLocation->setWhatsThis(i18n("<b>Display the Location Column</b><p>Displays a column with the location of the files.")); m_part = part; @@ -261,7 +261,7 @@ void FileGroupsWidget::slotContextMenu(TDEListView *, TQListViewItem *item, cons "customization dialog"); TQVBox *vbox = dlg.addVBoxPage(i18n("File Groups")); FileGroupsConfigWidget *w = new FileGroupsConfigWidget(m_part, vbox, "file groups config widget"); - connect(&dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(&dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); dlg.exec(); } } diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp index af6f9e1f..1af5fe51 100644 --- a/parts/fileview/filetreeviewwidgetimpl.cpp +++ b/parts/fileview/filetreeviewwidgetimpl.cpp @@ -38,7 +38,7 @@ FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const ch // Actions m_actionToggleShowNonProjectFiles = new TDEToggleAction( i18n("Show Non Project Files"), TDEShortcut(), - this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); + this, TQ_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files")); m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("<b>Show non project files</b><p>Shows files that do not belong to a project in a file tree.")); @@ -63,7 +63,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl() FileTreeWidget *FileTreeViewWidgetImpl::fileTree() const { - return static_cast<FileTreeWidget *>( TQT_TQWIDGET(parent()) ); + return static_cast<FileTreeWidget *>( parent() ); } /////////////////////////////////////////////////////////////////////////////// @@ -96,7 +96,7 @@ void FileTreeViewWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewIt // kill the call-back's from working) if (item == fileTree()->firstChild() && canReloadTree()) { - int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQT_SLOT( slotReloadTree() ) ); + int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQ_SLOT( slotReloadTree() ) ); popupMenu->setWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") ); } diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index f89bf71d..d4bfedaf 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -70,19 +70,19 @@ FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFil setDragEnabled( false ); // Slot connections - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); // Intercepts KDevelop core signals and VCS notifications (if available) - connect( m_part->project(), TQT_SIGNAL( activeDirectoryChanged( const TQString&, const TQString& ) ), - this, TQT_SLOT( changeActiveDirectory( const TQString&, const TQString& ) ) ); - connect( m_part->project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), - this, TQT_SLOT( addProjectFiles( const TQStringList & ) ) ); - connect( m_part->project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), - this, TQT_SLOT( removeProjectFiles( const TQStringList & ) ) ); + connect( m_part->project(), TQ_SIGNAL( activeDirectoryChanged( const TQString&, const TQString& ) ), + this, TQ_SLOT( changeActiveDirectory( const TQString&, const TQString& ) ) ); + connect( m_part->project(), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQ_SLOT( addProjectFiles( const TQStringList & ) ) ); + connect( m_part->project(), TQ_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQ_SLOT( removeProjectFiles( const TQStringList & ) ) ); // Safeguard against VCS plug-in unloading at run-time - connect( m_impl, TQT_SIGNAL(implementationInvalidated()), this, TQT_SLOT(slotImplementationInvalidated()) ); + connect( m_impl, TQ_SIGNAL(implementationInvalidated()), this, TQ_SLOT(slotImplementationInvalidated()) ); // Hide pattern for files TQDomDocument &dom = *m_part->projectDom(); @@ -112,7 +112,7 @@ void FileTreeWidget::openDirectory( const TQString& dirName ) // if we're reloading if (m_rootBranch) { - disconnect( m_rootBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQT_SLOT(finishPopulate(KFileTreeViewItem*)) ); + disconnect( m_rootBranch, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQ_SLOT(finishPopulate(KFileTreeViewItem*)) ); removeBranch( m_rootBranch ); m_projectFiles.clear(); } @@ -128,7 +128,7 @@ void FileTreeWidget::openDirectory( const TQString& dirName ) b->setChildRecurse( false ); m_rootBranch = addBranch( b ); m_rootBranch->setOpen( true ); - connect( m_rootBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQT_SLOT(finishPopulate(KFileTreeViewItem*)) ); + connect( m_rootBranch, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQ_SLOT(finishPopulate(KFileTreeViewItem*)) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp index 25aa8f62..a9b7b3a5 100644 --- a/parts/fileview/fileviewpart.cpp +++ b/parts/fileview/fileviewpart.cpp @@ -66,10 +66,10 @@ FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringLis _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Tree"), FILETREE_OPTIONS, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - TQTimer::singleShot( 1000, this, TQT_SLOT(init()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(init()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -149,7 +149,7 @@ void FileViewPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * page, if ( pagenumber == FILETREE_OPTIONS ) { VCSColorsConfigWidget *w = new VCSColorsConfigWidget( this, vcsColors, page, "vcscolorsconfigwidget" ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } } diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp index bf68de83..4387b26c 100644 --- a/parts/fileview/partwidget.cpp +++ b/parts/fileview/partwidget.cpp @@ -60,10 +60,10 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent ) m_filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(m_filter, 2); - connect( m_btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBtnFilterClick() ) ); - connect( m_filter, TQT_SIGNAL( activated(const TQString&) ), this, TQT_SLOT( slotFilterChange(const TQString&) ) ); - connect( m_filter, TQT_SIGNAL( returnPressed(const TQString&) ), - m_filter, TQT_SLOT( addToHistory(const TQString&) ) ); + connect( m_btnFilter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBtnFilterClick() ) ); + connect( m_filter, TQ_SIGNAL( activated(const TQString&) ), this, TQ_SLOT( slotFilterChange(const TQString&) ) ); + connect( m_filter, TQ_SIGNAL( returnPressed(const TQString&) ), + m_filter, TQ_SLOT( addToHistory(const TQString&) ) ); TQWhatsThis::add ( m_filter, diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp index 450a6a58..21086959 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.cpp +++ b/parts/fileview/vcsfiletreewidgetimpl.cpp @@ -198,27 +198,27 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil parent->addColumn( "Work" ); parent->addColumn( "Repo" ); - connect( m_vcsInfoProvider, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void *)), - this, TQT_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) ); + connect( m_vcsInfoProvider, TQ_SIGNAL(statusReady(const VCSFileInfoMap&, void *)), + this, TQ_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) ); // Harakiri itself if the infoProvider object is destroyed since we cannot work anymore :-( - connect( m_vcsInfoProvider, TQT_SIGNAL(destroyed()), TQT_SIGNAL(implementationInvalidated()) ); + connect( m_vcsInfoProvider, TQ_SIGNAL(destroyed()), TQ_SIGNAL(implementationInvalidated()) ); m_actionToggleShowVCSFields = new TDEToggleAction( i18n("Show VCS Fields"), TDEShortcut(), this, "actiontoggleshowvcsfieldstoggleaction" ); m_actionToggleShowVCSFields->setCheckedState(i18n("Hide VCS Fields")); TQString aboutAction = i18n("<b>Show VCS fields</b><p>Shows <b>Revision</b> and <b>Timestamp</b> for each file contained in VCS repository."); m_actionToggleShowVCSFields->setWhatsThis( aboutAction ); - connect( m_actionToggleShowVCSFields, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleShowVCSFields(bool)) ); + connect( m_actionToggleShowVCSFields, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleShowVCSFields(bool)) ); m_actionSyncWithRepository = new TDEAction( i18n( "Sync with Repository"), TDEShortcut(), - this, TQT_SLOT(slotSyncWithRepository()), this, "actionsyncwithrepository" ); + this, TQ_SLOT(slotSyncWithRepository()), this, "actionsyncwithrepository" ); aboutAction = i18n("<b>Sync with repository</b><p>Synchronize file status with remote repository."); m_actionSyncWithRepository->setWhatsThis( aboutAction ); TQDomDocument &dom = projectDom(); m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") ); slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings - connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*))); + connect( parent, TQ_SIGNAL(expanded(TQListViewItem*)), this, TQ_SLOT(slotDirectoryExpanded(TQListViewItem*))); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp index 3a1351ad..a68f1ec5 100644 --- a/parts/filter/filterpart.cpp +++ b/parts/filter/filterpart.cpp @@ -38,13 +38,13 @@ FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) TDEAction *action; action = new TDEAction( i18n("Execute Command..."), 0, - this, TQT_SLOT(slotShellInsert()), + this, TQ_SLOT(slotShellInsert()), actionCollection(), "tools_insertshell" ); action->setToolTip(i18n("Execute shell command")); action->setWhatsThis(i18n("<b>Execute shell command</b><p>Executes a shell command and outputs its result into the current document.")); action = new TDEAction( i18n("Filter Selection Through Command..."), 0, - this, TQT_SLOT(slotShellFilter()), + this, TQ_SLOT(slotShellFilter()), actionCollection(), "tools_filtershell" ); action->setToolTip(i18n("Filter selection through a shell command")); action->setWhatsThis(i18n("<b>Filter selection through shell command</b><p>Filters selection through a shell command and outputs its result into the current document.")); diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp index a5100d5b..007e58f6 100644 --- a/parts/filter/shellfilterdlg.cpp +++ b/parts/filter/shellfilterdlg.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kstdguiitem.h> #include <tdeversion.h> @@ -44,10 +44,10 @@ ShellFilterDialog::ShellFilterDialog() buttonbox->layout(); layout->addWidget(buttonbox); - connect( start_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotStartClicked()) ); - connect( cancel_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject()) ); + connect( start_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotStartClicked()) ); + connect( cancel_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); m_proc = 0; @@ -81,12 +81,12 @@ void ShellFilterDialog::slotStartClicked() delete m_proc; m_proc = new KShellProcess("/bin/sh"); (*m_proc) << combo->currentText(); - connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char *, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); - connect( m_proc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess*)) ); - connect( m_proc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char *, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); + connect( m_proc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess*)) ); + connect( m_proc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::All); m_proc->writeStdin(m_instr, m_instr.length()); } diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp index 057e8121..d75f6895 100644 --- a/parts/filter/shellinsertdlg.cpp +++ b/parts/filter/shellinsertdlg.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klineedit.h> #include <kstdguiitem.h> #include <tdeversion.h> @@ -45,11 +45,11 @@ ShellInsertDialog::ShellInsertDialog() buttonbox->layout(); layout->addWidget(buttonbox); - connect( start_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotStartClicked()) ); - connect( cancel_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject()) ); - connect( combo->lineEdit(), TQT_SIGNAL(textChanged( const TQString &)), this, TQT_SLOT(executeTextChanged( const TQString &))); + connect( start_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotStartClicked()) ); + connect( cancel_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); + connect( combo->lineEdit(), TQ_SIGNAL(textChanged( const TQString &)), this, TQ_SLOT(executeTextChanged( const TQString &))); m_proc = 0; TDEConfig *config = FilterFactory::instance()->config(); @@ -97,10 +97,10 @@ void ShellInsertDialog::slotStartClicked() delete m_proc; m_proc = new KShellProcess("/bin/sh"); (*m_proc) << combo->currentText(); - connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char *, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); - connect( m_proc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char *, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); + connect( m_proc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp index 98581a9c..1d31f618 100644 --- a/parts/fullscreen/fullscreen_part.cpp +++ b/parts/fullscreen/fullscreen_part.cpp @@ -40,7 +40,7 @@ FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStrin m_bFullScreen = false; - m_pFullScreen = KStdAction::fullScreen(this, TQT_SLOT(slotToggleFullScreen()), actionCollection(), mainWindow()->main()); + m_pFullScreen = KStdAction::fullScreen(this, TQ_SLOT(slotToggleFullScreen()), actionCollection(), mainWindow()->main()); } FullScreenPart::~FullScreenPart() diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp index 6333805f..70f301a0 100644 --- a/parts/grepview/grepdlg.cpp +++ b/parts/grepview/grepdlg.cpp @@ -173,7 +173,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name layout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter); files_combo = new KComboBox(true, this); - files_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy())); + files_label->setBuddy(files_combo->focusProxy()); files_combo->insertStrList(filepatterns); layout->addWidget(files_combo, 5, 1); @@ -182,7 +182,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name TQStringList exclude_list = config->readListEntry("exclude_patterns"); exclude_combo = new KComboBox(true, this); - exclude_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy())); + exclude_label->setBuddy(files_combo->focusProxy()); if (exclude_list.count()) { exclude_combo->insertStringList(exclude_list); } @@ -249,15 +249,15 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name "by the pattern input field, resulting in the regular expression " "to search for.")); - connect( template_combo, TQT_SIGNAL(activated(int)), - TQT_SLOT(templateActivated(int)) ); - connect( search_button, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSearchClicked()) ); - connect( done_button, TQT_SIGNAL(clicked()), - TQT_SLOT(hide()) ); - connect( pattern_combo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), - TQT_SLOT( slotPatternChanged( const TQString & ) ) ); - connect( synch_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSynchDirectory()) ); + connect( template_combo, TQ_SIGNAL(activated(int)), + TQ_SLOT(templateActivated(int)) ); + connect( search_button, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSearchClicked()) ); + connect( done_button, TQ_SIGNAL(clicked()), + TQ_SLOT(hide()) ); + connect( pattern_combo->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), + TQ_SLOT( slotPatternChanged( const TQString & ) ) ); + connect( synch_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSynchDirectory()) ); slotPatternChanged( pattern_combo->currentText() ); } diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp index 92f4ebb6..a2a60aff 100644 --- a/parts/grepview/grepviewpart.cpp +++ b/parts/grepview/grepviewpart.cpp @@ -19,7 +19,7 @@ #include <tdeaction.h> #include <kdialogbase.h> #include <kiconloader.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kstringhandler.h> #include <tdetexteditor/document.h> @@ -41,12 +41,12 @@ GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringLi setXMLFile("kdevgrepview.rc"); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(stopButtonClicked(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(stopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); m_widget = new GrepViewWidget(this); m_widget->setIcon(SmallIcon("grep")); @@ -63,7 +63,7 @@ GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringLi TDEAction *action; action = new TDEAction(i18n("Find in Fi&les..."), "grep", CTRL+ALT+Key_F, - this, TQT_SLOT(slotGrep()), + this, TQ_SLOT(slotGrep()), actionCollection(), "edit_grep"); action->setToolTip( i18n("Search for expressions over several files") ); action->setWhatsThis( i18n("<b>Find in files</b><p>" @@ -117,7 +117,7 @@ void GrepViewPart::contextMenu(TQPopupMenu *popup, const Context *context) m_popupstr = ident; TQString squeezed = KStringHandler::csqueeze(ident, 30); int id = popup->insertItem( i18n("Grep: %1").arg(squeezed), - this, TQT_SLOT(slotContextGrep()) ); + this, TQ_SLOT(slotContextGrep()) ); popup->setWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog " "and sets the pattern to the text under the cursor.")); popup->insertSeparator(); diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp index 1d709dff..be4c8dc9 100644 --- a/parts/grepview/grepviewwidget.cpp +++ b/parts/grepview/grepviewwidget.cpp @@ -16,7 +16,7 @@ #include <tqtoolbutton.h> #include <kdialogbase.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeparts/part.h> #include <tdetexteditor/selectioninterface.h> #include <tdeaction.h> @@ -137,25 +137,25 @@ GrepViewWidget::GrepViewWidget(GrepViewPart *part) : TQWidget(0, "grepview widg m_tabWidget->addTab(m_curOutput, i18n("Search Results")); grepdlg = new GrepDialog( part, this, "grep widget"); - connect( grepdlg, TQT_SIGNAL(searchClicked()), this, TQT_SLOT(searchActivated()) ); - connect( m_curOutput, TQT_SIGNAL(processExited(TDEProcess* )), this, TQT_SLOT(slotSearchProcessExited()) ); + connect( grepdlg, TQ_SIGNAL(searchClicked()), this, TQ_SLOT(searchActivated()) ); + connect( m_curOutput, TQ_SIGNAL(processExited(TDEProcess* )), this, TQ_SLOT(slotSearchProcessExited()) ); - connect( m_tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotOutputTabChanged()) ); + connect( m_tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotOutputTabChanged()) ); - connect( m_curOutput, TQT_SIGNAL(clicked(TQListBoxItem*)), - this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, TQT_SIGNAL(returnPressed(TQListBoxItem*)), - this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQ_SIGNAL(clicked(TQListBoxItem*)), + this, TQ_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQ_SIGNAL(returnPressed(TQListBoxItem*)), + this, TQ_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, TQT_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); + connect( m_curOutput, TQ_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQ_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); m_part = part; m_closeButton = new TQToolButton(m_tabWidget);//@todo change text/icon m_closeButton->setIconSet(SmallIconSet("tab_remove")); m_closeButton->setEnabled(false); - connect (m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseCurrentOutput())); + connect (m_closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCloseCurrentOutput())); m_tabWidget->setCornerWidget(m_closeButton); } @@ -459,10 +459,10 @@ void GrepViewWidget::slotKeepOutput( ) m_curOutput = new GrepViewProcessWidget(m_tabWidget); m_tabWidget->insertTab(m_curOutput, i18n("Search Results"), 0); - connect( m_curOutput, TQT_SIGNAL(clicked(TQListBoxItem*)), this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, TQT_SIGNAL(returnPressed(TQListBoxItem*)), this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, TQT_SIGNAL(processExited(TDEProcess* )), this, TQT_SLOT(slotSearchProcessExited()) ); - connect( m_curOutput, TQT_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); + connect( m_curOutput, TQ_SIGNAL(clicked(TQListBoxItem*)), this, TQ_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQ_SIGNAL(returnPressed(TQListBoxItem*)), this, TQ_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQ_SIGNAL(processExited(TDEProcess* )), this, TQ_SLOT(slotSearchProcessExited()) ); + connect( m_curOutput, TQ_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQ_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); } void GrepViewWidget::slotCloseCurrentOutput( ) diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp index 873ab790..118cb756 100644 --- a/parts/konsole/konsoleviewpart.cpp +++ b/parts/konsole/konsoleviewpart.cpp @@ -48,7 +48,7 @@ KonsoleViewPart::KonsoleViewPart(TQObject *parent, const char *name, const TQStr mainWindow()->embedOutputView(m_widget, i18n("Konsole"), i18n("Embedded console window")); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); } diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index e58dde5b..76dfb6c3 100644 --- a/parts/konsole/konsoleviewwidget.cpp +++ b/parts/konsole/konsoleviewwidget.cpp @@ -30,7 +30,7 @@ KonsoleViewWidget::KonsoleViewWidget(KonsoleViewPart *part) : TQWidget(0, "konsole widget"), part(0), owner( part ) { - connect(part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect(part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(activePartChanged(KParts::Part*))); vbox = new TQVBoxLayout(this); } @@ -70,7 +70,7 @@ void KonsoleViewWidget::activate() // this->activePartChanged( owner->partController()->activePart() ); part->widget()->show(); - connect(part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed())); + connect(part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(partDestroyed())); } @@ -104,7 +104,7 @@ void KonsoleViewWidget::setDirectory(const KURL &dirUrl) { kdDebug(9035) << k_funcinfo << "Changing dirUrl.path() == " << dirUrl.path() << endl; kdDebug(9035) << k_funcinfo << "Changing part->url.path() == " << part->url().path() << endl; - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); kdDebug(9035) << k_funcinfo << "SyncTerminalEmulator: " << config->readBoolEntry("SyncTerminalEmulator") << endl; diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp index 665f725c..feca079c 100644 --- a/parts/openwith/openwithpart.cpp +++ b/parts/openwith/openwithpart.cpp @@ -26,8 +26,8 @@ OpenWithPart::OpenWithPart(TQObject *parent, const char *name, const TQStringLis { setInstance( OpenWithFactory::instance() ); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu*,const Context *)), - this, TQT_SLOT(fillContextMenu(TQPopupMenu*,const Context *))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu*,const Context *)), + this, TQ_SLOT(fillContextMenu(TQPopupMenu*,const Context *))); } @@ -45,7 +45,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); - popup->insertItem( i18n("Open as UTF-8"), this, TQT_SLOT(openAsUtf8()) ); + popup->insertItem( i18n("Open as UTF-8"), this, TQ_SLOT(openAsUtf8()) ); TDEPopupMenu * openAsPopup = new TDEPopupMenu( popup ); @@ -58,7 +58,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) TQStringList::const_iterator it = encodings.constBegin(); while ( it != encodings.constEnd() ) { - openAsPopup->insertItem( *it, this, TQT_SLOT(openAsEncoding(int)), 0, i ); + openAsPopup->insertItem( *it, this, TQ_SLOT(openAsEncoding(int)), 0, i ); ++it; i++; } @@ -74,7 +74,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) for (it = offers.begin(); it != offers.end(); ++it) { TDEAction *action = new TDEAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName( (*it)->desktopEntryPath() ).data()); - connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(openWithService())); + connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(openWithService())); action->plug( openWithPopup ); } } @@ -85,7 +85,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) openWithPopup->insertSeparator(); // make sure the generic "Open with ..." entry gets appended to the submenu - id = openWithPopup->insertItem(i18n("Open With..."), this, TQT_SLOT(openWithDialog())); + id = openWithPopup->insertItem(i18n("Open With..."), this, TQ_SLOT(openWithDialog())); openWithPopup->setWhatsThis(id, i18n("<b>Open With...</b><p>Provides a dialog to choose the application to open the selected file.")); } diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 3d8b47bf..b2771a8a 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -51,10 +51,10 @@ AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const T mainWindow()->embedOutputView(m_widget, i18n("Application"), i18n("Output of the executed user program")); hideView(); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited())); - connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SIGNAL(processExited())); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect(m_widget, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited())); + connect(m_widget, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SIGNAL(processExited())); } @@ -97,7 +97,7 @@ void AppOutputViewPart::startAppCommand(const TQString &directory, const TQStrin TQString cmd; if (inTerminal) { - cmd = Settings::terminalEmulatorName( *kapp->config() ); + cmd = Settings::terminalEmulatorName( *tdeApp->config() ); if ( cmd == "konsole" && !directory.isNull() ) { // isn't setting the working directory below enough? // If a directory was specified, use it cmd += TQString(" --workdir '%1'").arg(directory); diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index 50060339..fbc4bb4c 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -40,10 +40,10 @@ AppOutputWidget::AppOutputWidget(AppOutputViewPart* part) : ProcessWidget(0, "app output widget"), m_part(part) { - connect(this, TQT_SIGNAL(executed(TQListBoxItem*)), TQT_SLOT(slotRowSelected(TQListBoxItem*))); - connect(this, TQT_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), - TQT_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & ))); - TDEConfig *config = kapp->config(); + connect(this, TQ_SIGNAL(executed(TQListBoxItem*)), TQ_SLOT(slotRowSelected(TQListBoxItem*))); + connect(this, TQ_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), + TQ_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & ))); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); setFont(config->readFontEntry("OutputViewFont")); setSelectionMode(TQListBox::Extended); @@ -251,24 +251,24 @@ void AppOutputWidget::slotContextMenu( TQListBoxItem *, const TQPoint &p ) { TDEPopupMenu popup(this, "filter output"); - int id = popup.insertItem( i18n("Clear output"), this, TQT_SLOT(clearViewAndContents()) ); + int id = popup.insertItem( i18n("Clear output"), this, TQ_SLOT(clearViewAndContents()) ); popup.setItemEnabled( id, m_contentList.size() > 0 ); - popup.insertItem( i18n("Copy selected lines"), this, TQT_SLOT(copySelected()) ); + popup.insertItem( i18n("Copy selected lines"), this, TQ_SLOT(copySelected()) ); popup.insertSeparator(); - popup.insertItem( i18n("Save unfiltered"), this, TQT_SLOT(saveAll()) ); - id = popup.insertItem( i18n("Save filtered output"), this, TQT_SLOT(saveFiltered()) ); + popup.insertItem( i18n("Save unfiltered"), this, TQ_SLOT(saveAll()) ); + id = popup.insertItem( i18n("Save filtered output"), this, TQ_SLOT(saveFiltered()) ); popup.setItemEnabled( id, m_filter.m_isActive ); popup.insertSeparator(); - id = popup.insertItem( i18n("Clear filter"), this, TQT_SLOT(clearFilter()) ); + id = popup.insertItem( i18n("Clear filter"), this, TQ_SLOT(clearFilter()) ); popup.setItemEnabled( id, m_filter.m_isActive ); - popup.insertItem( i18n("Edit filter"), this, TQT_SLOT(editFilter() ) ); + popup.insertItem( i18n("Edit filter"), this, TQ_SLOT(editFilter() ) ); popup.insertSeparator(); - popup.insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) ); + popup.insertItem( i18n("Hide view"), this, TQ_SLOT(hideView()) ); popup.exec(p); } @@ -339,7 +339,7 @@ void AppOutputWidget::copySelected() if (isSelected(i)) buffer += item(i)->text() + "\n"; } - kapp->clipboard()->setText(buffer, TQClipboard::Clipboard); + tdeApp->clipboard()->setText(buffer, TQClipboard::Clipboard); } void AppOutputWidget::addPartialStderrLine(const TQCString & line) diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index 2df7d384..d1b1df76 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -52,17 +52,17 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis mainWindow()->embedOutputView(m_widget, i18n("Messages"), i18n("Compiler output messages")); TDEAction *action; - action = new TDEAction( i18n("&Next Error"), Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(nextError()), + action = new TDEAction( i18n("&Next Error"), Key_F4, m_widget, TQ_SLOT(nextError()), actionCollection(), "view_next_error"); action->setToolTip( i18n("Go to the next error") ); action->setWhatsThis(i18n("<b>Next error</b><p>Switches to the file and line where the next error was reported from.")); - action = new TDEAction( i18n("&Previous Error"), SHIFT+Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(prevError()), + action = new TDEAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, TQ_SLOT(prevError()), actionCollection(), "view_previous_error"); action->setToolTip( i18n("Go to the previous error") ); action->setWhatsThis(i18n("<b>Previous error</b><p>Switches to the file and line where the previous error was reported from.")); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); } diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 78b3a386..f4287262 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -25,10 +25,10 @@ #include <kdebug.h> #include <tdelocale.h> #include <knotifyclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeglobal.h> -#include <kstandarddirs.h> -#include <kinstance.h> +#include <tdestandarddirs.h> +#include <tdeinstance.h> #include <kstatusbar.h> #include <tdeapplication.h> #include <tdeconfig.h> @@ -42,7 +42,7 @@ #include <tqfileinfo.h> #include <tqclipboard.h> #include <tqpopupmenu.h> -#include <tqrichtext_p.h> +#include <private/tqrichtext_p.h> #include <stdlib.h> #include <limits.h> @@ -178,44 +178,44 @@ MakeWidget::MakeWidget(MakeViewPart *part) dirstack.setAutoDelete(true); - childproc = new TDEProcess(TQT_TQOBJECT(this)); + childproc = new TDEProcess(this); procLineMaker = new ProcessLineMaker( childproc ); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - this, TQT_SLOT(insertStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - this, TQT_SLOT(insertStderrLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - this, TQT_SLOT(storePartialStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - this, TQT_SLOT(storePartialStderrLine(const TQCString&) )); - - connect( childproc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*) )) ; - - connect( &m_directoryStatusFilter, TQT_SIGNAL(item(EnteringDirectoryItem*)), - this, TQT_SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) ); - connect( &m_directoryStatusFilter, TQT_SIGNAL(item(ExitingDirectoryItem*)), - this, TQT_SLOT(slotExitedDirectory(ExitingDirectoryItem*)) ); - connect( &m_errorFilter, TQT_SIGNAL(item(MakeItem*)), - this, TQT_SLOT(insertItem(MakeItem*)) ); - connect( &m_actionFilter, TQT_SIGNAL(item(MakeItem*)), - this, TQT_SLOT(insertItem(MakeItem*)) ); - connect( &m_otherFilter, TQT_SIGNAL(item(MakeItem*)), - this, TQT_SLOT(insertItem(MakeItem*)) ); - - connect( verticalScrollBar(), TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(verticScrollingOn()) ); - connect( verticalScrollBar(), TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(verticScrollingOff()) ); - connect( horizontalScrollBar(), TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(horizScrollingOn()) ); - connect( horizontalScrollBar(), TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(horizScrollingOff()) ); + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + this, TQ_SLOT(insertStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + this, TQ_SLOT(insertStderrLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + this, TQ_SLOT(storePartialStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + this, TQ_SLOT(storePartialStderrLine(const TQCString&) )); + + connect( childproc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*) )) ; + + connect( &m_directoryStatusFilter, TQ_SIGNAL(item(EnteringDirectoryItem*)), + this, TQ_SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) ); + connect( &m_directoryStatusFilter, TQ_SIGNAL(item(ExitingDirectoryItem*)), + this, TQ_SLOT(slotExitedDirectory(ExitingDirectoryItem*)) ); + connect( &m_errorFilter, TQ_SIGNAL(item(MakeItem*)), + this, TQ_SLOT(insertItem(MakeItem*)) ); + connect( &m_actionFilter, TQ_SIGNAL(item(MakeItem*)), + this, TQ_SLOT(insertItem(MakeItem*)) ); + connect( &m_otherFilter, TQ_SIGNAL(item(MakeItem*)), + this, TQ_SLOT(insertItem(MakeItem*)) ); + + connect( verticalScrollBar(), TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(verticScrollingOn()) ); + connect( verticalScrollBar(), TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(verticScrollingOff()) ); + connect( horizontalScrollBar(), TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(horizScrollingOn()) ); + connect( horizontalScrollBar(), TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(horizScrollingOff()) ); // this slot doesn't exist anymore -// connect( m_part->partController(), TQT_SIGNAL(loadedFile(const KURL&)), -// this, TQT_SLOT(slotDocumentOpened(const KURL&)) ); +// connect( m_part->partController(), TQ_SIGNAL(loadedFile(const KURL&)), +// this, TQ_SLOT(slotDocumentOpened(const KURL&)) ); } MakeWidget::~MakeWidget() @@ -342,7 +342,7 @@ void MakeWidget::copy() selection.replace(""","\""); selection.replace("&","&"); - kapp->clipboard()->setText(selection, TQClipboard::Clipboard); + tdeApp->clipboard()->setText(selection, TQClipboard::Clipboard); } void MakeWidget::nextError() @@ -527,7 +527,7 @@ void MakeWidget::searchItem(int parag) void MakeWidget::insertStdoutLine( const TQCString& line ) { TQString sline; - bool forceCLocale = TDEConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); + bool forceCLocale = TDEConfigGroup( tdeApp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); if( forceCLocale ) sline = TQString::fromAscii( stdoutbuf+line ); @@ -542,7 +542,7 @@ void MakeWidget::insertStdoutLine( const TQCString& line ) void MakeWidget::insertStderrLine( const TQCString& line ) { TQString sline; - bool forceCLocale = TDEConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); + bool forceCLocale = TDEConfigGroup( tdeApp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); if( forceCLocale ) { sline = TQString( stderrbuf+line ); @@ -588,7 +588,7 @@ void MakeWidget::slotProcessExited(TDEProcess *) // and its TDEProcess object can be reused. if (childproc->normalExit() && !childproc->exitStatus()) { - TQTimer::singleShot(0, this, TQT_SLOT(startNextJob())); + TQTimer::singleShot(0, this, TQ_SLOT(startNextJob())); // if (commandList.isEmpty()) // The last command on the list was successful so restore the // output view to what it had before the compilation process started @@ -698,23 +698,23 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos ) pMenu->setCheckable(true); pMenu->insertSeparator(); - int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_SLOT(toggleLineWrapping()) ); + int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQ_SLOT(toggleLineWrapping()) ); pMenu->setItemChecked(id, m_bLineWrapping); pMenu->setWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed.")); pMenu->insertSeparator(); - id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQT_SLOT(slotVeryShortCompilerOutput()) ); + id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQ_SLOT(slotVeryShortCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eVeryShort); - id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQT_SLOT(slotShortCompilerOutput()) ); + id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQ_SLOT(slotShortCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eShort); - id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQT_SLOT(slotFullCompilerOutput()) ); + id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQ_SLOT(slotFullCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eFull); pMenu->insertSeparator(); - id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQT_SLOT(toggleShowDirNavigMessages())); + id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQ_SLOT(toggleShowDirNavigMessages())); pMenu->setWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building.")); pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages()); @@ -724,7 +724,7 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos ) void MakeWidget::toggleLineWrapping() { m_bLineWrapping = !m_bLineWrapping; - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("LineWrapping", m_bLineWrapping); pConfig->sync(); @@ -759,7 +759,7 @@ void MakeWidget::slotFullCompilerOutput() { setTextFormat( TQt::RichText ); setC void MakeWidget::setCompilerOutputLevel(EOutputLevel level) { m_compilerOutputLevel = level; - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("CompilerOutputLevel", (int) level); pConfig->sync(); @@ -769,7 +769,7 @@ void MakeWidget::setCompilerOutputLevel(EOutputLevel level) void MakeWidget::toggleShowDirNavigMessages() { DirectoryItem::setShowDirectoryMessages( !DirectoryItem::getShowDirectoryMessages() ); - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("ShowDirNavigMsg", DirectoryItem::getShowDirectoryMessages()); pConfig->sync(); @@ -778,7 +778,7 @@ void MakeWidget::toggleShowDirNavigMessages() void MakeWidget::updateSettingsFromConfig() { - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("General Options"); TQFont outputFont = pConfig->readFontEntry("OutputViewFont"); setFont(outputFont); diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp index 57b1cd58..86ed8306 100644 --- a/parts/partexplorer/partexplorer_plugin.cpp +++ b/parts/partexplorer/partexplorer_plugin.cpp @@ -11,7 +11,7 @@ #include "partexplorer_plugin.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <kdevgenericfactory.h> #include <kdebug.h> @@ -40,7 +40,7 @@ PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, con m_widget = new PartExplorerForm( mainWindow()->main() ); // mainWindow()->embedSelectView( m_widget, i18n("PartExplorer"), i18n("Query system services")); - TDEAction *action = new TDEAction( i18n("&Part Explorer"), 0, this, TQT_SLOT(slotShowForm()), + TDEAction *action = new TDEAction( i18n("&Part Explorer"), 0, this, TQ_SLOT(slotShowForm()), actionCollection(), "show_partexplorerform" ); action->setToolTip(i18n("TDETrader query execution")); action->setWhatsThis(i18n("<b>Part explorer</b><p>Shows a dialog for TDETrader query execution. Search your TDE documentation for more information about TDE services and TDETrader.")); diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp index baf05bb2..14a926f5 100644 --- a/parts/partexplorer/partexplorerform.cpp +++ b/parts/partexplorer/partexplorerform.cpp @@ -131,11 +131,11 @@ PartExplorerForm::PartExplorerForm( TQWidget *parent ) // Resize dialog resize( 480, 512 ); -// connect( m_base->typeCombo->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchRequested()) ); -// connect( m_base->constraintsText, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchRequested()) ); +// connect( m_base->typeCombo->lineEdit(), TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotSearchRequested()) ); +// connect( m_base->constraintsText, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotSearchRequested()) ); - connect( actionButton(User1), TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearchRequested()) ); -// connect( m_base->typeCombo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotServicetypeChanged( const TQString& ) ) ); + connect( actionButton(User1), TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchRequested()) ); +// connect( m_base->typeCombo->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotServicetypeChanged( const TQString& ) ) ); // slotServicetypeChanged( m_base->typeCombo->lineEdit()->text() ); // populating with all known servicetypes diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index 78c97eb6..0d127a9c 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -56,26 +56,26 @@ QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringL setXMLFile("kdevpart_quickopen.rc"); m_actionQuickOpen = new TDEAction( i18n("Quick Open File..."), CTRL + ALT + Key_O, - this, TQT_SLOT(slotQuickFileOpen()), + this, TQ_SLOT(slotQuickFileOpen()), actionCollection(), "quick_open" ); m_actionQuickOpen->setToolTip(i18n("Quick open file in project")); m_actionQuickOpen->setWhatsThis(i18n("<b>Quick open</b><p>Provides a file name input form with completion listbox to quickly open file in a project.")); m_actionQuickOpenClass = new TDEAction( i18n("Quick Open Class..."), CTRL + ALT + Key_C, - this, TQT_SLOT(slotQuickOpenClass()), + this, TQ_SLOT(slotQuickOpenClass()), actionCollection(), "quick_open_class" ); m_actionQuickOpenClass->setToolTip(i18n("Find class in project")); m_actionQuickOpenClass->setWhatsThis(i18n("<b>Find class</b><p>Provides a class name input form with completion listbox to quickly open a file where the class is defined.")); - m_actionFunctionOpen = new TDEAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, TQT_SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" ); + m_actionFunctionOpen = new TDEAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, TQ_SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" ); m_actionFunctionOpen->setToolTip(i18n("Quick open function in project")); - m_switchToAction = new TDEAction(i18n("Switch To..."), TDEShortcut("CTRL+/"), this, TQT_SLOT(slotSwitchTo()), actionCollection(), "file_switchto"); + m_switchToAction = new TDEAction(i18n("Switch To..."), TDEShortcut("CTRL+/"), this, TQ_SLOT(slotSwitchTo()), actionCollection(), "file_switchto"); m_switchToAction->setToolTip(i18n("Switch to")); m_switchToAction->setWhatsThis(i18n("<b>Switch to</b><p>Prompts to enter the name of previously opened file to switch to.")); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); } diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui index 64a2ff0f..23c028c7 100644 --- a/parts/quickopen/quickopenbase.ui +++ b/parts/quickopen/quickopenbase.ui @@ -161,12 +161,12 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotTextChanged( const TQString & )</slot> <slot>executed( TQListBoxItem * )</slot> <slot>slotExecuted( TQListBoxItem * )</slot> <slot>slotReturnPressed()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/quickopen/quickopenclassdialog.h b/parts/quickopen/quickopenclassdialog.h index 3e2df273..bcd21e2e 100644 --- a/parts/quickopen/quickopenclassdialog.h +++ b/parts/quickopen/quickopenclassdialog.h @@ -32,7 +32,7 @@ class QuickOpenClassDialog : public QuickOpenDialog TQ_OBJECT public: - QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 ); virtual ~QuickOpenClassDialog(); public slots: diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp index 5929dfa1..dd07f2eb 100644 --- a/parts/quickopen/quickopendialog.cpp +++ b/parts/quickopen/quickopendialog.cpp @@ -32,7 +32,7 @@ QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, TQWidget* parent, const ch : QuickOpenDialogBase( parent, name, modal, fl ), m_part( part ) { nameEdit->installEventFilter(this); - connect( &m_typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTextChangedDelayed()) ); + connect( &m_typeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTextChangedDelayed()) ); } QuickOpenDialog::~QuickOpenDialog() diff --git a/parts/quickopen/quickopendialog.h b/parts/quickopen/quickopendialog.h index f768b4aa..f3dc34a7 100644 --- a/parts/quickopen/quickopendialog.h +++ b/parts/quickopen/quickopendialog.h @@ -37,7 +37,7 @@ class QuickOpenDialog : public QuickOpenDialogBase public: - QuickOpenDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 ); virtual ~QuickOpenDialog(); virtual bool eventFilter(TQObject *watched, TQEvent *e); diff --git a/parts/quickopen/quickopenfiledialog.h b/parts/quickopen/quickopenfiledialog.h index 2f94e0db..9e3eb22b 100644 --- a/parts/quickopen/quickopenfiledialog.h +++ b/parts/quickopen/quickopenfiledialog.h @@ -34,8 +34,8 @@ class QuickOpenFileDialog : public QuickOpenDialog TQ_OBJECT public: - QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); - QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 ); + QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 ); virtual ~QuickOpenFileDialog(); public slots: diff --git a/parts/quickopen/quickopenfunctionchooseform.h b/parts/quickopen/quickopenfunctionchooseform.h index a5dd5085..d9b8919d 100644 --- a/parts/quickopen/quickopenfunctionchooseform.h +++ b/parts/quickopen/quickopenfunctionchooseform.h @@ -31,7 +31,7 @@ class QuickOpenFunctionChooseForm : public QuickOpenFunctionChooseFormBase public: - QuickOpenFunctionChooseForm(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + QuickOpenFunctionChooseForm(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~QuickOpenFunctionChooseForm(); void setRelativePath(int id, const TQString &path) { m_relPaths[id] = path; } diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui index 48916460..290440c1 100644 --- a/parts/quickopen/quickopenfunctionchooseformbase.ui +++ b/parts/quickopen/quickopenfunctionchooseformbase.ui @@ -218,10 +218,10 @@ <tabstop>okBtn</tabstop> <tabstop>cancelBtn</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot specifier="pure virtual">slotFileChange( int id )</slot> <slot specifier="pure virtual">slotArgsChange( int id )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> diff --git a/parts/quickopen/quickopenfunctiondialog.h b/parts/quickopen/quickopenfunctiondialog.h index 1927f673..53391e54 100644 --- a/parts/quickopen/quickopenfunctiondialog.h +++ b/parts/quickopen/quickopenfunctiondialog.h @@ -35,7 +35,7 @@ class QuickOpenFunctionDialog : public QuickOpenDialog public: - QuickOpenFunctionDialog( QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + QuickOpenFunctionDialog( QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~QuickOpenFunctionDialog(); void gotoFile( TQString name ); diff --git a/parts/regexptest/regexptestdlgbase.ui b/parts/regexptest/regexptestdlgbase.ui index 8d6bf504..e21bba69 100644 --- a/parts/regexptest/regexptestdlgbase.ui +++ b/parts/regexptest/regexptestdlgbase.ui @@ -336,11 +336,11 @@ <tabstop>cancelbutton</tabstop> <tabstop>extendedposix_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">insertQuoted()</slot> <slot>somethingChanged()</slot> <slot access="protected">showRegExpEditor()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp index 1e16d144..2fec05f6 100644 --- a/parts/regexptest/regexptestpart.cpp +++ b/parts/regexptest/regexptestpart.cpp @@ -33,7 +33,7 @@ RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStrin TDEAction *action; action = new TDEAction( i18n("Debug Regular Expression..."), 0, - this, TQT_SLOT(slotRegexpTest()), + this, TQ_SLOT(slotRegexpTest()), actionCollection(), "tools_regexptest" ); action->setToolTip(i18n("Debug regular expression")); action->setWhatsThis(i18n("<b>Debug regular expression</b><p>Allows to enter a regular expression " diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp index 447548ef..d5329308 100644 --- a/parts/replace/replace_part.cpp +++ b/parts/replace/replace_part.cpp @@ -53,7 +53,7 @@ ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& mainWindow()->setViewAvailable( m_widget, false ); action = new TDEAction(i18n("Find-Select-Replace..."), 0, - CTRL+SHIFT+Key_R, this, TQT_SLOT(slotReplace()), actionCollection(), "edit_replace_across"); + CTRL+SHIFT+Key_R, this, TQ_SLOT(slotReplace()), actionCollection(), "edit_replace_across"); action->setToolTip( i18n("Project wide string replacement") ); action->setWhatsThis( i18n("<b>Find-Select-Replace</b><p>" "Opens the project wide string replacement dialog. There you " @@ -62,9 +62,9 @@ ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& "you specify. Matches will be displayed in the <b>Replace</b> window, you " "can replace them with the specified string, exclude them from replace operation or cancel the whole replace.") ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(enableAction())); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(disableAction())); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(enableAction())); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(disableAction())); } void ReplacePart::enableAction() @@ -100,7 +100,7 @@ void ReplacePart::contextMenu(TQPopupMenu *popup, const Context *context) m_popupstr = ident; TQString squeezed = KStringHandler::csqueeze(ident, 30); int id = popup->insertItem( i18n("Replace Project Wide: %1").arg(squeezed), - this, TQT_SLOT(slotReplace()) ); + this, TQ_SLOT(slotReplace()) ); popup->setWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog " "and sets the pattern to the text under the cursor.")); popup->insertSeparator(); diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index 6b1bcbda..210a1c19 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -81,13 +81,13 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part) layout->addWidget( _listview ); // setup signals - connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) ); + connect( m_dialog->find_button, TQ_SIGNAL( clicked() ), TQ_SLOT( find() ) ); - connect( _replace, TQT_SIGNAL( clicked() ), TQT_SLOT( replace() ) ); - connect( _cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( clear() ) ); - connect( _listview, TQT_SIGNAL( editDocument( const TQString &, int ) ), TQT_SLOT( editDocument( const TQString &, int ) ) ); + connect( _replace, TQ_SIGNAL( clicked() ), TQ_SLOT( replace() ) ); + connect( _cancel, TQ_SIGNAL( clicked() ), TQ_SLOT( clear() ) ); + connect( _listview, TQ_SIGNAL( editDocument( const TQString &, int ) ), TQ_SLOT( editDocument( const TQString &, int ) ) ); - connect( m_part->core(), TQT_SIGNAL( stopButtonClicked( KDevPlugin * ) ), TQT_SLOT( stopButtonClicked( KDevPlugin * ) ) ); + connect( m_part->core(), TQ_SIGNAL( stopButtonClicked( KDevPlugin * ) ), TQ_SLOT( stopButtonClicked( KDevPlugin * ) ) ); } //BEGIN Slots @@ -235,7 +235,7 @@ bool ReplaceWidget::showReplacements() } ++it; - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } m_part->core()->running( m_part, false ); @@ -330,7 +330,7 @@ bool ReplaceWidget::makeReplacements() } fileitem = fileitem->nextSibling(); - kapp->processEvents( 100 ); + tdeApp->processEvents( 100 ); } // Telling the project about the edited files diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp index 3fcdd761..412f0545 100644 --- a/parts/replace/replacedlgimpl.cpp +++ b/parts/replace/replacedlgimpl.cpp @@ -41,13 +41,13 @@ ReplaceDlgImpl::ReplaceDlgImpl(TQWidget* parent, const char* name, bool modal, W : ReplaceDlg(parent,name, modal,fl), _regexp_dialog( 0 ) { - connect( find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( saveComboHistories() ) ); - connect( regexp_button, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpEditor() ) ); - connect( find_combo, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( validateFind( const TQString & ) ) ); - connect( regexp_combo, TQT_SIGNAL( textChanged ( const TQString & ) ), - TQT_SLOT( validateExpression( const TQString & ) ) ); - connect( strings_regexp_radio, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleExpression( bool ) ) ); + connect( find_button, TQ_SIGNAL( clicked() ), TQ_SLOT( saveComboHistories() ) ); + connect( regexp_button, TQ_SIGNAL( clicked() ), TQ_SLOT( showRegExpEditor() ) ); + connect( find_combo, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( validateFind( const TQString & ) ) ); + connect( regexp_combo, TQ_SIGNAL( textChanged ( const TQString & ) ), + TQ_SLOT( validateExpression( const TQString & ) ) ); + connect( strings_regexp_radio, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( toggleExpression( bool ) ) ); // disable the editor button if the regexp editor isn't installed if ( TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) diff --git a/parts/replace/replacedlgimpl.h b/parts/replace/replacedlgimpl.h index f71adaa6..86241999 100644 --- a/parts/replace/replacedlgimpl.h +++ b/parts/replace/replacedlgimpl.h @@ -12,7 +12,7 @@ class ReplaceDlgImpl : public ReplaceDlg public: - ReplaceDlgImpl(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ReplaceDlgImpl(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~ReplaceDlgImpl(); TQRegExp expressionPattern(); diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index 7a797414..2304a31b 100644 --- a/parts/replace/replaceview.cpp +++ b/parts/replace/replaceview.cpp @@ -40,9 +40,9 @@ ReplaceView::ReplaceView( TQWidget * parent ) : TDEListView( parent ), _latestfi pal.setActive( cg ); setPalette( pal ); - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), TQT_SLOT( slotClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int) ), - TQT_SLOT( slotMousePressed(int, TQListViewItem *, const TQPoint &, int) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), TQ_SLOT( slotClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int) ), + TQ_SLOT( slotMousePressed(int, TQListViewItem *, const TQPoint &, int) ) ); } void ReplaceView::makeReplacementsForFile( TQTextStream & istream, TQTextStream & ostream, ReplaceItem const * fileitem ) diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp index 6a3376f2..ca008029 100644 --- a/parts/scripting/scriptingglobalconfig.cpp +++ b/parts/scripting/scriptingglobalconfig.cpp @@ -28,7 +28,7 @@ scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *pare : scriptingGlobalConfigBase(parent, name), m_part(part) { // read tdeconfig and post list to the m_dirs - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); TQStringList searchDirs = cfg->readListEntry("SearchDirs"); m_dirs->clear(); m_dirs->insertStringList(searchDirs); @@ -37,7 +37,7 @@ scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *pare void scriptingGlobalConfig::accept() { // read mdirs and save to tdeconfig - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); if( !m_dirs->isEnabled() ) cfg->writeEntry("SearchDirs", TQStringList() ); else diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index d0558b79..17aa5b51 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -55,12 +55,12 @@ scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringL m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("Scripting"), GLOBALDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } scriptingPart::~scriptingPart() @@ -83,7 +83,7 @@ void scriptingPart::setupActions() TQStringList searchDirs; searchDirs += "kate/scripts"; - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); searchDirs += cfg->readListEntry("SearchDirs"); unplugActionList(TQString::fromLatin1( "script_actions" )); @@ -98,7 +98,7 @@ void scriptingPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, u case GLOBALDOC_OPTIONS: { scriptingGlobalConfig *w = new scriptingGlobalConfig(this, page, "global config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index 1c650ce2..75815de5 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -51,12 +51,12 @@ SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& mainWindow()->embedSelectViewRight( m_widget, i18n("Code Snippets"), i18n("Insert a code snippet") ); - connect( core(), TQT_SIGNAL( configWidget( KDialogBase * ) ), this, TQT_SLOT( slotConfigWidget( KDialogBase * ) ) ); + connect( core(), TQ_SIGNAL( configWidget( KDialogBase * ) ), this, TQ_SLOT( slotConfigWidget( KDialogBase * ) ) ); /*The next two connects are used to check if certain SnippetGroups need to be opened according to the languages supported by this project*/ - connect( core(), TQT_SIGNAL( projectOpened() ), m_widget, TQT_SLOT( languageChanged() ) ); - connect( core(), TQT_SIGNAL( languageChanged() ), m_widget, TQT_SLOT( languageChanged() ) ); + connect( core(), TQ_SIGNAL( projectOpened() ), m_widget, TQ_SLOT( languageChanged() ) ); + connect( core(), TQ_SIGNAL( languageChanged() ), m_widget, TQ_SLOT( languageChanged() ) ); setupActions(); } @@ -73,7 +73,7 @@ SnippetPart::~SnippetPart() void SnippetPart::setupActions() { - new TDEAction( i18n("Show Snippet Tree"), CTRL+ALT+SHIFT+Key_S, this, TQT_SLOT(slotShowView()), actionCollection(), "snippet_showview"); + new TDEAction( i18n("Show Snippet Tree"), CTRL+ALT+SHIFT+Key_S, this, TQ_SLOT(slotShowView()), actionCollection(), "snippet_showview"); } /*! @@ -105,7 +105,7 @@ void SnippetPart::slotConfigWidget( KDialogBase *dlg ) w->leDelimiter->setText(m_widget->getSnippetConfig()->getDelimiter()); w->cbToolTip->setChecked(m_widget->getSnippetConfig()->useToolTips()); w->btnGroupAutoOpen->setButton(m_widget->getSnippetConfig()->getAutoOpenGroups()); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotOKClicked()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotOKClicked()) ); } diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 9cd4ae4b..a8f47da7 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -51,7 +51,7 @@ SnippetWidget::SnippetWidget(SnippetPart *part) m_part( part ) { // init the TQPtrList - _list.setAutoDelete(TRUE); + _list.setAutoDelete(true); // init the TDEListView setSorting( -1 ); @@ -64,20 +64,20 @@ SnippetWidget::SnippetWidget(SnippetPart *part) setRootIsDecorated(true); //connect the signals - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); - connect( this, TQT_SIGNAL( executed (TQListViewItem *) ), - this, TQT_SLOT( slotExecuted( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( returnPressed (TQListViewItem *) ), - this, TQT_SLOT( slotExecuted( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( executed (TQListViewItem *) ), + this, TQ_SLOT( slotExecuted( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed (TQListViewItem *) ), + this, TQ_SLOT( slotExecuted( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), - this, TQT_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), + this, TQ_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); _cfg = 0; - TQTimer::singleShot(0, this, TQT_SLOT(initConfig())); + TQTimer::singleShot(0, this, TQ_SLOT(initConfig())); } SnippetWidget::~SnippetWidget() @@ -226,7 +226,7 @@ void SnippetWidget::slotEdit() pSnippet->resetParent(); } - setSelected(item, TRUE); + setSelected(item, true); } } @@ -248,7 +248,7 @@ void SnippetWidget::slotEditGroup() dlg.snippetName->setText(pGroup->getName()); dlg.snippetText->setText(pGroup->getText()); dlg.btnAdd->setText(i18n("&Apply")); - dlg.snippetText->setEnabled(FALSE); + dlg.snippetText->setEnabled(false); dlg.setCaption(i18n("Edit Group")); dlg.cbGroup->insertItem(i18n("All")); dlg.cbGroup->insertStringList(m_part->getAllLanguages()); @@ -261,7 +261,7 @@ void SnippetWidget::slotEditGroup() pGroup->setName( dlg.snippetName->text() ); pGroup->setLanguage(dlg.cbGroup->currentText()); - setSelected(item, TRUE); + setSelected(item, true); } } @@ -452,9 +452,9 @@ void SnippetWidget::initConfig() kdDebug(9035) << "Created group " << group->getName() << " " << group->getId() << endl; _list.append(group); if (group->getLanguage() == i18n("All")) - group->setOpen(TRUE); + group->setOpen(true); else - group->setOpen(FALSE); //groups assigned to certain languages get handled later + group->setOpen(false); //groups assigned to certain languages get handled later } } @@ -551,19 +551,19 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int if ( item ) { popup.insertTitle( selectedItem->getName() ); - popup.insertItem( i18n("Add Item..."), this, TQT_SLOT( slotAdd() ) ); - popup.insertItem( i18n("Add Group..."), this, TQT_SLOT( slotAddGroup() ) ); + popup.insertItem( i18n("Add Item..."), this, TQ_SLOT( slotAdd() ) ); + popup.insertItem( i18n("Add Group..."), this, TQ_SLOT( slotAddGroup() ) ); if (dynamic_cast<SnippetGroup*>(item)) { - popup.insertItem( i18n("Edit..."), this, TQT_SLOT( slotEditGroup() ) ); + popup.insertItem( i18n("Edit..."), this, TQ_SLOT( slotEditGroup() ) ); } else { - popup.insertItem( i18n("Edit..."), this, TQT_SLOT( slotEdit() ) ); + popup.insertItem( i18n("Edit..."), this, TQ_SLOT( slotEdit() ) ); } - popup.insertItem( i18n("Remove"), this, TQT_SLOT( slotRemove() ) ); + popup.insertItem( i18n("Remove"), this, TQ_SLOT( slotRemove() ) ); } else { popup.insertTitle(i18n("Code Snippets")); - popup.insertItem( i18n("Add Group..."), this, TQT_SLOT( slotAddGroup() ) ); + popup.insertItem( i18n("Add Group..."), this, TQ_SLOT( slotAddGroup() ) ); } popup.exec(p); @@ -694,7 +694,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ continue; cb = new TQCheckBox( &dlg, "cbVar" ); - cb->setChecked( FALSE ); + cb->setChecked( false ); cb->setText(it.key()); layoutVar->addWidget( cb, i ,0, TQt::AlignTop ); @@ -702,7 +702,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ layoutVar->addWidget( te, i, 1, TQt::AlignTop ); if ((*mapSave)[it.key()].length() > 0) { - cb->setChecked( TRUE ); + cb->setChecked( true ); te->setText((*mapSave)[it.key()]); } @@ -726,7 +726,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" ); btn2->setText(i18n("&Apply")); - btn2->setDefault( TRUE ); + btn2->setDefault( true ); btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn2->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn2, 0, 1 ); @@ -735,8 +735,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots - connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); - connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); + connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) ); + connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) ); //prepare to execute the dialog bool bReturn = false; @@ -816,14 +816,14 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri cb = new TQCheckBox( &dlg, "cbVar" ); - cb->setChecked( FALSE ); + cb->setChecked( false ); cb->setText(i18n( "Make value &default" )); te = new KTextEdit( &dlg, "teVar" ); layoutVar->addWidget( te, 0, 1, TQt::AlignTop); layoutVar->addWidget( cb, 1, 1, TQt::AlignTop); if ((*mapSave)[var].length() > 0) { - cb->setChecked( TRUE ); + cb->setChecked( true ); te->setText((*mapSave)[var]); } @@ -840,7 +840,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" ); btn2->setText(i18n("&Apply")); - btn2->setDefault( TRUE ); + btn2->setDefault( true ); layoutBtn->addWidget( btn2, 0, 1 ); layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); @@ -848,8 +848,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots - connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); - connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); + connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) ); + connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) ); //execute the dialog TQString strReturn = ""; @@ -896,12 +896,12 @@ bool SnippetWidget::acceptDrag (TQDropEvent *event) const if (item && TQString(event->format()).startsWith("text/plain") && static_cast<SnippetWidget *>(event->source()) != this) { - kdDebug(9035) << "returning TRUE " << endl; - return TRUE; + kdDebug(9035) << "returning true " << endl; + return true; } else { - kdDebug(9035) << "returning FALSE" << endl; - event->acceptAction(FALSE); - return FALSE; + kdDebug(9035) << "returning false" << endl; + event->acceptAction(false); + return false; } } @@ -959,9 +959,9 @@ void SnippetWidget::languageChanged() SnippetGroup * group = dynamic_cast<SnippetGroup*>(it); if (group) { if (group->getLanguage() == i18n("All") || langs.contains(group->getLanguage())) { - group->setOpen(TRUE); + group->setOpen(true); } else { - group->setOpen(FALSE); + group->setOpen(false); } } } diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui index f7bafb74..7b924164 100644 --- a/parts/snippet/snippetdlg.ui +++ b/parts/snippet/snippetdlg.ui @@ -197,9 +197,9 @@ <tabstop>btnAdd</tabstop> <tabstop>btnCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotHelp()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp index 7e38f061..26cb14de 100644 --- a/parts/texttools/texttoolspart.cpp +++ b/parts/texttools/texttoolspart.cpp @@ -36,8 +36,8 @@ TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringL m_widget = 0; - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*)) ); } diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index c6df3310..f1e31ca1 100644 --- a/parts/texttools/texttoolswidget.cpp +++ b/parts/texttools/texttoolswidget.cpp @@ -68,14 +68,14 @@ TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *parent, const ch m_part = part; m_timer = new TQTimer(this); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotItemPressed(int,TQListViewItem*)) ); - // connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - // this, TQT_SLOT(slotItemPressed(int,TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotReturnPressed(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotItemPressed(int,TQListViewItem*)) ); + // connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + // this, TQ_SLOT(slotItemPressed(int,TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotReturnPressed(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } @@ -171,8 +171,8 @@ void TextToolsWidget::stop() void TextToolsWidget::setMode(Mode mode, KParts::Part *part) { - connect( part, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(startTimer()) ); + connect( part, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(startTimer()) ); m_editIface = dynamic_cast<KTextEditor::EditInterface*>(part); switch (mode) { @@ -181,18 +181,18 @@ void TextToolsWidget::setMode(Mode mode, KParts::Part *part) << "table" << "tr"; m_emptyTags << "br" << "hr" << "img" << "input" << "p" << "meta"; - connect( m_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(parseXML()) ); + connect( m_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(parseXML()) ); break; case Docbook: m_relevantTags << "chapter" << "sect1" << "sect2" << "para" << "formalpara"; - connect( m_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(parseXML()) ); + connect( m_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(parseXML()) ); break; case LaTeX: - connect( m_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(parseLaTeX()) ); + connect( m_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(parseLaTeX()) ); break; default: ; } diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index 9172d44b..3668783d 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -12,7 +12,7 @@ #include <kdevplugininfo.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktextbrowser.h> #include <ktip.h> @@ -34,19 +34,19 @@ TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringLis TDEAction *action; action = new TDEAction(i18n("&Tip of the Day"), "idea", 0, - this, TQT_SLOT(showTip()), actionCollection(), "help_tipofday"); + this, TQ_SLOT(showTip()), actionCollection(), "help_tipofday"); action->setToolTip(i18n("A tip how to use TDevelop")); action->setWhatsThis(i18n("<b>Tip of the day</b><p>" "Will display another good tip \n" "contributed by KDevelop users.")); - connect(core(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(showOnStart())); + connect(core(), TQ_SIGNAL(coreInitialized()), this, TQ_SLOT(showOnStart())); } TQString TipOfDayPart::getFilename() { - TDEConfig * config = TDEApplication::kApplication()->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("Tip of day plugin"); return config->readEntry("TipsFile", "kdevtipofday/tips"); } diff --git a/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui index ece7a089..79dd24ae 100644 --- a/parts/tools/addtooldlg.ui +++ b/parts/tools/addtooldlg.ui @@ -226,11 +226,11 @@ executed.</p></string> <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot returnType="TQString">getApp()</slot> <slot access="private">treeSelectionChanged( TQListViewItem * lvi )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/tools/addtooldlg.ui.h b/parts/tools/addtooldlg.ui.h index fea69766..61b52809 100644 --- a/parts/tools/addtooldlg.ui.h +++ b/parts/tools/addtooldlg.ui.h @@ -12,7 +12,7 @@ void AddToolDialog::init() { - connect( tree, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(treeSelectionChanged(TQListViewItem*)) ); + connect( tree, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(treeSelectionChanged(TQListViewItem*)) ); tree->header()->hide(); } diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index 8c13a4ea..cd587e96 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -36,7 +36,7 @@ #include <tdeapplication.h> #include <kbuttonbox.h> #include <kcombobox.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdialog.h> #include <tdeglobal.h> #include <klineedit.h> @@ -44,7 +44,7 @@ #include <kiconloader.h> #include <kmimemagic.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <kuserprofile.h> #include <kurlcompletion.h> @@ -139,8 +139,8 @@ KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name ) addDesktopGroup( TQString() ); - connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ), TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) ); - connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( currentChanged(TQListViewItem*) ), TQ_SLOT( slotItemHighlighted(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( selectionChanged(TQListViewItem*) ), TQ_SLOT( slotSelectionChanged(TQListViewItem*) ) ); } // ---------------------------------------------------------------------- diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index 5487bc77..66fd442b 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -11,12 +11,12 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdialogbase.h> #include <kiconloader.h> #include <tdelocale.h> #include <tdeparts/part.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetexteditor/document.h> #include "kdevcore.h" @@ -49,17 +49,17 @@ ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &) m_configProxy = new ConfigWidgetProxy( core() ); m_configProxy->createGlobalConfigPage( i18n("Tools Menu"), TOOLSSETTINGS, info()->icon() ); m_configProxy->createGlobalConfigPage( i18n("External Tools"), EXTRATOOLSSETTINGS, info()->icon() ); - connect( m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - connect(core(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(updateMenu())); + connect(core(), TQ_SIGNAL(coreInitialized()), this, TQ_SLOT(updateMenu())); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); // Apparently action lists can only be plugged after the // xmlgui client has been registered - TQTimer::singleShot(0, this, TQT_SLOT(updateToolsMenu())); + TQTimer::singleShot(0, this, TQ_SLOT(updateToolsMenu())); } @@ -73,14 +73,14 @@ void ToolsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, un if ( pagenumber == TOOLSSETTINGS ) { ToolsConfig *w = new ToolsConfig( page, "tools config widget" ); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateMenu())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(updateMenu())); } else if ( pagenumber == EXTRATOOLSSETTINGS ) { ToolsConfigWidget *w2 = new ToolsConfigWidget( page, "tools config widget" ); - connect(dlg, TQT_SIGNAL(okClicked()), w2, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateToolsMenu())); + connect(dlg, TQ_SIGNAL(okClicked()), w2, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(updateToolsMenu())); } } @@ -98,12 +98,12 @@ void ToolsPart::updateMenu() { TQString name = *it; - KDesktopFile df(name, true); + TDEDesktopFile df(name, true); if (df.readName().isNull()) continue; TDEAction *action = new TDEAction(df.readName(), df.readIcon(), 0, - this, TQT_SLOT(slotToolActivated()), (TQObject*)0, name.latin1()); + this, TQ_SLOT(slotToolActivated()), (TQObject*)0, name.latin1()); actions.append(action); } @@ -114,7 +114,7 @@ void ToolsPart::updateMenu() void ToolsPart::slotToolActivated() { TQString df = sender()->name(); - kapp->startServiceByDesktopPath(df); + tdeApp->startServiceByDesktopPath(df); } void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName) @@ -180,10 +180,10 @@ void ToolsPart::updateToolsMenu() config->setGroup("Tool Menu " + menutext); bool isdesktopfile = config->readBoolEntry("DesktopFile"); TDEAction *action = new TDEAction(*it, 0, - this, TQT_SLOT(toolsMenuActivated()), + this, TQ_SLOT(toolsMenuActivated()), (TQObject*) 0, menutext.utf8()); if (isdesktopfile) { - KDesktopFile df(config->readPathEntry("CommandLine")); + TDEDesktopFile df(config->readPathEntry("CommandLine")); action->setIcon(df.readIcon()); } actions.append(action); @@ -212,12 +212,12 @@ void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context) TQStringList l = config->readListEntry("Dir Context"); TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) - externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(dirContextActivated(int)) ), (*it) ); + externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQ_SLOT(dirContextActivated(int)) ), (*it) ); } else { TQStringList l = config->readListEntry("File Context"); TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) - externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(fileContextActivated(int)) ), (*it) ); + externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQ_SLOT(fileContextActivated(int)) ), (*it) ); } } @@ -234,7 +234,7 @@ void ToolsPart::toolsMenuActivated() << "with cmdline " << cmdline << "and desktopfile " << isdesktopfile << endl; if (isdesktopfile) - kapp->startServiceByDesktopPath(cmdline); + tdeApp->startServiceByDesktopPath(cmdline); else startCommand(cmdline, captured, TQString()); } diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp index f21713e9..bedbd59f 100644 --- a/parts/tools/toolsconfig.cpp +++ b/parts/tools/toolsconfig.cpp @@ -8,7 +8,7 @@ #include <tqheader.h> #include <tdeapplication.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdialog.h> #include <kiconloader.h> #include <tdelocale.h> @@ -50,13 +50,13 @@ void ToolsConfig::showEvent(TQShowEvent *e) _toList->show(); vbox->addWidget(_toList); - connect(_toList, TQT_SIGNAL(clicked()), this, TQT_SLOT(toList())); + connect(_toList, TQ_SIGNAL(clicked()), this, TQ_SLOT(toList())); _toTree = new TQPushButton(TQApplication::reverseLayout() ? ">>" : "<<", this); _toTree->show(); vbox->addWidget(_toTree); - connect(_toTree, TQT_SIGNAL(clicked()), this, TQT_SLOT(toTree())); + connect(_toTree, TQ_SIGNAL(clicked()), this, TQ_SLOT(toTree())); vbox = new TQVBoxLayout(hbox); _list = new TQListBox(this); @@ -72,8 +72,8 @@ void ToolsConfig::showEvent(TQShowEvent *e) fill(); checkButtons(); - connect(_tree, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(checkButtons())); - connect(_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(checkButtons())); + connect(_tree, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(checkButtons())); + connect(_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(checkButtons())); } @@ -100,7 +100,7 @@ void ToolsConfig::fill() void ToolsConfig::add(const TQString &desktopFile) { - KDesktopFile df(desktopFile, true); + TDEDesktopFile df(desktopFile, true); if (df.readName().isEmpty()) return; diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp index 22d705c2..bfc9efbe 100644 --- a/parts/tools/toolsconfigwidget.cpp +++ b/parts/tools/toolsconfigwidget.cpp @@ -19,7 +19,7 @@ #include <tdeconfig.h> #include <tdeversion.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kiconloader.h> #include <tdemessagebox.h> #include <kurl.h> @@ -113,7 +113,7 @@ void ToolsConfigWidget::fillListBox(TQListBox *lb, const TQDict<ToolsConfigEntry for (; it.current(); ++it) { ToolsConfigEntry *entry = it.current(); if (entry->isdesktopfile) { - KDesktopFile df(entry->cmdline); + TDEDesktopFile df(entry->cmdline); lb->insertItem(SmallIcon(df.readIcon()), entry->menutext); } else { lb->insertItem(entry->menutext); @@ -259,8 +259,8 @@ bool ToolsConfigWidget::eventFilter(TQObject *o, TQEvent *e) if (KURLDrag::decode(de, fileList)) { KURL::List::ConstIterator it; for (it = fileList.begin(); it != fileList.end(); ++it) { - if ((*it).isLocalFile() && KDesktopFile::isDesktopFile((*it).path())) { - KDesktopFile df((*it).path()); + if ((*it).isLocalFile() && TDEDesktopFile::isDesktopFile((*it).path())) { + TDEDesktopFile df((*it).path()); ToolsConfigEntry *entry = new ToolsConfigEntry; entry->menutext = df.readName(); entry->cmdline = (*it).path(); diff --git a/parts/tools/toolsconfigwidgetbase.ui b/parts/tools/toolsconfigwidgetbase.ui index 67f9b7b5..4f9dfc4c 100644 --- a/parts/tools/toolsconfigwidgetbase.ui +++ b/parts/tools/toolsconfigwidgetbase.ui @@ -397,14 +397,14 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">dircontextaddClicked()</slot> <slot access="protected">filecontextaddClicked()</slot> <slot access="protected">filecontextremoveClicked()</slot> <slot access="protected">dircontextremoveClicked()</slot> <slot access="protected">toolsmenuaddClicked()</slot> <slot access="protected">toolsmenuremoveClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/uimode/uichooser.ui b/parts/uimode/uichooser.ui index 98fe652f..bf9f71d3 100644 --- a/parts/uimode/uichooser.ui +++ b/parts/uimode/uichooser.ui @@ -242,9 +242,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">maybeEnableCloseOnHover(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp index a547bdef..a8b40350 100644 --- a/parts/uimode/uichooser_part.cpp +++ b/parts/uimode/uichooser_part.cpp @@ -25,8 +25,8 @@ UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringL _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createGlobalConfigPage( i18n("User Interface"), UICHOOSERSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); } @@ -42,7 +42,7 @@ void UIChooserPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page if ( pagenumber == UICHOOSERSETTINGSPAGE ) { UIChooserWidget * w = new UIChooserWidget( this, page, "UIChooser widget" ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } } diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp index cb75ec02..481670c1 100644 --- a/parts/uimode/uichooser_widget.cpp +++ b/parts/uimode/uichooser_widget.cpp @@ -36,7 +36,7 @@ UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const void UIChooserWidget::load() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); int mdistyle = config->readNumEntry( "MDIStyle", 1 ); @@ -86,7 +86,7 @@ void UIChooserWidget::load() void UIChooserWidget::save() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); if ( AlwaysShowTabs->isChecked() ) diff --git a/parts/valgrind/dialog_widget.ui b/parts/valgrind/dialog_widget.ui index 74b4a941..f09997c1 100644 --- a/parts/valgrind/dialog_widget.ui +++ b/parts/valgrind/dialog_widget.ui @@ -331,10 +331,10 @@ <tabstop>ctParamEdit</tabstop> <tabstop>kcExecutableEdit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private" specifier="non virtual">checkBoxToggled()</slot> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp index 23d45735..ccf2fb8e 100644 --- a/parts/valgrind/valgrind_dialog.cpp +++ b/parts/valgrind/valgrind_dialog.cpp @@ -3,11 +3,11 @@ #include <tqregexp.h> #include <tqwidgetstack.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <kurlrequester.h> #include <klineedit.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include "dialog_widget.h" @@ -25,10 +25,10 @@ ValgrindDialog::ValgrindDialog( Type type, TQWidget* parent ) w->executableEdit->setFocus(); w->stack->raiseWidget(m_type); setMainWidget( w ); - connect( w->executableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); - connect( w->valExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); - connect( w->ctExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); - connect( w->kcExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); + connect( w->executableEdit->lineEdit(), TQ_SIGNAL( textChanged( const TQString &)), this, TQ_SLOT( valgrindTextChanged())); + connect( w->valExecutableEdit->lineEdit(), TQ_SIGNAL( textChanged( const TQString &)), this, TQ_SLOT( valgrindTextChanged())); + connect( w->ctExecutableEdit->lineEdit(), TQ_SIGNAL( textChanged( const TQString &)), this, TQ_SLOT( valgrindTextChanged())); + connect( w->kcExecutableEdit->lineEdit(), TQ_SIGNAL( textChanged( const TQString &)), this, TQ_SLOT( valgrindTextChanged())); enableButtonOK( false ); } diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp index 5c78d952..b857ee53 100644 --- a/parts/valgrind/valgrind_part.cpp +++ b/parts/valgrind/valgrind_part.cpp @@ -8,7 +8,7 @@ #include <tdelocale.h> #include <kdevgenericfactory.h> #include <tdeaction.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <tdefiledialog.h> #include <kdebug.h> @@ -33,16 +33,16 @@ ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringLi setXMLFile( "kdevpart_valgrind.rc" ); proc = new KShellProcess(); - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) ); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) ); - connect( proc, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(processExited( TDEProcess* )) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), - this, TQT_SLOT(projectOpened()) ); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStdout( TDEProcess*, char*, int )) ); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStderr( TDEProcess*, char*, int )) ); + connect( proc, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(processExited( TDEProcess* )) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), + this, TQ_SLOT(projectOpened()) ); m_widget = new ValgrindWidget( this ); m_widget->setIcon( SmallIcon("fork") ); @@ -59,12 +59,12 @@ ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringLi "some abuses of the POSIX pthread API." ) ); TDEAction* action = new TDEAction( i18n("&Valgrind Memory Leak Check"), 0, this, - TQT_SLOT(slotExecValgrind()), actionCollection(), "tools_valgrind" ); + TQ_SLOT(slotExecValgrind()), actionCollection(), "tools_valgrind" ); action->setToolTip(i18n("Valgrind memory leak check")); action->setWhatsThis(i18n("<b>Valgrind memory leak check</b><p>Runs Valgrind - a tool to help you find memory-management problems in your programs.")); action = new TDEAction( i18n("P&rofile with KCachegrind"), 0, this, - TQT_SLOT(slotExecCalltree()), actionCollection(), "tools_calltree" ); + TQ_SLOT(slotExecCalltree()), actionCollection(), "tools_calltree" ); action->setToolTip(i18n("Profile with KCachegrind")); action->setWhatsThis(i18n("<b>Profile with KCachegrind</b><p>Runs your program in calltree and then displays profiler information in KCachegrind.")); diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp index 70484704..75f0c506 100644 --- a/parts/valgrind/valgrind_widget.cpp +++ b/parts/valgrind/valgrind_widget.cpp @@ -101,17 +101,17 @@ ValgrindWidget::ValgrindWidget( ValgrindPart *part ) vbl->addWidget( lv ); popup = new TQPopupMenu( lv, "valPopup" ); - popup->insertItem( i18n( "&Open Valgrind Output..." ), _part, TQT_SLOT(loadOutput()), 0, 0 ); + popup->insertItem( i18n( "&Open Valgrind Output..." ), _part, TQ_SLOT(loadOutput()), 0, 0 ); popup->insertSeparator(); - popup->insertItem( i18n( "Expand All Items" ), this, TQT_SLOT(expandAll()), 0, 2 ); - popup->insertItem( i18n( "Collapse All Items" ), this, TQT_SLOT(collapseAll()), 0, 3 ); - - connect( popup, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(aboutToShowPopup()) ); - connect( lv, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(executed(TQListViewItem*)) ); - connect( lv, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + popup->insertItem( i18n( "Expand All Items" ), this, TQ_SLOT(expandAll()), 0, 2 ); + popup->insertItem( i18n( "Collapse All Items" ), this, TQ_SLOT(collapseAll()), 0, 3 ); + + connect( popup, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(aboutToShowPopup()) ); + connect( lv, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(executed(TQListViewItem*)) ); + connect( lv, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp index e8606636..e1719371 100644 --- a/parts/vcsmanager/vcsmanagerpart.cpp +++ b/parts/vcsmanager/vcsmanagerpart.cpp @@ -58,10 +58,10 @@ VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStrin m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createProjectConfigPage(i18n("Version Control"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); } VCSManagerPart::~VCSManagerPart() @@ -76,7 +76,7 @@ void VCSManagerPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, case PROJECTDOC_OPTIONS: { VCSManagerProjectConfig *w = new VCSManagerProjectConfig(this, page, "project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } diff --git a/src/Mainpage.dox b/src/Mainpage.dox index 67b3be1a..b15ccbaf 100644 --- a/src/Mainpage.dox +++ b/src/Mainpage.dox @@ -62,8 +62,8 @@ Example: app.processEvents(); - TQObject::connect(PluginController::getInstance(), SIGNAL(loadingPlugin(const TQString &)), - splash, SLOT(showMessage(const TQString &))); + TQObject::connect(PluginController::getInstance(), TQ_SIGNAL(loadingPlugin(const TQString &)), + splash, TQ_SLOT(showMessage(const TQString &))); splash->message( i18n( "Loading Settings" ) ); TopLevel::getInstance()->loadSettings(); @@ -80,7 +80,7 @@ Example: delete splash; - kapp->dcopClient()->registerAs("myapp"); + tdeApp->dcopClient()->registerAs("myapp"); return app.exec(); } diff --git a/src/core.cpp b/src/core.cpp index ccdd0ace..0ee37fa1 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -7,7 +7,7 @@ #include <tdemainwindow.h> #include <tdeconfig.h> #include <tdeversion.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeactioncollection.h> @@ -71,7 +71,7 @@ Core::~Core() bool Core::queryClose() { // save the the project to open it automaticly on startup if needed - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("General Options"); config->writePathEntry("Last Project",ProjectManager::getInstance()->projectFile().url()); diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index 73ff852b..f9ce2ab8 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -40,13 +40,13 @@ EditorProxy::EditorProxy() : TQObject() { m_delayedLineTimer = new TQTimer( this ); - connect( m_delayedLineTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(setLineNumberDelayed()) ); - TDEConfig *config = kapp->config(); + connect( m_delayedLineTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(setLineNumberDelayed()) ); + TDEConfig *config = tdeApp->config(); m_delayedViewCreationCompatibleUI = true; TDEAction *ac = new TDEAction( i18n("Show Context Menu"), 0, this, - TQT_SLOT(showPopup()), TopLevel::getInstance()->main()->actionCollection(), "show_popup" ); + TQ_SLOT(showPopup()), TopLevel::getInstance()->main()->actionCollection(), "show_popup" ); TDEShortcut cut ;/*= TDEStdAccel::shortcut(TDEStdAccel::PopupMenuContext);*/ cut.append(KKey(CTRL+Key_Return)); ac->setShortcut(cut); @@ -143,7 +143,7 @@ void EditorProxy::installPopup( KParts::Part * part ) iface->installPopup( popup ); - connect(popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(popupAboutToShow())); + connect(popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(popupAboutToShow())); // ugly hack: mark the "original" items m_popupIds.resize(popup->count()); diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp index 794ab8cd..8445f0e8 100644 --- a/src/generalinfowidget.cpp +++ b/src/generalinfowidget.cpp @@ -32,10 +32,10 @@ TQString makeRelativePath(const TQString& fromPath, const TQString& toPath); GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name) : GeneralInfoWidgetBase(parent, name), m_projectDom(projectDom) { - connect(project_directory_edit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotProjectDirectoryChanged(const TQString&))); - connect(project_directory_combo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotProjectDirectoryComboChanged())); + connect(project_directory_edit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotProjectDirectoryChanged(const TQString&))); + connect(project_directory_combo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotProjectDirectoryComboChanged())); readConfig(); } @@ -117,7 +117,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt // AC_DEFINE(VERSION, "5.6") TQRegExp ac_define("^AC_DEFINE\\s*\\("); TQRegExp version("(\\bversion\\b)"); - version.setCaseSensitive(FALSE); + version.setCaseSensitive(false); while ( !stream.eof() ) { TQString line = stream.readLine(); diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp index 7bfbf29f..e9e3d9ac 100644 --- a/src/kdevideextension.cpp +++ b/src/kdevideextension.cpp @@ -53,7 +53,7 @@ void KDevIDEExtension::init() void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); TQVBox *vbox = dlg->addVBoxPage(i18n("General"), i18n("General"), BarIcon("tdevelop", TDEIcon::SizeMedium) ); gsw = new SettingsWidget(vbox, "general settings widget"); @@ -87,7 +87,7 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("General Options"); config->writeEntry("DesignerApp", gsw->designerButtonGroup->selectedId()); diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index 52dd0053..f07f9b4d 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -94,7 +94,7 @@ void LanguageSelectWidget::init() layout->addWidget( groupBox2 ); - connect( _pluginList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) ); + connect( _pluginList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQ_SLOT( itemSelected( TQListViewItem * ) ) ); readProjectConfig(); } diff --git a/src/main.cpp b/src/main.cpp index 65177e53..edd538ff 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,7 +5,7 @@ #include <tdecmdlineargs.h> #include <tdelocale.h> #include <tdemainwindow.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <dcopclient.h> @@ -102,8 +102,8 @@ int main(int argc, char *argv[]) if (splash) splash->message( i18n( "Loading Settings" ) ); TopLevel::getInstance()->loadSettings(); - TQObject::connect(PluginController::getInstance(), TQT_SIGNAL(loadingPlugin(const TQString &)), - splash, TQT_SLOT(message(const TQString &))); + TQObject::connect(PluginController::getInstance(), TQ_SIGNAL(loadingPlugin(const TQString &)), + splash, TQ_SLOT(message(const TQString &))); if (splash) splash->show(); PluginController::getInstance()->loadInitialPlugins(); @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) } } - kapp->dcopClient()->registerAs("tdevelop"); + tdeApp->dcopClient()->registerAs("tdevelop"); int ret = app.exec(); diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp index 10b5fd56..480d2c9c 100644 --- a/src/main_assistant.cpp +++ b/src/main_assistant.cpp @@ -5,7 +5,7 @@ #include <tdecmdlineargs.h> #include <tdelocale.h> #include <tdemainwindow.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <dcopclient.h> @@ -94,8 +94,8 @@ int main(int argc, char *argv[]) app.processEvents(); - TQObject::connect(PluginController::getInstance(), TQT_SIGNAL(loadingPlugin(const TQString &)), - splash, TQT_SLOT(message(const TQString &))); + TQObject::connect(PluginController::getInstance(), TQ_SIGNAL(loadingPlugin(const TQString &)), + splash, TQ_SLOT(message(const TQString &))); if (splash) splash->message( i18n( "Loading Settings" ) ); TopLevel::getInstance()->loadSettings(); @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) if (splash) delete splash; - kapp->dcopClient()->registerAs("kdevassistant"); + tdeApp->dcopClient()->registerAs("kdevassistant"); return app.exec(); } diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index c0c63e2e..f67f2cd2 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -81,11 +81,11 @@ MainWindowShare::MainWindowShare(TQObject* pParent, const char* name) void MainWindowShare::init() { - connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(Core::getInstance(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect( m_pMainWnd->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( m_pMainWnd->actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); } void MainWindowShare::slotActionStatusText( const TQString &text ) @@ -105,83 +105,83 @@ void MainWindowShare::createActions() { ProjectManager::getInstance()->createActions( m_pMainWnd->actionCollection() ); - KStdAction::quit(this->parent(), TQT_SLOT(close()), m_pMainWnd->actionCollection()); + KStdAction::quit(this->parent(), TQ_SLOT(close()), m_pMainWnd->actionCollection()); TDEAction* action; m_stopProcesses = new TDEToolBarPopupAction( i18n( "&Stop" ), "process-stop", - Key_Escape, this, TQT_SLOT(slotStopButtonPressed()), + Key_Escape, this, TQ_SLOT(slotStopButtonPressed()), m_pMainWnd->actionCollection(), "stop_processes" ); m_stopProcesses->setToolTip(i18n("Stop")); m_stopProcesses->setWhatsThis(i18n("<b>Stop</b><p>Stops all running processes (like building process, grep command, etc.). When placed onto a toolbar provides a popup menu to choose a process to stop.")); m_stopProcesses->setEnabled( false ); - connect(m_stopProcesses->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotStopMenuAboutToShow())); - connect(m_stopProcesses->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotStopPopupActivated(int))); + connect(m_stopProcesses->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotStopMenuAboutToShow())); + connect(m_stopProcesses->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotStopPopupActivated(int))); - connect( Core::getInstance(), TQT_SIGNAL(activeProcessChanged(KDevPlugin*, bool)), - this, TQT_SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) ); + connect( Core::getInstance(), TQ_SIGNAL(activeProcessChanged(KDevPlugin*, bool)), + this, TQ_SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) ); action = KStdAction::showMenubar( - this, TQT_SLOT(slotShowMenuBar()), + this, TQ_SLOT(slotShowMenuBar()), m_pMainWnd->actionCollection(), "settings_show_menubar" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you switch the menubar on/off."))); action = KStdAction::keyBindings( - this, TQT_SLOT(slotKeyBindings()), + this, TQ_SLOT(slotKeyBindings()), m_pMainWnd->actionCollection(), "settings_configure_shortcuts" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure shortcut keys."))); action = KStdAction::configureToolbars( - this, TQT_SLOT(slotConfigureToolbars()), + this, TQ_SLOT(slotConfigureToolbars()), m_pMainWnd->actionCollection(), "settings_configure_toolbars" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure toolbars."))); action = KStdAction::configureNotifications( - this, TQT_SLOT(slotConfigureNotifications()), + this, TQ_SLOT(slotConfigureNotifications()), m_pMainWnd->actionCollection(), "settings_configure_notifications" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure system notifications."))); - action = KStdAction::preferences(this, TQT_SLOT(slotSettings()), + action = KStdAction::preferences(this, TQ_SLOT(slotSettings()), m_pMainWnd->actionCollection(), "settings_configure" ); action->setToolTip( i18n( "Configure TDevelop" ) ); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(i18n( "Configure TDevelop" )).arg(i18n("Lets you customize TDevelop."))); - m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); + m_toggleStatusbar = KStdAction::showToolbar(this, TQ_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); m_toggleStatusbar->setText(i18n("Show &Statusbar")); m_toggleStatusbar->setToolTip( i18n("Show statusbar") ); m_toggleStatusbar->setWhatsThis(i18n("<b>Show statusbar</b><p>Hides or shows the statusbar.")); - action = new TDEAction( i18n("&Next Window"), ALT+Key_Right, this, TQT_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window"); + action = new TDEAction( i18n("&Next Window"), ALT+Key_Right, this, TQ_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window"); action->setToolTip( i18n("Next window") ); action->setWhatsThis(i18n("<b>Next window</b><p>Switches to the next window.")); - action = new TDEAction( i18n("&Previous Window"), ALT+Key_Left, this, TQT_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window"); + action = new TDEAction( i18n("&Previous Window"), ALT+Key_Left, this, TQ_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window"); action->setToolTip( i18n("Previous window") ); action->setWhatsThis(i18n("<b>Previous window</b><p>Switches to the previous window.")); - action = new TDEAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQT_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window"); + action = new TDEAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQ_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window"); action->setToolTip( i18n("Last accessed window") ); action->setWhatsThis(i18n("<b>Last accessed window</b><p>Switches to the last viewed window (Hold the Alt key pressed and walk on by repeating the Up key).")); - action = new TDEAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQT_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window"); + action = new TDEAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQ_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window"); action->setToolTip( i18n("First accessed window") ); action->setWhatsThis(i18n("<b>First accessed window</b><p>Switches to the first accessed window (Hold the Alt key pressed and walk on by repeating the Down key).")); - action = new TDEAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQT_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" ); + action = new TDEAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQ_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" ); - m_configureEditorAction = new TDEAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQT_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors"); + m_configureEditorAction = new TDEAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQ_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors"); m_configureEditorAction->setToolTip( i18n("Configure editor settings") ); m_configureEditorAction->setWhatsThis(i18n("<b>Configure editor</b><p>Opens editor configuration dialog.")); m_configureEditorAction->setEnabled( false ); KDevPartController * partController = API::getInstance()->partController(); - connect( partController, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part* )) ); + connect( partController, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part* )) ); } void MainWindowShare::slotReportBug() @@ -302,7 +302,7 @@ void MainWindowShare::slotSettings() ShellExtension::getInstance()->createGlobalSettingsPage(&dlg); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Global Settings Dialog"); int height = config->readNumEntry( "Height", 600 ); @@ -367,15 +367,15 @@ void MainWindowShare::slotGUICreated( KParts::Part * part ) if ( TDEAction * action = part->action("file_save") ) { kdDebug(9000) << " *** found \"file_save\" action - disconnecting" << endl; - disconnect( action, TQT_SIGNAL(activated()), 0, 0 ); - connect( action, TQT_SIGNAL(activated()), PartController::getInstance(), TQT_SLOT(slotSave()) ); + disconnect( action, TQ_SIGNAL(activated()), 0, 0 ); + connect( action, TQ_SIGNAL(activated()), PartController::getInstance(), TQ_SLOT(slotSave()) ); } if ( TDEAction * action = part->action("file_reload") ) { kdDebug(9000) << " *** found \"file_reload\" action - disconnecting" << endl; - disconnect( action, TQT_SIGNAL(activated()), 0, 0 ); - connect( action, TQT_SIGNAL(activated()), PartController::getInstance(), TQT_SLOT(slotReload()) ); + disconnect( action, TQ_SIGNAL(activated()), 0, 0 ); + connect( action, TQ_SIGNAL(activated()), PartController::getInstance(), TQ_SLOT(slotReload()) ); } } @@ -429,7 +429,7 @@ void MainWindowShare::slotConfigureToolbars() { m_pMainWnd->saveMainWindowSettings( TDEGlobal::config(), "Mainwindow" ); KEditToolbar dlg( m_pMainWnd->factory() ); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -438,7 +438,7 @@ void MainWindowShare::contextMenu(TQPopupMenu* popup, const Context *) if ( m_pMainWnd->menuBar()->isVisible() ) return; - int id = popup->insertItem( i18n("Show &Menubar"), m_pMainWnd->menuBar(), TQT_SLOT(show()) ); + int id = popup->insertItem( i18n("Show &Menubar"), m_pMainWnd->menuBar(), TQ_SLOT(show()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Show menubar</b><p>Lets you switch the menubar on/off.")); } diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp index 5fbc1cc9..fe988c02 100644 --- a/src/multibuffer.cpp +++ b/src/multibuffer.cpp @@ -57,8 +57,8 @@ MultiBuffer::MultiBuffer( TQWidget *parent ) API::getInstance() ->languageSupport() ) { setOrientation( lang->splitOrientation() ); - connect( lang, TQT_SIGNAL( splitOrientationChanged( TQt::Orientation ) ), - this, TQT_SLOT( setOrientation( TQt::Orientation ) ) ); + connect( lang, TQ_SIGNAL( splitOrientationChanged( TQt::Orientation ) ), + this, TQ_SLOT( setOrientation( TQt::Orientation ) ) ); } else { @@ -221,8 +221,8 @@ void MultiBuffer::show() // We're managing the view deletion by being its parent, // don't let the part self-destruct - disconnect( view, TQT_SIGNAL( destroyed() ), - document, TQT_SLOT( slotWidgetDestroyed() ) ); + disconnect( view, TQ_SIGNAL( destroyed() ), + document, TQ_SLOT( slotWidgetDestroyed() ) ); document->insertChildClient( view ); PartController::getInstance() ->integrateTextEditorPart( document ); diff --git a/src/newui/button.cpp b/src/newui/button.cpp index ea63ea51..3220533e 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -56,11 +56,11 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, TQToolTip::add(this, m_realText); m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this)); + this, TQ_SLOT(assignAccel()), this); m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0, - TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this)); + this, TQ_SLOT(clearAccel()), this); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); TQString accel = config->readEntry(TQString("button_%1").arg(text), ""); if (!accel.isEmpty()) @@ -70,7 +70,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, Button::~Button() { // m_buttonBar->removeButton(this); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); TQRegExp r("^&([0-9])\\s.*"); diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index 164ecae7..0cf3cbdc 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -68,7 +68,7 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) break; } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); int mode = config->readNumEntry("MDIStyle", 3); Ideal::ButtonMode buttonMode = Ideal::Text; @@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) m_widgetStack = new TQWidgetStack(this); m_internalLayout->addWidget(m_widgetStack); - m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) ); - m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) ); - m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) ); + m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQ_SLOT(moveToDockLeft()), this ); + m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQ_SLOT(moveToDockRight()), this ); + m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQ_SLOT(moveToDockBottom()), this ); setVisible(m_visible); @@ -103,7 +103,7 @@ DDockWindow::~DDockWindow() void DDockWindow::setVisible(bool v) { //write dock width to the config file - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); config->setGroup(group); @@ -147,7 +147,7 @@ void DDockWindow::loadSettings() void DDockWindow::saveSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); int invisibleWidth = 0; config->setGroup(group); @@ -192,14 +192,14 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc m_bar->addButton(button); m_widgetStack->addWidget(widget); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectWidget())); - connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), this, TQT_SLOT(contextMenu(TQPopupMenu*)) ); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectWidget())); + connect(button, TQ_SIGNAL(contextMenu(TQPopupMenu*)), this, TQ_SLOT(contextMenu(TQPopupMenu*)) ); if (!skipActivation) { //if the widget was selected last time the dock is deleted //we need to show it - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); config->setGroup(group); if (config->readEntry("ViewLastWidget") == title) @@ -375,7 +375,7 @@ void DDockWindow::selectPrevWidget() void DDockWindow::contextMenu(TQPopupMenu * menu) { - m_lastContextMenuButton = static_cast<Ideal::Button*>( TQT_TQWIDGET(const_cast<TQObject*>( sender() )) ); + m_lastContextMenuButton = static_cast<Ideal::Button*>( const_cast<TQObject*>( sender() ) ); menu->insertSeparator(); diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index bc50b6f4..b2488901 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -42,7 +42,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name) void DMainWindow::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); m_openTabAfterCurrent = config->readBoolEntry("OpenNewTabAfterCurrent", true); m_showIconsOnTabs = config->readBoolEntry("ShowTabIcons", false); @@ -208,10 +208,10 @@ DTabWidget *DMainWindow::createTab() DTabWidget *tab = new DTabWidget(m_central); m_tabs.append(tab); if (tab->closeButton()) - connect(tab->closeButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(closeTab())); - connect(tab, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*))); - connect(tab, TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), - this, TQT_SLOT(tabContext(TQWidget*,const TQPoint &))); + connect(tab->closeButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(closeTab())); + connect(tab, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*))); + connect(tab, TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), + this, TQ_SLOT(tabContext(TQWidget*,const TQPoint &))); return tab; } @@ -274,7 +274,7 @@ void DMainWindow::addDockWidget(DDockWindow::Position position, TQWidget *view, { toolWindow(position)->addWidget(title, view); m_docks[view] = position; - connect(view, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed())); + connect(view, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed())); } void DMainWindow::removeDockWidget(TQWidget *view) @@ -295,7 +295,7 @@ DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view) void DMainWindow::widgetDestroyed() { - TQWidget *w = TQT_TQWIDGET(const_cast<TQObject*>(sender())); + TQWidget *w = static_cast<TQWidget*>(const_cast<TQObject*>(sender())); if (m_docks.contains(w)) { diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp index becfb12c..e0a27982 100644 --- a/src/newui/dtabwidget.cpp +++ b/src/newui/dtabwidget.cpp @@ -49,13 +49,13 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) setTabReorderingEnabled(true); } - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(setFocus(TQWidget*))); -// connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(updateHistory(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(setFocus(TQWidget*))); +// connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(updateHistory(TQWidget*))); } void DTabWidget::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); // m_tabBarShown = config->readBoolEntry("TabBarShown", true); m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0); diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index b34eb4f9..b5a5ef3b 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -92,9 +92,9 @@ struct ModificationData PartController::PartController(TQWidget *parent) : KDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false) { - connect(this, TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part* )) ); - connect(this, TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part* )) ); - connect(this, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part*))); + connect(this, TQ_SIGNAL(partRemoved(KParts::Part*)), this, TQ_SLOT(slotPartRemoved(KParts::Part* )) ); + connect(this, TQ_SIGNAL(partAdded(KParts::Part*)), this, TQ_SLOT(slotPartAdded(KParts::Part* )) ); + connect(this, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part*))); setupActions(); @@ -126,56 +126,56 @@ void PartController::setupActions() { TDEActionCollection *ac = TopLevel::getInstance()->main()->actionCollection(); - TDEAction* newAction = KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac, "file_open"); + TDEAction* newAction = KStdAction::open(this, TQ_SLOT(slotOpenFile()), ac, "file_open"); newAction->setToolTip( i18n("Open file") ); newAction->setWhatsThis( i18n("<b>Open file</b><p>Opens an existing file without adding it to the project.</p>") ); - m_openRecentAction = KStdAction::openRecent( this, TQT_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); + m_openRecentAction = KStdAction::openRecent( this, TQ_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file."))); - m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" ); + m_openRecentAction->loadEntries( tdeApp->config(), "RecentFiles" ); - m_saveAllFilesAction = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all"); + m_saveAllFilesAction = new TDEAction(i18n("Save Al&l"), 0, this, TQ_SLOT(slotSaveAllFiles()), ac, "file_save_all"); m_saveAllFilesAction->setToolTip( i18n("Save all modified files") ); m_saveAllFilesAction->setWhatsThis(i18n("<b>Save all</b><p>Saves all modified files.")); m_saveAllFilesAction->setEnabled(false); - m_revertAllFilesAction = new TDEAction(i18n("Rever&t All"), 0, this, TQT_SLOT(slotRevertAllFiles()), ac, "file_revert_all"); + m_revertAllFilesAction = new TDEAction(i18n("Rever&t All"), 0, this, TQ_SLOT(slotRevertAllFiles()), ac, "file_revert_all"); m_revertAllFilesAction->setToolTip(i18n("Revert all changes")); m_revertAllFilesAction->setWhatsThis(i18n("<b>Revert all</b><p>Reverts all changes in opened files. Prompts to save changes so the reversion can be canceled for each modified file.")); m_revertAllFilesAction->setEnabled(false); - m_closeWindowAction = KStdAction::close(this, TQT_SLOT(slotCloseWindow()), ac, "file_close"); + m_closeWindowAction = KStdAction::close(this, TQ_SLOT(slotCloseWindow()), ac, "file_close"); m_closeWindowAction->setToolTip( i18n("Close current file") ); m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file."))); m_closeWindowAction->setEnabled(false); - m_closeAllWindowsAction = new TDEAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all"); + m_closeAllWindowsAction = new TDEAction(i18n("Close All"), 0, this, TQ_SLOT(slotCloseAllWindows()), ac, "file_close_all"); m_closeAllWindowsAction->setToolTip( i18n("Close all files") ); m_closeAllWindowsAction->setWhatsThis(i18n("<b>Close all</b><p>Close all opened files.")); m_closeAllWindowsAction->setEnabled(false); - m_closeOtherWindowsAction = new TDEAction(i18n("Close All Others"), 0, this, TQT_SLOT(slotCloseOtherWindows()), ac, "file_closeother"); + m_closeOtherWindowsAction = new TDEAction(i18n("Close All Others"), 0, this, TQ_SLOT(slotCloseOtherWindows()), ac, "file_closeother"); m_closeOtherWindowsAction->setToolTip( i18n("Close other files") ); m_closeOtherWindowsAction->setWhatsThis(i18n("<b>Close all others</b><p>Close all opened files except current.")); m_closeOtherWindowsAction->setEnabled(false); new TDEActionSeparator(ac, "dummy_separator"); - m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQT_SLOT(slotBack()), ac, "history_back"); + m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQ_SLOT(slotBack()), ac, "history_back"); m_backAction->setEnabled( false ); m_backAction->setToolTip(i18n("Back")); m_backAction->setWhatsThis(i18n("<b>Back</b><p>Moves backwards one step in the navigation history.")); - connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBackAboutToShow())); - connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotBackPopupActivated(int))); + connect(m_backAction->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotBackAboutToShow())); + connect(m_backAction->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotBackPopupActivated(int))); - m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQT_SLOT(slotForward()), ac, "history_forward"); + m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQ_SLOT(slotForward()), ac, "history_forward"); m_forwardAction->setEnabled( false ); m_forwardAction->setToolTip(i18n("Forward")); m_forwardAction->setWhatsThis(i18n("<b>Forward</b><p>Moves forward one step in the navigation history.")); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotForwardAboutToShow())); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotForwardPopupActivated(int))); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotForwardAboutToShow())); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotForwardPopupActivated(int))); - m_gotoLastEditPosAction = new TDEAction( i18n("Goto Last Edit Position"), "go-bottom", 0, this, TQT_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" ); + m_gotoLastEditPosAction = new TDEAction( i18n("Goto Last Edit Position"), "go-bottom", 0, this, TQ_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" ); m_gotoLastEditPosAction->setEnabled( false ); m_gotoLastEditPosAction->setToolTip( i18n("Goto Last Edit Position") ); m_gotoLastEditPosAction->setWhatsThis( i18n("<b>Goto Last Edit Position</b><p>Open the last edited file and position cursor at the point of edit") ); @@ -382,7 +382,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, m_openNextAsText = true; } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); // we don't trust KDE with designer files, let's handle it ourselves @@ -419,7 +419,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, addHistoryEntry(); integratePart( kdevpart, url ); m_openRecentAction->addURL( url ); - m_openRecentAction->saveEntries( kapp->config(), "RecentFiles" ); + m_openRecentAction->saveEntries( tdeApp->config(), "RecentFiles" ); return; } } @@ -476,7 +476,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, m_openNextAsText = false; m_openRecentAction->addURL( url ); - m_openRecentAction->saveEntries( kapp->config(), "RecentFiles" ); + m_openRecentAction->saveEntries( tdeApp->config(), "RecentFiles" ); return; } @@ -521,7 +521,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, } m_openRecentAction->addURL( url ); - m_openRecentAction->saveEntries( kapp->config(), "RecentFiles" ); + m_openRecentAction->saveEntries( tdeApp->config(), "RecentFiles" ); } } else @@ -540,7 +540,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, { if ( dlg.always_open_as_text->isChecked() ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); TQStringList texttypeslist = config->readListEntry( "TextTypes" ); texttypeslist << MimeType->name(); @@ -574,8 +574,8 @@ void PartController::showDocument(const KURL &url, bool newWin) { part = new HTMLDocumentationPart; integratePart(part,docUrl); - connect(part, TQT_SIGNAL(fileNameChanged(KParts::ReadOnlyPart* )), - this, TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart* ))); + connect(part, TQ_SIGNAL(fileNameChanged(KParts::ReadOnlyPart* )), + this, TQ_SIGNAL(partURLChanged(KParts::ReadOnlyPart* ))); } else { @@ -631,8 +631,8 @@ KTextEditor::Editor * PartController::createEditorPart( bool activate, static bool alwaysActivate = true; - kapp->config()->setGroup("Editor"); - TQString preferred = kapp->config()->readPathEntry("EmbeddedKTextEditor"); + tdeApp->config()->setGroup("Editor"); + TQString preferred = tdeApp->config()->readPathEntry("EmbeddedKTextEditor"); // If we are not using kyzis... // Don't create non-wrapped views for now, // avoid two paths (== two chances for bad bugs) @@ -678,14 +678,14 @@ void PartController::integratePart(KParts::Part *part, const KURL &url, emit loadedFile( ro_part->url() ); - connect( part, TQT_SIGNAL(modifiedOnDisc(Kate::Document*, bool, unsigned char)), this, TQT_SLOT(slotDocumentDirty(Kate::Document*, bool, unsigned char)) ); + connect( part, TQ_SIGNAL(modifiedOnDisc(Kate::Document*, bool, unsigned char)), this, TQ_SLOT(slotDocumentDirty(Kate::Document*, bool, unsigned char)) ); // let's get notified when a document has been changed - connect(part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotUploadFinished())); + connect(part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotUploadFinished())); // yes, we're cheating again. this signal exists for katepart's // Document object and our HTMLDocumentationPart -// connect(part, TQT_SIGNAL(fileNameChanged()), this, TQT_SLOT(slotFileNameChanged())); +// connect(part, TQ_SIGNAL(fileNameChanged()), this, TQ_SLOT(slotFileNameChanged())); // Connect to the document's views newStatus() signal in order to keep track of the // modified-status of the document. @@ -697,22 +697,22 @@ void PartController::integratePart(KParts::Part *part, const KURL &url, if (designerPart && API::getInstance()->languageSupport()) { kdDebug() << "integrating designer part with language support" << endl; - connect(designerPart, TQT_SIGNAL(addedFunction(DesignerType, const TQString&, Function )), + connect(designerPart, TQ_SIGNAL(addedFunction(DesignerType, const TQString&, Function )), API::getInstance()->languageSupport(), - TQT_SLOT(addFunction(DesignerType, const TQString&, Function ))); - connect(designerPart, TQT_SIGNAL(editedFunction(DesignerType, const TQString&, Function, Function )), API::getInstance()->languageSupport(), - TQT_SLOT(editFunction(DesignerType, const TQString&, Function, Function ))); - connect(designerPart, TQT_SIGNAL(removedFunction(DesignerType, const TQString&, Function )), + TQ_SLOT(addFunction(DesignerType, const TQString&, Function ))); + connect(designerPart, TQ_SIGNAL(editedFunction(DesignerType, const TQString&, Function, Function )), API::getInstance()->languageSupport(), + TQ_SLOT(editFunction(DesignerType, const TQString&, Function, Function ))); + connect(designerPart, TQ_SIGNAL(removedFunction(DesignerType, const TQString&, Function )), API::getInstance()->languageSupport(), - TQT_SLOT(removeFunction(DesignerType, const TQString&, Function ))); - connect(designerPart, TQT_SIGNAL(editFunction(DesignerType, const TQString&, const TQString& )), + TQ_SLOT(removeFunction(DesignerType, const TQString&, Function ))); + connect(designerPart, TQ_SIGNAL(editFunction(DesignerType, const TQString&, const TQString& )), API::getInstance()->languageSupport(), - TQT_SLOT(openFunction(DesignerType, const TQString&, const TQString& ))); - connect(designerPart, TQT_SIGNAL(editSource(DesignerType, const TQString& )), + TQ_SLOT(openFunction(DesignerType, const TQString&, const TQString& ))); + connect(designerPart, TQ_SIGNAL(editSource(DesignerType, const TQString& )), API::getInstance()->languageSupport(), - TQT_SLOT(openSource(DesignerType, const TQString& ))); - connect(designerPart, TQT_SIGNAL(newStatus(const TQString &, int)), - this, TQT_SLOT(slotNewDesignerStatus(const TQString &, int))); + TQ_SLOT(openSource(DesignerType, const TQString& ))); + connect(designerPart, TQ_SIGNAL(newStatus(const TQString &, int)), + this, TQ_SLOT(slotNewDesignerStatus(const TQString &, int))); } } @@ -733,14 +733,14 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) if ( !doc ) return; - connect( doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(textChanged()) ); - connect( doc, TQT_SIGNAL(fileNameChanged()), - this, TQT_SLOT(slotDocumentUrlChanged())); + connect( doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(textChanged()) ); + connect( doc, TQ_SIGNAL(fileNameChanged()), + this, TQ_SLOT(slotDocumentUrlChanged())); if( doc->widget() ) { - connect( doc->widget(), TQT_SIGNAL(dropEventPass(TQDropEvent *)), - TopLevel::getInstance()->main(), TQT_SLOT(slotDropEvent(TQDropEvent *)) ); + connect( doc->widget(), TQ_SIGNAL(dropEventPass(TQDropEvent *)), + TopLevel::getInstance()->main(), TQ_SLOT(slotDropEvent(TQDropEvent *)) ); } if ( KTextEditor::View * view = dynamic_cast<KTextEditor::View*>( doc->widget() ) ) @@ -780,7 +780,7 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) TQPtrListIterator<KTextEditor::View> it( list ); while ( it.current() ) { - connect( it, TQT_SIGNAL( newStatus() ), this, TQT_SLOT( slotNewStatus() ) ); + connect( it, TQ_SIGNAL( newStatus() ), this, TQ_SLOT( slotNewStatus() ) ); ++it; } } @@ -1275,7 +1275,7 @@ void PartController::slotOpenFile() if ( DefaultEncoding.isEmpty() ) { // have a peek at katepart's settings: - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("Kate Document Defaults"); DefaultEncoding = config->readEntry("Encoding", TQString() ); } @@ -1327,7 +1327,7 @@ void PartController::slotActivePartChanged( KParts::Part *part ) } updateMenuItems(); - TQTimer::singleShot( 100, this, TQT_SLOT(slotWaitForFactoryHack()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(slotWaitForFactoryHack()) ); } void PartController::showPart( KParts::Part* part, const TQString& name, const TQString& shortDescription ) @@ -1379,7 +1379,7 @@ void PartController::slotDocumentDirty( Kate::Document * d, bool isModified, uns p->doc = doc; p->isModified = isModified; p->reason = reason; - KDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p ); + KDevJobTimer::singleShot( 0, this, TQ_SLOT(slotDocumentDirtyStepTwo(void*)), p ); } } @@ -1453,7 +1453,7 @@ bool PartController::isDirty( KURL const & url ) bool PartController::reactToDirty( KURL const & url, unsigned char reason ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Editor"); TQString dirtyAction = config->readEntry( "DirtyAction" ); @@ -1754,7 +1754,7 @@ void PartController::slotWaitForFactoryHack( ) { if ( !activePart()->factory() ) { - TQTimer::singleShot( 100, this, TQT_SLOT(slotWaitForFactoryHack()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(slotWaitForFactoryHack()) ); return; } else diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 30aa9171..901f6bc4 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -15,7 +15,7 @@ #include <kdebug.h> #include <kdialogbase.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <kiconloader.h> @@ -80,7 +80,7 @@ PluginController::PluginController() : KDevPluginController() { /* m_defaultProfile = TQString::fromLatin1( "FullIDE" ); - m_defaultProfilePath = kapp->dirs()->localtdedir() + "/" + + m_defaultProfilePath = tdeApp->dirs()->localtdedir() + "/" + TDEStandardDirs::kde_default( "data" ) + TQString::fromLatin1("/tdevelop/profiles/FullIDE");*/ @@ -244,8 +244,8 @@ void PluginController::integratePart(KXMLGUIClient *part) Core::setupShourtcutTips(part); TopLevel::getInstance()->main()->guiFactory()->addClient(part); - connect( part->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ), - TopLevel::getInstance()->main()->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ) ); + connect( part->actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), + TopLevel::getInstance()->main()->actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ) ); } void PluginController::integrateAndRememberPart(const TQString &name, KDevPlugin *part) diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp index a626a0dd..1e73ff48 100644 --- a/src/pluginselectdialog.cpp +++ b/src/pluginselectdialog.cpp @@ -51,8 +51,8 @@ PluginSelectDialog::PluginSelectDialog(TQWidget* parent, const char* name, bool plugin_list->addColumn(""); plugin_list->header()->hide(); - connect( plugin_list, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) ); - connect( urllabel, TQT_SIGNAL( leftClickedURL( const TQString & ) ), this, TQT_SLOT( openURL( const TQString & ) ) ); + connect( plugin_list, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQ_SLOT( itemSelected( TQListViewItem * ) ) ); + connect( urllabel, TQ_SIGNAL( leftClickedURL( const TQString & ) ), this, TQ_SLOT( openURL( const TQString & ) ) ); init(); } @@ -86,7 +86,7 @@ void PluginSelectDialog::saveAsDefault() void PluginSelectDialog::openURL( const TQString & url ) { - kapp->invokeBrowser( url ); + tdeApp->invokeBrowser( url ); } void PluginSelectDialog::itemSelected( TQListViewItem * item ) diff --git a/src/pluginselectdialog.h b/src/pluginselectdialog.h index fc00c5f7..4f0820c7 100644 --- a/src/pluginselectdialog.h +++ b/src/pluginselectdialog.h @@ -23,7 +23,7 @@ class PluginSelectDialog : public PluginSelectDialogBase public: - PluginSelectDialog( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + PluginSelectDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~PluginSelectDialog(); TQStringList unselectedPluginNames(); diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui index 8f53d109..81795f29 100644 --- a/src/pluginselectdialogbase.ui +++ b/src/pluginselectdialogbase.ui @@ -169,9 +169,9 @@ <slot>saveAsDefault()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">saveAsDefault()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurllabel.h</include> diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index 36acd44d..b9d17720 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -649,7 +649,7 @@ <tabstop>disabledList</tabstop> <tabstop>pluginsView</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>profileExecuted(TQListViewItem *item)</slot> <slot>propertyExecuted(TQListBoxItem *item)</slot> <slot>addProfile()</slot> @@ -660,7 +660,7 @@ <slot>delEnabled()</slot> <slot>addDisabled()</slot> <slot>delDisabled()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index c2449374..c2d0c316 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -22,7 +22,7 @@ #include <tqfileinfo.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdeio/netaccess.h> diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index fd4d06fa..d68eab51 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -23,7 +23,7 @@ #include <kurl.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdevplugin.h> diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 19a88d78..385353c5 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -21,9 +21,9 @@ class TQDomDocument; #include <tdeaction.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/netaccess.h> #include <tdetempfile.h> #include <tdemenubar.h> @@ -94,29 +94,29 @@ void ProjectManager::createActions( TDEActionCollection* ac ) TDEAction *action; action = new TDEAction(i18n("&Open Project..."), "project_open", 0, - this, TQT_SLOT(slotOpenProject()), + this, TQ_SLOT(slotOpenProject()), ac, "project_open"); action->setToolTip( i18n("Open project")); action->setWhatsThis(i18n("<b>Open project</b><p>Opens a KDevelop3 or KDevelop2 project.")); m_openRecentProjectAction = new TDERecentFilesAction(i18n("Open &Recent Project"), 0, - this, TQT_SLOT(loadProject(const KURL &)), + this, TQ_SLOT(loadProject(const KURL &)), ac, "project_open_recent"); m_openRecentProjectAction->setToolTip(i18n("Open recent project")); m_openRecentProjectAction->setWhatsThis(i18n("<b>Open recent project</b><p>Opens recently opened project.")); - m_openRecentProjectAction->loadEntries(kapp->config(), "RecentProjects"); + m_openRecentProjectAction->loadEntries(tdeApp->config(), "RecentProjects"); m_closeProjectAction = new TDEAction(i18n("C&lose Project"), "window-close",0, - this, TQT_SLOT(closeProject()), + this, TQ_SLOT(closeProject()), ac, "project_close"); m_closeProjectAction->setEnabled(false); m_closeProjectAction->setToolTip(i18n("Close project")); m_closeProjectAction->setWhatsThis(i18n("<b>Close project</b><p>Closes the current project.")); m_projectOptionsAction = new TDEAction(i18n("Project &Options"), "configure", 0, - this, TQT_SLOT(slotProjectOptions()), + this, TQ_SLOT(slotProjectOptions()), ac, "project_options" ); m_projectOptionsAction->setToolTip(i18n("Project options")); m_projectOptionsAction->setWhatsThis(i18n("<b>Project options</b><p>Lets you customize project options.")); @@ -125,7 +125,7 @@ void ProjectManager::createActions( TDEActionCollection* ac ) void ProjectManager::slotOpenProject() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/"); @@ -151,9 +151,9 @@ void ProjectManager::slotProjectOptions() TQVBox *box = dlg.addVBoxPage( i18n("General"), i18n("General"), BarIcon( "tdevelop", TDEIcon::SizeMedium ) ); GeneralInfoWidget *g = new GeneralInfoWidget(*API::getInstance()->projectDom(), box, "general informations widget"); - connect (&dlg, TQT_SIGNAL(okClicked()), g, TQT_SLOT(accept())); + connect (&dlg, TQ_SIGNAL(okClicked()), g, TQ_SLOT(accept())); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Project Settings Dialog"); int height = config->readNumEntry( "Height", 600 ); int width = config->readNumEntry( "Width", 800 ); @@ -176,7 +176,7 @@ void ProjectManager::loadSettings() void ProjectManager::saveSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); if (projectLoaded()) { @@ -189,7 +189,7 @@ void ProjectManager::saveSettings() void ProjectManager::loadDefaultProject() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); TQString project = config->readPathEntry("Last Project"); bool readProject = config->readBoolEntry("Read Last Project On Startup", true); @@ -226,20 +226,20 @@ bool ProjectManager::loadProject(const KURL &projectURL) } TopLevel::getInstance()->main()->menuBar()->setEnabled( false ); - kapp->setOverrideCursor( waitCursor ); + tdeApp->setOverrideCursor( waitCursor ); if( projectLoaded() && !closeProject() ) { m_openRecentProjectAction->setCurrentItem( -1 ); TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return false; } m_info = new ProjectInfo; m_info->m_projectURL = url; - TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadProject()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotLoadProject()) ); // no one cares about this value return true; @@ -253,7 +253,7 @@ void ProjectManager::slotLoadProject( ) delete m_info; m_info = 0; saveSettings(); TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return; } @@ -262,7 +262,7 @@ void ProjectManager::slotLoadProject( ) if( !loadLanguageSupport(m_info->m_language) ) { delete m_info; m_info = 0; TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return; } @@ -271,7 +271,7 @@ void ProjectManager::slotLoadProject( ) delete m_info; m_info = 0; API::getInstance()->setProjectDom( 0 ); TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return; } @@ -301,7 +301,7 @@ void ProjectManager::slotLoadProject( ) Core::getInstance()->doEmitProjectOpened(); TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); TopLevel::getInstance()->statusBar()->message( i18n("Project loaded."), 3000 ); diff --git a/src/projectsession.cpp b/src/projectsession.cpp index afdaf0b5..d4a011de 100644 --- a/src/projectsession.cpp +++ b/src/projectsession.cpp @@ -24,7 +24,7 @@ #include <kurl.h> #include <tdemessagebox.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdetexteditor/viewcursorinterface.h> #include <tdetexteditor/document.h> #include <tdetexteditor/encodinginterface.h> @@ -118,7 +118,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ ++it; } - TQTimer::singleShot( 0, this, TQT_SLOT(loadDocument()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(loadDocument()) ); return true; } @@ -444,7 +444,7 @@ void ProjectSession::loadDocument( ) _docDataList.pop_front(); loadDocument(); - //TQTimer::singleShot( 0, this, TQT_SLOT(loadDocument()) ); + //TQTimer::singleShot( 0, this, TQ_SLOT(loadDocument()) ); } } diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 65bf0792..eebc7ad1 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -61,11 +61,11 @@ SimpleMainWindow::SimpleMainWindow(TQWidget* parent, const char *name) :DMainWindow(parent, name) { resize(800, 600); // starts tdevelop at 800x600 the first time - m_mainWindowShare = new MainWindowShare(TQT_TQOBJECT(this)); + m_mainWindowShare = new MainWindowShare(this); - connect(m_bottomDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor())); - connect(m_leftDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor())); - connect(m_rightDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor())); + connect(m_bottomDock, TQ_SIGNAL(hidden()), this, TQ_SLOT(raiseEditor())); + connect(m_leftDock, TQ_SIGNAL(hidden()), this, TQ_SLOT(raiseEditor())); + connect(m_rightDock, TQ_SIGNAL(hidden()), this, TQ_SLOT(raiseEditor())); } SimpleMainWindow::~ SimpleMainWindow( ) @@ -97,7 +97,7 @@ void SimpleMainWindow::init() if (help_menu) { help_menu->insertItem(SmallIconSet("contents"), i18n("TDevelop &Programming Handbook"), - TQT_TQOBJECT(this), TQT_SLOT(slotProgrammingHandbook()), 0, -1, 1); + this, TQ_SLOT(slotProgrammingHandbook()), 0, -1, 1); } menuBar()->setEnabled( false ); @@ -116,19 +116,19 @@ void SimpleMainWindow::init() i18n("Could Not Find Plugins") ); } - connect(Core::getInstance(), TQT_SIGNAL(coreInitialized()), TQT_TQOBJECT(this), TQT_SLOT(slotCoreInitialized())); - connect(Core::getInstance(), TQT_SIGNAL(projectOpened()), TQT_TQOBJECT(this), TQT_SLOT(projectOpened())); - connect(Core::getInstance(), TQT_SIGNAL(projectClosed()), TQT_TQOBJECT(this), TQT_SLOT(projectClosed())); - connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(PartController::getInstance(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart *)), - TQT_TQOBJECT(this), TQT_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * ))); - connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - TQT_TQOBJECT(this), TQT_SLOT(activePartChanged(KParts::Part*))); + connect(Core::getInstance(), TQ_SIGNAL(coreInitialized()), this, TQ_SLOT(slotCoreInitialized())); + connect(Core::getInstance(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(Core::getInstance(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); + connect(Core::getInstance(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(PartController::getInstance(), TQ_SIGNAL(partURLChanged(KParts::ReadOnlyPart *)), + this, TQ_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * ))); + connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); connect(PartController::getInstance(), - TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)), - TQT_TQOBJECT(this), TQT_SLOT(documentChangedState(const KURL&, DocumentState))); + TQ_SIGNAL(documentChangedState(const KURL &, DocumentState)), + this, TQ_SLOT(documentChangedState(const KURL&, DocumentState))); loadSettings(); } @@ -260,7 +260,7 @@ void SimpleMainWindow::embedView( DDockWindow::Position pos, TQWidget * view, co DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const TQString & name, DDockWindow::Position defaultPos ) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "DToolDockPosition" ); TQString position = config->readEntry( name ); @@ -279,7 +279,7 @@ DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const TQString & void SimpleMainWindow::rememberToolViewPosition( const TQString & name, DDockWindow::Position pos ) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "DToolDockPosition" ); TQString position = "unknown"; @@ -364,7 +364,7 @@ void SimpleMainWindow::lowerView(TQWidget * view) void SimpleMainWindow::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); ProjectManager::getInstance()->loadSettings(); applyMainWindowSettings(config, "SimpleMainWindow"); @@ -374,7 +374,7 @@ void SimpleMainWindow::loadSettings() void SimpleMainWindow::saveSettings( ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); ProjectManager::getInstance()->saveSettings(); saveMainWindowSettings(config, "SimpleMainWindow"); @@ -413,65 +413,65 @@ void SimpleMainWindow::createFramework() { PartController::createInstance( this ); - connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - TQT_TQOBJECT(this), TQT_SLOT(createGUI(KParts::Part*))); + connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(createGUI(KParts::Part*))); } void SimpleMainWindow::createActions() { m_raiseEditor = new TDEAction(i18n("Raise &Editor"), ALT+Key_C, - TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor"); + this, TQ_SLOT(raiseEditor()), actionCollection(), "raise_editor"); m_raiseEditor->setToolTip(i18n("Raise editor")); m_raiseEditor->setWhatsThis(i18n("<b>Raise editor</b><p>Focuses the editor.")); m_lowerAllDocks = new TDEAction(i18n("Lower All Docks"), CTRL+SHIFT+Key_C, - TQT_TQOBJECT(this), TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks"); + this, TQ_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks"); - new TDEAction(i18n("Switch to next TabWidget"), 0, TQT_TQOBJECT(this), - TQT_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" ); + new TDEAction(i18n("Switch to next TabWidget"), 0, this, + TQ_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" ); m_splitHor = new TDEAction(i18n("Split &Horizontal"), CTRL+SHIFT+Key_T, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h"); + this, TQ_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h"); m_splitHor->setIcon("view_top_bottom"); m_splitVer = new TDEAction(i18n("Split &Vertical"), CTRL+SHIFT+Key_L, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v"); + this, TQ_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v"); m_splitVer->setIcon("view_left_right"); m_splitHor1 = new TDEAction(i18n("Split &Horizontal"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1"); + this, TQ_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1"); m_splitHor1->setIcon("view_top_bottom"); m_splitVer1 = new TDEAction(i18n("Split &Vertical"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1"); + this, TQ_SLOT(slotSplitVertical()), actionCollection(), "split_v1"); m_splitVer1->setIcon("view_left_right"); m_splitHor2 = new TDEAction(i18n("Split &Horizontal and Open"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2"); + this, TQ_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2"); m_splitHor2->setIcon("view_top_bottom"); m_splitVer2 = new TDEAction(i18n("Split &Vertical and Open"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2"); + this, TQ_SLOT(slotSplitVertical()), actionCollection(), "split_v2"); m_splitVer2->setIcon("view_left_right"); m_raiseLeftDock = new TDEAction(i18n("Switch Left Dock"), CTRL+SHIFT+ALT+Key_L, - TQT_TQOBJECT(this), TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock"); + this, TQ_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock"); m_raiseRightDock = new TDEAction(i18n("Switch Right Dock"), CTRL+SHIFT+ALT+Key_R, - TQT_TQOBJECT(this), TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock"); + this, TQ_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock"); m_raiseBottomDock = new TDEAction(i18n("Switch Bottom Dock"), CTRL+SHIFT+ALT+Key_B, - TQT_TQOBJECT(this), TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock"); + this, TQ_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock"); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), + KStdAction::configureToolbars(this, TQ_SLOT(configureToolbars()), actionCollection(), "set_configure_toolbars"); m_mainWindowShare->createActions(); - connect(m_mainWindowShare, TQT_SIGNAL(gotoNextWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoNextWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoPreviousWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoPreviousWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoFirstWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoFirstWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoLastWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoLastWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoNextWindow()), this, TQ_SLOT(gotoNextWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoPreviousWindow()), this, TQ_SLOT(gotoPreviousWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoFirstWindow()), this, TQ_SLOT(gotoFirstWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoLastWindow()), this, TQ_SLOT(gotoLastWindow())); } void SimpleMainWindow::raiseEditor() @@ -598,7 +598,7 @@ void SimpleMainWindow::closeTab() void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p) { - DTabWidget *tabWidget = static_cast<DTabWidget*>(TQT_TQWIDGET(const_cast<TQObject*>(sender()))); + DTabWidget *tabWidget = static_cast<DTabWidget*>(const_cast<TQObject*>(sender())); if (!tabWidget) return; @@ -644,7 +644,7 @@ void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p) ++it; } - connect(&tabMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(tabContextActivated(int))); + connect(&tabMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(tabContextActivated(int))); tabMenu.exec(p); } @@ -679,7 +679,7 @@ void SimpleMainWindow::configureToolbars() { saveMainWindowSettings(TDEGlobal::config(), "SimpleMainWindow"); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -704,7 +704,7 @@ bool SimpleMainWindow::queryExit() void SimpleMainWindow::setupWindowMenu() { // get the xmlgui created one instead - m_windowMenu = static_cast<TQPopupMenu*>(TQT_TQWIDGET(main()->child("window", "TDEPopupMenu"))); + m_windowMenu = static_cast<TQPopupMenu*>(main()->child("window", "TDEPopupMenu")); if (!m_windowMenu) { @@ -718,8 +718,8 @@ void SimpleMainWindow::setupWindowMenu() actionCollection()->action("file_close_all")->plug(m_windowMenu); actionCollection()->action("file_closeother")->plug(m_windowMenu); - TQObject::connect(m_windowMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(openURL(int))); - TQObject::connect(m_windowMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillWindowMenu())); + TQObject::connect(m_windowMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(openURL(int))); + TQObject::connect(m_windowMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(fillWindowMenu())); } void SimpleMainWindow::openURL(int w) @@ -1019,7 +1019,7 @@ void SimpleMainWindow::projectClosed() void SimpleMainWindow::slotProgrammingHandbook() { - kapp->invokeHelp(TQString::null, "tde_app_devel"); + tdeApp->invokeHelp(TQString::null, "tde_app_devel"); } #include "simplemainwindow.moc" diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp index 205656bd..b2e0f13a 100644 --- a/src/splashscreen.cpp +++ b/src/splashscreen.cpp @@ -13,7 +13,7 @@ KDevSplashScreen::KDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f) { TQTimer *timer = new TQTimer( this ); - TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); + TQObject::connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(animate())); timer->start(150); state = 0; diff --git a/src/statusbar.cpp b/src/statusbar.cpp index b4e11769..44cb4b70 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -39,8 +39,8 @@ KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name) _status->setAlignment(TQWidget::AlignCenter); addWidget(_status, 0, true); - connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); } @@ -60,14 +60,14 @@ void KDevStatusBar::activePartChanged(KParts::Part *part) { if ((_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) { - connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), - this, TQT_SLOT( setStatus( const TQString & ) ) ); + connect( part->widget(), TQ_SIGNAL( viewStatusMsg( const TQString & ) ), + this, TQ_SLOT( setStatus( const TQString & ) ) ); _status->show(); } else if ((_cursorIface = dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()))) { - connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); + connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged())); _status->show(); cursorPositionChanged(); diff --git a/src/statusbar.h b/src/statusbar.h index 4a61a07e..82efa285 100644 --- a/src/statusbar.h +++ b/src/statusbar.h @@ -32,7 +32,7 @@ class KDevStatusBar : public KStatusBar public: KDevStatusBar( TQWidget *parent=0, const char *name=0 ); ~KDevStatusBar(); - void addWidget ( TQWidget *widget, int stretch = 0, bool permanent = FALSE ); + void addWidget ( TQWidget *widget, int stretch = 0, bool permanent = false ); private slots: void cursorPositionChanged(); diff --git a/src/toplevel.cpp b/src/toplevel.cpp index 129d869c..75b3b50b 100644 --- a/src/toplevel.cpp +++ b/src/toplevel.cpp @@ -22,7 +22,7 @@ KDevMainWindow *TopLevel::getInstance() SimpleMainWindow *mainWindow = new SimpleMainWindow(0, "SimpleMainWindow"); s_instance = mainWindow; mainWindow->init(); - kapp->setMainWidget(mainWindow); + tdeApp->setMainWidget(mainWindow); } return s_instance; diff --git a/translations/desktop_files/tdevelop-desktops/es_AR.po b/translations/desktop_files/tdevelop-desktops/es_AR.po new file mode 100644 index 00000000..dcf6ba4a --- /dev/null +++ b/translations/desktop_files/tdevelop-desktops/es_AR.po @@ -0,0 +1,3419 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: buildtools/ada/kdevadaproject.desktop:2 +msgid "KDevAdaProject" +msgstr "" + +#. GenericName +#. Comment +#: buildtools/ada/kdevadaproject.desktop:4 +#: buildtools/ada/kdevadaproject.desktop:6 +msgid "Ada Project" +msgstr "" + +#. Name +#: buildtools/ant/kdevantproject.desktop:2 +msgid "KDevAntProject" +msgstr "" + +#. GenericName +#. Comment +#: buildtools/ant/kdevantproject.desktop:4 +#: buildtools/ant/kdevantproject.desktop:6 +msgid "Ant Project" +msgstr "" + +#. Name +#: buildtools/autotools/kdevautoproject.desktop:2 +msgid "KDevAutoProject" +msgstr "" + +#. GenericName +#. Comment +#: buildtools/autotools/kdevautoproject.desktop:4 +#: buildtools/autotools/kdevautoproject.desktop:6 +msgid "Automake Project" +msgstr "" + +#. Name +#: buildtools/autotools/kdevtdeautoproject.desktop:2 +msgid "KDevTDEAutoProject" +msgstr "" + +#. GenericName +#. Comment +#: buildtools/autotools/kdevtdeautoproject.desktop:4 +#: buildtools/autotools/kdevtdeautoproject.desktop:6 +msgid "TDE Automake Project" +msgstr "" + +#. Name +#: buildtools/custommakefiles/kdevcustomproject.desktop:2 +msgid "KDevCustomProject" +msgstr "" + +#. GenericName +#. Comment +#: buildtools/custommakefiles/kdevcustomproject.desktop:4 +#: buildtools/custommakefiles/kdevcustomproject.desktop:6 +msgid "Custom Project" +msgstr "" + +#. Name +#: buildtools/pascal/kdevpascalproject.desktop:2 +msgid "KDevPascalProject" +msgstr "" + +#. GenericName +#. Comment +#: buildtools/pascal/kdevpascalproject.desktop:4 +#: buildtools/pascal/kdevpascalproject.desktop:6 +msgid "Pascal Project" +msgstr "" + +#. Name +#: buildtools/qmake/kdevtmakeproject.desktop:2 +msgid "KDevTMakeProject" +msgstr "" + +#. GenericName +#. Comment +#: buildtools/qmake/kdevtmakeproject.desktop:4 +#: buildtools/qmake/kdevtmakeproject.desktop:6 +msgid "TMake Project" +msgstr "" + +#. Name +#: buildtools/qmake/kdevtrollproject.desktop:2 +msgid "KDevTrollProject" +msgstr "" + +#. GenericName +#. Comment +#: buildtools/qmake/kdevtrollproject.desktop:4 +#: buildtools/qmake/kdevtrollproject.desktop:6 +msgid "QMake Project" +msgstr "" + +#. Name +#: buildtools/script/kdevscriptproject.desktop:2 +msgid "KDevScriptProject" +msgstr "" + +#. GenericName +#. Comment +#: buildtools/script/kdevscriptproject.desktop:4 +#: buildtools/script/kdevscriptproject.desktop:6 +msgid "Scripting Language Project" +msgstr "" + +#. Name +#: editors/editor-chooser/kdeveditorchooser.desktop:2 +msgid "KDevEditorChooser" +msgstr "" + +#. GenericName +#: editors/editor-chooser/kdeveditorchooser.desktop:4 +msgid "Editor Selection" +msgstr "" + +#. Comment +#: editors/editor-chooser/kdeveditorchooser.desktop:6 +msgid "Provides a dialog for Editor selection." +msgstr "" + +#. Name +#: embedded/visualboyadvance/kdevvisualboyadvance.desktop:2 +msgid "KDevVisualBoyAdvance" +msgstr "" + +#. GenericName +#: embedded/visualboyadvance/kdevvisualboyadvance.desktop:4 +msgid "VisualBoyAdvance Support" +msgstr "" + +#. Comment +#: embedded/visualboyadvance/kdevvisualboyadvance.desktop:6 +msgid "VisualBoyAdvance is a GameBoyAdvance emulator. http://vboy.emuhq.com/" +msgstr "" + +#. Keywords +#: embedded/visualboyadvance/kdevvisualboyadvance.desktop:8 +msgid "GBA;" +msgstr "" + +#. Name +#. GenericName +#: kdevassistant.desktop:2 src/profiles/KDevAssistant/profile.config:9 +msgid "TDevelop Assistant" +msgstr "" + +#. GenericName +#: kdevassistant.desktop:4 +msgid "Documentation Viewer" +msgstr "" + +#. Name +#: kdevdesigner/designer/kdevdesigner_part.desktop:2 +msgid "KDevDesignerPart" +msgstr "" + +#. Name +#: kdevdesigner/src/kdevdesigner.desktop:2 +msgid "TDevelop Designer" +msgstr "" + +#. GenericName +#: kdevdesigner/src/kdevdesigner.desktop:4 +msgid "Interface Designer" +msgstr "" + +#. Comment +#: kdevdesigner/src/kdevdesigner.desktop:6 +msgid "GUI Designer for Qt/TDE" +msgstr "" + +#. Name +#: languages/ada/kdevadasupport.desktop:2 +msgid "KDevAdaSupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/ada/kdevadasupport.desktop:4 +#: languages/ada/kdevadasupport.desktop:6 +msgid "Ada Language Support" +msgstr "" + +#. Name +#: languages/bash/kdevbashsupport.desktop:2 +msgid "KDevBashSupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/bash/kdevbashsupport.desktop:4 +#: languages/bash/kdevbashsupport.desktop:6 +msgid "Bash Support" +msgstr "" + +#. Name +#. Comment +#. Name +#: languages/cpp/app_templates/dcopservice/dcopservice.desktop:2 +#: languages/cpp/app_templates/kapp/app.desktop:2 +#: languages/cpp/app_templates/kdevlang/kdevlang.desktop:4 +#: languages/cpp/app_templates/khello/app.desktop:2 +#: languages/cpp/app_templates/khello2/app.desktop:2 +#: languages/cpp/app_templates/kmake/app.desktop:2 +#: languages/cpp/app_templates/kofficepart/kopart.desktop:2 +#: languages/cpp/app_templates/kxt/app.desktop:2 +#: languages/cpp/app_templates/opieapp/example.desktop:2 +#: languages/cpp/app_templates/qtopiaapp/example.desktop:2 +#: languages/cpp/app_templates/tdeconfig35/app.desktop:2 +#: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 +#: languages/cpp/app_templates/wxhello/app.desktop:2 +#: languages/java/app_templates/kappjava/app.desktop:2 +#: languages/ruby/app_templates/dcopservice/dcopservice.desktop:2 +#: languages/ruby/app_templates/kapp/app.desktop:2 +#: languages/ruby/app_templates/kxt/app.desktop:2 +#: parts/appwizard/common/tde-app.desktop:2 +#: languages/cpp/app_templates/noatunui/plugin.plugin:7 +#: languages/cpp/app_templates/noatunvisual/plugin.plugin:7 +msgid "%{APPNAME}" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/dcopservice/dcopservice.desktop:4 +#: languages/ruby/app_templates/dcopservice/dcopservice.desktop:4 +msgid "Template for dcop services" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kapp/app.desktop:4 +#: languages/cpp/app_templates/kmake/app.desktop:4 +#: languages/ruby/app_templates/kapp/app.desktop:4 +#: parts/appwizard/common/tde-app.desktop:4 +msgid "A TDE KPart Application" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kateplugin/plugin.desktop:2 +#: languages/cpp/app_templates/kateplugin2/plugin.desktop:2 +msgid "My First Kate Plugin" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kateplugin/plugin.desktop:4 +#: languages/cpp/app_templates/kateplugin2/plugin.desktop:4 +msgid "Your short description about the plugin goes here" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 +#: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 +#: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 +msgid "KDev%{APPNAME}" +msgstr "" + +#. GenericName +#: languages/cpp/app_templates/kdevpart/kdevpart.desktop:4 +#: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:4 +msgid "%{APPNAME} Plugin" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kdevpart/kdevpart.desktop:6 +#: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:6 +msgid "%{APPNAME} Description" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/khello/app.desktop:4 +#: languages/cpp/app_templates/khello2/app.desktop:4 +#: languages/cpp/app_templates/kxt/app.desktop:4 +#: languages/cpp/app_templates/tdeconfig35/app.desktop:4 +#: languages/ruby/app_templates/kxt/app.desktop:4 +msgid "A simple TDE Application" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kicker/applet.desktop:2 +#: languages/cpp/app_templates/konqnavpanel/konqnavpanel.desktop:2 +msgid "%{APPNAMELC}" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kicker/applet.desktop:4 +msgid "A panel applet called $NAME$" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kofficepart/x-kopart.desktop:2 +msgid "A really awesome KOffice application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/konqnavpanel/konqnavpanel.desktop:4 +msgid "A konqueror navigation panel plugin called $NAME$" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kpartapp/app.desktop:2 +#: parts/appwizard/common/tde-part.desktop:2 +msgid "%{APPNAME}Part" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opieapp/example.desktop:4 +#: languages/cpp/app_templates/qtopiaapp/example.desktop:4 +msgid "An %{APPNAME} Program" +msgstr "" + +#. Name +#: languages/cpp/app_templates/tdecmodule/module.desktop:12 +msgid "The %{APPNAME} Applet" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/tdecmodule/module.desktop:14 +msgid "%{APPNAME} - a kcontrol module" +msgstr "" + +#. Keywords +#: languages/cpp/app_templates/tdecmodule/module.desktop:16 +msgid "%{APPNAME};%{APPNAMELC};" +msgstr "" + +#. Name +#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.desktop:2 +msgid "%{APPNAME} Info" +msgstr "" + +#. Name +#: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:10 +msgid "Setup..." +msgstr "" + +#. Name +#: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:15 +msgid "Display in Specified Window" +msgstr "" + +#. Name +#: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:20 +msgid "Display in Root Window" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/wxhello/app.desktop:4 +msgid "A simple wxWidgets Application" +msgstr "" + +#. Name +#: languages/cpp/compiler/gccoptions/kdevg77options.desktop:2 +msgid "G77Options" +msgstr "" + +#. Comment +#: languages/cpp/compiler/gccoptions/kdevg77options.desktop:4 +msgid "GNU Fortran 77 Compiler" +msgstr "" + +#. Name +#: languages/cpp/compiler/gccoptions/kdevgccoptions.desktop:2 +msgid "GccOptions" +msgstr "" + +#. Comment +#: languages/cpp/compiler/gccoptions/kdevgccoptions.desktop:4 +msgid "GNU C Compiler" +msgstr "" + +#. Name +#: languages/cpp/compiler/gccoptions/kdevgppoptions.desktop:2 +msgid "GppOptions" +msgstr "" + +#. Comment +#: languages/cpp/compiler/gccoptions/kdevgppoptions.desktop:4 +msgid "GNU C++ Compiler" +msgstr "" + +#. Name +#: languages/cpp/debugger/kdevdebugger.desktop:2 +msgid "KDevDebugger" +msgstr "" + +#. GenericName +#: languages/cpp/debugger/kdevdebugger.desktop:4 +msgid "Debugger Frontend" +msgstr "" + +#. Comment +#: languages/cpp/debugger/kdevdebugger.desktop:6 +msgid "" +"This plugin provides a frontend for GDB, a source-level debugger for C, C++ " +"and more. http://sources.redhat.com/gdb/" +msgstr "" + +#. Name +#: languages/cpp/kdevcppsupport.desktop:2 +msgid "KDevCppSupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/cpp/kdevcppsupport.desktop:4 +#: languages/cpp/kdevcppsupport.desktop:6 +msgid "C++ Support" +msgstr "" + +#. Name +#: languages/cpp/kdevcsupport.desktop:2 +msgid "KDevCSupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/cpp/kdevcsupport.desktop:4 languages/cpp/kdevcsupport.desktop:6 +msgid "C Support" +msgstr "" + +#. Name +#: languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop:2 +msgid "KDevPCSCustomImporter" +msgstr "" + +#. Comment +#: languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop:4 +msgid "TDevelop Custom Directory PCS Importer" +msgstr "" + +#. Name +#: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 +msgid "KDevQtImporter" +msgstr "" + +#. Comment +#: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:4 +msgid "TDevelop Qt3 PCS Importer" +msgstr "" + +#. Name +#: languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop:2 +msgid "KDevKDELibsImporter" +msgstr "" + +#. Comment +#: languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop:4 +msgid "TDevelop KDELibs PCS Importer" +msgstr "" + +#. Name +#: languages/csharp/kdevcsharpsupport.desktop:2 +msgid "KDevCSharpSupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/csharp/kdevcsharpsupport.desktop:4 +#: languages/csharp/kdevcsharpsupport.desktop:6 +msgid "CSharp Support" +msgstr "" + +#. Name +#: languages/fortran/compiler/pgioptions/kdevpgf77options.desktop:2 +msgid "Pgf77Options" +msgstr "" + +#. Comment +#: languages/fortran/compiler/pgioptions/kdevpgf77options.desktop:4 +msgid "Portland Group Fortran77 Compiler" +msgstr "" + +#. Name +#: languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop:2 +msgid "PghpfOptions" +msgstr "" + +#. Comment +#: languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop:4 +msgid "Portland Group High Performance Fortran compiler" +msgstr "" + +#. Name +#: languages/fortran/kdevfortransupport.desktop:2 +msgid "KDevFortranSupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/fortran/kdevfortransupport.desktop:4 +#: languages/fortran/kdevfortransupport.desktop:6 +msgid "Fortran 77 Support" +msgstr "" + +#. Comment +#: languages/java/app_templates/kappjava/app.desktop:4 +msgid "A Java TDE KPart Application" +msgstr "" + +#. Name +#: languages/java/kdevjavasupport.desktop:2 +msgid "KDevJavaSupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/java/kdevjavasupport.desktop:4 +#: languages/java/kdevjavasupport.desktop:6 +msgid "Java Support" +msgstr "" + +#. Name +#: languages/kjssupport/kdevkjssupport.desktop:2 +msgid "KDevkjsSupport" +msgstr "" + +#. GenericName +#: languages/kjssupport/kdevkjssupport.desktop:4 +msgid "TDE JavaScript Support" +msgstr "" + +#. Comment +#: languages/kjssupport/kdevkjssupport.desktop:6 +msgid "kjsSupport" +msgstr "" + +#. Name +#: languages/lib/interfaces/tdeveloppcsimporter.desktop:2 +msgid "TDevelop PCS Importer" +msgstr "" + +#. Name +#: languages/pascal/compiler/dccoptions/kdevdccoptions.desktop:2 +msgid "DccOptions" +msgstr "" + +#. Comment +#: languages/pascal/compiler/dccoptions/kdevdccoptions.desktop:4 +msgid "Borland Delphi Compiler" +msgstr "" + +#. Name +#: languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop:2 +msgid "FpcOptions" +msgstr "" + +#. Comment +#: languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop:4 +msgid "Free Pascal Compiler" +msgstr "" + +#. Name +#: languages/pascal/kdevpascalsupport.desktop:2 +msgid "KDevPascalSupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/pascal/kdevpascalsupport.desktop:4 +#: languages/pascal/kdevpascalsupport.desktop:6 +msgid "Pascal Language Support" +msgstr "" + +#. Name +#: languages/perl/kdevperlsupport.desktop:2 +msgid "KDevPerlSupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/perl/kdevperlsupport.desktop:4 +#: languages/perl/kdevperlsupport.desktop:6 +msgid "Perl Support" +msgstr "" + +#. Name +#: languages/php/kdevphpsupport.desktop:2 +msgid "KDevPHPSupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/php/kdevphpsupport.desktop:4 +#: languages/php/kdevphpsupport.desktop:6 +msgid "PHP Support" +msgstr "" + +#. Name +#: languages/python/kdevpythonsupport.desktop:2 +msgid "KDevPythonSupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/python/kdevpythonsupport.desktop:4 +#: languages/python/kdevpythonsupport.desktop:6 +msgid "Python Support" +msgstr "" + +#. Name +#: languages/ruby/debugger/kdevrbdebugger.desktop:2 +msgid "KDevRbDebugger" +msgstr "" + +#. GenericName +#: languages/ruby/debugger/kdevrbdebugger.desktop:4 +msgid "Ruby Debugger Frontend" +msgstr "" + +#. Comment +#: languages/ruby/debugger/kdevrbdebugger.desktop:6 +msgid "This plugin provides a frontend for the source-level debugger for Ruby." +msgstr "" + +#. Name +#: languages/ruby/kdevrubysupport.desktop:2 +msgid "KDevRubySupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/ruby/kdevrubysupport.desktop:4 +#: languages/ruby/kdevrubysupport.desktop:6 +msgid "Ruby Support" +msgstr "" + +#. Name +#: languages/sql/kdevsqlsupport.desktop:2 +msgid "KDevSQLSupport" +msgstr "" + +#. GenericName +#. Comment +#: languages/sql/kdevsqlsupport.desktop:4 +#: languages/sql/kdevsqlsupport.desktop:6 +msgid "SQL Support" +msgstr "" + +#. Name +#: lib/interfaces/extensions/tdevelopappfrontend.desktop:2 +msgid "App Frontend Interface" +msgstr "" + +#. Name +#: lib/interfaces/extensions/tdevelopcodebrowserfrontend.desktop:2 +msgid "Code Browser Frontend" +msgstr "" + +#. Name +#: lib/interfaces/extensions/tdevelopcreatefile.desktop:2 +msgid "TDevelop Create File Interface" +msgstr "" + +#. Name +#: lib/interfaces/extensions/tdevelopdifffrontend.desktop:2 +msgid "Diff Frontend Interface" +msgstr "" + +#. Name +#: lib/interfaces/extensions/tdevelopmakefrontend.desktop:2 +msgid "Make Frontend Interface" +msgstr "" + +#. Name +#: lib/interfaces/extensions/tdevelopquickopen.desktop:2 +msgid "Quick Open Interface" +msgstr "" + +#. Name +#: lib/interfaces/extensions/tdevelopsourceformatter.desktop:2 +msgid "Source Formatter Interface" +msgstr "" + +#. Name +#: lib/interfaces/extensions/tdevelopversioncontrol.desktop:2 +msgid "TDevelop Version Control Interface" +msgstr "" + +#. Name +#: lib/interfaces/extras/tdevelopcompileroptions.desktop:2 +msgid "TDevelop Compiler Options Dialog Interface" +msgstr "" + +#. Name +#: lib/interfaces/extras/tdevelopvcsintegrator.desktop:2 +msgid "TDevelop VCS Integrator" +msgstr "" + +#. Name +#: lib/interfaces/tdeveloplanguagesupport.desktop:2 +msgid "TDevelop Language Support Interface" +msgstr "" + +#. Name +#: lib/interfaces/tdevelopplugin.desktop:2 +msgid "TDevelop Plugin" +msgstr "" + +#. Name +#: lib/interfaces/tdevelopproject.desktop:2 +msgid "TDevelop Project Interface" +msgstr "" + +#. Comment +#: mimetypes/chm.desktop:2 +msgid "HTML Help Document" +msgstr "" + +#. Comment +#: mimetypes/x-fortran.desktop:2 +msgid "Fortran Source File" +msgstr "" + +#. Name +#: parts/abbrev/kdevabbrev.desktop:2 +msgid "KDevAbbrev" +msgstr "" + +#. GenericName +#: parts/abbrev/kdevabbrev.desktop:4 +msgid "Abbreviation Expansion" +msgstr "" + +#. Comment +#: parts/abbrev/kdevabbrev.desktop:6 +msgid "" +"Provides support for customizable abbreviations - short words which expand " +"into commonly needed code structures." +msgstr "" + +#. Name +#: parts/appwizard/kdevappwizard.desktop:2 +msgid "KDevAppWizard" +msgstr "" + +#. GenericName +#. Comment +#: parts/appwizard/kdevappwizard.desktop:4 +#: parts/appwizard/kdevappwizard.desktop:6 +msgid "Application Wizard" +msgstr "" + +#. Name +#: parts/astyle/kdevastyle.desktop:2 +msgid "KDevAStyle" +msgstr "" + +#. GenericName +#: parts/astyle/kdevastyle.desktop:4 +msgid "Source Code Formatter" +msgstr "" + +#. Comment +#: parts/astyle/kdevastyle.desktop:6 +msgid "" +"A plugin for formatting of sourcecode according to a specified set of rules. " +"When loaded it is found in the Tools menu." +msgstr "" + +#. Name +#: parts/bookmarks/kdevbookmarks.desktop:2 +msgid "KDevBookmarks" +msgstr "" + +#. GenericName +#: parts/bookmarks/kdevbookmarks.desktop:4 +msgid "Bookmarks" +msgstr "" + +#. Comment +#: parts/bookmarks/kdevbookmarks.desktop:6 +msgid "" +"Plugin that provides navigation and overview of active source bookmarks and " +"persists them between sessions." +msgstr "" + +#. Name +#: parts/classview/kdevclassview.desktop:2 +msgid "KDevClassView" +msgstr "" + +#. GenericName +#: parts/classview/kdevclassview.desktop:4 +msgid "Class View" +msgstr "" + +#. Comment +#: parts/classview/kdevclassview.desktop:6 +msgid "" +"This plugin displays a graphical view of all the classes in the project, " +"complete with methods and attributes, and provides a way of direct source " +"navigation." +msgstr "" + +#. Name +#: parts/ctags2/kdevctags2.desktop:2 +msgid "KDevCTags2" +msgstr "" + +#. GenericName +#: parts/ctags2/kdevctags2.desktop:4 +msgid "CTags Frontend" +msgstr "" + +#. Comment +#: parts/ctags2/kdevctags2.desktop:6 +msgid "" +"CTags is a source navigation tool with support for many languages. When " +"loaded it provides a context menu for finding type declarations/definitions " +"and also a query dialog. http://ctags.sourceforge.net/" +msgstr "" + +#. Name +#: parts/diff/kdevdiff.desktop:2 +msgid "KDevDiff" +msgstr "" + +#. GenericName +#. Comment +#: parts/diff/kdevdiff.desktop:4 parts/diff/kdevdiff.desktop:6 +msgid "Difference Viewer" +msgstr "" + +#. Name +#: parts/distpart/kdevdistpart.desktop:2 +msgid "KDevdistpart" +msgstr "" + +#. GenericName +#: parts/distpart/kdevdistpart.desktop:4 +msgid "Final Packaging Support" +msgstr "" + +#. Comment +#: parts/distpart/kdevdistpart.desktop:6 +msgid "" +"Aids in building and publishing the final project. Supports creation of RPM " +"packages or source packages." +msgstr "" + +#. Name +#: parts/documentation/interfaces/tdevelopdocumentationplugins.desktop:2 +msgid "TDevelop Documentation Plugin Interface" +msgstr "" + +#. Name +#: parts/documentation/kdevdocumentation.desktop:2 +msgid "KDevDocumentation" +msgstr "" + +#. GenericName +#: parts/documentation/kdevdocumentation.desktop:4 +msgid "Documentation" +msgstr "" + +#. Comment +#: parts/documentation/kdevdocumentation.desktop:6 +msgid "" +"The Documentation plugin offers browsing and searching in local and online " +"documentation with support for multiple documentation systems." +msgstr "" + +#. Name +#: parts/documentation/plugins/chm/docchmplugin.desktop:2 +msgid "DocCHMPlugin" +msgstr "" + +#. Comment +#: parts/documentation/plugins/chm/docchmplugin.desktop:4 +msgid "Documentation plugin for CHM documentation" +msgstr "" + +#. Name +#: parts/documentation/plugins/custom/doccustomplugin.desktop:2 +msgid "DocCustomPlugin" +msgstr "" + +#. Comment +#: parts/documentation/plugins/custom/doccustomplugin.desktop:4 +msgid "Documentation plugin for all types of documentation" +msgstr "" + +#. Name +#: parts/documentation/plugins/devhelp/docdevhelpplugin.desktop:2 +msgid "DevHelpPlugin" +msgstr "" + +#. Comment +#: parts/documentation/plugins/devhelp/docdevhelpplugin.desktop:4 +msgid "Documentation plugin for DevHelp documentation" +msgstr "" + +#. Name +#: parts/documentation/plugins/djvu/docdjvuplugin.desktop:2 +msgid "DocDjvuPlugin" +msgstr "" + +#. Comment +#: parts/documentation/plugins/djvu/docdjvuplugin.desktop:4 +msgid "Documentation plugin for djvu format" +msgstr "" + +#. Name +#: parts/documentation/plugins/doxygen/docdoxygenplugin.desktop:2 +msgid "DocDoxygenPlugin" +msgstr "" + +#. Comment +#: parts/documentation/plugins/doxygen/docdoxygenplugin.desktop:4 +msgid "Documentation plugin for Doxygen documentation" +msgstr "" + +#. Name +#: parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop:2 +msgid "DocKDevTOCPlugin" +msgstr "" + +#. Comment +#: parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop:4 +msgid "Documentation plugin for TDevelopTOC documentation" +msgstr "" + +#. Name +#: parts/documentation/plugins/pdb/docpdbplugin.desktop:2 +msgid "DocPDBPlugin" +msgstr "" + +#. Comment +#: parts/documentation/plugins/pdb/docpdbplugin.desktop:4 +msgid "Documentation plugin for Palmdoc format" +msgstr "" + +#. Name +#: parts/documentation/plugins/pdf/docpdfplugin.desktop:2 +msgid "DocPDFPlugin" +msgstr "" + +#. Comment +#: parts/documentation/plugins/pdf/docpdfplugin.desktop:4 +msgid "Documentation plugin for PDF format" +msgstr "" + +#. Name +#: parts/documentation/plugins/qt/docqtplugin.desktop:2 +msgid "DocQtPlugin" +msgstr "" + +#. Comment +#: parts/documentation/plugins/qt/docqtplugin.desktop:4 +msgid "Documentation plugin for Qt DCF documentation" +msgstr "" + +#. Name +#: parts/documentation/protocols/chm/kchmpart.desktop:2 +msgid "KChmPart" +msgstr "" + +#. Comment +#: parts/documentation/protocols/chm/kchmpart.desktop:4 +msgid "Embeddable HTMLHelp Viewer" +msgstr "" + +#. Name +#: parts/doxygen/kdevdoxygen.desktop:2 +msgid "KDevDoxygen" +msgstr "" + +#. GenericName +#: parts/doxygen/kdevdoxygen.desktop:4 +msgid "Doxygen Support" +msgstr "" + +#. Comment +#: parts/doxygen/kdevdoxygen.desktop:6 +msgid "" +"The doxygen plugin provides a way to specify and control generation of " +"documentation for a project, based on source code content. You need to have " +"doxygen installed to be able to use this. For more info goto http://www." +"doxygen.org" +msgstr "" + +#. Name +#: parts/filecreate/kdevfilecreate.desktop:2 +msgid "KDevFileCreate" +msgstr "" + +#. GenericName +#. Comment +#: parts/filecreate/kdevfilecreate.desktop:4 +#: parts/filecreate/kdevfilecreate.desktop:6 +msgid "FileCreate" +msgstr "" + +#. Name +#: parts/filelist/kdevfilelist.desktop:2 +msgid "KDevfilelist" +msgstr "" + +#. GenericName +#: parts/filelist/kdevfilelist.desktop:4 +msgid "FileList" +msgstr "" + +#. Comment +#: parts/filelist/kdevfilelist.desktop:6 +msgid "" +"Provides a list of all currently open files. (Handy when the tab bar is not " +"quite wide enough.)" +msgstr "" + +#. Name +#: parts/fileselector/kdevfileselector.desktop:2 +msgid "KDevFileSelector" +msgstr "" + +#. GenericName +#: parts/fileselector/kdevfileselector.desktop:4 +msgid "File Selector" +msgstr "" + +#. Comment +#: parts/fileselector/kdevfileselector.desktop:6 +msgid "Powerful network transparent file browser utility." +msgstr "" + +#. Name +#: parts/fileview/kdevfilegroups.desktop:2 +msgid "KDevFileGroups" +msgstr "" + +#. GenericName +#: parts/fileview/kdevfilegroups.desktop:4 +msgid "File Groups" +msgstr "" + +#. Comment +#: parts/fileview/kdevfilegroups.desktop:6 +msgid "Allows for grouping of project files according to filename patterns." +msgstr "" + +#. Name +#: parts/fileview/kdevfileview.desktop:2 +msgid "KDevFileView" +msgstr "" + +#. GenericName +#: parts/fileview/kdevfileview.desktop:4 +msgid "File Tree" +msgstr "" + +#. Comment +#: parts/fileview/kdevfileview.desktop:6 +msgid "" +"Provides a way of navigating and interacting with the source files of the " +"current project." +msgstr "" + +#. Name +#: parts/filter/kdevfilter.desktop:2 +msgid "KDevFilter" +msgstr "" + +#. GenericName +#: parts/filter/kdevfilter.desktop:4 +msgid "Shell Filtering and Insertion" +msgstr "" + +#. Comment +#: parts/filter/kdevfilter.desktop:6 +msgid "" +"Provides a way of manipulating editor text using commandline tools. Appears " +"in the Tools menu." +msgstr "" + +#. Name +#: parts/fullscreen/kdevfullscreen.desktop:2 +msgid "KDevFullScreen" +msgstr "" + +#. GenericName +#. Comment +#: parts/fullscreen/kdevfullscreen.desktop:4 +#: parts/fullscreen/kdevfullscreen.desktop:6 +msgid "FullScreen" +msgstr "" + +#. Name +#: parts/grepview/kdevgrepview.desktop:2 +msgid "KDevGrepView" +msgstr "" + +#. GenericName +#: parts/grepview/kdevgrepview.desktop:4 +msgid "Grep Frontend" +msgstr "" + +#. Comment +#: parts/grepview/kdevgrepview.desktop:6 +msgid "" +"Integrates \"find|grep\" in TDevelop - allows fast searching of multiple " +"files using patterns or regular expressions." +msgstr "" + +#. Name +#: parts/konsole/kdevkonsoleview.desktop:2 +msgid "KDevKonsoleView" +msgstr "" + +#. GenericName +#: parts/konsole/kdevkonsoleview.desktop:4 +msgid "Embedded Konsole" +msgstr "" + +#. Comment +#: parts/konsole/kdevkonsoleview.desktop:6 +msgid "" +"This plugin gives TDevelop an embedded konsole for quick and easy command " +"line access." +msgstr "" + +#. Name +#: parts/openwith/kdevopenwith.desktop:2 +msgid "KDevOpenWith" +msgstr "" + +#. GenericName +#: parts/openwith/kdevopenwith.desktop:4 +msgid "\"Open with\" Menu Addon" +msgstr "" + +#. Comment +#: parts/openwith/kdevopenwith.desktop:6 +msgid "" +"This plugin provides additional \"open\" alternatives for various context " +"menus in TDevelop." +msgstr "" + +#. Name +#: parts/outputviews/kdevappoutputview.desktop:2 +msgid "KDevAppOutputView" +msgstr "" + +#. GenericName +#. Comment +#: parts/outputviews/kdevappoutputview.desktop:4 +#: parts/outputviews/kdevappoutputview.desktop:6 +msgid "Application Output View" +msgstr "" + +#. Name +#: parts/outputviews/kdevmakeview.desktop:2 +msgid "KDevMakeView" +msgstr "" + +#. GenericName +#. Comment +#: parts/outputviews/kdevmakeview.desktop:4 +#: parts/outputviews/kdevmakeview.desktop:6 +msgid "Compiler Frontend" +msgstr "" + +#. Name +#: parts/partexplorer/kdevpartexplorer.desktop:2 +msgid "KDevPartExplorer" +msgstr "" + +#. GenericName +#: parts/partexplorer/kdevpartexplorer.desktop:4 +msgid "Part Explorer Tool" +msgstr "" + +#. Comment +#: parts/partexplorer/kdevpartexplorer.desktop:6 +msgid "" +"A Graphical tool for performing TDETrader-like queries about registered " +"services" +msgstr "" + +#. Name +#: parts/quickopen/kdevquickopen.desktop:2 +msgid "KDevQuickOpen" +msgstr "" + +#. GenericName +#: parts/quickopen/kdevquickopen.desktop:4 +msgid "QuickOpen" +msgstr "" + +#. Comment +#: parts/quickopen/kdevquickopen.desktop:6 +msgid "" +"Provides an efficient way of finding/opening files, classes and methods in a " +"large project. Appears in the File and Tools menus when loaded." +msgstr "" + +#. Name +#: parts/regexptest/kdevregexptest.desktop:2 +msgid "KDevRegexpTest" +msgstr "" + +#. GenericName +#: parts/regexptest/kdevregexptest.desktop:4 +msgid "Regular Expression Tester" +msgstr "" + +#. Comment +#: parts/regexptest/kdevregexptest.desktop:6 +msgid "" +"Tool to design and test regular expressions against common regexp syntaxes." +msgstr "" + +#. Name +#: parts/replace/kdevreplace.desktop:2 +msgid "KDevReplace" +msgstr "" + +#. GenericName +#: parts/replace/kdevreplace.desktop:4 +msgid "Replace Part" +msgstr "" + +#. Comment +#: parts/replace/kdevreplace.desktop:6 +msgid "" +"This plugin is an interactive projectwide \"Search and Replace\" tool. " +"Search using string or regexp matching, and select the replacements to be " +"made from a preview before the action is finalized. When loaded it appears " +"in the Edit menu." +msgstr "" + +#. Name +#: parts/scripting/kdevscripting.desktop:2 +msgid "KDevscripting" +msgstr "" + +#. GenericName +#: parts/scripting/kdevscripting.desktop:4 +msgid "Scripting" +msgstr "" + +#. Comment +#: parts/scripting/kdevscripting.desktop:6 +msgid "" +"The Scripting plugin offers KScript based scripting of the TDevelop " +"application" +msgstr "" + +#. Name +#. GenericName +#: parts/snippet/kdevsnippet.desktop:2 parts/snippet/kdevsnippet.desktop:4 +msgid "Code Snippets" +msgstr "" + +#. Comment +#: parts/snippet/kdevsnippet.desktop:6 +msgid "This plugin allows you to store code snippets and add them to your code" +msgstr "" + +#. Name +#: parts/texttools/kdevtexttools.desktop:2 +msgid "KDevTextTools" +msgstr "" + +#. GenericName +#: parts/texttools/kdevtexttools.desktop:4 +msgid "Text Structure" +msgstr "" + +#. Comment +#: parts/texttools/kdevtexttools.desktop:6 +msgid "Provides a structure overview and navigation for HTML and TEX files" +msgstr "" + +#. Name +#: parts/tipofday/kdevtipofday.desktop:2 +msgid "KDevTipOfDay" +msgstr "" + +#. GenericName +#. Comment +#: parts/tipofday/kdevtipofday.desktop:4 parts/tipofday/kdevtipofday.desktop:6 +msgid "Tip of the Day" +msgstr "" + +#. Name +#: parts/tools/kdevtools.desktop:2 +msgid "KDevTools" +msgstr "" + +#. GenericName +#: parts/tools/kdevtools.desktop:4 +msgid "Tools Menu Addition" +msgstr "" + +#. Comment +#: parts/tools/kdevtools.desktop:6 +msgid "" +"This plugin provides an easy way to add external applications to the Tools " +"menu and toolbar." +msgstr "" + +#. Name +#: parts/uimode/kdevuichooser.desktop:2 +msgid "KDevUIChooser" +msgstr "" + +#. GenericName +#: parts/uimode/kdevuichooser.desktop:4 +msgid "User-Interface Selection" +msgstr "" + +#. Comment +#: parts/uimode/kdevuichooser.desktop:6 +msgid "Provides a dialog for UI-mode selection." +msgstr "" + +#. Name +#: parts/valgrind/kdevvalgrind.desktop:2 +msgid "KDevvalgrind" +msgstr "" + +#. GenericName +#: parts/valgrind/kdevvalgrind.desktop:4 +msgid "Valgrind Frontend" +msgstr "" + +#. Comment +#: parts/valgrind/kdevvalgrind.desktop:6 +msgid "" +"Valgrind is a tool that helps you find memory management problems in " +"programs. http://valgrind.org/" +msgstr "" + +#. Name +#: parts/vcsmanager/kdevvcsmanager.desktop:2 +msgid "KDevVCSManager" +msgstr "" + +#. GenericName +#: parts/vcsmanager/kdevvcsmanager.desktop:4 +msgid "VCSManager" +msgstr "" + +#. Comment +#: parts/vcsmanager/kdevvcsmanager.desktop:6 +msgid "Version Control System Manager" +msgstr "" + +#. Name +#: tdevelop.desktop:2 +msgid "TDevelop: Multilanguage" +msgstr "" + +#. GenericName +#: tdevelop.desktop:4 +msgid "IDE" +msgstr "" + +#. Name +#: tdevelop_c_cpp.desktop:2 +msgid "TDevelop: C/C++" +msgstr "" + +#. GenericName +#: tdevelop_c_cpp.desktop:4 +msgid "IDE for C/C++" +msgstr "" + +#. Name +#: tdevelop_kde_cpp.desktop:2 +msgid "TDevelop: TDE/C++" +msgstr "" + +#. GenericName +#: tdevelop_kde_cpp.desktop:4 +msgid "IDE for TDE Development" +msgstr "" + +#. Name +#: tdevelop_ruby.desktop:2 +msgid "TDevelop: Ruby" +msgstr "" + +#. GenericName +#: tdevelop_ruby.desktop:4 +msgid "IDE for Ruby" +msgstr "" + +#. Name +#: tdevelop_scripting.desktop:2 +msgid "TDevelop: Scripting" +msgstr "" + +#. GenericName +#: tdevelop_scripting.desktop:4 +msgid "IDE for Scripting Language" +msgstr "" + +#. Name +#: vcs/clearcase/integrator/kdevclearcaseintegrator.desktop:2 +msgid "KDevClearcaseIntegrator" +msgstr "" + +#. Comment +#: vcs/clearcase/integrator/kdevclearcaseintegrator.desktop:4 +msgid "Clearcase Project Integration Facility" +msgstr "" + +#. Name +#: vcs/clearcase/kdevclearcase.desktop:2 +msgid "KDevClearCase" +msgstr "" + +#. GenericName +#: vcs/clearcase/kdevclearcase.desktop:4 +msgid "ClearCase Integration" +msgstr "" + +#. Comment +#: vcs/clearcase/kdevclearcase.desktop:6 +msgid "" +"A plugin that provides support for Rational ClearCase, a large version " +"control and build management system. http://www.rational.com/products/" +"clearcase/index.jsp" +msgstr "" + +#. Name +#: vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop:2 +msgid "KDevCVSIntegrator" +msgstr "" + +#. Comment +#: vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop:4 +msgid "CVS Service Project Integration Facility" +msgstr "" + +#. Name +#: vcs/cvsservice/kdevcvsservice.desktop:2 +msgid "KDevCvsService" +msgstr "" + +#. GenericName +#: vcs/cvsservice/kdevcvsservice.desktop:4 +msgid "CVS Integration (Cervisia)" +msgstr "" + +#. Comment +#: vcs/cvsservice/kdevcvsservice.desktop:6 +msgid "" +"CVS Integration using Cervisia's cvsservice. http://www.kde.org/apps/" +"cervisia/" +msgstr "" + +#. Name +#: vcs/perforce/integrator/kdevperforceintegrator.desktop:2 +msgid "KDevPerforceIntegrator" +msgstr "" + +#. Comment +#: vcs/perforce/integrator/kdevperforceintegrator.desktop:4 +msgid "Perforce Project Integration Facility" +msgstr "" + +#. Name +#: vcs/perforce/kdevperforce.desktop:2 +msgid "KDevPerforce" +msgstr "" + +#. GenericName +#: vcs/perforce/kdevperforce.desktop:4 +msgid "Perforce Integration" +msgstr "" + +#. Comment +#: vcs/perforce/kdevperforce.desktop:6 +msgid "" +"Integrates Perforce, a software configuration management system. http://www." +"perforce.com/" +msgstr "" + +#. Name +#: vcs/subversion/integrator/kdevsubversionintegrator.desktop:2 +msgid "KDevSubversionIntegrator" +msgstr "" + +#. Comment +#: vcs/subversion/integrator/kdevsubversionintegrator.desktop:4 +msgid "Subversion Project Integration Facility" +msgstr "" + +#. Name +#: vcs/subversion/kdevsubversion.desktop:2 +msgid "KDevsubversion" +msgstr "" + +#. GenericName +#. Comment +#: vcs/subversion/kdevsubversion.desktop:4 +#: vcs/subversion/kdevsubversion.desktop:6 +msgid "Subversion" +msgstr "" + +#. Name +#: vcs/subversion/kdevsvnd.desktop:2 +msgid "TDevelop Subversion Module" +msgstr "" + +#. Comment +#: vcs/subversion/kdevsvnd.desktop:4 +msgid "Provides subversion client services with TDevelop" +msgstr "" + +#. Comment +#: x-tdevelop.desktop:2 +msgid "TDevelop Project File" +msgstr "" + +#. Description +#: languages/cpp/app_templates/tdeioslave/slave.protocol:10 +msgid "A tdeioslave for %{APPNAMELC}" +msgstr "" + +#. Description +#: parts/documentation/protocols/chm/chm.protocol:10 +msgid "A tdeioslave for displaying WinHelp files" +msgstr "" + +#. Description +#: vcs/subversion/kdevsvn+file.protocol:17 +#: vcs/subversion/kdevsvn+http.protocol:17 +#: vcs/subversion/kdevsvn+https.protocol:17 +#: vcs/subversion/kdevsvn+ssh.protocol:17 +#: vcs/subversion/kdevsvn+svn.protocol:17 +msgid "Subversion ioslave for TDevelop" +msgstr "" + +#. Name +#. GenericName +#: tde-development-tdevelop.directory:2 src/profiles/profile.config:3 +msgid "TDevelop" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/noatunui/plugin.plugin:8 +msgid "A UI for Noatun" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/noatunvisual/plugin.plugin:8 +msgid "My scope visualization plugin" +msgstr "" + +#. Description +#: src/profiles/IDE/CompiledLanguageIDE/AdaIDE/profile.config:8 +msgid "Ada IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/CompiledLanguageIDE/AdaIDE/profile.config:9 +msgid "Ada IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE/profile.config:8 +msgid "C IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE/profile.config:9 +msgid "C IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/profile.config:8 +msgid "C++ IDE for KDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/profile.config:9 +msgid "C++ IDE for KDE" +msgstr "" + +#. Description +#: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/profile.config:8 +msgid "C++ IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/profile.config:9 +msgid "C++ IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/profile.config:8 +msgid "C and C++ IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/profile.config:9 +msgid "C and C++ IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/CompiledLanguageIDE/FortranIDE/profile.config:8 +msgid "Fortran IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/CompiledLanguageIDE/FortranIDE/profile.config:9 +msgid "Fortran IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/CompiledLanguageIDE/HaskellIDE/profile.config:8 +msgid "Haskell IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/CompiledLanguageIDE/HaskellIDE/profile.config:9 +msgid "Haskell IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/CompiledLanguageIDE/JavaIDE/profile.config:8 +msgid "Java IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/CompiledLanguageIDE/JavaIDE/profile.config:9 +msgid "Java IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/CompiledLanguageIDE/PascalIDE/profile.config:8 +msgid "Pascal IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/CompiledLanguageIDE/PascalIDE/profile.config:9 +msgid "Pascal IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/CompiledLanguageIDE/profile.config:8 +msgid "Compiled Language IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/CompiledLanguageIDE/profile.config:9 +msgid "Compiled Language IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/DatabaseIDE/profile.config:8 +msgid "SQL IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/DatabaseIDE/profile.config:9 +msgid "SQL IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/ScriptingLanguageIDE/PHPIDE/profile.config:8 +msgid "PHP IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/ScriptingLanguageIDE/PHPIDE/profile.config:9 +msgid "PHP IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/ScriptingLanguageIDE/PerlIDE/profile.config:8 +msgid "Perl IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/ScriptingLanguageIDE/PerlIDE/profile.config:9 +msgid "Perl IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/ScriptingLanguageIDE/PythonIDE/profile.config:8 +msgid "Python IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/ScriptingLanguageIDE/PythonIDE/profile.config:9 +msgid "Python IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/ScriptingLanguageIDE/RubyIDE/profile.config:8 +msgid "Ruby IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/ScriptingLanguageIDE/RubyIDE/profile.config:9 +msgid "Ruby IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/ScriptingLanguageIDE/ShellIDE/profile.config:8 +msgid "Shell scripting IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/ScriptingLanguageIDE/ShellIDE/profile.config:9 +msgid "Shell scripting IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/ScriptingLanguageIDE/profile.config:8 +msgid "Scripting Language IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/ScriptingLanguageIDE/profile.config:9 +msgid "Scripting Language IDE" +msgstr "" + +#. Description +#: src/profiles/IDE/profile.config:8 +msgid "Generic TDevelop IDE profile" +msgstr "" + +#. GenericName +#: src/profiles/IDE/profile.config:9 +msgid "TDevelop IDE" +msgstr "" + +#. Description +#: src/profiles/KDevAssistant/profile.config:8 +msgid "TDevelop Assistant profile" +msgstr "" + +#. Description +#: src/profiles/profile.config:2 +msgid "Default TDevelop profile" +msgstr "" + +#. Name +#: languages/ada/app_templates/adahello/adahello:3 +#: languages/ada/app_templates/adahello/adahello.kdevtemplate:3 +#: languages/cpp/app_templates/chello/chello.kdevtemplate:3 +#: languages/cpp/app_templates/cpphello/cpphello.kdevtemplate:3 +#: languages/fortran/app_templates/fortranhello/fortranhello:3 +#: languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate:3 +#: languages/pascal/app_templates/pascalhello/pascalhello:3 +#: languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate:3 +msgid "Simple Hello world program" +msgstr "" + +#. Comment +#: languages/ada/app_templates/adahello/adahello:5 +#: languages/ada/app_templates/adahello/adahello.kdevtemplate:5 +msgid "Generates a simple Hello world program in Ada" +msgstr "" + +#. Category +#: languages/ada/app_templates/adahello/adahello:7 +#: languages/ada/app_templates/adahello/adahello.kdevtemplate:7 +msgid "Ada" +msgstr "" + +#. Comment +#: languages/ada/app_templates/adahello/adahello.kdevtemplate:45 +msgid "A simple \"Hello world\" program in ADA was created in %{dest}" +msgstr "" + +#. Name +#: languages/bash/app_templates/bashhello/bashhello:3 +#: languages/bash/app_templates/bashhello/bashhello.kdevtemplate:3 +msgid "Simple Bash Shell Script" +msgstr "" + +#. Comment +#: languages/bash/app_templates/bashhello/bashhello:5 +#: languages/bash/app_templates/bashhello/bashhello.kdevtemplate:5 +msgid "This generates a simplistic 'Hello world' program in Bash shell" +msgstr "" + +#. Category +#: languages/bash/app_templates/bashhello/bashhello:7 +#: languages/bash/app_templates/bashhello/bashhello.kdevtemplate:7 +msgid "Shell" +msgstr "" + +#. Comment +#: languages/bash/app_templates/bashhello/bashhello.kdevtemplate:26 +msgid "A simple bash shell script project was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate:3 +msgid "Empty Autotools Template" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate:5 +msgid "Generate an empty Automake based application" +msgstr "" + +#. Category +#: languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate:7 +msgid "C++/Automake project" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate:44 +msgid "An Automake based application was created in %{dest}" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/chello/chello.kdevtemplate:5 +msgid "Generates a simple Hello world program in C" +msgstr "" + +#. Category +#: languages/cpp/app_templates/chello/chello.kdevtemplate:7 +#: languages/cpp/app_templates/kmod/kmod.kdevtemplate:7 +msgid "C" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/chello/chello.kdevtemplate:18 +msgid "Optional libraries to link to." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/chello/chello.kdevtemplate:25 +msgid "Optional include path." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/chello/chello.kdevtemplate:32 +msgid "Optional CFLAGS to define in the makefile." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/chello/chello.kdevtemplate:37 +msgid "A simple C project was created in %{dest}." +msgstr "" + +#. Name +#: languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate:3 +#: languages/cpp/app_templates/cmakesimple/cmakesimple:3 +#: languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate:3 +#: languages/cpp/app_templates/cmakesimplec/cmakesimplec:3 +#: languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate:3 +#: languages/cpp/app_templates/prc-tool/prc-tool:3 +#: languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate:3 +#: languages/cpp/app_templates/qmakesimple/qmakesimple:3 +msgid "Hello world program" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate:5 +msgid "" +"Generates a simple \"Hello world\" program for the Gameboy Advance. You will " +"need the \"devkitadvance\" to compile it. See README.devel for more details." +msgstr "" + +#. Category +#: languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate:7 +msgid "C/GBA" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate:90 +msgid "A Hello World program was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/clanlib/clanlib.kdevtemplate:3 +msgid "Simple ClanLib application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/clanlib/clanlib.kdevtemplate:5 +msgid "Generates a simple ClanLib application." +msgstr "" + +#. Category +#: languages/cpp/app_templates/clanlib/clanlib.kdevtemplate:7 +#: languages/cpp/app_templates/cppcurseshello/cppcurseshello:7 +#: languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate:7 +#: languages/cpp/app_templates/cpphello/cpphello.kdevtemplate:7 +#: languages/cpp/app_templates/cppsdlhello/cppsdlhello:7 +#: languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate:7 +#: languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate:7 +#: languages/cpp/app_templates/win32gui/win32gui.kdevtemplate:7 +#: languages/cpp/app_templates/win32hello/win32hello.kdevtemplate:7 +msgid "C++" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/clanlib/clanlib.kdevtemplate:55 +msgid "A simple clanlib application was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/cmakelibc/cmakelibc:3 +#: languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate:3 +#: languages/cpp/app_templates/cmakelibcpp/cmakelibcpp:3 +#: languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate:3 +msgid "A shared library template" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cmakelibc/cmakelibc:5 +#: languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate:5 +msgid "" +"Generates a shared library template including a test application in C. It " +"compiles using the CMake build tool instead of the automake/autoconf/libtool " +"combination. It requires cmake 2.1 (available from cmake cvs) or the " +"upcoming cmake 2.2 release." +msgstr "" + +#. Category +#: languages/cpp/app_templates/cmakelibc/cmakelibc:7 +#: languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate:7 +#: languages/cpp/app_templates/cmakesimplec/cmakesimplec:7 +#: languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate:7 +msgid "C/CMake based projects" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate:55 +#: languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate:55 +msgid "A CMake based shared library template was created in %{dest}" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cmakelibcpp/cmakelibcpp:5 +#: languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate:5 +msgid "" +"Generates a shared library template including a test application in C++. It " +"compiles using the CMake build tool instead of the automake/autoconf/libtool " +"combination. It requires cmake 2.1 (available from cmake cvs) or the " +"upcoming cmake 2.2 release." +msgstr "" + +#. Category +#: languages/cpp/app_templates/cmakelibcpp/cmakelibcpp:7 +#: languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate:7 +#: languages/cpp/app_templates/cmakeqt3app/cmakeqt3app:5 +#: languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate:7 +#: languages/cpp/app_templates/cmakesimple/cmakesimple:7 +#: languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate:7 +msgid "C++/CMake based projects" +msgstr "" + +#. Name +#: languages/cpp/app_templates/cmakeqt3app/cmakeqt3app:3 +#: languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate:3 +#: languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate:3 +msgid "Qt3 Application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cmakeqt3app/cmakeqt3app:6 +#: languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate:5 +msgid "Generate a CMake based Qt3 application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate:65 +msgid "A CMake based Qt3 application was created in %{dest}" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cmakesimple/cmakesimple:5 +msgid "" +"Generates a simple Hello world program in C++ using the CMake build tool " +"instead of the automake/autoconf/libtool combination. It requires cmake 2.1 " +"(available from cmake cvs) or the upcoming cmake 2.2 release." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate:5 +msgid "" +"Generates a simple Hello world program in C++ using the CMake build tool " +"instead of the automake/autoconf/libtool combination. It requires cmake 2.1 " +"or cmake 2.2." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate:37 +#: languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate:32 +msgid "A CMake based hello world program was created in %{dest}" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cmakesimplec/cmakesimplec:5 +#: languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate:5 +msgid "" +"Generates a simple Hello world program in C using the CMake build tool " +"instead of the automake/autoconf/libtool combination. It requires cmake 2.1 " +"(available from cmake cvs) or the upcoming cmake 2.2 release." +msgstr "" + +#. Name +#: languages/cpp/app_templates/cppcurseshello/cppcurseshello:3 +#: languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate:3 +msgid "Simple ncurses Hello world program" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cppcurseshello/cppcurseshello:5 +#: languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate:5 +msgid "Generates a simple ncurses based Hello world program in C++" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate:59 +msgid "A simple hello world program using ncurses was created in %{dest}" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cpphello/cpphello.kdevtemplate:5 +#: languages/cpp/app_templates/generichello/generichello.kdevtemplate:5 +msgid "Generates a simple Hello world program in C++" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cpphello/cpphello.kdevtemplate:59 +msgid "A Simple Hello World program was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/cppsdlhello/cppsdlhello:3 +#: languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate:3 +msgid "Simple SDL program" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cppsdlhello/cppsdlhello:5 +#: languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate:5 +msgid "Generates a simple SDL program in C++" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate:65 +msgid "A simple SDL program was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/dcopservice/dcopservice:3 +#: languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate:3 +msgid "TDE DCOP Service" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/dcopservice/dcopservice:5 +msgid "Generates a framework for a TDE dcop service and client access library." +msgstr "" + +#. Category +#: languages/cpp/app_templates/dcopservice/dcopservice:7 +#: languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate:7 +#: languages/cpp/app_templates/kapp/kapp.kdevtemplate:7 +#: languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate:7 +#: languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate:7 +#: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:7 +#: languages/cpp/app_templates/khello/khello.kdevtemplate:7 +#: languages/cpp/app_templates/khello2/khello2.kdevtemplate:7 +#: languages/cpp/app_templates/kicker/kicker.kdevtemplate:6 +#: languages/cpp/app_templates/kofficepart/kopart.kdevtemplate:7 +#: languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate:7 +#: languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate:7 +#: languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate:7 +#: languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate:7 +#: languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate:7 +#: languages/cpp/app_templates/kxt/kxt.kdevtemplate:7 +#: languages/cpp/app_templates/noatunui/noatunui:6 +#: languages/cpp/app_templates/noatunui/noatunui.kdevtemplate:7 +#: languages/cpp/app_templates/noatunvisual/noatunvisual:7 +#: languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate:7 +#: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:7 +#: languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate:7 +#: languages/cpp/app_templates/tdefileplugin/tdefileplugin:7 +#: languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate:7 +#: languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate:7 +#: languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate:7 +msgid "C++/TDE" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate:5 +msgid "Generates a framework for a TDE DCOP service and client access library." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate:112 +msgid "A TDE DCOP Service was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/generichello/generichello.kdevtemplate:3 +msgid "C++ program (shell script build system)" +msgstr "" + +#. Category +#: languages/cpp/app_templates/generichello/generichello.kdevtemplate:7 +msgid "C++/Generic" +msgstr "" + +#. Name +#: languages/cpp/app_templates/gnome2mmapp/gnome2mmapp:3 +#: languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate:3 +msgid "GNOME-- Application framework" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/gnome2mmapp/gnome2mmapp:5 +#: languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate:5 +msgid "" +"Generates a simple GNOME-- application. Gnomemm, Gtkmm >= 1.2.8 and < 1.3.0 " +"should be installed. To edit glade file glade-- (http://home.wtal.de/petig/" +"Gtk/) is required." +msgstr "" + +#. Category +#: languages/cpp/app_templates/gnome2mmapp/gnome2mmapp:7 +#: languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate:7 +#: languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate:7 +msgid "C++/GTK+" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate:103 +msgid "A GNOME-- application framework was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate:3 +msgid "Gtk-- Application framework" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate:5 +msgid "" +"Generates a simple Gtk-- application. Gtkmm >= 2.8.0 should be installed. To " +"edit glade file glade-- (http://home.wtal.de/petig/Gtk/) is required." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate:99 +msgid "A Gtk-- application framework was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kapp/kapp.kdevtemplate:3 +#: languages/java/app_templates/kappjava/kappjava:3 +#: languages/java/app_templates/kappjava/kappjava.kdevtemplate:3 +#: languages/ruby/app_templates/kapp/kappruby.kdevtemplate:3 +msgid "Application framework" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kapp/kapp.kdevtemplate:5 +msgid "" +"Generates a simple TDE application with one toplevel window, menus and " +"toolbars. A DCOP interface is also provided, so that your application can " +"provide a scripting interface" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kapp/kapp.kdevtemplate:165 +msgid "A TDE Application was created at %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate:3 +msgid "Kate plugin" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate:5 +msgid "Generates a plugin for Kate the text editor." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate:125 +msgid "A plugin for Kate was created at %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate:3 +msgid "Kate plugin with config page" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate:5 +msgid "Generates a plugin with config page for Kate the text editor." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate:125 +msgid "A plugin for Kate with a config page was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 +msgid "Simple DCOP server" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:5 +msgid "" +"Generates a basic TDE DCOP server. This is an ideal starting point for a " +"DCOP server that does not require a GUI interface." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:139 +msgid "A simple DCOP server was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate:3 +msgid "TDevelop Language Support Plugin (Standalone build)" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate:5 +msgid "" +"This generates a language support plugin for TDevelop, to be built outside " +"of the TDevelop source tree." +msgstr "" + +#. Category +#: languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate:7 +#: languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate:7 +#: languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate:7 +msgid "C++/TDevelop/" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate:79 +msgid "" +"A language plugin for TDevelop for standalone build was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate:3 +msgid "TDevelop Plugin (TDevelop source tree build)" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate:5 +msgid "" +"This generates a plugin for TDevelop, for building within the TDevelop " +"source tree" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate:17 +#: languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate:17 +msgid "The scope of a plugin (Global, Project, Core)" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate:24 +#: languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate:24 +msgid "The list of supported TDevelop properties" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate:108 +#: languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate:140 +msgid "A TDevelop plugin was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate:3 +msgid "TDevelop Plugin (Standalone build)" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate:5 +msgid "" +"This generates a KPart for TDevelop, to be built outside of the TDevelop " +"source tree." +msgstr "" + +#. Name +#: languages/cpp/app_templates/khello/khello.kdevtemplate:3 +msgid "Simple TDE Application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/khello/khello.kdevtemplate:5 +msgid "Generates a simple TDE application with one widget." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/khello/khello.kdevtemplate:130 +msgid "A TDE Hello world program was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/khello2/khello2.kdevtemplate:3 +msgid "Simple Designer based TDE Application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/khello2/khello2.kdevtemplate:5 +msgid "Generates a simple TDE application with one Qt-designer based widget." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/khello2/khello2.kdevtemplate:146 +msgid "A simple designer based TDE application was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kicker/kicker.kdevtemplate:2 +msgid "Kicker Applet" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kicker/kicker.kdevtemplate:4 +msgid "Generates a framework for an applet that embeds into the TDE panel" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kicker/kicker.kdevtemplate:106 +msgid "A Kicker Applet was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kmake/kmake.kdevtemplate:3 +msgid "QMake based TDE template" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kmake/kmake.kdevtemplate:5 +msgid "Generates a simple TDE application using QMake based project manager" +msgstr "" + +#. Category +#: languages/cpp/app_templates/kmake/kmake.kdevtemplate:7 +#: languages/cpp/app_templates/qmakeapp/qmakeapp:7 +#: languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate:7 +#: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 +#: languages/cpp/app_templates/qmakesimple/qmakesimple:7 +#: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 +msgid "C++/QMake project" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kmake/kmake.kdevtemplate:68 +msgid "A Qmake based TDE application was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kmod/kmod.kdevtemplate:3 +msgid "Linux Kernel module" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kmod/kmod.kdevtemplate:5 +msgid "Generates a template for a Linux kernel module." +msgstr "" + +#. Name +#: languages/cpp/app_templates/kofficepart/kopart.kdevtemplate:3 +msgid "KOffice Part" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kofficepart/kopart.kdevtemplate:5 +msgid "Generates a framework for a full KOffice Application." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kofficepart/kopart.kdevtemplate:148 +msgid "A KOffice part was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate:3 +msgid "Konqueror Navigation Panel Plugin" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate:5 +msgid "" +"Generates a framework for a plugin that embeds into Konqueror's navigation " +"panel" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate:107 +msgid "A konqueror navigation panel plugin was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate:3 +msgid "Application framework (KParts)" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate:5 +msgid "" +"Generates a complex TDE application with a KParts shell and a KPart " +"component." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate:151 +msgid "A complex TDE application using KParts was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate:3 +msgid "TDEHTMLPart plugin" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate:5 +msgid "Generates a plugin for the TDEHTML part." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate:120 +msgid "A TDEHTMLPart plugin was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate:3 +msgid "Scons-based TDE application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate:5 +msgid "" +"Generates a simple TDE application with one widget, a configuration dialog " +"and a dcop interface. Scons scripts are provided for compiling and " +"installing the application." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate:173 +#: languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate:192 +msgid "A TDE application with scons scripts was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate:3 +msgid "Scons-based KMDI application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate:5 +msgid "" +"Generates a complex KMDI application. Scons scripts are provided for " +"compiling and installing the application." +msgstr "" + +#. Name +#: languages/cpp/app_templates/kxt/kxt.kdevtemplate:3 +#: languages/ruby/app_templates/kxt/kxtruby.kdevtemplate:3 +msgid "TDEConfig XT application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kxt/kxt.kdevtemplate:5 +msgid "" +"Generates a simple TDE application with one widget and a configuration dialog" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/kxt/kxt.kdevtemplate:182 +msgid "A TDEConfig XT application was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate:3 +msgid "Empty Custom Makefile Template" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate:5 +msgid "Generate an empty Custom Makefile based application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate:30 +msgid "A Custom Makefile based application was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/noatunui/noatunui:3 +#: languages/cpp/app_templates/noatunui/noatunui.kdevtemplate:3 +msgid "Noatun UI plugin" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/noatunui/noatunui:4 +#: languages/cpp/app_templates/noatunui/noatunui.kdevtemplate:5 +msgid "Generates a simple user interface plugin for noatun." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/noatunui/noatunui.kdevtemplate:112 +msgid "A Noatun UI plugin was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/noatunvisual/noatunvisual:3 +#: languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate:3 +msgid "Noatun visualization plugin" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/noatunvisual/noatunvisual:5 +#: languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate:5 +msgid "Generates a visualization plugin for noatun using SDL" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate:117 +msgid "A Noatun visualization plugin was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/opieapp/opieapp.kdevtemplate:3 +msgid "Opie Application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opieapp/opieapp.kdevtemplate:5 +msgid "Generate an Opie application." +msgstr "" + +#. Category +#: languages/cpp/app_templates/opieapp/opieapp.kdevtemplate:7 +#: languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate:7 +#: languages/cpp/app_templates/opieinput/opieinput.kdevtemplate:7 +#: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 +#: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 +#: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 +msgid "C++/Embedded" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opieapp/opieapp.kdevtemplate:65 +msgid "An opie application was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate:3 +msgid "Opie Applet" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate:5 +msgid "Generate an Opie applet." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate:51 +msgid "An opie applet was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/opieinput/opieinput.kdevtemplate:3 +msgid "Opie Input" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opieinput/opieinput.kdevtemplate:5 +msgid "Generate an Opie input method plugin." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opieinput/opieinput.kdevtemplate:51 +msgid "An opie input method plugin was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:3 +msgid "Opie Menu Applet" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:5 +msgid "Generate an Opie menu applet." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:51 +msgid "An opie menu applet was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/opienet/opienet.kdevtemplate:3 +msgid "Opie Networksettings" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opienet/opienet.kdevtemplate:5 +msgid "Generate an Opie network config plugin." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opienet/opienet.kdevtemplate:61 +msgid "An opie network settings plugin was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:3 +msgid "Opie Today Plugin" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:5 +msgid "Generate an Opie today plugin." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:71 +msgid "An opie today plugin was created in %{dest}" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/prc-tool/prc-tool:5 +#: languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate:5 +msgid "Generates a template for palm application" +msgstr "" + +#. Category +#: languages/cpp/app_templates/prc-tool/prc-tool:7 +#: languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate:7 +msgid "C/PalmOS" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate:56 +msgid "A palm application was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/qmakeapp/qmakeapp:3 +#: languages/java/app_templates/javahello/javahello:3 +#: languages/java/app_templates/javahello/javahello.kdevtemplate:3 +msgid "Application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qmakeapp/qmakeapp:5 +msgid "Generate a QMake/Qt based application (crossplatform compatible)" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate:5 +msgid "Generate a QMake/Qt3 based application (crossplatform compatible)" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate:65 +msgid "A Qt3/Qmake based application was created in %{dest}" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate:71 +#: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:47 +msgid "Directory where Qt3 is installed." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate:78 +#: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:54 +msgid "Absolute Path for QMake (Qt3)." +msgstr "" + +#. Name +#: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:3 +msgid "Empty QMake Template" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:5 +msgid "" +"Generate an empty QMake based application (crossplatform compatible) - Needs " +"Qt" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:25 +msgid "A Qmake based application was created in %{dest}" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:31 +msgid "Absolute Path for QMake." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:38 +msgid "Absolute Path for Designer." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qmakesimple/qmakesimple:5 +msgid "" +"Generates a simple Hello world program in C++ using QMake based project " +"manager" +msgstr "" + +#. Name +#: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:3 +msgid "Qt3 Hello world program" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:5 +msgid "" +"Generates a simple Hello world program in C++ using QMake/Qt3 based project " +"manager" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:41 +msgid "A Qmake/Qt3 based hello world program was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 +msgid "Qtopia Application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp:5 +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:5 +msgid "Generate a TMake/Qt based application for Qtopia 1.x" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 +msgid "Control Center module" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:5 +msgid "" +"Generates a framework for a module which can be embedded into the Trinity " +"Control Center." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:112 +msgid "A control center module was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate:3 +msgid "TDEConfig XT for TDE 3.5" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate:5 +msgid "" +"Generates a simple TDE application with one widget and a configuration " +"dialog compatible with TDE 3.5 only" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate:180 +msgid "A TDE 3.5 TDEConfig XT application was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/tdefileplugin/tdefileplugin:3 +#: languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate:3 +msgid "KFile plugin" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/tdefileplugin/tdefileplugin:5 +#: languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate:5 +msgid "Generates a KFile plugin for konqueror to display meta information." +msgstr "" + +#. Name +#: languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate:3 +msgid "TDEIO slave" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate:5 +msgid "Generates a framework for an IO slave" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate:107 +msgid "A TDEIO slave was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate:3 +msgid "TDE Screen Saver" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate:5 +msgid "Generates a framework for a TDE screensaver." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate:114 +msgid "A screensaver application was created in %{dest}" +msgstr "" + +#. Name +#: languages/cpp/app_templates/win32gui/win32gui.kdevtemplate:3 +msgid "Simple Win32 GUI App." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/win32gui/win32gui.kdevtemplate:5 +#: languages/cpp/app_templates/win32hello/win32hello.kdevtemplate:5 +msgid "Generates a shell project for crosscompiling Win32 projects." +msgstr "" + +#. Comment +#: languages/cpp/app_templates/win32gui/win32gui.kdevtemplate:59 +#: languages/cpp/app_templates/win32hello/win32hello.kdevtemplate:59 +msgid "" +"For this project to compile and run you need both Wine and MinGW installed." +msgstr "" + +#. Name +#: languages/cpp/app_templates/win32hello/win32hello.kdevtemplate:3 +msgid "Simple Win32 Hello World" +msgstr "" + +#. Name +#: languages/cpp/app_templates/wxhello/wxhello:3 +#: languages/cpp/app_templates/wxhello/wxhello.kdevtemplate:3 +msgid "Simple Hello wxWidgets Application" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/wxhello/wxhello:5 +#: languages/cpp/app_templates/wxhello/wxhello.kdevtemplate:5 +msgid "Generates a simple wxWidgets Hello application." +msgstr "" + +#. Category +#: languages/cpp/app_templates/wxhello/wxhello:7 +#: languages/cpp/app_templates/wxhello/wxhello.kdevtemplate:7 +msgid "C++/wxWidgets" +msgstr "" + +#. Comment +#: languages/cpp/app_templates/wxhello/wxhello.kdevtemplate:114 +msgid "Simple hello wxWidgets application was created in %{dest}" +msgstr "" + +#. Comment +#: languages/fortran/app_templates/fortranhello/fortranhello:5 +#: languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate:5 +msgid "Generates a simple Hello world program in Fortran" +msgstr "" + +#. Category +#: languages/fortran/app_templates/fortranhello/fortranhello:7 +#: languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate:7 +msgid "Fortran" +msgstr "" + +#. Comment +#: languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate:59 +msgid "a simple \"Hello world\" program in fortran was created in %{dest}" +msgstr "" + +#. Comment +#: languages/java/app_templates/javahello/javahello:5 +#: languages/java/app_templates/javahello/javahello.kdevtemplate:5 +msgid "Generate a Java application" +msgstr "" + +#. Category +#: languages/java/app_templates/javahello/javahello:7 +#: languages/java/app_templates/javahello/javahello.kdevtemplate:7 +msgid "Java/Ant project" +msgstr "" + +#. Comment +#: languages/java/app_templates/javahello/javahello.kdevtemplate:37 +msgid "A JAVA application was created in %{dest}" +msgstr "" + +#. Comment +#: languages/java/app_templates/kappjava/kappjava:5 +#: languages/java/app_templates/kappjava/kappjava.kdevtemplate:5 +msgid "" +"Generates a simple Java KDE application with one toplevel window, menus and " +"toolbars." +msgstr "" + +#. Category +#: languages/java/app_templates/kappjava/kappjava:7 +#: languages/java/app_templates/kappjava/kappjava.kdevtemplate:7 +msgid "Java/KDE" +msgstr "" + +#. Name +#: languages/java/app_templates/superwaba/superwaba:3 +#: languages/java/app_templates/superwaba/superwaba.kdevtemplate:3 +msgid "SuperWaba" +msgstr "" + +#. Comment +#: languages/java/app_templates/superwaba/superwaba:5 +#: languages/java/app_templates/superwaba/superwaba.kdevtemplate:5 +msgid "" +"A simple template for building SuperWaba Java based apps on WinCE and " +"PalmOS. More information can be found at http://www.superwaba.org" +msgstr "" + +#. Category +#: languages/java/app_templates/superwaba/superwaba:7 +#: languages/java/app_templates/superwaba/superwaba.kdevtemplate:7 +msgid "Java" +msgstr "" + +#. Comment +#: languages/java/app_templates/superwaba/superwaba:17 +#: languages/java/app_templates/superwaba/superwaba.kdevtemplate:17 +msgid "Path to your java root" +msgstr "" + +#. Comment +#: languages/java/app_templates/superwaba/superwaba:24 +#: languages/java/app_templates/superwaba/superwaba.kdevtemplate:24 +msgid "Path to your SuperWaba root" +msgstr "" + +#. Comment +#: languages/java/app_templates/superwaba/superwaba:55 +#: languages/java/app_templates/superwaba/superwaba.kdevtemplate:56 +msgid "" +"Your application is setup to build. Edit the make targets to customize the " +"file." +msgstr "" + +#. Name +#: languages/pascal/app_templates/fpcgtk/fpcgtk:3 +#: languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate:3 +msgid "GTK+ application" +msgstr "" + +#. Comment +#: languages/pascal/app_templates/fpcgtk/fpcgtk:5 +#: languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate:5 +msgid "Generates a GTK+ based GUI application in Pascal" +msgstr "" + +#. Category +#: languages/pascal/app_templates/fpcgtk/fpcgtk:7 +#: languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate:7 +#: languages/pascal/app_templates/fpchello/fpchello:7 +#: languages/pascal/app_templates/fpchello/fpchello.kdevtemplate:7 +#: languages/pascal/app_templates/fpcsharedlib/fpcsharedlib:7 +#: languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate:7 +msgid "Pascal/Free Pascal" +msgstr "" + +#. Comment +#: languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate:34 +msgid "A GTK+ application written in pascal was created in %{dest}" +msgstr "" + +#. Name +#: languages/pascal/app_templates/fpchello/fpchello:3 +#: languages/pascal/app_templates/fpchello/fpchello.kdevtemplate:3 +msgid "Simple program" +msgstr "" + +#. Comment +#: languages/pascal/app_templates/fpchello/fpchello:5 +#: languages/pascal/app_templates/fpchello/fpchello.kdevtemplate:5 +msgid "Generates a simple program in Pascal" +msgstr "" + +#. Comment +#: languages/pascal/app_templates/fpchello/fpchello.kdevtemplate:34 +msgid "A simple pascal program was created in %{dest}" +msgstr "" + +#. Name +#: languages/pascal/app_templates/fpcsharedlib/fpcsharedlib:3 +#: languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate:3 +msgid "Shared library" +msgstr "" + +#. Comment +#: languages/pascal/app_templates/fpcsharedlib/fpcsharedlib:5 +#: languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate:5 +msgid "Generates a shared library in Pascal" +msgstr "" + +#. Comment +#: languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate:34 +msgid "A shared library project written in pascal was created in %{dest}" +msgstr "" + +#. Comment +#: languages/pascal/app_templates/pascalhello/pascalhello:5 +#: languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate:5 +msgid "Generates a simple Hello world program in Pascal" +msgstr "" + +#. Category +#: languages/pascal/app_templates/pascalhello/pascalhello:7 +#: languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate:7 +msgid "Pascal" +msgstr "" + +#. Comment +#: languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate:35 +msgid "A simple 'hello world' program in Pascal was created in %{dest}" +msgstr "" + +#. Name +#: languages/perl/app_templates/perlhello/perlhello:3 +#: languages/perl/app_templates/perlhello/perlhello.kdevtemplate:3 +msgid "Simple Perl script" +msgstr "" + +#. Comment +#: languages/perl/app_templates/perlhello/perlhello:5 +#: languages/perl/app_templates/perlhello/perlhello.kdevtemplate:5 +msgid "" +"This generates a simplistic 'Hello world' program in Perl (http://www.perl." +"org)" +msgstr "" + +#. Category +#: languages/perl/app_templates/perlhello/perlhello:7 +#: languages/perl/app_templates/perlhello/perlhello.kdevtemplate:7 +msgid "Perl" +msgstr "" + +#. Comment +#: languages/perl/app_templates/perlhello/perlhello.kdevtemplate:27 +msgid "A simple Perl script was created in %{dest}" +msgstr "" + +#. Name +#: languages/php/app_templates/phphello/phphello:3 +#: languages/php/app_templates/phphello/phphello.kdevtemplate:3 +msgid "Simple PHP script" +msgstr "" + +#. Comment +#: languages/php/app_templates/phphello/phphello:5 +#: languages/php/app_templates/phphello/phphello.kdevtemplate:5 +msgid "" +"This generates a simplistic 'Hello world' program in PHP (http://www.php.net)" +msgstr "" + +#. Category +#: languages/php/app_templates/phphello/phphello:7 +#: languages/php/app_templates/phphello/phphello.kdevtemplate:7 +msgid "PHP" +msgstr "" + +#. Comment +#: languages/php/app_templates/phphello/phphello:26 +#: languages/php/app_templates/phphello/phphello.kdevtemplate:27 +msgid "A simple PHP project was created in %{dest}." +msgstr "" + +#. Name +#: languages/python/app_templates/pyqt/pyqt:3 +#: languages/python/app_templates/pyqt/pyqt.kdevtemplate:3 +msgid "Python Qt application" +msgstr "" + +#. Comment +#: languages/python/app_templates/pyqt/pyqt:5 +#: languages/python/app_templates/pyqt/pyqt.kdevtemplate:5 +msgid "This generates an application framework using Python and Qt" +msgstr "" + +#. Category +#: languages/python/app_templates/pyqt/pyqt:7 +#: languages/python/app_templates/pyqt/pyqt.kdevtemplate:7 +#: languages/python/app_templates/pythonhello/pythonhello:7 +#: languages/python/app_templates/pythonhello/pythonhello.kdevtemplate:7 +#: languages/python/app_templates/pytk/pytk:7 +#: languages/python/app_templates/pytk/pytk.kdevtemplate:7 +msgid "Python" +msgstr "" + +#. Comment +#: languages/python/app_templates/pyqt/pyqt.kdevtemplate:87 +msgid "A Python Qt application was created in %{dest}" +msgstr "" + +#. Name +#: languages/python/app_templates/pythonhello/pythonhello:3 +#: languages/python/app_templates/pythonhello/pythonhello.kdevtemplate:3 +msgid "Simple Python script" +msgstr "" + +#. Comment +#: languages/python/app_templates/pythonhello/pythonhello:5 +#: languages/python/app_templates/pythonhello/pythonhello.kdevtemplate:5 +msgid "This generates a simplistic \"Hello world\" program in Python" +msgstr "" + +#. Comment +#: languages/python/app_templates/pythonhello/pythonhello.kdevtemplate:27 +msgid "A simple python script was created in %{dest}" +msgstr "" + +#. Name +#: languages/python/app_templates/pytk/pytk:3 +#: languages/python/app_templates/pytk/pytk.kdevtemplate:3 +msgid "Simple Python/Tkinter script" +msgstr "" + +#. Comment +#: languages/python/app_templates/pytk/pytk:5 +#: languages/python/app_templates/pytk/pytk.kdevtemplate:5 +msgid "This generates a simplistic \"Hello world\" program in Python/Tkinter" +msgstr "" + +#. Comment +#: languages/python/app_templates/pytk/pytk.kdevtemplate:27 +msgid "A simple Python/Tkinter script was created in %{dest}" +msgstr "" + +#. Name +#: languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate:3 +msgid "DCOP Service" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate:5 +msgid "Generates a framework for a KDE DCOP service and client access library." +msgstr "" + +#. Category +#: languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate:7 +#: languages/ruby/app_templates/kapp/kappruby.kdevtemplate:7 +#: languages/ruby/app_templates/kxt/kxtruby.kdevtemplate:7 +msgid "Ruby/KDE" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate:112 +msgid "A KDE DCOP Service was created in %{dest}" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/kapp/kappruby.kdevtemplate:5 +msgid "" +"Generates a simple Korundum application with one toplevel window, menus and " +"toolbars. A DCOP interface is also provided, so that your application can " +"provide a scripting interface" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/kapp/kappruby.kdevtemplate:155 +msgid "A Korundum Application was created at %{dest}" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/kxt/kxtruby.kdevtemplate:5 +msgid "" +"Generates a simple KDE application with one widget and a configuration dialog" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/kxt/kxtruby.kdevtemplate:164 +msgid "A Korundum TDEConfig XT Application was created at %{dest}" +msgstr "" + +#. Name +#: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:3 +msgid "QtRuby Hello World" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:5 +msgid "This generates a simple QtRuby Hello World application" +msgstr "" + +#. Category +#: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 +#: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 +msgid "Ruby/Qt" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:42 +msgid "A simple QtRuby application was created in %{dest}" +msgstr "" + +#. Name +#: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 +msgid "QtRuby Application" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:5 +msgid "Generate a QtRuby based application (crossplatform compatible)" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:61 +msgid "A QtRuby based application was created in %{dest}" +msgstr "" + +#. Name +#: languages/ruby/app_templates/rails/rails.kdevtemplate:3 +msgid "Ruby On Rails" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/rails/rails.kdevtemplate:5 +msgid "This generates a Ruby On Rails project" +msgstr "" + +#. Category +#: languages/ruby/app_templates/rails/rails.kdevtemplate:7 +#: languages/ruby/app_templates/rubyhello/rubyhello:7 +#: languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate:7 +msgid "Ruby" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/rails/rails.kdevtemplate:22 +msgid "A Ruby On Rails project created in %{dest}" +msgstr "" + +#. Name +#: languages/ruby/app_templates/rubyhello/rubyhello:3 +#: languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate:3 +msgid "Simple Ruby script" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/rubyhello/rubyhello:5 +#: languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate:5 +msgid "This generates a simplistic 'Hello world' program in Ruby" +msgstr "" + +#. Comment +#: languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate:26 +msgid "A simple ruby script was created in %{dest}" +msgstr "" + +#. Name +#: languages/sql/app_templates/sqlsimple/sqlsimple:3 +#: languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate:3 +msgid "Simple SQL Project" +msgstr "" + +#. Comment +#: languages/sql/app_templates/sqlsimple/sqlsimple:5 +#: languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate:5 +msgid "Generates a simple SQL project." +msgstr "" + +#. Category +#: languages/sql/app_templates/sqlsimple/sqlsimple:7 +#: languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate:7 +msgid "Database" +msgstr "" + +#. Comment +#: languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate:26 +msgid "A simple SQL project was created in %{dest}" +msgstr "" + +#. Comment +#: parts/appwizard/common/dockbook.kdevtemplate:2 +msgid "Install Docbook documentation templates." +msgstr "" + +#. Comment +#: parts/appwizard/imports/ada:3 +msgid "Ada Application" +msgstr "" + +#. Comment +#: parts/appwizard/imports/c:3 +msgid "Generic C Application (Custom Buildsystem)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/c-auto:3 +msgid "Generic C Application (Automake-based)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/cpp:3 +msgid "Generic C++ Application (Custom Buildsystem)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/cpp-auto:3 +msgid "Generic C++ Application (Automake based)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/fortran:3 +msgid "Fortran Application (Custom Buildsystem)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/fortran-auto:3 +msgid "Fortran Application (Automake based)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/gnome:3 +msgid "GNOME C Application (Automake based)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/java:3 parts/appwizard/imports/java-auto:3 +msgid "Java Application (Automake based)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/java-ant:3 +msgid "Java Application (Ant based)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/kde:3 +msgid "KDE C++ Application (Automake based)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/pascal:3 +msgid "Pascal Application" +msgstr "" + +#. Comment +#: parts/appwizard/imports/perl:3 +msgid "Perl Application" +msgstr "" + +#. Comment +#: parts/appwizard/imports/php:3 +msgid "PHP Application" +msgstr "" + +#. Comment +#: parts/appwizard/imports/python:3 +msgid "Python Application" +msgstr "" + +#. Comment +#: parts/appwizard/imports/qt:3 +msgid "Generic C++ Application with Custom Buildsystem" +msgstr "" + +#. Comment +#: parts/appwizard/imports/qt-auto:3 +msgid "Qt C++ Application (Automake based)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/qtqmake:3 +msgid "Qt C++ Application (QMake based)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/qtqmake:6 +msgid "Attempt to generate QMake build system infrastructure" +msgstr "" + +#. Comment +#: parts/appwizard/imports/qttmake:3 +msgid "Qt C++ Application (TMake based)" +msgstr "" + +#. Comment +#: parts/appwizard/imports/ruby:3 +msgid "Ruby Application" +msgstr "" diff --git a/translations/desktop_files/tdevelop-desktops/pl.po b/translations/desktop_files/tdevelop-desktops/pl.po index ae976740..0ae3f186 100644 --- a/translations/desktop_files/tdevelop-desktops/pl.po +++ b/translations/desktop_files/tdevelop-desktops/pl.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Eryk Michalak <gnu.ewm@protonmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-13 21:37+0900\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-09-18 05:11+0000\n" +"Last-Translator: Eryk Michalak <gnu.ewm@protonmail.com>\n" +"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdevelop/tdevelop-desktop-files/pl/>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: buildtools/ada/kdevadaproject.desktop:2 @@ -141,9 +143,8 @@ msgstr "Okno dialogowe do wyboru edytora." #. Name #: embedded/visualboyadvance/kdevvisualboyadvance.desktop:2 -#, fuzzy msgid "KDevVisualBoyAdvance" -msgstr "Obsługa VisualBoyAdvance" +msgstr "KDevVisualBoyAdvance" #. GenericName #: embedded/visualboyadvance/kdevvisualboyadvance.desktop:4 diff --git a/translations/desktop_files/tdevelop-eventsrc/cs.po b/translations/desktop_files/tdevelop-eventsrc/cs.po new file mode 100644 index 00000000..7d5c9716 --- /dev/null +++ b/translations/desktop_files/tdevelop-eventsrc/cs.po @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-22 04:04+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: src/eventsrc:3 +msgid "KDevelop" +msgstr "" + +#. Name +#: src/eventsrc:6 +msgid "Process successful" +msgstr "" + +#. Comment +#: src/eventsrc:7 +msgid "Process finished successfully" +msgstr "" + +#. Name +#: src/eventsrc:11 +msgid "Process error" +msgstr "" + +#. Comment +#: src/eventsrc:12 +msgid "Process finished with errors" +msgstr "" diff --git a/translations/desktop_files/tdevelop-eventsrc/es_AR.po b/translations/desktop_files/tdevelop-eventsrc/es_AR.po new file mode 100644 index 00000000..8f3e2526 --- /dev/null +++ b/translations/desktop_files/tdevelop-eventsrc/es_AR.po @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-22 04:04+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: src/eventsrc:3 +msgid "KDevelop" +msgstr "" + +#. Name +#: src/eventsrc:6 +msgid "Process successful" +msgstr "" + +#. Comment +#: src/eventsrc:7 +msgid "Process finished successfully" +msgstr "" + +#. Name +#: src/eventsrc:11 +msgid "Process error" +msgstr "" + +#. Comment +#: src/eventsrc:12 +msgid "Process finished with errors" +msgstr "" diff --git a/translations/desktop_files/tdevelop-eventsrc/pl.po b/translations/desktop_files/tdevelop-eventsrc/pl.po index f8742487..21dd5303 100644 --- a/translations/desktop_files/tdevelop-eventsrc/pl.po +++ b/translations/desktop_files/tdevelop-eventsrc/pl.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Eryk Michalak <gnu.ewm@protonmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-22 04:04+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-09-18 05:11+0000\n" +"Last-Translator: Eryk Michalak <gnu.ewm@protonmail.com>\n" +"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdevelop/tdevelop-events/pl/>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: src/eventsrc:3 msgid "KDevelop" -msgstr "" +msgstr "KDevelop" #. Name #: src/eventsrc:6 diff --git a/translations/desktop_files/tdevelop-eventsrc/ru.po b/translations/desktop_files/tdevelop-eventsrc/ru.po index d2160798..77a344c4 100644 --- a/translations/desktop_files/tdevelop-eventsrc/ru.po +++ b/translations/desktop_files/tdevelop-eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-22 04:04+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-03-29 02:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdevelop/tdevelop-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: src/eventsrc:3 msgid "KDevelop" -msgstr "" +msgstr "KDevelop" #. Name #: src/eventsrc:6 diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp index 1e18f8e1..aa311518 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.cpp +++ b/vcs/clearcase/clearcasefileinfoprovider.cpp @@ -13,7 +13,7 @@ #include "clearcasepart.h" #include "kdevversioncontrol.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tqapplication.h> ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent) @@ -21,7 +21,7 @@ ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent) { vcsInfo_ = NULL; - connect(parent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); + connect(parent, TQ_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQ_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); kdevVCS_ = parent; } diff --git a/vcs/clearcase/clearcasemanipulator.cpp b/vcs/clearcase/clearcasemanipulator.cpp index 65f05c4e..54ad4faf 100644 --- a/vcs/clearcase/clearcasemanipulator.cpp +++ b/vcs/clearcase/clearcasemanipulator.cpp @@ -12,7 +12,7 @@ #include "config.h" #include "clearcasemanipulator.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tqregexp.h> #include <tqstring.h> diff --git a/vcs/clearcase/clearcasemanipulator.h b/vcs/clearcase/clearcasemanipulator.h index 0cb795e3..276938f8 100644 --- a/vcs/clearcase/clearcasemanipulator.h +++ b/vcs/clearcase/clearcasemanipulator.h @@ -14,7 +14,7 @@ #include "kdevversioncontrol.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tqregexp.h> diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp index 8f05fbad..a8769127 100644 --- a/vcs/clearcase/clearcasepart.cpp +++ b/vcs/clearcase/clearcasepart.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <kdevgenericfactory.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <tdeapplication.h> @@ -60,8 +60,8 @@ ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQString fileInfoProvider_ = new ClearcaseFileinfoProvider(this); setInstance(ClearcaseFactory::instance()); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); } ClearcasePart::~ClearcasePart() @@ -88,26 +88,26 @@ void ClearcasePart::contextMenu(TQPopupMenu *popup, const Context *context) TQString name = fi.fileName(); sub->insertTitle( i18n("Actions for %1").arg(name) ); sub->insertItem( i18n("Checkin"), - this, TQT_SLOT(slotCheckin()) ); + this, TQ_SLOT(slotCheckin()) ); sub->insertItem( i18n("Checkout"), - this, TQT_SLOT(slotCheckout()) ); + this, TQ_SLOT(slotCheckout()) ); sub->insertItem( i18n("Uncheckout"), - this, TQT_SLOT(slotUncheckout()) ); + this, TQ_SLOT(slotUncheckout()) ); sub->insertSeparator(); sub->insertItem( i18n("Create Element"), - this, TQT_SLOT(slotCreate()) ); + this, TQ_SLOT(slotCreate()) ); sub->insertItem( i18n("Remove Element"), - this, TQT_SLOT(slotRemove()) ); + this, TQ_SLOT(slotRemove()) ); sub->insertSeparator(); sub->insertItem( i18n("History"), - this, TQT_SLOT(slotListHistory()) ); + this, TQ_SLOT(slotListHistory()) ); sub->insertSeparator(); sub->insertItem( i18n("Diff"), - this, TQT_SLOT(slotDiff()) ); + this, TQ_SLOT(slotDiff()) ); sub->insertSeparator(); sub->insertItem( i18n("List Checkouts"), - this, TQT_SLOT(slotListCheckouts()) ); + this, TQ_SLOT(slotListCheckouts()) ); popup->insertItem(i18n("Clearcase"), sub); @@ -125,7 +125,7 @@ void ClearcasePart::slotCheckin() dir = fi.dirPath(); name = fi.fileName(); - CcaseCommentDlg dlg(FALSE); + CcaseCommentDlg dlg(false); if (dlg.exec() == TQDialog::Rejected) return; @@ -156,7 +156,7 @@ void ClearcasePart::slotCheckout() dir = fi.dirPath(); name = fi.fileName(); - CcaseCommentDlg dlg(TRUE); + CcaseCommentDlg dlg(true); if (dlg.exec() == TQDialog::Rejected) return; @@ -304,8 +304,8 @@ void ClearcasePart::slotDiff() args << name; ExecCommand* cmv = new ExecCommand( "cleartool", args, dir, env, this ); - connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )), - this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); + connect( cmv, TQ_SIGNAL(finished( const TQString&, const TQString& )), + this, TQ_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); } diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp index 2f93ab49..f940b77c 100644 --- a/vcs/clearcase/commentdlg.cpp +++ b/vcs/clearcase/commentdlg.cpp @@ -46,8 +46,8 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin) buttonbox->addStretch(); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); ok->setDefault(true); buttonbox->layout(); layout2->addWidget(buttonbox, 0); diff --git a/vcs/clearcase/commentdlg.h b/vcs/clearcase/commentdlg.h index 1967dfb8..9c1feb46 100644 --- a/vcs/clearcase/commentdlg.h +++ b/vcs/clearcase/commentdlg.h @@ -21,9 +21,9 @@ class CcaseCommentDlg : public TQDialog TQ_OBJECT public: - CcaseCommentDlg(bool = FALSE); + CcaseCommentDlg(bool = false); TQString logMessage() { return _edit->text(); }; - bool isReserved() { return (_check) ? _check->isChecked() : FALSE; }; + bool isReserved() { return (_check) ? _check->isChecked() : false; }; private: TQMultiLineEdit *_edit; diff --git a/vcs/cvsservice/README.dox b/vcs/cvsservice/README.dox index 9887fac9..4a4c5b8c 100644 --- a/vcs/cvsservice/README.dox +++ b/vcs/cvsservice/README.dox @@ -23,7 +23,7 @@ mailing list. Contributions are always welcome :-) Implementation of this component is done by: - class CvsServicePart, which does provide integration within tdevelop, set-up GUI integration, forward cvs commands to the implementation (m_impl). It does also - intercepts Q_SIGNALS like "new files added to project" and "... removed from ...". + intercepts signals like "new files added to project" and "... removed from ...". - class CvsServicePartImpl implements the actual feature: more general speaking functions (like checking for whether files are in repository, provide checks on file lists, ...). @@ -73,7 +73,7 @@ Implementation of this component is done by: \todo Test with SSH repositories! \todo Share a common outputview between VCS: CvsProcessWidget should be reworked :-/ -\todo Additional Q_SLOTS for more complex stuff as status, revert, patch creation, ... +\todo Additional slots for more complex stuff as status, revert, patch creation, ... \faq <b>Does cvsservicepart support login with :pserver: or :ext: ?</b> Well, I dunno ;-) I have no ssh repositories to test so feel free to provide feedback on the subject :-) diff --git a/vcs/cvsservice/annotatedialog.cpp b/vcs/cvsservice/annotatedialog.cpp index ac9f293d..b7cbb749 100644 --- a/vcs/cvsservice/annotatedialog.cpp +++ b/vcs/cvsservice/annotatedialog.cpp @@ -33,8 +33,8 @@ AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent, c TQVBox *vbox = addVBoxPage( i18n("Annotate") ); m_cvsAnnotatePage = new AnnotatePage( m_cvsService, vbox ); - connect( m_cvsAnnotatePage, TQT_SIGNAL(requestAnnotate(const TQString)), - this, TQT_SLOT(slotAnnotate(const TQString)) ); + connect( m_cvsAnnotatePage, TQ_SIGNAL(requestAnnotate(const TQString)), + this, TQ_SLOT(slotAnnotate(const TQString)) ); } AnnotateDialog::~AnnotateDialog() @@ -61,8 +61,8 @@ void AnnotateDialog::slotAnnotate(const TQString rev) AnnotatePage * page = new AnnotatePage( m_cvsService, vbox ); page->startAnnotate(m_pathName, rev); - connect( page, TQT_SIGNAL(requestAnnotate(const TQString)), - this, TQT_SLOT(slotAnnotate(const TQString)) ); + connect( page, TQ_SIGNAL(requestAnnotate(const TQString)), + this, TQ_SLOT(slotAnnotate(const TQString)) ); } #include "annotatedialog.moc" diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp index 1b23e973..9ecf8279 100644 --- a/vcs/cvsservice/annotatepage.cpp +++ b/vcs/cvsservice/annotatepage.cpp @@ -59,10 +59,10 @@ AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *parent, const dialogLayout->add( LayoutWidget ); - connect( m_btnAnnotate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewAnnotate()) ); - connect( m_leRevision, TQT_SIGNAL( returnPressed() ), - m_btnAnnotate, TQT_SLOT( setFocus() ) ); + connect( m_btnAnnotate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewAnnotate()) ); + connect( m_leRevision, TQ_SIGNAL( returnPressed() ), + m_btnAnnotate, TQ_SLOT( setFocus() ) ); //Nest create the AnnotateView; it will do the actual displaying m_annotateView = new AnnotateView(this, "annotateview"); diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp index 89aa7f01..55f9b8fd 100644 --- a/vcs/cvsservice/annotateview.cpp +++ b/vcs/cvsservice/annotateview.cpp @@ -157,8 +157,8 @@ AnnotateView::AnnotateView(AnnotatePage *parent, const char *name) setSorting(AnnotateViewItem::LineNumberColumn); setColumnAlignment(AnnotateViewItem::LineNumberColumn, TQt::AlignRight); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*)) ); } diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index e6bcbd05..ff14eb20 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -77,10 +77,10 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService, m_base = new CheckoutDialogBase( this, "checkoutdialogbase" ); setMainWidget( m_base ); - connect( m_base->fetchModulesButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFetchModulesList()) ); - connect( m_base->modulesListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotModuleSelected(TQListViewItem*)) ); + connect( m_base->fetchModulesButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFetchModulesList()) ); + connect( m_base->modulesListView, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotModuleSelected(TQListViewItem*)) ); // Avoid displaying 'file:/' when displaying the file m_base->workURLRequester->setShowLocalProtocol( false ); @@ -89,7 +89,7 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService, // Grab the entries from $HOME/.cvspass fetchUserCvsRepositories(); // And suggest to use the default projects dir set in KDevelop's preferences - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/"); setWorkDir( defaultProjectsDir ); diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp index f47516ed..206fe754 100644 --- a/vcs/cvsservice/commitdlg.cpp +++ b/vcs/cvsservice/commitdlg.cpp @@ -33,8 +33,8 @@ CommitDialog::CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent ) : CommitDialogBase( parent, "commitdialog", true ) { - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); setChangeLogFileName( changeLogfileNamePath ); } diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 8eb77b71..e71e8a28 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -35,7 +35,7 @@ CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stu : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ), m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 ) { - connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&))); + connect( this, TQ_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQ_SLOT(updateStatusFor(const CVSDir&))); } /////////////////////////////////////////////////////////////////////////////// @@ -146,7 +146,7 @@ void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir) * item conains any childs. Therefor we need to give FileTree some time * to update the directory item before we give the status infos. */ - TQTimer::singleShot( 1000, this, TQT_SLOT(propagateUpdate()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(propagateUpdate()) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp index 21169346..fb189234 100644 --- a/vcs/cvsservice/cvslogdialog.cpp +++ b/vcs/cvsservice/cvslogdialog.cpp @@ -42,8 +42,8 @@ CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent, const TQVBox *vbox = addVBoxPage( i18n("Log From CVS") ); m_cvsLogPage = new CVSLogPage( m_cvsService, vbox ); - connect( m_cvsLogPage, TQT_SIGNAL(diffRequested(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&, const TQString&)) ); + connect( m_cvsLogPage, TQ_SIGNAL(diffRequested(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(slotDiffRequested(const TQString&, const TQString&, const TQString&)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -66,8 +66,8 @@ void CVSLogDialog::startLog( const TQString &workDir, const TQString &pathName ) m_cvsLogPage = new CVSLogPage( m_cvsService, vbox ); this->resize( m_cvsLogPage->size() ); - connect( m_cvsLogPage, TQT_SIGNAL(linkClicked(const TQString&, const TQString&)), - this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&)) ); + connect( m_cvsLogPage, TQ_SIGNAL(linkClicked(const TQString&, const TQString&)), + this, TQ_SLOT(slotDiffRequested(const TQString&, const TQString&)) ); */ m_cvsLogPage->startLog( workDir, pathName ); } diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp index 4b2d7fb4..756d28d1 100644 --- a/vcs/cvsservice/cvslogpage.cpp +++ b/vcs/cvsservice/cvslogpage.cpp @@ -46,7 +46,7 @@ CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *parent, const cha m_textBrowser->setMinimumWidth(fontMetrics().width('X')*50); m_textBrowser->setMinimumHeight(fontMetrics().width('X')*43); - connect( m_textBrowser, TQT_SIGNAL(linkClicked( const TQString& )), this, TQT_SLOT(slotLinkClicked( const TQString& )) ); + connect( m_textBrowser, TQ_SIGNAL(linkClicked( const TQString& )), this, TQ_SLOT(slotLinkClicked( const TQString& )) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index 6ded6ecb..1f510d16 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -22,13 +22,13 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kdialogbase.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaction.h> #include <kurl.h> #include <tdeapplication.h> #include <tdemainwindow.h> // Because of KShellProcess::quote() -#include <kprocess.h> +#include <tdeprocess.h> #include <kiconloader.h> #include <dcopref.h> @@ -96,10 +96,10 @@ CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStri m_impl = new CvsServicePartImpl( this ); // Load / store project configuration every time project is opened/closed - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } /////////////////////////////////////////////////////////////////////////////// @@ -119,15 +119,15 @@ void CvsServicePart::init() setupActions(); // Re-route our implementation signal for when check-out finishes to the standard signal - connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) ); + connect( m_impl, TQ_SIGNAL(checkoutFinished(TQString)), TQ_SIGNAL(finishedFetching(TQString)) ); // Context menu - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) ); TQWhatsThis::add( m_impl->processWidget(), i18n("<b>CVS</b><p>Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") ); @@ -144,92 +144,92 @@ void CvsServicePart::setupActions() // context at runtime. See CvsServicePart::contextMenu(). actionCommit = new TDEAction( i18n("&Commit to Repository"), 0, this, - TQT_SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" ); + TQ_SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" ); actionCommit->setToolTip( i18n("Commit file(s)") ); actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") ); - actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), + actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "cvsservice_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); - actionLog = new TDEAction( i18n("Generate &Log"), 0, this, TQT_SLOT(slotActionLog()), + actionLog = new TDEAction( i18n("Generate &Log"), 0, this, TQ_SLOT(slotActionLog()), actionCollection(), "cvsservice_log" ); actionLog->setToolTip( i18n("Generate log") ); actionLog->setWhatsThis( i18n("<b>Generate log</b><p>Produces log for this file.") ); - actionAnnotate = new TDEAction( i18n("&Annotate"), 0, this, TQT_SLOT(slotActionAnnotate()), + actionAnnotate = new TDEAction( i18n("&Annotate"), 0, this, TQ_SLOT(slotActionAnnotate()), actionCollection(), "cvsservice_annotate" ); actionAnnotate->setToolTip( i18n("Generate annotations") ); actionAnnotate->setWhatsThis( i18n("<b>Annotate</b><p>Produces annotations for this file.") ); - actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), + actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "cvsservice_add" ); actionAdd->setToolTip( i18n("Add file to repository") ); actionAdd->setWhatsThis( i18n("<b>Add to repository</b><p>Adds file to repository.") ); - actionEdit = new TDEAction( i18n("&Edit Files"), 0, this, TQT_SLOT(slotActionEdit()), + actionEdit = new TDEAction( i18n("&Edit Files"), 0, this, TQ_SLOT(slotActionEdit()), actionCollection(), "cvsservice_edit" ); actionEdit->setToolTip( i18n("Mark as being edited") ); actionEdit->setWhatsThis( i18n("<b>Mark as being edited</b><p>Mark the files as being edited.") ); - actionUnEdit = new TDEAction( i18n("&Unedit Files"), 0, this, TQT_SLOT(slotActionUnEdit()), + actionUnEdit = new TDEAction( i18n("&Unedit Files"), 0, this, TQ_SLOT(slotActionUnEdit()), actionCollection(), "cvsservice_unedit" ); actionUnEdit->setToolTip( i18n("Remove editing mark from files") ); actionUnEdit->setWhatsThis( i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.") ); - actionEditors = new TDEAction( i18n("&Show Editors"), 0, this, TQT_SLOT(slotActionEditors()), + actionEditors = new TDEAction( i18n("&Show Editors"), 0, this, TQ_SLOT(slotActionEditors()), actionCollection(), "cvsservice_editors" ); actionEditors->setToolTip( i18n("Show editors") ); actionEditors->setWhatsThis( i18n("<b>Show editors</b><p>Shows the list of users who are editing files.") ); actionAddBinary = new TDEAction( i18n("Add to Repository as &Binary"), 0, this, - TQT_SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" ); + TQ_SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" ); actionAddBinary->setToolTip( i18n("Add file to repository as binary") ); actionAddBinary->setWhatsThis( i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).") ); actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, - TQT_SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" ); + TQ_SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" ); actionRemove->setToolTip( i18n("Remove from repository") ); actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") ); actionUpdate = new TDEAction( i18n("&Update/Revert to Another Release"), 0, this, - TQT_SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" ); + TQ_SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" ); actionUpdate->setToolTip( i18n("Update/revert") ); actionUpdate->setWhatsThis( i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.") ); actionRemoveSticky = new TDEAction( i18n("R&emove Sticky Flag"), 0, - this, TQT_SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" ); + this, TQ_SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" ); actionRemoveSticky->setToolTip( i18n("Remove sticky flag") ); actionRemoveSticky->setWhatsThis( i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).") ); actionTag = new TDEAction( i18n("Make &Tag/Branch"), 0, - this, TQT_SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" ); + this, TQ_SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" ); actionTag->setToolTip( i18n("Make tag/branch") ); actionTag->setWhatsThis( i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).") ); actionUnTag = new TDEAction( i18n("&Delete Tag"), 0, - this, TQT_SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" ); + this, TQ_SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" ); actionUnTag->setToolTip( i18n("Delete tag") ); actionUnTag->setWhatsThis( i18n("<b>Delete tag</b><p>Delete tag from selected file(s).") ); actionAddToIgnoreList = new TDEAction( i18n("&Ignore in CVS Operations"), 0, - this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" ); + this, TQ_SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" ); actionAddToIgnoreList->setToolTip( i18n("Ignore in CVS operations") ); actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.") ); actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in CVS Operations"), 0, - this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" ); + this, TQ_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" ); actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in CVS operations") ); actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.") ); actionLogin = new TDEAction( i18n("&Log to Server"), 0, this, - TQT_SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" ); + TQ_SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" ); actionLogin->setToolTip( i18n("Login to server") ); actionLogin->setWhatsThis( i18n("<b>Login to server</b><p>Logs in to the CVS server.") ); actionLogout = new TDEAction( i18n("L&ogout From Server"), 0, this, - TQT_SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" ); + TQ_SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" ); actionLogout->setToolTip( i18n("Logout from server") ); actionLogout->setWhatsThis( i18n("<b>Logout from server</b><p>Logs out from the CVS server.") ); } @@ -278,7 +278,7 @@ void CvsServicePart::projectConfigWidget( KDialogBase *dlg ) { TQVBox *vbox = dlg->addVBoxPage( i18n("CvsService"), i18n("CvsService"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); CvsOptionsWidget *w = new CvsOptionsWidget( (TQWidget *)vbox, "cvs config widget" ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -320,45 +320,45 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context ) if (context->hasType( Context::FileContext )) popup->insertSeparator(); - int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) ); + int id = subMenu->insertItem( actionCommit->text(), this, TQ_SLOT(slotCommit()) ); subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); // CvsService let to do log and diff operations only on one file (or directory) at time if (m_urls.count() == 1) { - id = subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); + id = subMenu->insertItem( actionDiff->text(), this, TQ_SLOT(slotDiff()) ); subMenu->setWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases.")); - id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + id = subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); subMenu->setWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file.")); - id = subMenu->insertItem( actionAnnotate->text(), this, TQT_SLOT(slotAnnotate()) ); + id = subMenu->insertItem( actionAnnotate->text(), this, TQ_SLOT(slotAnnotate()) ); subMenu->setWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file.")); } - id = subMenu->insertItem( actionEditors->text(), this, TQT_SLOT(slotEditors()) ); + id = subMenu->insertItem( actionEditors->text(), this, TQ_SLOT(slotEditors()) ); subMenu->setWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files.")); - id = subMenu->insertItem( actionEdit->text(), this, TQT_SLOT(slotEdit()) ); + id = subMenu->insertItem( actionEdit->text(), this, TQ_SLOT(slotEdit()) ); subMenu->setWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited.")); - id = subMenu->insertItem( actionUnEdit->text(), this, TQT_SLOT(slotUnEdit()) ); + id = subMenu->insertItem( actionUnEdit->text(), this, TQ_SLOT(slotUnEdit()) ); subMenu->setWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.")); - id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); + id = subMenu->insertItem( actionAdd->text(), this, TQ_SLOT(slotAdd()) ); subMenu->setWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository.")); - id = subMenu->insertItem( actionAddBinary->text(), this, TQT_SLOT(slotAddBinary()) ); + id = subMenu->insertItem( actionAddBinary->text(), this, TQ_SLOT(slotAddBinary()) ); subMenu->setWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).")); - id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotRemove()) ); + id = subMenu->insertItem( actionRemove->text(), this, TQ_SLOT(slotRemove()) ); subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionTag->text(), this, TQT_SLOT(slotTag()) ); + id = subMenu->insertItem( actionTag->text(), this, TQ_SLOT(slotTag()) ); subMenu->setWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).")); - id = subMenu->insertItem( actionUnTag->text(), this, TQT_SLOT(slotUnTag()) ); + id = subMenu->insertItem( actionUnTag->text(), this, TQ_SLOT(slotUnTag()) ); subMenu->setWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s).")); - id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); + id = subMenu->insertItem( actionUpdate->text(), this, TQ_SLOT(slotUpdate()) ); subMenu->setWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.")); - id = subMenu->insertItem( actionRemoveSticky->text(), this, TQT_SLOT(slotRemoveSticky()) ); + id = subMenu->insertItem( actionRemoveSticky->text(), this, TQ_SLOT(slotRemoveSticky()) ); subMenu->setWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); + id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQ_SLOT(slotAddToIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.")); - id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); + id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQ_SLOT(slotRemoveFromIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.")); // Now insert in parent menu @@ -750,8 +750,8 @@ void CvsServicePart::slotProjectOpened() options->load( project() ); // When files are added to project they may be added to/removed from repository too - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -772,8 +772,8 @@ void CvsServicePart::slotProjectClosed() delete options; // We don't have a project anymore ... - disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + disconnect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + disconnect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } #include "cvspart.moc" diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp index 01c85df3..36d9a498 100644 --- a/vcs/cvsservice/cvspartimpl.cpp +++ b/vcs/cvsservice/cvspartimpl.cpp @@ -19,8 +19,8 @@ #include <kdebug.h> #include <tdeversion.h> #include <tdelocale.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdemainwindow.h> #include <dcopref.h> // CvsService stuff @@ -80,7 +80,7 @@ CvsServicePartImpl::CvsServicePartImpl( CvsServicePart *part, const char *name ) m_scheduler = new DirectScheduler( m_widget ); m_fileInfoProvider = new CVSFileInfoProvider( part, m_cvsService ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); } else { @@ -374,7 +374,7 @@ bool CvsServicePartImpl::checkout() modulePath = dlg.workDir() + dlg.module(); m_scheduler->schedule( job ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotCheckoutFinished(bool,int)) ); return true; } } @@ -406,7 +406,7 @@ void CvsServicePartImpl::commit( const KURL::List& urlList ) } m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); // 2. if requested to do so, add an entry to the Changelog too if (dlg.mustAddToChangeLog()) @@ -448,7 +448,7 @@ void CvsServicePartImpl::update( const KURL::List& urlList ) additionalOptions ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -465,7 +465,7 @@ void CvsServicePartImpl::add( const KURL::List& urlList, bool binary ) DCOPRef cvsJob = m_cvsService->add( fileList(), binary ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -531,7 +531,7 @@ void CvsServicePartImpl::unedit( const KURL::List& urlList) DCOPRef cvsJob = m_cvsService->unedit( fileList() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -548,7 +548,7 @@ void CvsServicePartImpl::edit( const KURL::List& urlList) DCOPRef cvsJob = m_cvsService->edit( fileList() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -582,8 +582,8 @@ void CvsServicePartImpl::remove( const KURL::List& urlList ) DCOPRef cvsJob = m_cvsService->remove( fileList(), true ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -606,8 +606,8 @@ void CvsServicePartImpl::removeStickyFlag( const KURL::List& urlList ) "-A" ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -656,8 +656,8 @@ void CvsServicePartImpl::diff( const KURL::List& urlList ) } m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotDiffFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotDiffFinished(bool,int)) ); doneOperation(); } @@ -680,8 +680,8 @@ void CvsServicePartImpl::tag( const KURL::List& urlList ) dlg.isBranch(), dlg.force() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -705,8 +705,8 @@ void CvsServicePartImpl::unTag( const KURL::List& urlList ) dlg.isBranch(), dlg.force() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -747,7 +747,7 @@ void CvsServicePartImpl::createNewProject( const TQString &dirName, DCOPRef cvsJob = m_cvsService->import( dirName, location, module, filesToIgnore, message, vendor, release, false ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotCheckoutFinished(bool,int)) ); */ TQString rsh_preamble; if ( !options->cvsRshEnvVar().isEmpty() ) diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index bb8fb459..87e917a5 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -140,7 +140,7 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob ) kdDebug(9006) << "Running: " << cmdLine << endl; // disconnect 3rd party slots from our signals - disconnect( TQT_SIGNAL(jobFinished(bool, int)) ); + disconnect( TQ_SIGNAL(jobFinished(bool, int)) ); showInfo( i18n("Started job: %1").arg( cmdLine ) ); diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 008dc867..0b92b200 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -41,7 +41,7 @@ TQStringList KDiffTextEdit::extPartsTranslated; KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name ) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "Diff" ); _highlight = config->readBoolEntry( "Highlight", true ); @@ -50,7 +50,7 @@ KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( KDiffTextEdit::~KDiffTextEdit() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( "Diff" ); config->writeEntry( "Highlight", _highlight ); @@ -75,14 +75,14 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) } if ( !extPartsTranslated.isEmpty() ) popup->insertSeparator( i ); - connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) ); + connect( popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupActivated(int)) ); - popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); + popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQ_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); popup->setItemEnabled( POPUP_BASE - 2, length() > 0 ); popup->insertSeparator( 1 ); - popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); + popup->insertItem( i18n( "Highlight Syntax" ), this, TQ_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); popup->setItemChecked( POPUP_BASE - 1, _highlight ); popup->insertSeparator( 3 ); @@ -184,7 +184,7 @@ DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ): te->setReadOnly( true ); te->setTextFormat( TQTextEdit::PlainText ); // te->setMinimumSize( 300, 200 ); - connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); + connect( te, TQ_SIGNAL(externalPartRequested(const TQString&)), this, TQ_SLOT(loadExtPart(const TQString&)) ); TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->addWidget( te ); @@ -222,7 +222,7 @@ void DiffWidget::loadExtPart( const TQString& partName ) if ( !extService ) return; - extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, TQT_TQOBJECT(this), 0 ); + extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, this, 0 ); if ( !extPart || !extPart->widget() ) return; @@ -301,10 +301,10 @@ void DiffWidget::openURL( const KURL& url ) if ( !job ) return; - connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), - this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotFinished()) ); + connect( job, TQ_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), + this, TQ_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotFinished()) ); } void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) @@ -312,7 +312,7 @@ void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) TQPopupMenu* popup = new TQPopupMenu( this ); if ( !te->isVisible() ) - popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) ); + popup->insertItem( i18n("Display &Raw Output"), this, TQ_SLOT(showTextEdit()) ); popup->exec( TQCursor::pos() ); delete popup; diff --git a/vcs/cvsservice/editorsdialog.cpp b/vcs/cvsservice/editorsdialog.cpp index 199ffdc6..4dea5db1 100644 --- a/vcs/cvsservice/editorsdialog.cpp +++ b/vcs/cvsservice/editorsdialog.cpp @@ -25,7 +25,7 @@ #include <cvsservice_stub.h> EditorsDialog::EditorsDialog(CvsService_stub *cvsService, TQWidget *parent, const char *name) - : DCOPObject( "CvsEditorsDCOPIface"), EditorsDialogBase(parent, name, TRUE, TQt::WDestructiveClose), + : DCOPObject( "CvsEditorsDCOPIface"), EditorsDialogBase(parent, name, true, TQt::WDestructiveClose), m_cvsService(cvsService), m_cvsJob(0) { } diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp index e44ed9e7..b2605bf7 100644 --- a/vcs/cvsservice/integrator/integratordlg.cpp +++ b/vcs/cvsservice/integrator/integratordlg.cpp @@ -30,7 +30,7 @@ #include <tdeapplication.h> #include <kdialogbase.h> #include <kurlrequester.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <kdebug.h> diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui index 6660faab..5dc8ae11 100644 --- a/vcs/cvsservice/integrator/integratordlgbase.ui +++ b/vcs/cvsservice/integrator/integratordlgbase.ui @@ -389,11 +389,11 @@ <tabstop>login</tabstop> <tabstop>init</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init_clicked()</slot> <slot>login_clicked()</slot> <slot>createModule_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index c5706903..daa882d4 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -17,7 +17,7 @@ #include <tqtextedit.h> #include <tqpushbutton.h> #include <tqregexp.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeapplication.h> #include <tdelocale.h> #include <klineedit.h> @@ -103,9 +103,9 @@ void CommitDialog::setDepotFiles( const TQStringList& lst ) args << (*it); } - ExecCommand* cmd = new ExecCommand( "p4", args, TQString(), TQStringList(), TQT_TQOBJECT(this) ); - connect( cmd, TQT_SIGNAL(finished( const TQString&, const TQString& )), - this, TQT_SLOT(getFilesFinished( const TQString&, const TQString& )) ); + ExecCommand* cmd = new ExecCommand( "p4", args, TQString(), TQStringList(), this ); + connect( cmd, TQ_SIGNAL(finished( const TQString&, const TQString& )), + this, TQ_SLOT(getFilesFinished( const TQString&, const TQString& )) ); } void CommitDialog::getFilesFinished( const TQString& out, const TQString& /* err */ ) diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index 76a4456a..e3229fb6 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -18,7 +18,7 @@ #include <tdepopupmenu.h> #include <kdebug.h> #include <kdevgenericfactory.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <tdeapplication.h> #include <tdeaction.h> @@ -44,8 +44,8 @@ PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringLi setInstance(PerforceFactory::instance()); setupActions(); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); } @@ -54,31 +54,31 @@ PerforcePart::~PerforcePart() void PerforcePart::setupActions() { - actionEdit = new TDEAction( i18n("Edit"), 0, this, TQT_SLOT(slotActionEdit()), + actionEdit = new TDEAction( i18n("Edit"), 0, this, TQ_SLOT(slotActionEdit()), actionCollection(), "perforce_edit" ); actionEdit->setToolTip(i18n("Edit")); actionEdit->setWhatsThis(i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit.")); - actionRevert = new TDEAction( i18n("Revert"), 0, this, TQT_SLOT(slotActionRevert()), + actionRevert = new TDEAction( i18n("Revert"), 0, this, TQ_SLOT(slotActionRevert()), actionCollection(), "perforce_revert" ); actionRevert->setToolTip(i18n("Revert")); actionRevert->setWhatsThis(i18n("<b>Revert</b><p>Discards changes made to open files.")); - actionSubmit = new TDEAction( i18n("Submit"), 0, this, TQT_SLOT(slotActionCommit()), + actionSubmit = new TDEAction( i18n("Submit"), 0, this, TQ_SLOT(slotActionCommit()), actionCollection(), "perforce_submit" ); actionSubmit->setToolTip(i18n("Submit")); actionSubmit->setWhatsThis(i18n("<b>Submit</b><p>Sends changes made to open files to the depot.")); - actionSync = new TDEAction( i18n("Sync"), 0, this, TQT_SLOT(slotActionUpdate()), + actionSync = new TDEAction( i18n("Sync"), 0, this, TQ_SLOT(slotActionUpdate()), actionCollection(), "perforce_sync" ); actionSync->setToolTip(i18n("Sync")); actionSync->setWhatsThis(i18n("<b>Sync</b><p>Copies files from the depot into the workspace.")); - actionDiff = new TDEAction( i18n("Diff Against Repository"), 0, this, TQT_SLOT(slotActionDiff()), + actionDiff = new TDEAction( i18n("Diff Against Repository"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "perforce_diff" ); actionDiff->setToolTip(i18n("Diff against repository")); actionDiff->setWhatsThis(i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot.")); - actionAdd = new TDEAction( i18n("Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), + actionAdd = new TDEAction( i18n("Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "perforce_add" ); actionAdd->setToolTip(i18n("Add to repository")); actionAdd->setWhatsThis(i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot.")); - actionRemove = new TDEAction( i18n("Remove From Repository"), 0, this, TQT_SLOT(slotActionRemove()), + actionRemove = new TDEAction( i18n("Remove From Repository"), 0, this, TQ_SLOT(slotActionRemove()), actionCollection(), "perforce_remove" ); actionRemove->setToolTip(i18n("Remove from repository")); actionRemove->setWhatsThis(i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot.")); @@ -97,26 +97,26 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context) sub->insertTitle( i18n("Actions for %1").arg(name) ); int id = sub->insertItem( i18n("Edit"), - this, TQT_SLOT(slotEdit()) ); + this, TQ_SLOT(slotEdit()) ); sub->setWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit.")); id = sub->insertItem( i18n("Revert"), - this, TQT_SLOT(slotRevert()) ); + this, TQ_SLOT(slotRevert()) ); sub->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files.")); id = sub->insertItem( i18n("Submit"), - this, TQT_SLOT(slotCommit()) ); + this, TQ_SLOT(slotCommit()) ); sub->setWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot.")); id = sub->insertItem( i18n("Sync"), - this, TQT_SLOT(slotUpdate()) ); + this, TQ_SLOT(slotUpdate()) ); sub->setWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace.")); sub->insertSeparator(); id = sub->insertItem( i18n("Diff Against Repository"), - this, TQT_SLOT(slotDiff()) ); + this, TQ_SLOT(slotDiff()) ); sub->setWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot.")); id = sub->insertItem( i18n("Add to Repository"), - this, TQT_SLOT(slotAdd()) ); + this, TQ_SLOT(slotAdd()) ); sub->setWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot.")); id = sub->insertItem( i18n("Remove From Repository"), - this, TQT_SLOT(slotRemove()) ); + this, TQ_SLOT(slotRemove()) ); sub->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot.")); id = popup->insertItem(i18n("Perforce"), sub); } @@ -243,8 +243,8 @@ void PerforcePart::diff( const TQString& filename ) args << "-du"; args << name; ExecCommand* cmv = new ExecCommand( "p4", args, TQString(), TQStringList(), this ); - connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )), - this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); + connect( cmv, TQ_SIGNAL(finished( const TQString&, const TQString& )), + this, TQ_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); } void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err ) diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index 87ccf488..468170b9 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -20,7 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "svnintegratordlg.h" -#include "blockingkprocess.h" +#include "blockingtdeprocess.h" #include <kurl.h> #include <tdeio/jobclasses.h> #include <tdeio/job.h> @@ -28,7 +28,7 @@ #include <kdebug.h> #include <tqradiobutton.h> #include <tdeio/scheduler.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeversion.h> #include <tdemessagebox.h> #include <tdelocale.h> diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp index 1fc4afc8..30e76f0e 100644 --- a/vcs/subversion/kdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -36,7 +36,7 @@ #include "commitdlg.h" extern "C" { - KDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) { + TDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) { return new KDevSvnd(name); } } diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp index 0fd2c20b..9f3eb3f9 100644 --- a/vcs/subversion/kdevsvnd_widgets.cpp +++ b/vcs/subversion/kdevsvnd_widgets.cpp @@ -27,9 +27,9 @@ SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool m btnPermanent->setText(i18n("Accept Permanently")); btnTemporary->setText(i18n("Accept Temporarily")); btnReject->setText(i18n("Reject")); - connect( btnPermanent, TQT_SIGNAL(clicked()), this, TQT_SLOT(setPermanent()) ); - connect( btnTemporary, TQT_SIGNAL(clicked()), this, TQT_SLOT(setTemporary()) ); - connect( btnReject, TQT_SIGNAL(clicked()), this, TQT_SLOT(setRejected ()) ); + connect( btnPermanent, TQ_SIGNAL(clicked()), this, TQ_SLOT(setPermanent()) ); + connect( btnTemporary, TQ_SIGNAL(clicked()), this, TQ_SLOT(setTemporary()) ); + connect( btnReject, TQ_SIGNAL(clicked()), this, TQ_SLOT(setRejected ()) ); } SvnSSLTrustPrompt::~SvnSSLTrustPrompt() {} diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index e9c89ece..5a82c88b 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -38,8 +38,8 @@ #include <tdeapplication.h> #include <dcopclient.h> #include <tdetempfile.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tqtextcodec.h> #include <tqtextstream.h> #include <tqtextbrowser.h> @@ -48,7 +48,7 @@ #include <tqregexp.h> #include <tdeapplication.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> using namespace TDEIO; @@ -127,7 +127,7 @@ void subversionCore::resolve( const KURL::List& list ) { s << cmd << *it << recurse; SimpleJob * job = TDEIO::special(servURL, parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } } @@ -142,7 +142,7 @@ void subversionCore::update( const KURL::List& list ) { s << cmd << list << rev << TQString( "HEAD" ); SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") ); } @@ -160,7 +160,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){ TQString revkind2 = "WORKING"; s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); if ( diffresult.count() > 0 ) { //check kompare is available @@ -241,7 +241,7 @@ void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, s << cmd << pathOrUrl1 << pathOrUrl2 << rev1 << revKind1 << rev2 << revKind2 << recurse; s << pegdiff; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDiffResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotDiffResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() ); } @@ -261,7 +261,7 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock s << *it; } SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if( list.count() == 1 ) initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") ); else if( list.count() > 1 ) @@ -295,7 +295,7 @@ void subversionCore::svnLog( const KURL::List& list, s << *it; } SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotLogResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotLogResult( TDEIO::Job * ) ) ); // progress info. LogView is allowed and meaninful only for one url in KDev3.4 initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") ); } @@ -316,7 +316,7 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQStrin s << revstart << revKindStart << revend << revKindEnd ; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotBlameResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotBlameResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") ); } @@ -332,7 +332,7 @@ void subversionCore::add( const KURL::List& list ) { // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::del( const KURL::List& list ) { @@ -346,7 +346,7 @@ void subversionCore::del( const KURL::List& list ) { // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::revert( const KURL::List& list ) { @@ -359,7 +359,7 @@ void subversionCore::revert( const KURL::List& list ) { s << cmd << list; SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::checkout() { @@ -377,7 +377,7 @@ void subversionCore::checkout() { servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" SimpleJob * job = TDEIO::special(servURL,parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotEndCheckout( TDEIO::Job * ) ) ); } } @@ -393,7 +393,7 @@ void subversionCore::switchTree( const KURL &path, const KURL &repositUrl, s << recurse << revNum << revKind; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() ); } @@ -408,7 +408,7 @@ void subversionCore::switchRelocate( const KURL &path, s << cmd << path << currentUrl << newUrl << recurse; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); // this doesn't contact repository } @@ -423,7 +423,7 @@ void subversionCore::svnCopy( const KURL &src, int srcRev, const TQString &srcRe s << cmd << src << srcRev << srcRevKind << dest; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, src.prettyURL(), dest.prettyURL() ); } @@ -440,7 +440,7 @@ void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1, s << recurse << ignore_ancestry << force << dry_run; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() , wc_path.prettyURL() ); } @@ -722,10 +722,10 @@ void subversionCore::initProcessDlg( TDEIO::Job *job, const TQString &src, const progress->setSourceUrl( src ); progress->setDestUrl( dest ); progress->setJob( job ); - connect( job, TQT_SIGNAL( totalSize(TDEIO::Job*, TDEIO::filesize_t) ), - progress, TQT_SLOT( slotTotalSize (TDEIO::Job*, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( processedSize(TDEIO::Job*, TDEIO::filesize_t) ), - progress, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( totalSize(TDEIO::Job*, TDEIO::filesize_t) ), + progress, TQ_SLOT( slotTotalSize (TDEIO::Job*, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( processedSize(TDEIO::Job*, TDEIO::filesize_t) ), + progress, TQ_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t) ) ); } void subversionCore::createNewProject( const TQString& // dirName diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index 45d44d1e..f845c035 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -155,7 +155,7 @@ bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerDa s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << checkRepos << recursive; KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/"; job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if( checkRepos ) m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory Status") ); return true; diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index 98b44848..be5f2b24 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -74,14 +74,14 @@ subversionPart::subversionPart(TQObject *parent, const char *name, const TQStrin setupActions(); - connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) ); + connect( m_impl, TQ_SIGNAL(checkoutFinished(TQString)), TQ_SIGNAL(finishedFetching(TQString)) ); // Context menu - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); m_impl->processWidget()->setCaption(i18n( "Subversion Output" )); mainWindow()->embedOutputView( (TQWidget*)m_impl->processWidget(), i18n( "Subversion" ), i18n( "Subversion messages" ) ); @@ -98,65 +98,65 @@ subversionPart::~subversionPart() { } void subversionPart::setupActions() { - actionCommit = new TDEAction( i18n("&Commit to Repository..."), 0, this, TQT_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); + actionCommit = new TDEAction( i18n("&Commit to Repository..."), 0, this, TQ_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); actionCommit->setToolTip( i18n("Commit file(s)") ); actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") ); - /* actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), + /* actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "subversion_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); */ - actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); + actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); actionAdd->setToolTip( i18n("Add file to repository") ); actionAdd->setWhatsThis( i18n("<b>Add file to repository</b><p>Adds file to repository.") ); - actionLog = new TDEAction( i18n("Show logs..."), 0, this, TQT_SLOT(slotLog()), actionCollection(), "subversion_log" ); - actionBlame = new TDEAction( i18n("Blame..."), 0, this, TQT_SLOT(slotBlame()), actionCollection(), "subversion_blame"); + actionLog = new TDEAction( i18n("Show logs..."), 0, this, TQ_SLOT(slotLog()), actionCollection(), "subversion_log" ); + actionBlame = new TDEAction( i18n("Blame..."), 0, this, TQ_SLOT(slotBlame()), actionCollection(), "subversion_blame"); - actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQT_SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); + actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQ_SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); actionRemove->setToolTip( i18n("Remove from repository") ); actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") ); - actionUpdate = new TDEAction( i18n("&Update"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); + actionUpdate = new TDEAction( i18n("&Update"), 0, this, TQ_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); actionUpdate->setToolTip( i18n("Update") ); actionUpdate->setWhatsThis( i18n("<b>Update</b><p>Updates file(s) from repository.") ); - actionDiffLocal = new TDEAction( i18n("&Diff to BASE"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); + actionDiffLocal = new TDEAction( i18n("&Diff to BASE"), 0, this, TQ_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); actionDiffLocal->setToolTip( i18n("Diff to BASE") ); actionDiffLocal->setWhatsThis( i18n("<b>Diff to disk</b><p>Diff current file to the BASE checked out copy.") ); - actionDiffHead = new TDEAction( i18n("&Diff to HEAD"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); + actionDiffHead = new TDEAction( i18n("&Diff to HEAD"), 0, this, TQ_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); actionDiffHead->setToolTip( i18n("Diff to HEAD") ); actionDiffHead->setWhatsThis( i18n("<b>Diff HEAD</b><p>Diff the current file to HEAD in svn.") ); - actionRevert = new TDEAction( i18n("&Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); + actionRevert = new TDEAction( i18n("&Revert"), 0, this, TQ_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); actionRevert->setToolTip( i18n("Revert") ); actionRevert->setWhatsThis( i18n("<b>Revert</b><p>Undo local changes.") ); /* actionAddToIgnoreList = new TDEAction( i18n("&Ignore in Subversion Operations"), 0, - this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" ); + this, TQ_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" ); actionAddToIgnoreList->setToolTip( i18n("Ignore in Subversion operations") ); actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).") ); actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in Subversion Operations"), 0, - this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" ); + this, TQ_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" ); actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in Subversion operations") ); actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).") ); */ actionResolve = new TDEAction( i18n("Re&solve Conflicting State"), 0, - this, TQT_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" ); + this, TQ_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" ); actionResolve->setToolTip( i18n("Resolve the conflicting state of a file after a merge") ); actionResolve->setWhatsThis( i18n("<b>Resolve the conflicting state</b><p>Remove the conflict state that can be set on a file after a merge failed.") ); actionSwitch = new TDEAction( i18n("Switch this working copy to URL.."), 0, - this, TQT_SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); + this, TQ_SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); // warn slogCopy(), slotMerge only works on context menu. There is no main-menu action actionCopy = new TDEAction( i18n("Copy this working copy to URL.."), 0, - this, TQT_SLOT(slotCopy()), actionCollection(), "subversion_copy" ); + this, TQ_SLOT(slotCopy()), actionCollection(), "subversion_copy" ); actionMerge = new TDEAction( i18n("Merge difference to working copy"), 0, - this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); + this, TQ_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); } TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) { @@ -213,48 +213,48 @@ if(!project()) if (context->hasType( Context::FileContext )) popup->insertSeparator(); - int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) ); + int id = subMenu->insertItem( actionCommit->text(), this, TQ_SLOT(slotCommit()) ); // CvsService let to do log and diff operations only on one file (or directory) at time /* if (m_urls.count() == 1) { - subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); - subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + subMenu->insertItem( actionDiff->text(), this, TQ_SLOT(slotDiff()) ); + subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); }*/ subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); - id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); + id = subMenu->insertItem( actionAdd->text(), this, TQ_SLOT(slotAdd()) ); subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository.")); - id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) ); + id = subMenu->insertItem( actionRemove->text(), this, TQ_SLOT(slotDel()) ); subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); - id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + id = subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs")); - id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) ); + id = subMenu->insertItem( actionBlame->text(), this, TQ_SLOT(slotBlame()) ); subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) ); + id = subMenu->insertItem( actionDiffLocal->text(), this, TQ_SLOT(slotDiffLocal()) ); subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk.")); - id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) ); + id = subMenu->insertItem( actionDiffHead->text(), this, TQ_SLOT(slotDiffHead()) ); subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository.")); - id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); + id = subMenu->insertItem( actionUpdate->text(), this, TQ_SLOT(slotUpdate()) ); subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository.")); - id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) ); + id = subMenu->insertItem( actionRevert->text(), this, TQ_SLOT(slotRevert()) ); subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") ); - id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) ); + id = subMenu->insertItem( actionResolve->text(), this, TQ_SLOT(slotResolve()) ); subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") ); - id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) ); + id = subMenu->insertItem( actionSwitch->text(), this, TQ_SLOT(slotSwitch()) ); subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") ); - id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) ); + id = subMenu->insertItem( actionCopy->text(), this, TQ_SLOT(slotCopy()) ); subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") ); - id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) ); + id = subMenu->insertItem( actionMerge->text(), this, TQ_SLOT(slotMerge()) ); subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") ); /* subMenu->insertSeparator(); - id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); + id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQ_SLOT(slotAddToIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).")); - id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); + id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQ_SLOT(slotRemoveFromIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).")); */ // Now insert in parent menu @@ -529,16 +529,16 @@ void subversionPart::slotProjectOpened() { } */ //loadOptions(); /// \FIXME slots - //connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - //connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + //connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + //connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } void subversionPart::slotProjectClosed() { kdDebug(9036) << "subversion :projectClosed" << endl; //saveOptions(); /// \FIXME slots - //disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - //disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + //disconnect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + //disconnect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } void subversionPart::savePartialProjectSession(TQDomElement* dom) { diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index 95b31f6b..f0438082 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -34,12 +34,12 @@ subversionWidget::subversionWidget( subversionPart *part, TQWidget *parent, cons { m_part = part; m_edit = new KTextEdit( this ); - m_edit->setReadOnly( TRUE ); + m_edit->setReadOnly( true ); tab()->addTab( m_edit, i18n("Notification") ); m_closeButton = new TQPushButton( tab() ); m_closeButton->setText( i18n("Close") ); tab()->setCornerWidget(m_closeButton); - connect( m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentTab()) ); + connect( m_closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeCurrentTab()) ); } subversionWidget::~subversionWidget() diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp index 87647525..d48edc43 100644 --- a/vcs/subversion/svn_blamewidget.cpp +++ b/vcs/subversion/svn_blamewidget.cpp @@ -31,7 +31,7 @@ SvnBlameWidget::SvnBlameWidget( TQWidget *parent, const char* name, bool modal, m_layout->setMargin(1); m_listView = new TQListView( this ); - outView()->setAllColumnsShowFocus( TRUE ); + outView()->setAllColumnsShowFocus( true ); outView()->addColumn( i18n("Line") ); outView()->addColumn( i18n("Rev") ); outView()->addColumn( i18n("Date") ); @@ -99,8 +99,8 @@ SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *parent ) m_layout->addWidget( m_okBtn, 1, 0 ); m_layout->addWidget( m_cancelBtn, 1, 1 ); - connect( m_okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( m_cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( m_okBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( m_cancelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); } SvnBlameFileSelectDlg::~SvnBlameFileSelectDlg() {} diff --git a/vcs/subversion/svn_blamewidget.h b/vcs/subversion/svn_blamewidget.h index 19f14238..50301cf9 100644 --- a/vcs/subversion/svn_blamewidget.h +++ b/vcs/subversion/svn_blamewidget.h @@ -42,7 +42,7 @@ class SvnBlameWidget : public TQWidget { TQ_OBJECT public: - SvnBlameWidget( TQWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); + SvnBlameWidget( TQWidget * parent = 0, const char * name = 0, bool modal = false, WFlags f = 0 ); virtual ~SvnBlameWidget(); void copyBlameData( TQValueList<SvnBlameHolder> *blamelist ); void show(); diff --git a/vcs/subversion/svn_copywidget.cpp b/vcs/subversion/svn_copywidget.cpp index 30b25fd7..094b9684 100644 --- a/vcs/subversion/svn_copywidget.cpp +++ b/vcs/subversion/svn_copywidget.cpp @@ -13,10 +13,10 @@ SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder { reqEdit->setText( reqPath ); - connect( urlRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsUrl()) ); - connect( pathRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsLocalPath()) ); - connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revnumInput, TQT_SLOT(setEnabled(bool)) ); - connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revkindCombo, TQT_SLOT(setDisabled(bool)) ); + connect( urlRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(setSourceAsUrl()) ); + connect( pathRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(setSourceAsLocalPath()) ); + connect( revnumRadio, TQ_SIGNAL(toggled(bool)), revnumInput, TQ_SLOT(setEnabled(bool)) ); + connect( revnumRadio, TQ_SIGNAL(toggled(bool)), revkindCombo, TQ_SLOT(setDisabled(bool)) ); // In many cases, users copy from reository to repository. This is for making tag/branche. // The case where copying from local path to repository may be lesser than the above one. diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp index e042df84..b12fdee4 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.cpp +++ b/vcs/subversion/svn_fileselectdlg_commit.cpp @@ -60,7 +60,7 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart if (fileInfo.isFile()){ KURL base_url( part->project()->projectDirectory()+"/" ); - TQString dirPath = KURL::relativeURL( base_url, fileInfo.dirPath(TRUE) ); + TQString dirPath = KURL::relativeURL( base_url, fileInfo.dirPath(true) ); vcsMap = ((SVNFileInfoProvider*)part->fileInfoProvider()) -> statusExt(dirPath, false/*repository access*/, true/*recurse*/, false/*getall*/, true/*noIgnore*/); vcsInfo = (*vcsMap)[fileInfo.fileName()]; diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index ebf5f438..5aa1aa40 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -56,8 +56,8 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) TQFont listView1_font( listView1->font() ); listView1_font.setPointSize( 9 ); listView1->setFont( listView1_font ); - listView1->setAllColumnsShowFocus( TRUE ); - listView1->setShowSortIndicator( TRUE ); + listView1->setAllColumnsShowFocus( true ); + listView1->setShowSortIndicator( true ); textEdit1 = new KTextEdit( splitter1, "textEdit1" ); textEdit1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) ); @@ -65,7 +65,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) textEdit1_font.setPointSize( 9 ); textEdit1->setFont( textEdit1_font ); textEdit1->setFocusPolicy( TQWidget::WheelFocus ); - textEdit1->setReadOnly( TRUE ); + textEdit1->setReadOnly( true ); m_layout->addWidget( splitter1, 0, 0 ); m_layout->setMargin(1); @@ -73,9 +73,9 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) resize( TQSize(692, 343).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); - connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) ); - connect( listView1, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)) ); + connect( listView1, TQ_SIGNAL(clicked( TQListViewItem *)), this, TQ_SLOT(slotClicked(TQListViewItem*)) ); + connect( listView1, TQ_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)) ); } SvnLogViewWidget::~SvnLogViewWidget() { @@ -128,8 +128,8 @@ void SvnLogViewWidget::contextMenuRequested( TQListViewItem *item, const TQPoint if( !m_ctxLogItem ) return; TQPopupMenu *menu = new TQPopupMenu(this); - menu->insertItem( i18n("Blame this revision"), this, TQT_SLOT(blameThis()) ); - menu->insertItem( i18n("Difference to previous revision"), this, TQT_SLOT(diffToPrevious()) ); + menu->insertItem( i18n("Blame this revision"), this, TQ_SLOT(blameThis()) ); + menu->insertItem( i18n("Difference to previous revision"), this, TQ_SLOT(diffToPrevious()) ); menu->exec( pos ); } void SvnLogViewWidget::blameThis() @@ -195,10 +195,10 @@ SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *parent, const char* name, bo radio4->setChecked(true); //start revistion by revision keyword radio5->setChecked(true); //end revision by revision number reinstallRevisionSpecifiers(); - connect( intInput1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartRevnumRadio()) ); - connect( comboBox1, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setStartRevkindRadio()) ); - connect( intInput2, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndRevnumRadio()) ); - connect( comboBox2, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setEndRevkindRadio()) ); + connect( intInput1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartRevnumRadio()) ); + connect( comboBox1, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(setStartRevkindRadio()) ); + connect( intInput2, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndRevnumRadio()) ); + connect( comboBox2, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(setEndRevkindRadio()) ); } SvnLogViewOptionDlg::~SvnLogViewOptionDlg() {} diff --git a/vcs/subversion/svn_logviewwidget.h b/vcs/subversion/svn_logviewwidget.h index c3f94bec..c5bd77d6 100644 --- a/vcs/subversion/svn_logviewwidget.h +++ b/vcs/subversion/svn_logviewwidget.h @@ -76,7 +76,7 @@ class SvnLogViewOptionDlg : public SvnLogViewOptionDlgBase { TQ_OBJECT public: - SvnLogViewOptionDlg(TQWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0); + SvnLogViewOptionDlg(TQWidget *parent=0, const char* name=0, bool modal=true, WFlags f=0); ~SvnLogViewOptionDlg(); int revstart(); TQString revKindStart(); diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp index 50731690..5885e6b7 100644 --- a/vcs/subversion/svn_mergewidget.cpp +++ b/vcs/subversion/svn_mergewidget.cpp @@ -33,10 +33,10 @@ SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent ) { dest->setURL( wcTarget.prettyURL() ); - connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revnum1, TQT_SLOT(setEnabled(bool)) ); - connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revkind1, TQT_SLOT(setDisabled(bool)) ); - connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revnum2, TQT_SLOT(setEnabled(bool)) ); - connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revkind2, TQT_SLOT(setDisabled(bool)) ); + connect( revnumbtn1, TQ_SIGNAL(toggled(bool)), revnum1, TQ_SLOT(setEnabled(bool)) ); + connect( revnumbtn1, TQ_SIGNAL(toggled(bool)), revkind1, TQ_SLOT(setDisabled(bool)) ); + connect( revnumbtn2, TQ_SIGNAL(toggled(bool)), revnum2, TQ_SLOT(setEnabled(bool)) ); + connect( revnumbtn2, TQ_SIGNAL(toggled(bool)), revkind2, TQ_SLOT(setDisabled(bool)) ); revkind1->setDisabled(true); revnum2->setDisabled(true); } diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui index b1811858..9a4e9c38 100644 --- a/vcs/subversion/svn_switchdlgbase.ui +++ b/vcs/subversion/svn_switchdlgbase.ui @@ -196,9 +196,9 @@ <slot>accept()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>Form1_destroyed( TQObject * )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/vcs/subversion/svn_switchwidget.cpp b/vcs/subversion/svn_switchwidget.cpp index 7149cce2..490d20b7 100644 --- a/vcs/subversion/svn_switchwidget.cpp +++ b/vcs/subversion/svn_switchwidget.cpp @@ -11,8 +11,8 @@ SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, : SvnSwitchDlgBase( parent ) , m_info( holder ) { - connect( switchOnlyRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); - connect( relocationRadio , TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( switchOnlyRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( relocationRadio , TQ_SIGNAL(clicked()), this, TQ_SLOT(resetCurrentRepositoryUrlEdit()) ); // set switch only switchOnlyRadio->setChecked( true ); wcUrlEdit->setText( wcPath ); diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp index d1eb8337..507ef8fa 100644 --- a/vcs/subversion/svn_tdeio.cpp +++ b/vcs/subversion/svn_tdeio.cpp @@ -32,9 +32,9 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kurl.h> #include <ksock.h> @@ -100,7 +100,7 @@ open_tmp_file (apr_file_t **fp, /* Open a unique file; use APR_DELONCLOSE. */ SVN_ERR (svn_io_open_unique_file (fp, &ignored_filename, - truepath, ".tmp", TRUE, pool)); + truepath, ".tmp", true, pool)); return SVN_NO_ERROR; } @@ -135,7 +135,7 @@ apr_array_header_t* svn_sort__hash(apr_hash_t *ht, ary = apr_array_make(pool, apr_hash_count(ht), sizeof(svn_sort_item_type)); /* loop over hash table and push all keys into the array */ - sorted = TRUE; + sorted = true; prev_item = NULL; for (hi = apr_hash_first(pool, ht); hi; hi = apr_hash_next(hi)) { @@ -251,13 +251,13 @@ void tdeio_svnProtocol::initNotifier(bool is_checkout, bool is_export, bool supp ctx->notify_func = tdeio_svnProtocol::notify; struct notify_baton *nb = ( struct notify_baton* )apr_palloc(spool, sizeof( struct notify_baton ) ); nb->master = this; - nb->received_some_change = FALSE; - nb->sent_first_txdelta = FALSE; + nb->received_some_change = false; + nb->sent_first_txdelta = false; nb->is_checkout = is_checkout; nb->is_export = is_export; nb->suppress_final_line = suppress_final_line; - nb->in_external = FALSE; - nb->had_print_error = FALSE; + nb->in_external = false; + nb->had_print_error = false; nb->pool = svn_pool_create (spool); ctx->notify_baton = nb; @@ -1185,7 +1185,7 @@ void tdeio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, i << endl ; apr_pool_t *subpool = svn_pool_create (pool); - apr_array_header_t *options = svn_cstring_split( "", "\t\r\n", TRUE, subpool ); + apr_array_header_t *options = svn_cstring_split( "", "\t\r\n", true, subpool ); // KURL nurl1 = url1; // KURL nurl2 = url2; @@ -1959,7 +1959,7 @@ void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_acti userstring = i18n( "Copied %1 " ).arg( path ); break; case svn_wc_notify_delete: //delete - nb->received_some_change = TRUE; + nb->received_some_change = true; userstring = i18n( "D %1" ).arg( path ); break; case svn_wc_notify_restore : //restore @@ -1981,11 +1981,11 @@ void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_acti userstring=i18n("Skipped %1.").arg( path ); break; case svn_wc_notify_update_delete: //update_delete - nb->received_some_change = TRUE; + nb->received_some_change = true; userstring=i18n( "D %1" ).arg( path ); break; case svn_wc_notify_update_add: //update_add - nb->received_some_change = TRUE; + nb->received_some_change = true; userstring=i18n( "A %1" ).arg( path ); break; case svn_wc_notify_update_update: //update_update @@ -1997,7 +1997,7 @@ void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_acti && ((prop_state == svn_wc_notify_state_inapplicable) || (prop_state == svn_wc_notify_state_unknown) || (prop_state == svn_wc_notify_state_unchanged)))) { - nb->received_some_change = TRUE; + nb->received_some_change = true; if (kind == svn_node_file) { if (content_state == svn_wc_notify_state_conflicted) @@ -2073,10 +2073,10 @@ void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_acti } } if (nb->in_external) - nb->in_external = FALSE; + nb->in_external = false; break; case svn_wc_notify_update_external: //update_external - nb->in_external = TRUE; + nb->in_external = true; userstring = i18n("Fetching external item into %1." ).arg( path ); break; case svn_wc_notify_status_completed: //status_completed @@ -2104,7 +2104,7 @@ void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_acti break; case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta if (! nb->sent_first_txdelta) { - nb->sent_first_txdelta = TRUE; + nb->sent_first_txdelta = true; userstring=i18n("Transmitting file data "); } else { userstring="."; @@ -2186,7 +2186,7 @@ void tdeio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) { extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv) { + TDE_EXPORT int kdemain(int argc, char **argv) { TDEInstance instance( "tdeio_kdevsvn" ); kdDebug(9036) << "*** Starting tdeio_kdevsvn " << endl; |