diff options
Diffstat (limited to 'parts')
321 files changed, 1630 insertions, 2478 deletions
diff --git a/parts/abbrev/abbrevconfigwidget.h b/parts/abbrev/abbrevconfigwidget.h index 4fdeb8a9..156c85ff 100644 --- a/parts/abbrev/abbrevconfigwidget.h +++ b/parts/abbrev/abbrevconfigwidget.h @@ -22,7 +22,7 @@ class AbbrevConfigWidget : public AbbrevConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: 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/abbrevpart.h b/parts/abbrev/abbrevpart.h index 2b602088..afc252a4 100644 --- a/parts/abbrev/abbrevpart.h +++ b/parts/abbrev/abbrevpart.h @@ -62,7 +62,7 @@ private: class AbbrevPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: 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/addtemplatedlg.h b/parts/abbrev/addtemplatedlg.h index c8912c18..71e72ac5 100644 --- a/parts/abbrev/addtemplatedlg.h +++ b/parts/abbrev/addtemplatedlg.h @@ -25,7 +25,7 @@ class AddTemplateDialog: public AddTemplateDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/abbrev/cpp_keywords b/parts/abbrev/cpp_keywords index e84d0cf1..19bd1a82 100644 --- a/parts/abbrev/cpp_keywords +++ b/parts/abbrev/cpp_keywords @@ -1,9 +1,9 @@ K_DCOP k_dcop -k_dcop_Q_SIGNALS -Q_OBJECT -Q_SIGNALS -Q_SLOTS +k_dcop_signals +TQ_OBJECT +signals +slots emit __int64 __asm__ diff --git a/parts/abbrev/qt_classes b/parts/abbrev/qt_classes index 266307bc..b6269002 100644 --- a/parts/abbrev/qt_classes +++ b/parts/abbrev/qt_classes @@ -38,14 +38,14 @@ QCanvasText QCanvasTextExtra QCanvasView QCanvasViewData -QChar +TQChar QCharRef QCharRef QCheckBox QCheckListItem QCleanupHandler QClipboard -QColor +TQColor QColorGroup QComboBox QComboBoxData @@ -137,7 +137,7 @@ QHeaderData QHostAddress QHttpHeader QHttpRequest -QIODevice +TQIODevice QIconDragItem QIconFactory QIconSet @@ -146,7 +146,7 @@ QIconViewItem QIconViewItemLineEdit QIconViewPrivate QIconViewToolTip -QImage +TQImage QImageConsumer QImageDataMisc QImageDecoder @@ -215,7 +215,7 @@ QNPlugin QNetworkOperation QNetworkProtocol QNetworkProtocolFactoryBase -QObject +TQObject QObjectList QObjectListIt QObjectUserData @@ -308,7 +308,7 @@ QSqlResult QStatusBar QStoredDragData QStrList -QString +TQString QStringList QStyle QStyleFactory @@ -380,7 +380,7 @@ QWSManager QWSRegionManager QWaitCondition QWheelEvent -QWidget +TQWidget QWidgetFactory QWidgetList QWidgetListIt 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/appwizarddlg.h b/parts/appwizard/appwizarddlg.h index bae75531..06fc723c 100644 --- a/parts/appwizard/appwizarddlg.h +++ b/parts/appwizard/appwizarddlg.h @@ -120,7 +120,7 @@ struct AppWizardFileTemplate class AppWizardDialog : public AppWizardDialogBase { - Q_OBJECT + TQ_OBJECT public: 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/appwizardpart.h b/parts/appwizard/appwizardpart.h index 59280631..a68a2cab 100644 --- a/parts/appwizard/appwizardpart.h +++ b/parts/appwizard/appwizardpart.h @@ -23,7 +23,7 @@ class AppWizardDialog; class AppWizardPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/appwizard/common/admin b/parts/appwizard/common/admin -Subproject c23f9f693475149602b052e66e7e9d9e726e299 +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/generic.py b/parts/appwizard/common/scons/admin/generic.py index 55c37c90..52c4e3bc 100644 --- a/parts/appwizard/common/scons/admin/generic.py +++ b/parts/appwizard/common/scons/admin/generic.py @@ -31,18 +31,18 @@ def generate(env): env['HELP']=1 if env['HELP']: - print """ + print(""" """+BOLD+"""*** Generic options *** -----------------------"""+NORMAL+""" """+BOLD+"""* debug """+NORMAL+""": debug=1 (-g) or debug=full (-g3, slower) else use environment CXXFLAGS, or -O2 by default """+BOLD+"""* prefix """+NORMAL+""": the installation path """+BOLD+"""* extraincludes """+NORMAL+""": a list of paths separated by ':' ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/include:/usr/local -"""+NORMAL +"""+NORMAL) ## Global cache directory ## Put all project files in it so a rm -rf cache will clean up the config - if not env.has_key('CACHEDIR'): + if 'CACHEDIR' not in env: env['CACHEDIR'] = os.getcwd()+'/cache/' if not os.path.isdir(env['CACHEDIR']): os.mkdir(env['CACHEDIR']) @@ -56,9 +56,9 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ # Special trick for installing rpms ... env['DESTDIR']='' - if 'install' in sys.argv and os.environ.has_key('DESTDIR'): + if 'install' in sys.argv and 'DESTDIR' in os.environ: env['DESTDIR']=os.environ['DESTDIR']+'/' - print CYAN+'** Enabling DESTDIR for the project ** ' + NORMAL + env['DESTDIR'] + print(CYAN+'** Enabling DESTDIR for the project ** ' + NORMAL + env['DESTDIR']) # load the options from SCons.Options import Options, PathOption @@ -89,7 +89,7 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ env['_CONFIGURE']=0 # configure the environment if needed - if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('ISCONFIGURED')): + if not env['HELP'] and (env['_CONFIGURE'] or 'ISCONFIGURED' not in env): import re def makeHashTable(args): @@ -108,40 +108,40 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ env['ARGS']=makeHashTable(sys.argv) # be paranoid, unset existing variables - if env.has_key('KDECXXFLAGS'): + if 'KDECXXFLAGS' in env: env.__delitem__('KDECXXFLAGS') - if env.has_key('KDECCFLAGS'): + if 'KDECCFLAGS' in env: env.__delitem__('KDECCFLAGS') - if env.has_key('KDELINKFLAGS'): + if 'KDELINKFLAGS' in env: env.__delitem__('KDELINKFLAGS') - if env.has_key('PREFIX'): + if 'PREFIX' in env: env.__delitem__('PREFIX') - if env.has_key('EXTRAINCLUDES'): + if 'EXTRAINCLUDES' in env: env.__delitem__('EXTRAINCLUDES') - if env.has_key('ISCONFIGURED'): + if 'ISCONFIGURED' in env: env.__delitem__('ISCONFIGURED') if env['ARGS'].get('debug', None): debuglevel = env['ARGS'].get('debug', None) - print CYAN+'** Enabling debug for the project **' + NORMAL + print(CYAN+'** Enabling debug for the project **' + NORMAL) if (debuglevel == "full"): env['KDECXXFLAGS'] = ['-DDEBUG', '-g3'] else: env['KDECXXFLAGS'] = ['-DDEBUG', '-g'] else: - if os.environ.has_key('CXXFLAGS'): + if 'CXXFLAGS' in os.environ: # user-defined flags (gentooers will be elighted) env['KDECXXFLAGS'] = SCons.Util.CLVar( os.environ['CXXFLAGS'] ) env.Append( KDECXXFLAGS = ['-DNDEBUG', '-DNO_DEBUG'] ) else: env.Append(KDECXXFLAGS = ['-O2', '-DNDEBUG', '-DNO_DEBUG']) - if os.environ.has_key('CFLAGS'): + if 'CFLAGS' in os.environ: env['KDECCFLAGS'] = SCons.Util.CLVar( os.environ['CFLAGS'] ) ## FreeBSD settings (contributed by will at freebsd dot org) if os.uname()[0] == "FreeBSD": - if os.environ.has_key('PTHREAD_LIBS'): + if 'PTHREAD_LIBS' in os.environ: env.AppendUnique( KDELINKFLAGS = SCons.Util.CLVar( os.environ['PTHREAD_LIBS'] ) ) else: syspf = os.popen('/sbin/sysctl kern.osreldate') @@ -159,15 +159,15 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ # User-specified prefix if env['ARGS'].get('prefix', None): env['PREFIX'] = env['ARGS'].get('prefix', None) - print CYAN+'** set the installation prefix for the project : ' + env['PREFIX'] +' **'+ NORMAL - elif env.has_key('PREFIX'): + print(CYAN+'** set the installation prefix for the project : ' + env['PREFIX'] +' **'+ NORMAL) + elif 'PREFIX' in env: env.__delitem__('PREFIX') # User-specified include paths env['EXTRAINCLUDES'] = env['ARGS'].get('extraincludes', None) if env['ARGS'].get('extraincludes', None): - print CYAN+'** set extra include paths for the project : ' + env['EXTRAINCLUDES'] +' **'+ NORMAL - elif env.has_key('EXTRAINCLUDES'): + print(CYAN+'** set extra include paths for the project : ' + env['EXTRAINCLUDES'] +' **'+ NORMAL) + elif 'EXTRAINCLUDES' in env: env.__delitem__('EXTRAINCLUDES') env['ISCONFIGURED']=1 @@ -175,16 +175,16 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ # And finally save the options in the cache opts.Save(cachefile, env) - if env.has_key('KDECXXFLAGS'): + if 'KDECXXFLAGS' in env: env.AppendUnique( CPPFLAGS = env['KDECXXFLAGS'] ) - if env.has_key('KDECCFLAGS'): + if 'KDECCFLAGS' in env: env.AppendUnique( CCFLAGS = env['KDECCFLAGS'] ) - if env.has_key('KDELINKFLAGS'): + if 'KDELINKFLAGS' in env: env.AppendUnique( LINKFLAGS = env['KDELINKFLAGS'] ) - if env.has_key('EXTRAINCLUDES'): + if 'EXTRAINCLUDES' in env: incpaths = [] for dir in str(env['EXTRAINCLUDES']).split(':'): incpaths.append( dir ) diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index 84b2c812..3d54ce93 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -43,109 +43,109 @@ def detect_kde(env): libdir = libdir+libsuffix ## Detect the kde libraries - print "Checking for tde-config : ", + print("Checking for tde-config : ", end=' ') kde_config = os.popen("which tde-config 2>/dev/null").read().strip() if len(kde_config): - print GREEN+"tde-config was found"+NORMAL + print(GREEN+"tde-config was found"+NORMAL) else: - print RED+"tde-config was NOT found in your PATH"+NORMAL - print "Make sure kde is installed properly" - print "(missing package tdebase-devel?)" + print(RED+"tde-config was NOT found in your PATH"+NORMAL) + print("Make sure kde is installed properly") + print("(missing package tdebase-devel?)") env.Exit(1) env['TDEDIR'] = os.popen('tde-config -prefix').read().strip() - print "Checking for kde version : ", + print("Checking for kde version : ", end=' ') kde_version = os.popen("tde-config --version|grep KDE").read().strip().split()[1] if int(kde_version[0]) != 3 or int(kde_version[2]) < 2: - print RED+kde_version - print RED+"Your kde version can be too old"+NORMAL - print RED+"Please make sure kde is at least 3.2"+NORMAL + print(RED+kde_version) + print(RED+"Your kde version can be too old"+NORMAL) + print(RED+"Please make sure kde is at least 3.2"+NORMAL) else: - print GREEN+kde_version+NORMAL + print(GREEN+kde_version+NORMAL) ## Detect the qt library - print "Checking for the qt library : ", + print("Checking for the qt library : ", end=' ') qtdir = os.getenv("TQTDIR") if qtdir: - print GREEN+"qt is in "+qtdir+NORMAL + print(GREEN+"qt is in "+qtdir+NORMAL) else: libdir = os.popen('tde-config --expandvars --install lib').read().strip() libtdeuiSO = libdir+'/'+getSOfromLA(libdir+'/libtdeui.la') m = re.search('(.*)/lib/libtqt.*', os.popen('ldd ' + libtdeuiSO + ' | grep libtqt').read().strip().split()[2]) if m: qtdir = m.group(1) - print YELLOW+"qt was found as "+m.group(1)+NORMAL + print(YELLOW+"qt was found as "+m.group(1)+NORMAL) else: - print RED+"qt was not found"+NORMAL - print RED+"Please set TQTDIR first (/usr/lib/qt3?)"+NORMAL + print(RED+"qt was not found"+NORMAL) + print(RED+"Please set TQTDIR first (/usr/lib/qt3?)"+NORMAL) env.Exit(1) env['TQTDIR'] = qtdir.strip() ## Find the necessary programs uic and moc - print "Checking for uic : ", + print("Checking for uic : ", end=' ') uic = qtdir + "/bin/uic" if os.path.isfile(uic): - print GREEN+"uic was found as "+uic+NORMAL + print(GREEN+"uic was found as "+uic+NORMAL) else: uic = os.popen("which uic 2>/dev/null").read().strip() if len(uic): - print YELLOW+"uic was found as "+uic+NORMAL + print(YELLOW+"uic was found as "+uic+NORMAL) else: uic = os.popen("which uic 2>/dev/null").read().strip() if len(uic): - print YELLOW+"uic was found as "+uic+NORMAL + print(YELLOW+"uic was found as "+uic+NORMAL) else: - print RED+"uic was not found - set TQTDIR put it in your PATH ?"+NORMAL + print(RED+"uic was not found - set TQTDIR put it in your PATH ?"+NORMAL) env.Exit(1) env['QT_UIC'] = uic - print "Checking for moc : ", + print("Checking for moc : ", end=' ') moc = qtdir + "/bin/moc" if os.path.isfile(moc): - print GREEN + "moc was found as " + moc + NORMAL + print(GREEN + "moc was found as " + moc + NORMAL) else: moc = os.popen("which moc 2>/dev/null").read().strip() if len(moc): - print YELLOW + "moc was found as " + moc + NORMAL + print(YELLOW + "moc was found as " + moc + NORMAL) elif os.path.isfile("/usr/share/qt3/bin/moc"): moc = "/usr/share/qt3/bin/moc" - print YELLOW + "moc was found as " + moc + NORMAL + print(YELLOW + "moc was found as " + moc + NORMAL) else: - print RED + "moc was not found - set TQTDIR or put it in your PATH ?" + NORMAL + print(RED + "moc was not found - set TQTDIR or put it in your PATH ?" + NORMAL) env.Exit(1) env['QT_MOC'] = moc ## check for the qt and kde includes - print "Checking for the qt includes : ", + print("Checking for the qt includes : ", end=' ') if qtincludes and os.path.isfile(qtincludes + "/qtqlayout.h"): # The user told where to look for and it looks valid - print GREEN + "ok " + qtincludes + NORMAL + print(GREEN + "ok " + qtincludes + NORMAL) else: if os.path.isfile(qtdir + "/include/qtqlayout.h"): # Automatic detection - print GREEN + "ok " + qtdir + "/include/ " + NORMAL + print(GREEN + "ok " + qtdir + "/include/ " + NORMAL) qtincludes = qtdir + "/include/" elif os.path.isfile("/usr/include/qt3/qtqlayout.h"): # Debian probably - print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL + print(YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL) qtincludes = "/usr/include/qt3" else: - print RED + "the qt headers were not found" + NORMAL + print(RED + "the qt headers were not found" + NORMAL) env.Exit(1) - print "Checking for the kde includes : ", + print("Checking for the kde includes : ", end=' ') kdeprefix = os.popen("tde-config --prefix").read().strip() if not kdeincludes: kdeincludes = kdeprefix+"/include/" if os.path.isfile(kdeincludes + "/klineedit.h"): - print GREEN + "ok " + kdeincludes + NORMAL + print(GREEN + "ok " + kdeincludes + NORMAL) else: if os.path.isfile(kdeprefix+"/include/tde/klineedit.h"): # Debian, Fedora probably - print YELLOW + "the kde headers were found in " + kdeprefix + "/include/tde/" + NORMAL + print(YELLOW + "the kde headers were found in " + kdeprefix + "/include/tde/" + NORMAL) kdeincludes = kdeprefix + "/include/tde/" else: - print RED + "The kde includes were NOT found" + NORMAL + print(RED + "The kde includes were NOT found" + NORMAL) env.Exit(1) if prefix: @@ -206,7 +206,7 @@ def detect_kde(env): def generate(env): """"Set up the qt and kde environment and builders - the moc part is difficult to understand """ if env['HELP']: - print """ + print(""" """+BOLD+"""*** KDE options *** -------------------"""+NORMAL+""" """+BOLD+"""* prefix """+NORMAL+""": base install path, ie: /usr/local @@ -219,7 +219,7 @@ def generate(env): """+BOLD+"""* tdelibs """+NORMAL+""": path to the kde libs, for linking the programs """+BOLD+"""* tqtlibs """+NORMAL+""": same punishment, for qt libraries ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt -"""+NORMAL +"""+NORMAL) import SCons.Defaults import SCons.Tool @@ -264,8 +264,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt objBuilder = getattr(env, self.objBuilderName) # some regular expressions: - # Q_OBJECT detection - q_object_search = re.compile(r'[^A-Za-z0-9]Q_OBJECT[^A-Za-z0-9]') + # TQ_OBJECT detection + q_object_search = re.compile(r'[^A-Za-z0-9]TQ_OBJECT[^A-Za-z0-9]') # The following is kind of hacky to get builders working properly (FIXME) ?? objBuilderEnv = objBuilder.env @@ -280,12 +280,12 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt if not obj.has_builder(): # binary obj file provided if qtdebug: - print "scons: qt: '%s' seems to be a binary. Discarded." % str(obj) + print("scons: qt: '%s' seems to be a binary. Discarded." % str(obj)) continue cpp = obj.sources[0] if not splitext(str(cpp))[1] in source_extensions: if qtdebug: - print "scons: qt: '%s' is no cxx file. Discarded." % str(cpp) + print("scons: qt: '%s' is no cxx file. Discarded." % str(cpp)) # c or fortran source continue #cpp_contents = comment.sub('', cpp.get_contents()) @@ -300,7 +300,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ui = find_file(uiname, (cpp.get_dir(),), FS.File) if ui: if qtdebug: - print "scons: qt: found .ui file of header" #% (str(h), str(cpp)) + print("scons: qt: found .ui file of header") #% (str(h), str(cpp)) #h_contents = comment.sub('', h.get_contents()) break @@ -315,18 +315,18 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt h = find_file(hname, (cpp.get_dir(),), FS.File) if h: if qtdebug: - print "scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp)) + print("scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp))) #h_contents = comment.sub('', h.get_contents()) h_contents = h.get_contents() break if not h and qtdebug: - print "scons: qt: no header for '%s'." % (str(cpp)) + print("scons: qt: no header for '%s'." % (str(cpp))) if h and q_object_search.search(h_contents): - # h file with the Q_OBJECT macro found -> add .moc or _moc.cpp file + # h file with the TQ_OBJECT macro found -> add .moc or _moc.cpp file moc_cpp = None - if env.has_key('NOMOCSCAN'): + if 'NOMOCSCAN' in env: moc_cpp = env.Moc(h) else: reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.moc("|>)' @@ -338,12 +338,12 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt moc_o = objBuilder(moc_cpp) out_sources.append(moc_o) if qtdebug: - print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0])) + print("scons: qt: found TQ_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0]))) if cpp and q_object_search.search(cpp_contents): - print "error, bksys cannot handle cpp files with Q_OBJECT classes" - print "if you are sure this is a feature worth the effort, " - print "report this to the authors tnagyemail-mail yahoo.fr" + print("error, bksys cannot handle cpp files with TQ_OBJECT classes") + print("if you are sure this is a feature worth the effort, ") + print("report this to the authors tnagyemail-mail yahoo.fr") # restore the original env attributes (FIXME) objBuilder.env = objBuilderEnv @@ -392,7 +392,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt opts.Update(env) # reconfigure when things are missing - if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('TQTDIR') or not env.has_key('TDEDIR')): + if not env['HELP'] and (env['_CONFIGURE'] or 'TQTDIR' not in env or 'TDEDIR' not in env): detect_kde(env) # finally save the configuration to the cache file @@ -501,7 +501,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt if len(source) <2: if not os.path.isfile(str(source[0])): - print RED+'kcfg file given'+str(source[0])+' does not exist !'+NORMAL + print(RED+'kcfg file given'+str(source[0])+' does not exist !'+NORMAL) return target, source kfcgfilename="" kcfgFileDeclRx = re.compile("^[fF]ile\s*=\s*(.+)\s*$") @@ -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): @@ -604,7 +604,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ## return a list of things def make_list(e): - if type(e) is types.ListType: + if type(e) is list: return e else: return e.split() @@ -650,13 +650,13 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt for file in ui_files: for ofile in other_files: if ofile == file: - print RED+"WARNING: You have included "+file+".ui and another file of the same prefix"+NORMAL - print "Files generated by uic (file.h, file.cpp must not be included" + print(RED+"WARNING: You have included "+file+".ui and another file of the same prefix"+NORMAL) + print("Files generated by uic (file.h, file.cpp must not be included") for file in kcfg_files: for ofile in other_files: if ofile == file: - print RED+"WARNING: You have included "+file+".kcfg and another file of the same prefix"+NORMAL - print "Files generated by tdeconfig_compiler (settings.h, settings.cpp) must not be included" + print(RED+"WARNING: You have included "+file+".kcfg and another file of the same prefix"+NORMAL) + print("Files generated by tdeconfig_compiler (settings.h, settings.cpp) must not be included") return src @@ -670,8 +670,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt return basedir=env['DESTDIR'] if len(restype)>0: - if not lenv.has_key(restype): - print RED+"unknown resource type "+restype+NORMAL + if restype not in lenv: + print(RED+"unknown resource type "+restype+NORMAL) else: basedir += lenv[restype]+'/' #print file # <- useful to trace stuff :) @@ -684,8 +684,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt return basedir=env['DESTDIR'] if len(restype)>0: - if not lenv.has_key(restype): - print RED+"unknown resource type "+restype+NORMAL + if restype not in lenv: + print(RED+"unknown resource type "+restype+NORMAL) else: basedir += lenv[restype]+'/' install_list = env.InstallAs(basedir+destfile, file) @@ -697,7 +697,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt The program is installed except if one sets env['NOAUTOINSTALL'] """ src = KDEfiles(lenv, target, source) program_list = lenv.Program(target, src) - if not lenv.has_key('NOAUTOINSTALL'): + if 'NOAUTOINSTALL' not in lenv: KDEinstall(lenv, 'KDEBIN', '', target) return program_list @@ -708,7 +708,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt lenv['LIBPREFIX']=libprefix library_list = lenv.SharedLibrary(target, src) lafile_list = lenv.LaFile(target, library_list) - if not lenv.has_key('NOAUTOINSTALL'): + if 'NOAUTOINSTALL' not in lenv: install_dir = 'KDEMODULE' if kdelib==1: install_dir = 'KDELIBPATH' @@ -800,13 +800,13 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt filename = lst[ len(lst) - 1 ] tmp = filename.split('-') if len(tmp)!=3: - print RED+'WARNING: icon filename has unknown format: '+iconfile+NORMAL + print(RED+'WARNING: icon filename has unknown format: '+iconfile+NORMAL) continue [icon_dir, icon_type, icon_filename]=tmp try: destfile = '%s/%s/%s/%s' % (lenv['KDEICONS'], dir_dic[icon_dir], type_dic[icon_type], icon_filename) except KeyError: - print RED+'WARNING: unknown icon type: '+iconfile+NORMAL + print(RED+'WARNING: unknown icon type: '+iconfile+NORMAL) continue ## Do not use KDEinstallas here, as parsing from an ide will be necessary if env['_INSTALL']: diff --git a/parts/appwizard/filepropspage.h b/parts/appwizard/filepropspage.h index 2539fd79..c75aa1b1 100644 --- a/parts/appwizard/filepropspage.h +++ b/parts/appwizard/filepropspage.h @@ -19,7 +19,7 @@ class ClassFileProp { class FilePropsPage : public FilePropsPageBase { - Q_OBJECT + TQ_OBJECT public: 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 cbe5bec2..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 @@ -417,7 +417,7 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName) TQFile configIn(dirName+"/configure.in"); TQFile configAc(dirName+"/configure.ac"); if (configInIn.open(IO_ReadOnly)){ - cstream.setDevice(TQT_TQIODEVICE(&configInIn)); + cstream.setDevice(&configInIn); while (!cstream.atEnd()) { TQString line = cstream.readLine(); if ( ac_init.search(line) >= 0){ @@ -437,11 +437,11 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName) } if (configIn.open(IO_ReadOnly)){ - cstream.setDevice(TQT_TQIODEVICE(&configIn)); + cstream.setDevice(&configIn); } else{ if (configAc.open(IO_ReadOnly)){ - cstream.setDevice(TQT_TQIODEVICE(&configAc)); + cstream.setDevice(&configAc); } else{ return; @@ -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/importdlg.h b/parts/appwizard/importdlg.h index 5b334668..3ab2e71a 100644 --- a/parts/appwizard/importdlg.h +++ b/parts/appwizard/importdlg.h @@ -27,7 +27,7 @@ struct InfrastructureCmd{ class ImportDialog : public ImportDialogBase { - Q_OBJECT + TQ_OBJECT public: 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/imports/CMakeLists.txt b/parts/appwizard/imports/CMakeLists.txt index b9abbf17..76d6e153 100644 --- a/parts/appwizard/imports/CMakeLists.txt +++ b/parts/appwizard/imports/CMakeLists.txt @@ -13,7 +13,7 @@ tde_create_translated_desktop( SOURCE c-auto cpp-auto fortran-auto java-auto kde gnome c cpp fortran python php perl java java-ant qttmake qtqmake - qt4qmake ruby pascal ada + ruby pascal ada DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/imports PO_DIR tdevelop-desktops ) @@ -23,6 +23,6 @@ install( FILES java-auto.kdevelop kde.kdevelop gnome.kdevelop c.kdevelop cpp.kdevelop fortran.kdevelop python.kdevelop php.kdevelop perl.kdevelop java.kdevelop java-ant.kdevelop - qttmake.kdevelop qtqmake.kdevelop qt4qmake.kdevelop + qttmake.kdevelop qtqmake.kdevelop ruby.kdevelop pascal.kdevelop ada.kdevelop DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/importfiles ) diff --git a/parts/appwizard/imports/Makefile.am b/parts/appwizard/imports/Makefile.am index 5047de18..309293d4 100644 --- a/parts/appwizard/imports/Makefile.am +++ b/parts/appwizard/imports/Makefile.am @@ -2,6 +2,6 @@ appwizarddatadir = ${kde_datadir}/kdevappwizard importsdir = ${appwizarddatadir}/imports importfilesdir = ${appwizarddatadir}/importfiles -imports_DATA = c-auto cpp-auto fortran-auto java-auto kde gnome c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada -importfiles_DATA = c-auto.kdevelop cpp-auto.kdevelop fortran-auto.kdevelop java-auto.kdevelop kde.kdevelop gnome.kdevelop c.kdevelop cpp.kdevelop fortran.kdevelop python.kdevelop php.kdevelop perl.kdevelop java.kdevelop java-ant.kdevelop qttmake.kdevelop qtqmake.kdevelop qt4qmake.kdevelop ruby.kdevelop pascal.kdevelop ada.kdevelop +imports_DATA = c-auto cpp-auto fortran-auto java-auto kde gnome c cpp fortran python php perl java java-ant qttmake qtqmake ruby pascal ada +importfiles_DATA = c-auto.kdevelop cpp-auto.kdevelop fortran-auto.kdevelop java-auto.kdevelop kde.kdevelop gnome.kdevelop c.kdevelop cpp.kdevelop fortran.kdevelop python.kdevelop php.kdevelop perl.kdevelop java.kdevelop java-ant.kdevelop qttmake.kdevelop qtqmake.kdevelop ruby.kdevelop pascal.kdevelop ada.kdevelop diff --git a/parts/appwizard/imports/qt4qmake b/parts/appwizard/imports/qt4qmake deleted file mode 100644 index 56f22885..00000000 --- a/parts/appwizard/imports/qt4qmake +++ /dev/null @@ -1,3 +0,0 @@ -# TDE Config File -[General] -Comment=Qt4 C++ Application (QMake4 based) diff --git a/parts/appwizard/imports/qt4qmake.kdevelop b/parts/appwizard/imports/qt4qmake.kdevelop deleted file mode 100644 index dedc866b..00000000 --- a/parts/appwizard/imports/qt4qmake.kdevelop +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0"?> -<kdevelop> - <general> - <author>%{AUTHOR}</author> - <email>%{EMAIL}</email> - <version>%{VERSION}</version> - <projectmanagement>KDevTrollProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - </keywords> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*" name="Others" /> - </groups> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>qt-kdev3</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoredoxygen> - <toc>KDE Libraries (Doxygen)</toc> - </ignoredoxygen> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell/> - </general> - </kdevdebugger> - <kdevcppsupport> - <qt> - <version>4</version> - <used>true</used> - <includestyle>4</includestyle> - <designerintegration>ExternalDesigner</designerintegration> - </qt> - </kdevcppsupport> - <kdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - <type ext="qrc" /> - </useglobaltypes> - </kdevfilecreate> -</kdevelop> 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 f5b5e2e7..df911cc1 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -33,7 +33,7 @@ #include "astyle_widget.h" #include "astyle_adaptor.h" -static const KDevPluginInfo data("kdevastyle"); +static const KDevPluginInfo pluginData("kdevastyle"); namespace { const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm"; @@ -41,22 +41,22 @@ namespace { typedef KDevGenericFactory<AStylePart> AStyleFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( pluginData ) ) AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) - : KDevSourceFormatter(&data, parent, name ? name : "AStylePart") + : KDevSourceFormatter(&pluginData, parent, name ? name : "AStylePart") { setInstance(AStyleFactory::instance()); 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_part.h b/parts/astyle/astyle_part.h index f5a79485..05f94bb7 100644 --- a/parts/astyle/astyle_part.h +++ b/parts/astyle/astyle_part.h @@ -22,7 +22,7 @@ class ConfigWidgetProxy; class AStylePart : public KDevSourceFormatter { - Q_OBJECT + TQ_OBJECT public: 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/astyle_widget.h b/parts/astyle/astyle_widget.h index 91963e54..5ebb70b0 100644 --- a/parts/astyle/astyle_widget.h +++ b/parts/astyle/astyle_widget.h @@ -9,7 +9,7 @@ class KDevPart; class AStyleWidget : public AStyleConfig { - Q_OBJECT + TQ_OBJECT public: 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 2d5a0a10..a22756df 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -41,11 +41,11 @@ #define BOOKMARKSETTINGSPAGE 1 typedef KDevGenericFactory<BookmarksPart> BookmarksFactory; -static const KDevPluginInfo data("kdevbookmarks"); -K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) ) +static const KDevPluginInfo pluginData("kdevbookmarks"); +K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( pluginData ) ) BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "BookmarksPart" ) + : KDevPlugin(&pluginData, parent, name ? name : "BookmarksPart" ) { setInstance(BookmarksFactory::instance()); @@ -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() ) ); } } } @@ -124,7 +124,7 @@ void BookmarksPart::reload() { //kdDebug(0) << "BookmarksPart::reload()" << endl; - TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); + TQObject * senderobj = const_cast<TQObject*>(sender()); if ( KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj ) ) { if ( partIsSane( ro_part ) ) @@ -140,7 +140,7 @@ void BookmarksPart::marksEvent() if ( ! _settingMarks ) { - TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); + TQObject * senderobj = const_cast<TQObject*>(sender()); KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj ); if ( partIsSane( ro_part ) && !_dirtyParts.contains( ro_part ) ) @@ -203,7 +203,7 @@ void BookmarksPart::restorePartialProjectSession( const TQDomElement * el ) TQString line = mark.attribute( "line" ); if ( line != TQString() ) { - data->marks.append( tqMakePair( line.toInt(), TQString() ) ); + data->marks.append( qMakePair( line.toInt(), TQString() ) ); } mark = mark.nextSibling().toElement(); } @@ -409,7 +409,7 @@ EditorData * BookmarksPart::storeBookmarksForURL( KParts::ReadOnlyPart * ro_part if ( it.current()->type & KTextEditor::MarkInterface::markType01 ) { int line = it.current()->line; - data->marks.append( tqMakePair( line, TQString() ) ); + data->marks.append( qMakePair( line, TQString() ) ); } ++it; } @@ -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_part.h b/parts/bookmarks/bookmarks_part.h index ae74bf63..b0b58b6b 100644 --- a/parts/bookmarks/bookmarks_part.h +++ b/parts/bookmarks/bookmarks_part.h @@ -40,7 +40,7 @@ class TQDomElement; class BookmarksPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/bookmarks/bookmarks_settings.h b/parts/bookmarks/bookmarks_settings.h index a28f424e..278fa637 100644 --- a/parts/bookmarks/bookmarks_settings.h +++ b/parts/bookmarks/bookmarks_settings.h @@ -18,7 +18,7 @@ class BookmarksPart; class BookmarkSettings : public BookmarkSettingsBase { - Q_OBJECT + TQ_OBJECT public: 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/bookmarks/bookmarks_widget.h b/parts/bookmarks/bookmarks_widget.h index 79df9593..3246cec0 100644 --- a/parts/bookmarks/bookmarks_widget.h +++ b/parts/bookmarks/bookmarks_widget.h @@ -28,7 +28,7 @@ class BookmarksConfig; class BookmarksWidget : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: 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/classtooldlg.h b/parts/classview/classtooldlg.h index d143e66e..958cb9b5 100644 --- a/parts/classview/classtooldlg.h +++ b/parts/classview/classtooldlg.h @@ -29,7 +29,7 @@ class ParsedClass; class ClassToolDialog : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/classview/classtoolwidget.h b/parts/classview/classtoolwidget.h index 8fd6b974..cfe2d603 100644 --- a/parts/classview/classtoolwidget.h +++ b/parts/classview/classtoolwidget.h @@ -19,7 +19,7 @@ class ClassToolWidget : public ClassTreeBase { - Q_OBJECT + TQ_OBJECT public: 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/classtreebase.h b/parts/classview/classtreebase.h index 413f288b..a73aede7 100644 --- a/parts/classview/classtreebase.h +++ b/parts/classview/classtreebase.h @@ -29,7 +29,7 @@ class TDEPopupMenu; class ClassTreeBase : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index 92e26bd0..93110a54 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -139,12 +139,12 @@ class FunctionCompletion : public CustomCompleter { typedef KDevGenericFactory<ClassViewPart> ClassViewFactory; -static const KDevPluginInfo data("kdevclassview"); -K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) ) +static const KDevPluginInfo pluginData("kdevclassview"); +K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( pluginData ) ) ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& ) - :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ), - KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ), + :/// KDevPlugin( &pluginData, parent, name ? name : "ClassViewPart" ), + KDevCodeBrowserFrontend( &pluginData, parent, name ? name : "ClassViewPart" ), m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0) { setInstance(ClassViewFactory::instance()); @@ -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/classviewpart.h b/parts/classview/classviewpart.h index 16e18def..19342916 100644 --- a/parts/classview/classviewpart.h +++ b/parts/classview/classviewpart.h @@ -54,7 +54,7 @@ class Navigator; class HierarchyDialog; class ClassViewPart : public Extensions::KDevCodeBrowserFrontend { - Q_OBJECT + TQ_OBJECT public: ClassViewPart(TQObject *parent, const char *name, const TQStringList &); 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/classviewwidget.h b/parts/classview/classviewwidget.h index d74448f5..bdbd69f4 100644 --- a/parts/classview/classviewwidget.h +++ b/parts/classview/classviewwidget.h @@ -45,7 +45,7 @@ class TDEToggleAction; class ClassViewWidget : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: enum ViewMode 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/digraphview.h b/parts/classview/digraphview.h index a72aa941..ed7fcc2e 100644 --- a/parts/classview/digraphview.h +++ b/parts/classview/digraphview.h @@ -23,7 +23,7 @@ class DigraphEdge; class DigraphView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp index c8761861..3059f00e 100644 --- a/parts/classview/hierarchydlg.cpp +++ b/parts/classview/hierarchydlg.cpp @@ -51,7 +51,7 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part ) TQPushButton *save_button = new KPushButton(KStdGuiItem::save(), this); TQPushButton *refresh_button = new KPushButton(i18n("Refresh"), this); - TQSplitter *splitter = new TQSplitter(Qt::Vertical, this); + TQSplitter *splitter = new TQSplitter(TQt::Vertical, this); digraph = new DigraphView(splitter, "digraph view"); // member_tree = new ClassToolWidget(part, splitter); @@ -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/hierarchydlg.h b/parts/classview/hierarchydlg.h index 1c41a8f0..486b9bcb 100644 --- a/parts/classview/hierarchydlg.h +++ b/parts/classview/hierarchydlg.h @@ -25,7 +25,7 @@ class TQListViewItem; class HierarchyDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: 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/classview/navigator.h b/parts/classview/navigator.h index ed0c3ffb..66442ea5 100644 --- a/parts/classview/navigator.h +++ b/parts/classview/navigator.h @@ -38,7 +38,7 @@ TextPaintItem highlightFunctionName( TQString function, int type, TextPaintStyle class Navigator : public TQObject { -Q_OBJECT +TQ_OBJECT public: enum NavigationState { GoToDefinitions, GoToDeclarations }; diff --git a/parts/ctags2/ctags2_createtagfile.h b/parts/ctags2/ctags2_createtagfile.h index f0138bbe..e0a51ba2 100644 --- a/parts/ctags2/ctags2_createtagfile.h +++ b/parts/ctags2/ctags2_createtagfile.h @@ -18,11 +18,11 @@ class CreateTagFile : public CTags2CreateTagFileBase { -Q_OBJECT +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 92dd4dc7..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> @@ -55,11 +55,11 @@ namespace ctags } typedef KDevGenericFactory<CTags2Part> CTags2Factory; -static const KDevPluginInfo data("kdevctags2"); -K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) ) +static const KDevPluginInfo pluginData("kdevctags2"); +K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( pluginData ) ) CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "ctags2Part" ) + : KDevPlugin(&pluginData, parent, name ? name : "ctags2Part" ) { setInstance(CTags2Factory::instance()); setXMLFile("kdevpart_ctags2.rc"); @@ -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_part.h b/parts/ctags2/ctags2_part.h index 5de52c37..2a60def7 100644 --- a/parts/ctags2/ctags2_part.h +++ b/parts/ctags2/ctags2_part.h @@ -28,7 +28,7 @@ class KDialogBase; class CTags2Part : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/ctags2/ctags2_selecttagfile.h b/parts/ctags2/ctags2_selecttagfile.h index 046e72c3..20f89b49 100644 --- a/parts/ctags2/ctags2_selecttagfile.h +++ b/parts/ctags2/ctags2_selecttagfile.h @@ -15,11 +15,11 @@ #include "ctags2_selecttagfilebase.h" class SelectTagFile : public SelectTagFileBase { - Q_OBJECT + TQ_OBJECT 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_settingswidget.h b/parts/ctags2/ctags2_settingswidget.h index 6eba2b44..90c7a095 100644 --- a/parts/ctags2/ctags2_settingswidget.h +++ b/parts/ctags2/ctags2_settingswidget.h @@ -39,7 +39,7 @@ private: class CTags2SettingsWidget : public CTags2SettingsWidgetBase { - Q_OBJECT + TQ_OBJECT public: 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 b9b54d97..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(); } @@ -148,7 +148,7 @@ void CTags2Widget::updateDBDateLabel( ) TQFileInfo tagsdb(tagFiles[0]); if ( tagsdb.exists() ) { - datetime_label->setText( tagsdb.created().date().toString( Qt::ISODate ) ); + datetime_label->setText( tagsdb.created().date().toString( TQt::ISODate ) ); } else { diff --git a/parts/ctags2/ctags2_widget.h b/parts/ctags2/ctags2_widget.h index d67ec415..7f1d1bd5 100644 --- a/parts/ctags2/ctags2_widget.h +++ b/parts/ctags2/ctags2_widget.h @@ -21,7 +21,7 @@ class TQListViewItem; class CTags2Widget : public CTags2WidgetBase { - Q_OBJECT + TQ_OBJECT public: 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/diffdlg.h b/parts/diff/diffdlg.h index ee15011a..87c37211 100644 --- a/parts/diff/diffdlg.h +++ b/parts/diff/diffdlg.h @@ -19,7 +19,7 @@ class DiffWidget; class DiffDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index 01c703d0..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> @@ -36,13 +36,13 @@ #include "diffdlg.h" #include "diffwidget.h" -static const KDevPluginInfo data("kdevdiff"); +static const KDevPluginInfo pluginData("kdevdiff"); typedef KDevGenericFactory<DiffPart> DiffFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( pluginData ) ) DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &) - : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0) + : KDevDiffFrontend(&pluginData, parent, name ? name : "DiffPart"), proc(0) { setInstance(DiffFactory::instance()); setXMLFile("kdevdiff.rc"); @@ -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/diffpart.h b/parts/diff/diffpart.h index 6fe89efe..3bccf1a1 100644 --- a/parts/diff/diffpart.h +++ b/parts/diff/diffpart.h @@ -26,7 +26,7 @@ class TQCString; class DiffPart : public KDevDiffFrontend { - Q_OBJECT + TQ_OBJECT public: 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/diff/diffwidget.h b/parts/diff/diffwidget.h index b021e516..43b9f90f 100644 --- a/parts/diff/diffwidget.h +++ b/parts/diff/diffwidget.h @@ -32,7 +32,7 @@ namespace KParts { // Helper class that displays a modified RMB popup menu class KDiffTextEdit: public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 ); @@ -61,7 +61,7 @@ private: class DiffWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp index e8a3e11a..e0f3cccf 100644 --- a/parts/distpart/distpart_part.cpp +++ b/parts/distpart/distpart_part.cpp @@ -34,11 +34,11 @@ #include <kdialogbase.h> typedef KDevGenericFactory<DistpartPart> DistpartFactory; -static const KDevPluginInfo data("kdevdistpart"); -K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) ) +static const KDevPluginInfo pluginData("kdevdistpart"); +K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( pluginData ) ) DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "DistpartPart") { + : KDevPlugin(&pluginData, parent, name ? name : "DistpartPart") { kdDebug(9007) << "DistpartPart::DistpartPart()" << endl; setInstance(DistpartFactory::instance()); @@ -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_part.h b/parts/distpart/distpart_part.h index aa019c4d..fb71202f 100644 --- a/parts/distpart/distpart_part.h +++ b/parts/distpart/distpart_part.h @@ -33,7 +33,7 @@ class DistpartDialog; class KDialogBase; class DistpartPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: 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/distpart_widget.h b/parts/distpart/distpart_widget.h index 7a684a5a..27877167 100644 --- a/parts/distpart/distpart_widget.h +++ b/parts/distpart/distpart_widget.h @@ -45,7 +45,7 @@ class ReadOnlyPart; class DistpartDialog : public distpart_ui { - Q_OBJECT + TQ_OBJECT public: 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/KDevDocumentationIface.h b/parts/documentation/KDevDocumentationIface.h index c55143e7..733bc7bf 100644 --- a/parts/documentation/KDevDocumentationIface.h +++ b/parts/documentation/KDevDocumentationIface.h @@ -26,7 +26,7 @@ class DocumentationPart; class KDevDocumentationIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/parts/documentation/addcatalogdlg.h b/parts/documentation/addcatalogdlg.h index b074ecb6..4353e1b8 100644 --- a/parts/documentation/addcatalogdlg.h +++ b/parts/documentation/addcatalogdlg.h @@ -28,10 +28,10 @@ class DocumentationPlugin; class AddCatalogDlg: public AddCatalogDlgBase { - Q_OBJECT + 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 b524720f..2734918d 100644 --- a/parts/documentation/addcatalogdlgbase.ui +++ b/parts/documentation/addcatalogdlgbase.ui @@ -135,9 +135,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -152,9 +149,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -195,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 f626e246..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() @@ -268,7 +268,7 @@ void BookmarkView::addBookmark(const TQString &title, const KURL &url) void BookmarkView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/bookmarkview.h b/parts/documentation/bookmarkview.h index 36283e0c..cdd102a0 100644 --- a/parts/documentation/bookmarkview.h +++ b/parts/documentation/bookmarkview.h @@ -49,7 +49,7 @@ private: class BookmarkView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: BookmarkView(DocumentationWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index 3707f318..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() @@ -73,7 +73,7 @@ void ContentsView::itemExecuted(TQListViewItem *item, const TQPoint &/*p*/, int void ContentsView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/contentsview.h b/parts/documentation/contentsview.h index e170b7dc..a638a5c9 100644 --- a/parts/documentation/contentsview.h +++ b/parts/documentation/contentsview.h @@ -29,7 +29,7 @@ class TDEListView; class ContentsView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ContentsView(DocumentationWidget *parent, const char *name = 0); 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/docconfiglistview.h b/parts/documentation/docconfiglistview.h index 811c49b1..13db2301 100644 --- a/parts/documentation/docconfiglistview.h +++ b/parts/documentation/docconfiglistview.h @@ -24,7 +24,7 @@ class DocConfigListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DocConfigListView(TQWidget *parent = 0, const char *name = 0); 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/docglobalconfigwidget.h b/parts/documentation/docglobalconfigwidget.h index 8fee856c..48d33817 100644 --- a/parts/documentation/docglobalconfigwidget.h +++ b/parts/documentation/docglobalconfigwidget.h @@ -31,7 +31,7 @@ class TDEListView; class DocGlobalConfigWidget : public DocGlobalConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: DocGlobalConfigWidget(DocumentationPart *part, DocumentationWidget *widget, 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/docprojectconfigwidget.h b/parts/documentation/docprojectconfigwidget.h index 0b7b4452..a35a0795 100644 --- a/parts/documentation/docprojectconfigwidget.h +++ b/parts/documentation/docprojectconfigwidget.h @@ -26,7 +26,7 @@ class DocumentationPart; class DocumentationPlugin; class DocProjectConfigWidget: public DocProjectConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); 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 3b9e9b78..0bac7045 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -72,13 +72,13 @@ #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -static const KDevPluginInfo data("kdevdocumentation"); +static const KDevPluginInfo pluginData("kdevdocumentation"); typedef KDevGenericFactory<DocumentationPart> DocumentationFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( pluginData ) ) DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ), + :KDevPlugin(&pluginData, parent, name ? name : "DocumentationPart" ), m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false) { setInstance(DocumentationFactory::instance()); @@ -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_part.h b/parts/documentation/documentation_part.h index 02564a3f..8385f25e 100644 --- a/parts/documentation/documentation_part.h +++ b/parts/documentation/documentation_part.h @@ -41,7 +41,7 @@ class TQPopupMenu; */ class DocumentationPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: enum ContextFeature { Finder, IndexLookup, FullTextSearch, GotoMan, GotoInfo }; 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/documentation_widget.h b/parts/documentation/documentation_widget.h index a813b393..0086163f 100644 --- a/parts/documentation/documentation_widget.h +++ b/parts/documentation/documentation_widget.h @@ -36,7 +36,7 @@ class TDEListView; class DocumentationWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DocumentationWidget(DocumentationPart *part); diff --git a/parts/documentation/editbookmarkdlg.ui b/parts/documentation/editbookmarkdlg.ui index 875f4546..013c0080 100644 --- a/parts/documentation/editbookmarkdlg.ui +++ b/parts/documentation/editbookmarkdlg.ui @@ -89,9 +89,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -106,9 +103,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/documentation/editcatalogdlg.h b/parts/documentation/editcatalogdlg.h index 4cd248ee..71f1c4a7 100644 --- a/parts/documentation/editcatalogdlg.h +++ b/parts/documentation/editcatalogdlg.h @@ -26,11 +26,11 @@ class DocumentationPlugin; class EditCatalogDlg : public EditCatalogBase { - Q_OBJECT + TQ_OBJECT 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 4355d579..34769563 100644 --- a/parts/documentation/editcatalogdlgbase.ui +++ b/parts/documentation/editcatalogdlgbase.ui @@ -63,9 +63,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -80,9 +77,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -184,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 ebddcd4c..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) ); + proc_man = new TDEProcess( this ); + proc_info = new TDEProcess( this ); - connect( proc_man, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(procManExited( TDEProcess* )) ); - connect( proc_man, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)), - this, TQT_SLOT(procManReadStdout( TDEProcess*, char*, int)) ); + connect( proc_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, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(procInfoExited( TDEProcess* )) ); - connect( proc_info, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)), - this, TQT_SLOT(procInfoReadStdout( TDEProcess*, char*, int)) ); + connect( proc_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); @@ -75,7 +75,7 @@ FindDocumentation::~FindDocumentation() void FindDocumentation::buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/find_documentation.h b/parts/documentation/find_documentation.h index b1fb6f05..b93f964f 100644 --- a/parts/documentation/find_documentation.h +++ b/parts/documentation/find_documentation.h @@ -32,7 +32,7 @@ class TDEProcess; class FindDocumentation : public FindDocumentationBase { -Q_OBJECT +TQ_OBJECT public: FindDocumentation(DocumentationWidget* parent, const char* name = 0); 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 ab1a3cc9..b1d0cea9 100644 --- a/parts/documentation/find_documentation_options.h +++ b/parts/documentation/find_documentation_options.h @@ -28,10 +28,10 @@ class TDEConfig; class FindDocumentationOptions : public FindDocumentationOptionsBase { -Q_OBJECT +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 5d85bdf1..2a31e034 100644 --- a/parts/documentation/find_documentation_optionsbase.ui +++ b/parts/documentation/find_documentation_optionsbase.ui @@ -147,9 +147,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -164,9 +161,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -210,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 3e0a3921..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); } @@ -123,7 +123,7 @@ bool IndexView::eventFilter(TQObject *watched, TQEvent *e) if (!watched || !e) return true; - if ((TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_edit)) && (e->type() == TQEvent::KeyPress)) + if ((watched == m_edit) && (e->type() == TQEvent::KeyPress)) { TQKeyEvent *ke = (TQKeyEvent*)e; if (ke->key() == Key_Up) @@ -162,7 +162,7 @@ bool IndexView::eventFilter(TQObject *watched, TQEvent *e) void IndexView::itemMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &pos) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; IndexItem *docItem = dynamic_cast<IndexItem*>(item); if (!docItem) diff --git a/parts/documentation/indexview.h b/parts/documentation/indexview.h index 5538f870..d76ee504 100644 --- a/parts/documentation/indexview.h +++ b/parts/documentation/indexview.h @@ -30,7 +30,7 @@ class FindDocumentation; class IndexView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: IndexView(DocumentationWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 0282d82a..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> @@ -168,7 +168,7 @@ IndexItem::List IndexItem::urls() const TQValueList<IndexItemProto*> itemProtos = m_listbox->items[text()]; for (TQValueList<IndexItemProto*>::const_iterator it = itemProtos.begin(); it != itemProtos.end(); ++it) - urlList.append(tqMakePair((*it)->description(), (*it)->url())); + urlList.append(qMakePair((*it)->description(), (*it)->url())); return urlList; } @@ -224,7 +224,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu y = (fm.height() + 2 + marg - boxsize) / 2; TQStyleOption opt(this); - lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, + lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt); return; @@ -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/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h index ba9d1948..0d8256f4 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.h +++ b/parts/documentation/interfaces/kdevdocumentationplugin.h @@ -216,7 +216,7 @@ a list of URL's for the full text search tool. */ class DocumentationPlugin: public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Capability of documentation plugin.*/ @@ -390,7 +390,7 @@ friend class DocumentationCatalogItem; Represents functionality to display project documentation catalog and index in documentation browser. */ class ProjectDocumentationPlugin: public TQObject { - Q_OBJECT + TQ_OBJECT public: ProjectDocumentationPlugin(DocumentationPlugin *docPlugin, DocumentationPlugin::ProjectDocType type); diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h index 5ac7d120..683a586f 100644 --- a/parts/documentation/plugins/chm/docchmplugin.h +++ b/parts/documentation/plugins/chm/docchmplugin.h @@ -24,7 +24,7 @@ class DocCHMPlugin :public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocCHMPlugin(TQObject* parent, const char* name, TQStringList args = TQStringList()); 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/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h index 19ff8a75..ad7c9a41 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h @@ -27,7 +27,7 @@ class DocDevHelpPlugin: public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocDevHelpPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); 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/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h index afa57cf6..36d6a61b 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h @@ -27,7 +27,7 @@ class TQDomElement; class DocDoxygenPlugin: public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); 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/plugins/kdevtoc/dockdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h index b6b5c037..5d090cec 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h @@ -26,7 +26,7 @@ class DocKDevTOCPlugin : public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h index 31b14b9b..10b60274 100644 --- a/parts/documentation/plugins/qt/docqtplugin.h +++ b/parts/documentation/plugins/qt/docqtplugin.h @@ -27,7 +27,7 @@ class TDEConfig; class DocQtPlugin : public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocQtPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); 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/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 9d1812b1..12c24990 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -32,7 +32,7 @@ class TDEAboutData; class KChmPartFactory: public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KChmPartFactory( TQObject *parent = 0, const char *name = 0 ); @@ -54,7 +54,7 @@ class KChmPartFactory: public KParts::Factory class KChmPart : public KDevHTMLPart { - Q_OBJECT + TQ_OBJECT public: KChmPart( TQWidget *, const char * = 0 ); diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 67dca0ed..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() @@ -303,7 +303,7 @@ void SearchView::executed(TQListViewItem *item) void SearchView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/searchview.h b/parts/documentation/searchview.h index 7c3602c1..90fd5442 100644 --- a/parts/documentation/searchview.h +++ b/parts/documentation/searchview.h @@ -32,7 +32,7 @@ class TQListViewItem; class SearchView: public TQWidget { - Q_OBJECT + TQ_OBJECT public: SearchView(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h index 6ca5ad8b..daa6e4f1 100644 --- a/parts/documentation/selecttopic.h +++ b/parts/documentation/selecttopic.h @@ -25,7 +25,7 @@ #include "kdevdocumentationplugin.h" class SelectTopic: public SelectTopicBase{ -Q_OBJECT +TQ_OBJECT public: SelectTopic(IndexItem::List &urls, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui index f57b2c10..a2931c19 100644 --- a/parts/documentation/selecttopicbase.ui +++ b/parts/documentation/selecttopicbase.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -135,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/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h index 667112a3..a5ae5225 100644 --- a/parts/documentation/tools/htdig/htdigindex.h +++ b/parts/documentation/tools/htdig/htdigindex.h @@ -24,7 +24,7 @@ class KProgress; class ProgressDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ProgressDialog(bool index, TQWidget *parent=0, const char *name=0); 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/doxygenconfigwidget.h b/parts/doxygen/doxygenconfigwidget.h index 2a65801e..97087dc7 100644 --- a/parts/doxygen/doxygenconfigwidget.h +++ b/parts/doxygen/doxygenconfigwidget.h @@ -23,7 +23,7 @@ class IInput; class DoxygenConfigWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index d965d98b..863f6176 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -48,43 +48,43 @@ #define PROJECTOPTIONS 1 typedef KDevGenericFactory<DoxygenPart> DoxygenFactory; -static const KDevPluginInfo data("kdevdoxygen"); -K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) ) +static const KDevPluginInfo pluginData("kdevdoxygen"); +K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( pluginData ) ) DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) + : KDevPlugin(&pluginData, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) { setInstance(DoxygenFactory::instance()); setXMLFile("kdevdoxygen.rc"); 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 aaa438de..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> @@ -39,7 +39,7 @@ namespace KTextEditor{ class DoxygenPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: 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 9a5189da..97599f37 100644 --- a/parts/doxygen/input.h +++ b/parts/doxygen/input.h @@ -35,7 +35,7 @@ class IInput class InputBool : public TQWidget, public IInput { - Q_OBJECT + TQ_OBJECT public: @@ -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: @@ -63,7 +63,7 @@ private: class InputInt : public TQWidget, public IInput { - Q_OBJECT + TQ_OBJECT public: @@ -73,7 +73,7 @@ public: void init(); virtual void setEnabled(bool); - TQObject *qobject() { return TQT_TQOBJECT(this); } + TQObject *qobject() { return this; } signals: void changed(); @@ -92,7 +92,7 @@ private: class InputString : public TQWidget, public IInput { - Q_OBJECT + TQ_OBJECT public: @@ -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(); @@ -133,7 +133,7 @@ private: class InputStrList : public TQWidget, public IInput { - Q_OBJECT + TQ_OBJECT public: @@ -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 57631e1e..59fb33d7 100644 --- a/parts/filecreate/addglobaldlg.h +++ b/parts/filecreate/addglobaldlg.h @@ -22,11 +22,11 @@ class TQPushButton; class AddGlobalDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT 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/fcconfigwidget.h b/parts/filecreate/fcconfigwidget.h index 98623bbb..bc39949d 100644 --- a/parts/filecreate/fcconfigwidget.h +++ b/parts/filecreate/fcconfigwidget.h @@ -28,7 +28,7 @@ class FileType; class FCConfigWidget : public FCConfigWidgetBase { -Q_OBJECT +TQ_OBJECT public: FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name); 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/fctemplateedit.h b/parts/filecreate/fctemplateedit.h index ca03aa6e..dd78df9d 100644 --- a/parts/filecreate/fctemplateedit.h +++ b/parts/filecreate/fctemplateedit.h @@ -16,7 +16,7 @@ class FCTemplateEdit : public FCTemplateEditBase { -Q_OBJECT +TQ_OBJECT public: FCTemplateEdit(TQWidget *parent=0, const char *name=0); 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/fctypeedit.h b/parts/filecreate/fctypeedit.h index 062cf7d9..d9dcc9f9 100644 --- a/parts/filecreate/fctypeedit.h +++ b/parts/filecreate/fctypeedit.h @@ -16,7 +16,7 @@ class FCTypeEdit : public FCTypeEditBase { -Q_OBJECT +TQ_OBJECT public: FCTypeEdit(TQWidget *parent = 0, char *name = 0); 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/CMakeLists.txt b/parts/filecreate/file-templates/CMakeLists.txt index 04405e1a..5a00aff2 100644 --- a/parts/filecreate/file-templates/CMakeLists.txt +++ b/parts/filecreate/file-templates/CMakeLists.txt @@ -11,7 +11,5 @@ install( FILES ui ui-dialog ui-mainwin ui-confdialog ui-dialogb ui-widget - ui-dialogr ui-tabdialog ui-wizard dox ts ui-mainwin-qt4 - ui-widget-qt4 ui-dialogb-qt4 ui-dialogr-qt4 ui-dialog-qt4 - qrc + ui-dialogr ui-tabdialog ui-wizard dox ts DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/parts/filecreate/file-templates/Makefile.am b/parts/filecreate/file-templates/Makefile.am index 672a1cfa..2117ccb1 100644 --- a/parts/filecreate/file-templates/Makefile.am +++ b/parts/filecreate/file-templates/Makefile.am @@ -1,2 +1,2 @@ rcdir = $(kde_datadir)/kdevfilecreate/file-templates -rc_DATA = ui ui-dialog ui-mainwin ui-confdialog ui-dialogb ui-widget ui-dialogr ui-tabdialog ui-wizard dox ts ui-mainwin-qt4 ui-widget-qt4 ui-dialogb-qt4 ui-dialogr-qt4 ui-dialog-qt4 qrc +rc_DATA = ui ui-dialog ui-mainwin ui-confdialog ui-dialogb ui-widget ui-dialogr ui-tabdialog ui-wizard dox ts diff --git a/parts/filecreate/file-templates/qrc b/parts/filecreate/file-templates/qrc deleted file mode 100644 index 4a4d7e46..00000000 --- a/parts/filecreate/file-templates/qrc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource prefix="/" > - <file></file> - </qresource> -</RCC> diff --git a/parts/filecreate/file-templates/ui b/parts/filecreate/file-templates/ui index 670a758b..5f42faf0 100644 --- a/parts/filecreate/file-templates/ui +++ b/parts/filecreate/file-templates/ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class=TQWIDGET_OBJECT_NAME_STRING> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> diff --git a/parts/filecreate/file-templates/ui-confdialog b/parts/filecreate/file-templates/ui-confdialog index b61af20d..5429e04f 100644 --- a/parts/filecreate/file-templates/ui-confdialog +++ b/parts/filecreate/file-templates/ui-confdialog @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>MyDialog1</class> -<widget class=TQDIALOG_OBJECT_NAME_STRING> +<widget class="TQDialog"> <property name="name"> <cstring>MyDialog1</cstring> </property> @@ -28,7 +28,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLISTBOX_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQListBox" row="0" column="0"> <item> <property name="text"> <string>New Item</string> @@ -46,11 +46,11 @@ </sizepolicy> </property> </widget> - <widget class=TQTABWIDGET_OBJECT_NAME_STRING row="0" column="1"> + <widget class="TQTabWidget" row="0" column="1"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>Widget2</cstring> </property> @@ -58,7 +58,7 @@ <string>Tab</string> </attribute> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>Widget3</cstring> </property> @@ -67,7 +67,7 @@ </attribute> </widget> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -81,7 +81,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -112,16 +112,13 @@ </size> </property> </spacer> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -129,16 +126,13 @@ <bool>true</bool> </property> </widget> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/filecreate/file-templates/ui-dialog b/parts/filecreate/file-templates/ui-dialog index 92e9bfff..16eb3a67 100644 --- a/parts/filecreate/file-templates/ui-dialog +++ b/parts/filecreate/file-templates/ui-dialog @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class=TQDIALOG_OBJECT_NAME_STRING> +<widget class="TQDialog"> <property name="name"> <cstring>Form1</cstring> </property> diff --git a/parts/filecreate/file-templates/ui-dialog-qt4 b/parts/filecreate/file-templates/ui-dialog-qt4 deleted file mode 100644 index b2096e86..00000000 --- a/parts/filecreate/file-templates/ui-dialog-qt4 +++ /dev/null @@ -1,22 +0,0 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>Dialog</class> - <widget class=TQDIALOG_OBJECT_NAME_STRING name="Dialog" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle" > - <string>Dialog</string> - </property> - </widget> - <pixmapfunction></pixmapfunction> - <resources/> - <connections/> -</ui> diff --git a/parts/filecreate/file-templates/ui-dialogb b/parts/filecreate/file-templates/ui-dialogb index e02e5ea6..f771fe9a 100644 --- a/parts/filecreate/file-templates/ui-dialogb +++ b/parts/filecreate/file-templates/ui-dialogb @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>MyDialog1</class> -<widget class=TQDIALOG_OBJECT_NAME_STRING> +<widget class="TQDialog"> <property name="name"> <cstring>MyDialog1</cstring> </property> @@ -18,7 +18,7 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -40,7 +40,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -71,16 +71,13 @@ </size> </property> </spacer> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -88,16 +85,13 @@ <bool>true</bool> </property> </widget> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/filecreate/file-templates/ui-dialogb-qt4 b/parts/filecreate/file-templates/ui-dialogb-qt4 deleted file mode 100644 index 33167acc..00000000 --- a/parts/filecreate/file-templates/ui-dialogb-qt4 +++ /dev/null @@ -1,100 +0,0 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>Dialog</class> - <widget class=TQDIALOG_OBJECT_NAME_STRING name="Dialog" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle" > - <string>Dialog</string> - </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING name="layoutWidget" > - <property name="geometry" > - <rect> - <x>20</x> - <y>250</y> - <width>351</width> - <height>33</height> - </rect> - </property> - <layout class=TQHBOXLAYOUT_OBJECT_NAME_STRING > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>131</width> - <height>31</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="okButton" > - <property name="text" > - <string>OK</string> - </property> - </widget> - </item> - <item> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="cancelButton" > - <property name="text" > - <string>Cancel</string> - </property> - </widget> - </item> - </layout> - </widget> - </widget> - <pixmapfunction></pixmapfunction> - <resources/> - <connections> - <connection> - <sender>okButton</sender> - <signal>clicked()</signal> - <receiver>Dialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel" > - <x>278</x> - <y>253</y> - </hint> - <hint type="destinationlabel" > - <x>96</x> - <y>254</y> - </hint> - </hints> - </connection> - <connection> - <sender>cancelButton</sender> - <signal>clicked()</signal> - <receiver>Dialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel" > - <x>369</x> - <y>253</y> - </hint> - <hint type="destinationlabel" > - <x>179</x> - <y>282</y> - </hint> - </hints> - </connection> - </connections> -</ui> diff --git a/parts/filecreate/file-templates/ui-dialogr b/parts/filecreate/file-templates/ui-dialogr index f5d5ffad..bc0e217b 100644 --- a/parts/filecreate/file-templates/ui-dialogr +++ b/parts/filecreate/file-templates/ui-dialogr @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>MyDialog1</class> -<widget class=TQDIALOG_OBJECT_NAME_STRING> +<widget class="TQDialog"> <property name="name"> <cstring>MyDialog1</cstring> </property> @@ -18,7 +18,7 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -40,16 +40,13 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -57,21 +54,18 @@ <bool>true</bool> </property> </widget> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> </widget> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> diff --git a/parts/filecreate/file-templates/ui-dialogr-qt4 b/parts/filecreate/file-templates/ui-dialogr-qt4 deleted file mode 100644 index d047e11c..00000000 --- a/parts/filecreate/file-templates/ui-dialogr-qt4 +++ /dev/null @@ -1,100 +0,0 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>Dialog</class> - <widget class=TQDIALOG_OBJECT_NAME_STRING name="Dialog" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle" > - <string>Dialog</string> - </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING name="layoutWidget" > - <property name="geometry" > - <rect> - <x>300</x> - <y>20</y> - <width>77</width> - <height>106</height> - </rect> - </property> - <layout class=TQVBOXLAYOUT_OBJECT_NAME_STRING > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="okButton" > - <property name="text" > - <string>OK</string> - </property> - </widget> - </item> - <item> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="cancelButton" > - <property name="text" > - <string>Cancel</string> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </widget> - <pixmapfunction></pixmapfunction> - <resources/> - <connections> - <connection> - <sender>okButton</sender> - <signal>clicked()</signal> - <receiver>Dialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel" > - <x>351</x> - <y>38</y> - </hint> - <hint type="destinationlabel" > - <x>233</x> - <y>29</y> - </hint> - </hints> - </connection> - <connection> - <sender>cancelButton</sender> - <signal>clicked()</signal> - <receiver>Dialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel" > - <x>330</x> - <y>66</y> - </hint> - <hint type="destinationlabel" > - <x>197</x> - <y>125</y> - </hint> - </hints> - </connection> - </connections> -</ui> diff --git a/parts/filecreate/file-templates/ui-mainwin b/parts/filecreate/file-templates/ui-mainwin index fd24b2f5..62d6d51a 100644 --- a/parts/filecreate/file-templates/ui-mainwin +++ b/parts/filecreate/file-templates/ui-mainwin @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class=TQMAINWINDOW_OBJECT_NAME_STRING> +<widget class="TQMainWindow"> <property name="name"> <cstring>Form1</cstring> </property> @@ -111,9 +111,6 @@ <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -142,9 +139,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -258,9 +252,6 @@ <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -272,9 +263,6 @@ <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -286,9 +274,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> </actions> <images> @@ -415,7 +400,7 @@ <slot>helpAbout()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>fileNew()</slot> <slot>fileOpen()</slot> <slot>fileSave()</slot> @@ -431,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/file-templates/ui-mainwin-qt4 b/parts/filecreate/file-templates/ui-mainwin-qt4 deleted file mode 100644 index a444cfa3..00000000 --- a/parts/filecreate/file-templates/ui-mainwin-qt4 +++ /dev/null @@ -1,34 +0,0 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>MainWindow</class> - <widget class=TQMAINWINDOW_OBJECT_NAME_STRING name="MainWindow" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>800</width> - <height>600</height> - </rect> - </property> - <property name="windowTitle" > - <string>MainWindow</string> - </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING name="centralwidget" /> - <widget class=TQMENUBAR_OBJECT_NAME_STRING name="menubar" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>800</width> - <height>33</height> - </rect> - </property> - </widget> - <widget class="QStatusBar" name="statusbar" /> - </widget> - <pixmapfunction></pixmapfunction> - <resources/> - <connections/> -</ui> diff --git a/parts/filecreate/file-templates/ui-tabdialog b/parts/filecreate/file-templates/ui-tabdialog index 56ac7bd7..c87b78fb 100644 --- a/parts/filecreate/file-templates/ui-tabdialog +++ b/parts/filecreate/file-templates/ui-tabdialog @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>MyDialog1</class> -<widget class=TQDIALOG_OBJECT_NAME_STRING> +<widget class="TQDialog"> <property name="name"> <cstring>MyDialog1</cstring> </property> @@ -28,11 +28,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQTABWIDGET_OBJECT_NAME_STRING> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>Widget8</cstring> </property> @@ -40,7 +40,7 @@ <string>Tab</string> </attribute> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>Widget9</cstring> </property> @@ -49,7 +49,7 @@ </attribute> </widget> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -63,7 +63,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -94,16 +94,13 @@ </size> </property> </spacer> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -111,16 +108,13 @@ <bool>true</bool> </property> </widget> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/filecreate/file-templates/ui-widget b/parts/filecreate/file-templates/ui-widget index 670a758b..5f42faf0 100644 --- a/parts/filecreate/file-templates/ui-widget +++ b/parts/filecreate/file-templates/ui-widget @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class=TQWIDGET_OBJECT_NAME_STRING> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> diff --git a/parts/filecreate/file-templates/ui-widget-qt4 b/parts/filecreate/file-templates/ui-widget-qt4 deleted file mode 100644 index d8b6e63c..00000000 --- a/parts/filecreate/file-templates/ui-widget-qt4 +++ /dev/null @@ -1,22 +0,0 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>Form</class> - <widget class=TQWIDGET_OBJECT_NAME_STRING name="Form" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form</string> - </property> - </widget> - <pixmapfunction></pixmapfunction> - <resources/> - <connections/> -</ui> diff --git a/parts/filecreate/file-templates/ui-wizard b/parts/filecreate/file-templates/ui-wizard index b942afb2..5fbb675a 100644 --- a/parts/filecreate/file-templates/ui-wizard +++ b/parts/filecreate/file-templates/ui-wizard @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class=TQWIZARD_OBJECT_NAME_STRING> +<widget class="TQWizard"> <property name="name"> <cstring>Form1</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Form1</string> </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> 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_filedialog.h b/parts/filecreate/filecreate_filedialog.h index 54365717..ac6a7a00 100644 --- a/parts/filecreate/filecreate_filedialog.h +++ b/parts/filecreate/filecreate_filedialog.h @@ -20,7 +20,7 @@ namespace FileCreate { class FileDialog : public KFileDialog { - Q_OBJECT + TQ_OBJECT public: 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_newfile.h b/parts/filecreate/filecreate_newfile.h index be11024d..67f83b49 100644 --- a/parts/filecreate/filecreate_newfile.h +++ b/parts/filecreate/filecreate_newfile.h @@ -25,7 +25,7 @@ class KLineEdit; namespace FileCreate { class NewFileChooser : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: NewFileChooser(TQWidget *parent=0); diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index 1c371177..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> @@ -54,37 +54,37 @@ #include "config.h" -static const KDevPluginInfo data("kdevfilecreate"); +static const KDevPluginInfo pluginData("kdevfilecreate"); typedef KDevGenericFactory<FileCreatePart> FileCreateFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( pluginData ) ) using namespace FileCreate; FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & ) -// : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) - : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0) +// : KDevCreateFile(&pluginData, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) + : KDevCreateFile(&pluginData, parent, name ? name : "FileCreatePart"), m_subPopups(0) { 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_part.h b/parts/filecreate/filecreate_part.h index ab870791..d281db5a 100644 --- a/parts/filecreate/filecreate_part.h +++ b/parts/filecreate/filecreate_part.h @@ -38,7 +38,7 @@ using namespace FileCreate; class FileCreatePart : public KDevCreateFile { - Q_OBJECT + TQ_OBJECT friend class FCConfigWidget; diff --git a/parts/filecreate/filecreate_typechoosersig.h b/parts/filecreate/filecreate_typechoosersig.h index 5ee090a2..4f8eb2d1 100644 --- a/parts/filecreate/filecreate_typechoosersig.h +++ b/parts/filecreate/filecreate_typechoosersig.h @@ -8,7 +8,7 @@ namespace FileCreate { class FileType; class Signaller : public TQObject { - Q_OBJECT + TQ_OBJECT public: 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_widget2.h b/parts/filecreate/filecreate_widget2.h index 217d37ce..ef9908a9 100644 --- a/parts/filecreate/filecreate_widget2.h +++ b/parts/filecreate/filecreate_widget2.h @@ -30,7 +30,7 @@ namespace FileCreate { class FriendlyWidget : public TQTable, public TypeChooser { - Q_OBJECT + TQ_OBJECT public: 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/filecreate/filecreate_widget3.h b/parts/filecreate/filecreate_widget3.h index ac8b866e..bd0bd594 100644 --- a/parts/filecreate/filecreate_widget3.h +++ b/parts/filecreate/filecreate_widget3.h @@ -29,7 +29,7 @@ namespace FileCreate { class ListWidget : public TDEListView, public TypeChooser { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filecreate/template-info.xml b/parts/filecreate/template-info.xml index bddd5d65..235fb064 100644 --- a/parts/filecreate/template-info.xml +++ b/parts/filecreate/template-info.xml @@ -64,24 +64,6 @@ <subtype ref="mainwin" name="Qt3 Main Window" icon="widget_doc"> <descr>A new empty main window.</descr> </subtype> - <subtype ref="widget-qt4" name="Qt4 Widget" icon="widget_doc"> - <descr>A new Qt4 widget.</descr> - </subtype> - <subtype ref="dialog-qt4" name="Qt4 Dialog" icon="widget_doc"> - <descr>A new empty Qt4 Dialog box.</descr> - </subtype> - <subtype ref="mainwin-qt4" name="Qt4 Main Window" icon="widget_doc"> - <descr>A new empty Qt4 main window.</descr> - </subtype> - <subtype ref="dialogr-qt4" name="Qt4 Dialog with Buttons (right)" icon="widget_doc"> - <descr>A new Qt4 Dialog box with buttons on the right.</descr> - </subtype> - <subtype ref="dialogb-qt4" name="Qt4 Dialog with Buttons (bottom)" icon="widget_doc"> - <descr>A new Qt4 Dialog box with buttons on the bottom.</descr> - </subtype> - </type> - <type ext="qrc" name="Qt4 Resource" create="template" icon="template_source"> - <descr>A new Qt4 Resource file.</descr> </type> <type ext="cpp" name="C++ Source" create="template" icon="source_cpp"> <descr>A new empty C++ file.</descr> 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/filelist_widget.h b/parts/filelist/filelist_widget.h index ace8ed0b..c1b862fc 100644 --- a/parts/filelist/filelist_widget.h +++ b/parts/filelist/filelist_widget.h @@ -32,7 +32,7 @@ namespace KParts { class Part; } class FileListWidget : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: 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/projectviewconfig.h b/parts/filelist/projectviewconfig.h index 8a39f6db..0957d060 100644 --- a/parts/filelist/projectviewconfig.h +++ b/parts/filelist/projectviewconfig.h @@ -26,7 +26,7 @@ class ProjectviewConfig: public ProjectviewConfigBase { - Q_OBJECT + TQ_OBJECT public: ProjectviewConfig(TQWidget *parent = 0, const char *name = 0); diff --git a/parts/filelist/projectviewconfigbase.ui b/parts/filelist/projectviewconfigbase.ui index 7e362f85..564a92d0 100644 --- a/parts/filelist/projectviewconfigbase.ui +++ b/parts/filelist/projectviewconfigbase.ui @@ -26,9 +26,6 @@ <property name="text"> <string>Display toolbar in toolview (note: change needs a restart)</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Uncheck this if you want the toolbar together with all other toolbars. You can disable it then</string> </property> @@ -43,9 +40,6 @@ <property name="text"> <string>Only save project files in a session</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Check this if you want to ignore files that are not part of the project</string> </property> @@ -60,9 +54,6 @@ <property name="text"> <string>Close all open files before opening a session</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Check this if you want the currently open files closed before opening a session</string> </property> 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/filelist/projectviewpart.h b/parts/filelist/projectviewpart.h index 392a9cdf..0111460d 100644 --- a/parts/filelist/projectviewpart.h +++ b/parts/filelist/projectviewpart.h @@ -55,7 +55,7 @@ FIXME at project open I get the default view and the open files at last close */ class ProjectviewPart: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filelist/projectviewprojectconfig.h b/parts/filelist/projectviewprojectconfig.h index a0a4429e..8bbe30db 100644 --- a/parts/filelist/projectviewprojectconfig.h +++ b/parts/filelist/projectviewprojectconfig.h @@ -27,7 +27,7 @@ class ProjectviewPart; class ProjectviewProjectConfig: public ProjectviewProjectConfigBase { - Q_OBJECT + TQ_OBJECT public: ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index b5f9961a..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> @@ -31,21 +31,21 @@ #include "fileselector_widget.h" typedef KDevGenericFactory<FileSelectorPart> FileSelectorFactory; -static const KDevPluginInfo data("kdevfileselector"); -K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) ) +static const KDevPluginInfo pluginData("kdevfileselector"); +K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( pluginData ) ) FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FileSelectorPart") + : KDevPlugin(&pluginData, parent, name ? name : "FileSelectorPart") { setInstance(FileSelectorFactory::instance()); 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_part.h b/parts/fileselector/fileselector_part.h index f415444d..6f96ab5d 100644 --- a/parts/fileselector/fileselector_part.h +++ b/parts/fileselector/fileselector_part.h @@ -13,7 +13,7 @@ class KDialogBase; class FileSelectorPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: FileSelectorPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 894bf185..3a57dc96 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -125,7 +125,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main TQVBoxLayout* lo = new TQVBoxLayout(this); - TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); + TQtMsgHandler oldHandler = qInstallMsgHandler( silenceTQToolBar ); KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this); toolbar = new KDevFileSelectorToolBar(tbp); @@ -133,7 +133,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main lo->addWidget(tbp); toolbar->setMovingEnabled(false); toolbar->setFlat(true); - tqInstallMsgHandler( oldHandler ); + qInstallMsgHandler( oldHandler ); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); @@ -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*) ) ); } @@ -519,7 +519,7 @@ bool KDevFileSelector::eventFilter( TQObject* o, TQEvent *e ) And the popup is rather useless, if the paths are only partly visible. */ TQListBox *lb = cmbPath->listBox(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) + if ( o == lb && e->type() == TQEvent::Show ) { int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0; @@ -585,25 +585,25 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect lo->setSpacing( spacing ); // Toolbar - a lot for a little... - TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this ); + TQGroupBox *gbToolbar = new TQGroupBox( 1, TQt::Vertical, i18n("Toolbar"), this ); acSel = new TDEActionSelector( gbToolbar ); 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, Qt::Horizontal, i18n("Auto Synchronization"), this ); + TQGroupBox *gbSync = new TQGroupBox( 1, TQt::Horizontal, i18n("Auto Synchronization"), this ); cbSyncActive = new TQCheckBox( i18n("When a docu&ment becomes active"), gbSync ); 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, Qt::Horizontal, i18n("Session"), this ); + 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/fileselector_widget.h b/parts/fileselector/fileselector_widget.h index ef64f88c..9462d383 100644 --- a/parts/fileselector/fileselector_widget.h +++ b/parts/fileselector/fileselector_widget.h @@ -59,7 +59,7 @@ namespace KTextEditor /* I think this fix for not moving toolbars is better */ class KDevFileSelectorToolBar: public TDEToolBar { - Q_OBJECT + TQ_OBJECT public: KDevFileSelectorToolBar(TQWidget *parent); @@ -70,7 +70,7 @@ public: class KDevFileSelectorToolBarParent: public TQFrame { - Q_OBJECT + TQ_OBJECT public: KDevFileSelectorToolBarParent(TQWidget *parent); @@ -86,7 +86,7 @@ protected: class KDevDirOperator: public KDirOperator { - Q_OBJECT + TQ_OBJECT public: KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0) @@ -103,7 +103,7 @@ private: class KDevFileSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class KFSConfigPage; @@ -180,7 +180,7 @@ private: */ class KFSConfigPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0); 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/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h index 4ec065aa..c54f92ca 100644 --- a/parts/fileselector/kbookmarkhandler.h +++ b/parts/fileselector/kbookmarkhandler.h @@ -30,7 +30,7 @@ class TDEActionMenu; class KBookmarkHandler : public TQObject, public KBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp index 1c639477..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 ); @@ -391,7 +391,7 @@ bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e ) } return true; } - else if ( o->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQListBox" ) ) { switch ( ((TQKeyEvent*)e)->key() ) { diff --git a/parts/fileselector/tdeactionselector.h b/parts/fileselector/tdeactionselector.h index 213363cf..2de231eb 100644 --- a/parts/fileselector/tdeactionselector.h +++ b/parts/fileselector/tdeactionselector.h @@ -74,7 +74,7 @@ class TDEActionSelectorPrivate; */ class TDEActionSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( ButtonIconSize InsertionPolicy ) TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick ) 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/addfilegroupdlg.h b/parts/fileview/addfilegroupdlg.h index 3465893e..ff67bf93 100644 --- a/parts/fileview/addfilegroupdlg.h +++ b/parts/fileview/addfilegroupdlg.h @@ -18,7 +18,7 @@ class TQPushButton; class AddFileGroupDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/fileview/filegroupsconfigwidget.h b/parts/fileview/filegroupsconfigwidget.h index 545471b0..500afa31 100644 --- a/parts/fileview/filegroupsconfigwidget.h +++ b/parts/fileview/filegroupsconfigwidget.h @@ -19,7 +19,7 @@ class FileGroupsPart; class FileGroupsConfigWidget : public FileGroupsConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: 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 77fc9646..3b3ffa21 100644 --- a/parts/fileview/filegroupspart.cpp +++ b/parts/fileview/filegroupspart.cpp @@ -33,11 +33,11 @@ #define FILEGROUPS_OPTIONS 1 typedef KDevGenericFactory<FileGroupsPart> FileGroupsFactory; -static const KDevPluginInfo data("kdevfilegroups"); -K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) ) +static const KDevPluginInfo pluginData("kdevfilegroups"); +K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( pluginData ) ) FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FileGroupsPart") + : KDevPlugin(&pluginData, parent, name ? name : "FileGroupsPart") { deleteRequested = false; setInstance(FileGroupsFactory::instance()); @@ -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/filegroupspart.h b/parts/fileview/filegroupspart.h index 314f1663..97612ab4 100644 --- a/parts/fileview/filegroupspart.h +++ b/parts/fileview/filegroupspart.h @@ -22,7 +22,7 @@ class KDialogBase; class FileGroupsPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index 8400b2f1..9a45dc66 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -162,7 +162,7 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) */ LocationID=-1; - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); setRootIsDecorated(true); setResizeMode(TQListView::LastColumn); setSorting(-1); @@ -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/filegroupswidget.h b/parts/fileview/filegroupswidget.h index 3294db32..a2f0dc3c 100644 --- a/parts/fileview/filegroupswidget.h +++ b/parts/fileview/filegroupswidget.h @@ -20,7 +20,7 @@ class KDevProject; class FileGroupsWidget : public TDEListView { - Q_OBJECT + TQ_OBJECT public: 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/filetreeviewwidgetimpl.h b/parts/fileview/filetreeviewwidgetimpl.h index bca8b1cd..9e69d8de 100644 --- a/parts/fileview/filetreeviewwidgetimpl.h +++ b/parts/fileview/filetreeviewwidgetimpl.h @@ -38,7 +38,7 @@ class TQPopupMenu; */ class FileTreeViewWidgetImpl : public TQObject { - Q_OBJECT + TQ_OBJECT public: FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name ); 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/filetreewidget.h b/parts/fileview/filetreewidget.h index f6abb0c6..4ac62aad 100644 --- a/parts/fileview/filetreewidget.h +++ b/parts/fileview/filetreewidget.h @@ -46,7 +46,7 @@ class KDevVersionControl; */ class FileTreeWidget : public KFileTreeView { - Q_OBJECT + TQ_OBJECT public: FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ); diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp index 414cea52..a9b7b3a5 100644 --- a/parts/fileview/fileviewpart.cpp +++ b/parts/fileview/fileviewpart.cpp @@ -50,15 +50,15 @@ VCSColors FileViewPart::vcsColors; /////////////////////////////////////////////////////////////////////////////// typedef KDevGenericFactory<FileViewPart> FileViewFactory; -static const KDevPluginInfo data("kdevfileview"); -K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) ) +static const KDevPluginInfo pluginData("kdevfileview"); +K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( pluginData ) ) /////////////////////////////////////////////////////////////////////////////// // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FileViewPart"), + : KDevPlugin(&pluginData, parent, name ? name : "FileViewPart"), m_widget( 0 ) { setInstance( FileViewFactory::instance() ); @@ -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/fileviewpart.h b/parts/fileview/fileviewpart.h index 68eb6a56..f4be9861 100644 --- a/parts/fileview/fileviewpart.h +++ b/parts/fileview/fileviewpart.h @@ -23,7 +23,7 @@ class KDevVersionControl; class FileViewPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: 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/partwidget.h b/parts/fileview/partwidget.h index 53a52bc9..c7f8c02c 100644 --- a/parts/fileview/partwidget.h +++ b/parts/fileview/partwidget.h @@ -18,7 +18,7 @@ class FileViewPart; class PartWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT public: PartWidget( FileViewPart *part, TQWidget *parent = 0 ); diff --git a/parts/fileview/stdfiletreewidgetimpl.h b/parts/fileview/stdfiletreewidgetimpl.h index 5502c192..13f393f1 100644 --- a/parts/fileview/stdfiletreewidgetimpl.h +++ b/parts/fileview/stdfiletreewidgetimpl.h @@ -22,7 +22,7 @@ */ class StdFileTreeWidgetImpl : public FileTreeViewWidgetImpl { - Q_OBJECT + TQ_OBJECT public: StdFileTreeWidgetImpl( FileTreeWidget *parent ); diff --git a/parts/fileview/vcscolorsconfigwidget.h b/parts/fileview/vcscolorsconfigwidget.h index d8a3b726..5fd9aedc 100644 --- a/parts/fileview/vcscolorsconfigwidget.h +++ b/parts/fileview/vcscolorsconfigwidget.h @@ -36,7 +36,7 @@ struct VCSColors class VCSColorsConfigWidget : public VCSColorsConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: 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/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h index 00a38b32..f0c33a9e 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.h +++ b/parts/fileview/vcsfiletreewidgetimpl.h @@ -24,7 +24,7 @@ class TDEToggleAction; */ class VCSFileTreeWidgetImpl : public FileTreeViewWidgetImpl { - Q_OBJECT + TQ_OBJECT public: VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider ); diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp index 5ebd265e..a68f1ec5 100644 --- a/parts/filter/filterpart.cpp +++ b/parts/filter/filterpart.cpp @@ -26,11 +26,11 @@ #include "shellinsertdlg.h" #include "kdevfilterIface.h" -static const KDevPluginInfo data("kdevfilter"); -K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) ) +static const KDevPluginInfo pluginData("kdevfilter"); +K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( pluginData ) ) FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FilterPart") + : KDevPlugin(&pluginData, parent, name ? name : "FilterPart") { setInstance(FilterFactory::instance()); setXMLFile("kdevfilter.rc"); @@ -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/filterpart.h b/parts/filter/filterpart.h index b8322425..44a78e3c 100644 --- a/parts/filter/filterpart.h +++ b/parts/filter/filterpart.h @@ -21,7 +21,7 @@ class ShellFilterDialog; class FilterPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filter/kdevfilterIface.h b/parts/filter/kdevfilterIface.h index fae74022..58d75eb1 100644 --- a/parts/filter/kdevfilterIface.h +++ b/parts/filter/kdevfilterIface.h @@ -9,7 +9,7 @@ class FilterPart; class KDevFilterIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: 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/shellfilterdlg.h b/parts/filter/shellfilterdlg.h index 87657501..f82f474b 100644 --- a/parts/filter/shellfilterdlg.h +++ b/parts/filter/shellfilterdlg.h @@ -22,7 +22,7 @@ class TDEProcess; class ShellFilterDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: 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/filter/shellinsertdlg.h b/parts/filter/shellinsertdlg.h index fda59678..8c40ddbc 100644 --- a/parts/filter/shellinsertdlg.h +++ b/parts/filter/shellinsertdlg.h @@ -22,7 +22,7 @@ class TDEProcess; class ShellInsertDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp index 0bdc714f..1d31f618 100644 --- a/parts/fullscreen/fullscreen_part.cpp +++ b/parts/fullscreen/fullscreen_part.cpp @@ -22,13 +22,13 @@ #include "fullscreen_part.h" -static const KDevPluginInfo data("kdevfullscreen"); +static const KDevPluginInfo pluginData("kdevfullscreen"); typedef KDevGenericFactory<FullScreenPart> FullScreenFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( pluginData ) ) FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "FullScreenPart" ) + : KDevPlugin(&pluginData, parent, name ? name : "FullScreenPart" ) { setInstance(FullScreenFactory::instance()); // const TDEAboutData &abdata1 = *(info()); @@ -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/fullscreen/fullscreen_part.h b/parts/fullscreen/fullscreen_part.h index fcb566e8..6e43f87f 100644 --- a/parts/fullscreen/fullscreen_part.h +++ b/parts/fullscreen/fullscreen_part.h @@ -19,7 +19,7 @@ class TDEAction; class FullScreenPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: FullScreenPart(TQObject *parent, const char *name, const TQStringList &); 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/grepdlg.h b/parts/grepview/grepdlg.h index fa00badb..ca00fd1d 100644 --- a/parts/grepview/grepdlg.h +++ b/parts/grepview/grepdlg.h @@ -27,7 +27,7 @@ class KLineEdit; class GrepDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: 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/grepviewpart.h b/parts/grepview/grepviewpart.h index 4ebd7638..da2aead6 100644 --- a/parts/grepview/grepviewpart.h +++ b/parts/grepview/grepviewpart.h @@ -24,7 +24,7 @@ class GrepViewWidget; class GrepViewPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: 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/grepview/grepviewwidget.h b/parts/grepview/grepviewwidget.h index 3bf803b5..68fd988b 100644 --- a/parts/grepview/grepviewwidget.h +++ b/parts/grepview/grepviewwidget.h @@ -24,7 +24,7 @@ class TQHBoxLayout; class TQToolButton; class GrepViewProcessWidget : public ProcessWidget { - Q_OBJECT + TQ_OBJECT public: GrepViewProcessWidget(TQWidget* parent) : ProcessWidget(parent) {}; @@ -59,7 +59,7 @@ private: class GrepViewWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: 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/konsoleviewpart.h b/parts/konsole/konsoleviewpart.h index 9bcecb38..0b831778 100644 --- a/parts/konsole/konsoleviewpart.h +++ b/parts/konsole/konsoleviewpart.h @@ -21,7 +21,7 @@ class KDevShellWidget; class KonsoleViewPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index 7c21cab2..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); } @@ -58,11 +58,11 @@ void KonsoleViewWidget::activate() if (!part) return; - part->widget()->setFocusPolicy(TQ_WheelFocus); + part->widget()->setFocusPolicy(TQWidget::WheelFocus); setFocusProxy(part->widget()); part->widget()->setFocus(); - if (part->widget()->inherits(TQFRAME_OBJECT_NAME_STRING)) + if (part->widget()->inherits("TQFrame")) ((TQFrame*)part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); vbox->addWidget(part->widget()); @@ -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/konsole/konsoleviewwidget.h b/parts/konsole/konsoleviewwidget.h index 2bf3160a..b3781871 100644 --- a/parts/konsole/konsoleviewwidget.h +++ b/parts/konsole/konsoleviewwidget.h @@ -29,7 +29,7 @@ class TQVBoxLayout; class KonsoleViewWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KonsoleViewWidget(KonsoleViewPart *part); diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp index 63fcc6d9..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,14 +85,14 @@ 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.")); } void OpenWithPart::openWithService() { - KService::Ptr ptr = KService::serviceByDesktopPath(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + KService::Ptr ptr = KService::serviceByDesktopPath(sender()->name()); if (ptr) { KRun::run(*ptr, m_urls); diff --git a/parts/openwith/openwithpart.h b/parts/openwith/openwithpart.h index bd338a3f..6cbbd6c0 100644 --- a/parts/openwith/openwithpart.h +++ b/parts/openwith/openwithpart.h @@ -11,7 +11,7 @@ class Context; class OpenWithPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 3a0e0e7d..b2771a8a 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -29,12 +29,12 @@ #include "kdevpartcontroller.h" #include "settings.h" -static const KDevPluginInfo data("kdevappoutputview"); +static const KDevPluginInfo pluginData("kdevappoutputview"); typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( pluginData ) ) AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart") + : KDevAppFrontend(&pluginData, parent, name ? name : "AppOutputViewPart") { setInstance(AppViewFactory::instance()); @@ -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/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h index 1067af97..db643f54 100644 --- a/parts/outputviews/appoutputviewpart.h +++ b/parts/outputviews/appoutputviewpart.h @@ -22,7 +22,7 @@ class AppOutputWidget; class AppOutputViewPart : public KDevAppFrontend { - Q_OBJECT + TQ_OBJECT public: 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/appoutputwidget.h b/parts/outputviews/appoutputwidget.h index 9e5810ea..9c95b879 100644 --- a/parts/outputviews/appoutputwidget.h +++ b/parts/outputviews/appoutputwidget.h @@ -21,7 +21,7 @@ class AppOutputViewPart; class AppOutputWidget : public ProcessWidget { - Q_OBJECT + TQ_OBJECT friend class AppOutputViewPart; public: diff --git a/parts/outputviews/compileerrorfilter.h b/parts/outputviews/compileerrorfilter.h index 81a78020..e703baaf 100644 --- a/parts/outputviews/compileerrorfilter.h +++ b/parts/outputviews/compileerrorfilter.h @@ -21,7 +21,7 @@ class MakeItem; class CompileErrorFilter : public TQObject, public OutputFilter { -Q_OBJECT +TQ_OBJECT public: diff --git a/parts/outputviews/directorystatusmessagefilter.h b/parts/outputviews/directorystatusmessagefilter.h index 13d23d02..dbcd4424 100644 --- a/parts/outputviews/directorystatusmessagefilter.h +++ b/parts/outputviews/directorystatusmessagefilter.h @@ -20,7 +20,7 @@ class ExitingDirectoryItem; class DirectoryStatusMessageFilter : public TQObject, public OutputFilter { -Q_OBJECT +TQ_OBJECT public: diff --git a/parts/outputviews/filterdlg.ui b/parts/outputviews/filterdlg.ui index eae824f3..07a8d1f5 100644 --- a/parts/outputviews/filterdlg.ui +++ b/parts/outputviews/filterdlg.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/outputviews/makeactionfilter.h b/parts/outputviews/makeactionfilter.h index f030f555..bf71a9e0 100644 --- a/parts/outputviews/makeactionfilter.h +++ b/parts/outputviews/makeactionfilter.h @@ -22,7 +22,7 @@ class ActionItem; class MakeActionFilter : public TQObject, public OutputFilter { -Q_OBJECT +TQ_OBJECT public: diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index 8b441e94..d1b1df76 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -26,12 +26,12 @@ #include "makewidget.h" -static const KDevPluginInfo data("kdevmakeview"); +static const KDevPluginInfo pluginData("kdevmakeview"); typedef KDevGenericFactory< MakeViewPart > MakeViewFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( pluginData ) ) MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevMakeFrontend(&data, parent, name) + : KDevMakeFrontend(&pluginData, parent, name) { setInstance(MakeViewFactory::instance()); @@ -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/makeviewpart.h b/parts/outputviews/makeviewpart.h index 89f2a8bd..b11d2f54 100644 --- a/parts/outputviews/makeviewpart.h +++ b/parts/outputviews/makeviewpart.h @@ -22,7 +22,7 @@ class MakeWidget; class MakeViewPart : public KDevMakeFrontend { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 029efdc6..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() @@ -389,7 +389,7 @@ void MakeWidget::prevError() void MakeWidget::contentsMouseReleaseEvent( TQMouseEvent* e ) { TQTextEdit::contentsMouseReleaseEvent(e); - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; searchItem(paragraphAt(e->pos())); } @@ -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/outputviews/makewidget.h b/parts/outputviews/makewidget.h index b01c95c4..127ae064 100644 --- a/parts/outputviews/makewidget.h +++ b/parts/outputviews/makewidget.h @@ -36,7 +36,7 @@ namespace KTextEditor { class Document; } class MakeWidget : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/outputviews/otherfilter.h b/parts/outputviews/otherfilter.h index 4bfc0733..849ecab9 100644 --- a/parts/outputviews/otherfilter.h +++ b/parts/outputviews/otherfilter.h @@ -20,7 +20,7 @@ class MakeItem; class OtherFilter : public TQObject, public OutputFilter { -Q_OBJECT +TQ_OBJECT public: diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp index d5240edb..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> @@ -23,13 +23,13 @@ #include "partexplorerform.h" -static const KDevPluginInfo data("kdevpartexplorer"); +static const KDevPluginInfo pluginData("kdevpartexplorer"); typedef KDevGenericFactory<PartExplorerPlugin> PartExplorerPluginFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( pluginData ) ) PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & ) - : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" ) + : KDevPlugin( &pluginData, parent, name ? name : "PartExplorerPlugin" ) { // we need an instance setInstance( PartExplorerPluginFactory::instance() ); @@ -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/partexplorer_plugin.h b/parts/partexplorer/partexplorer_plugin.h index eea44750..0a10d96b 100644 --- a/parts/partexplorer/partexplorer_plugin.h +++ b/parts/partexplorer/partexplorer_plugin.h @@ -23,7 +23,7 @@ class PartExplorerForm; class PartExplorerPlugin : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp index 76e4fc50..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 @@ -212,7 +212,7 @@ void PartExplorerForm::fillServiceList( const TDETrader::OfferList &services ) TQVariant property = service->property( propertyName ); TQString propertyType = property.typeName(); TQString propertyValue; - if (propertyType == TQSTRINGLIST_OBJECT_NAME_STRING) { + if (propertyType == "TQStringList") { propertyValue = property.toStringList().join(", "); } else { diff --git a/parts/partexplorer/partexplorerform.h b/parts/partexplorer/partexplorerform.h index e5bcabc1..fd882671 100644 --- a/parts/partexplorer/partexplorerform.h +++ b/parts/partexplorer/partexplorerform.h @@ -25,7 +25,7 @@ class PartExplorerFormBase; */ class PartExplorerForm : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PartExplorerForm( TQWidget *parent = 0 ); diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index 4d316e68..0d127a9c 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -44,38 +44,38 @@ #include "kdeveditorutil.h" typedef KDevGenericFactory<QuickOpenPart> QuickOpenFactory; -static const KDevPluginInfo data("kdevquickopen"); -K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) ) +static const KDevPluginInfo pluginData("kdevquickopen"); +K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( pluginData ) ) using namespace KTextEditor; QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" ) + : KDevQuickOpen(&pluginData, parent, name ? name : "QuickOpenPart" ) { setInstance(QuickOpenFactory::instance()); 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/quickopen_part.h b/parts/quickopen/quickopen_part.h index fa1d85e3..98329db6 100644 --- a/parts/quickopen/quickopen_part.h +++ b/parts/quickopen/quickopen_part.h @@ -29,7 +29,7 @@ class TDEAction; class QuickOpenPart : public KDevQuickOpen { - Q_OBJECT + TQ_OBJECT public: QuickOpenPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui index 1fb873fc..23c028c7 100644 --- a/parts/quickopen/quickopenbase.ui +++ b/parts/quickopen/quickopenbase.ui @@ -87,9 +87,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -104,9 +101,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -167,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 13e01360..bcd21e2e 100644 --- a/parts/quickopen/quickopenclassdialog.h +++ b/parts/quickopen/quickopenclassdialog.h @@ -29,10 +29,10 @@ class QuickOpenPart; class QuickOpenClassDialog : public QuickOpenDialog { - Q_OBJECT + 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 dc90a20c..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() @@ -74,7 +74,7 @@ bool QuickOpenDialog::eventFilter( TQObject * watched, TQEvent * e ) if (!watched || !e) return true; - if ((TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(nameEdit)) && (e->type() == TQEvent::KeyPress)) + if ((watched == nameEdit) && (e->type() == TQEvent::KeyPress)) { TQKeyEvent *ke = (TQKeyEvent*)e; if (ke->key() == Key_Up) diff --git a/parts/quickopen/quickopendialog.h b/parts/quickopen/quickopendialog.h index d763b31e..f3dc34a7 100644 --- a/parts/quickopen/quickopendialog.h +++ b/parts/quickopen/quickopendialog.h @@ -33,11 +33,11 @@ class TDECompletion; class QuickOpenDialog : public QuickOpenDialogBase { - Q_OBJECT + TQ_OBJECT 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 6db19401..9e3eb22b 100644 --- a/parts/quickopen/quickopenfiledialog.h +++ b/parts/quickopen/quickopenfiledialog.h @@ -31,11 +31,11 @@ class TDECompletion; class QuickOpenFileDialog : public QuickOpenDialog { - Q_OBJECT + 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 06f58e47..d9b8919d 100644 --- a/parts/quickopen/quickopenfunctionchooseform.h +++ b/parts/quickopen/quickopenfunctionchooseform.h @@ -27,11 +27,11 @@ class QuickOpenFunctionChooseForm : public QuickOpenFunctionChooseFormBase { - Q_OBJECT + TQ_OBJECT 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 dc5c69e4..53391e54 100644 --- a/parts/quickopen/quickopenfunctiondialog.h +++ b/parts/quickopen/quickopenfunctiondialog.h @@ -31,11 +31,11 @@ class QuickOpenPart; class QuickOpenFunctionDialog : public QuickOpenDialog { - Q_OBJECT + TQ_OBJECT 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/regexptestdlg.h b/parts/regexptest/regexptestdlg.h index 4c7094a6..32fd1119 100644 --- a/parts/regexptest/regexptestdlg.h +++ b/parts/regexptest/regexptestdlg.h @@ -19,7 +19,7 @@ class KDevPlugin; class RegexpTestDialog : public RegexpTestDialogBase { - Q_OBJECT + TQ_OBJECT public: 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 6c45a492..2fec05f6 100644 --- a/parts/regexptest/regexptestpart.cpp +++ b/parts/regexptest/regexptestpart.cpp @@ -19,13 +19,13 @@ #include "kdevcore.h" #include "regexptestdlg.h" -static const KDevPluginInfo data("kdevregexptest"); +static const KDevPluginInfo pluginData("kdevregexptest"); typedef KDevGenericFactory<RegexpTestPart> RegexpTestFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( pluginData ) ) RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "RegexpTestPart") + : KDevPlugin(&pluginData, parent, name ? name : "RegexpTestPart") { setInstance(RegexpTestFactory::instance()); setXMLFile("kdevregexptest.rc"); @@ -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/regexptest/regexptestpart.h b/parts/regexptest/regexptestpart.h index ec153d90..479bee03 100644 --- a/parts/regexptest/regexptestpart.h +++ b/parts/regexptest/regexptestpart.h @@ -21,7 +21,7 @@ class RegexpTestDialog; class RegexpTestPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: 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_part.h b/parts/replace/replace_part.h index fbd0f2f7..d00cc11d 100644 --- a/parts/replace/replace_part.h +++ b/parts/replace/replace_part.h @@ -24,7 +24,7 @@ class Context; class ReplacePart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: 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/replace_widget.h b/parts/replace/replace_widget.h index c9063928..e666b872 100644 --- a/parts/replace/replace_widget.h +++ b/parts/replace/replace_widget.h @@ -28,7 +28,7 @@ class ReplaceView; class ReplaceWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: 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 cc53029e..86241999 100644 --- a/parts/replace/replacedlgimpl.h +++ b/parts/replace/replacedlgimpl.h @@ -8,11 +8,11 @@ class TQDialog; class ReplaceDlgImpl : public ReplaceDlg { - Q_OBJECT + TQ_OBJECT 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/replaceitem.cpp b/parts/replace/replaceitem.cpp index 20471d67..ebd92797 100644 --- a/parts/replace/replaceitem.cpp +++ b/parts/replace/replaceitem.cpp @@ -116,7 +116,7 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, else y = (fm.height() + 2 + marg - boxsize) / 2; - lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, + lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, TQStyleOption(this)); diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index a85b0818..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 ) @@ -112,11 +112,11 @@ void ReplaceView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& po if ( ReplaceItem * item = dynamic_cast<ReplaceItem*>( i ) ) { - if ( btn == Qt::RightButton ) + if ( btn == TQt::RightButton ) { // popup menu? } - else if ( btn == Qt::LeftButton ) + else if ( btn == TQt::LeftButton ) { // map pos to item/column and call ReplacetItem::activate(pos) item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(item).top() ) ); diff --git a/parts/replace/replaceview.h b/parts/replace/replaceview.h index 1b7591aa..6f3d2b04 100644 --- a/parts/replace/replaceview.h +++ b/parts/replace/replaceview.h @@ -23,7 +23,7 @@ class ReplaceItem; class ReplaceView : public TDEListView { - Q_OBJECT + TQ_OBJECT signals: 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/scriptingglobalconfig.h b/parts/scripting/scriptingglobalconfig.h index b5e3ad17..9d9d1f91 100644 --- a/parts/scripting/scriptingglobalconfig.h +++ b/parts/scripting/scriptingglobalconfig.h @@ -27,7 +27,7 @@ class scriptingPart; class scriptingGlobalConfig: public scriptingGlobalConfigBase { - Q_OBJECT + TQ_OBJECT public: scriptingGlobalConfig(scriptingPart *part, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index 80a33c9e..17aa5b51 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -41,26 +41,26 @@ #include "tdescriptactionmanager.h" typedef KDevGenericFactory<scriptingPart> scriptingFactory; -KDevPluginInfo data("kdevscripting"); -K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) ) +KDevPluginInfo pluginData("kdevscripting"); +K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( pluginData ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L) + : KDevPlugin(&pluginData, parent, name ? name : "scriptingPart"), m_scripts(0L) { setInstance(scriptingFactory::instance()); setXMLFile("kdevscripting.rc"); 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/scripting/scriptingpart.h b/parts/scripting/scriptingpart.h index 832318b9..0dc63d45 100644 --- a/parts/scripting/scriptingpart.h +++ b/parts/scripting/scriptingpart.h @@ -36,7 +36,7 @@ Please read the README.dox file for more info about this part */ class scriptingPart: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: scriptingPart(TQObject *parent, const char *name, const TQStringList &args); diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index 82969151..75815de5 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -33,12 +33,12 @@ #include "snippetsettings.h" #include "snippetconfig.h" -static const KDevPluginInfo data("kdevsnippet"); +static const KDevPluginInfo pluginData("kdevsnippet"); typedef KDevGenericFactory<SnippetPart> snippetFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( pluginData ) ) SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "SnippetPart" ) + : KDevPlugin(&pluginData, parent, name ? name : "SnippetPart" ) { setInstance(snippetFactory::instance()); setXMLFile("kdevpart_snippet.rc"); @@ -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_part.h b/parts/snippet/snippet_part.h index 8ffd8fce..90052c2e 100644 --- a/parts/snippet/snippet_part.h +++ b/parts/snippet/snippet_part.h @@ -26,7 +26,7 @@ For more info read the README.dox file */ class SnippetPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: 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/snippet_widget.h b/parts/snippet/snippet_widget.h index 8b6c17a1..5ed9ec82 100644 --- a/parts/snippet/snippet_widget.h +++ b/parts/snippet/snippet_widget.h @@ -39,7 +39,7 @@ tooltips which contains the text of the snippet */ class SnippetWidget : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT friend class SnippetSettings; //to allow SnippetSettings to call languageChanged() 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/snippet/snippetsettings.h b/parts/snippet/snippetsettings.h index 4c0d922a..92d34309 100644 --- a/parts/snippet/snippetsettings.h +++ b/parts/snippet/snippetsettings.h @@ -23,7 +23,7 @@ same named .ui file */ class SnippetSettings : public SnippetSettingsBase { -Q_OBJECT +TQ_OBJECT public: SnippetSettings(TQWidget *parent = 0, const char *name = 0); diff --git a/parts/snippet/snippetsettingsbase.ui b/parts/snippet/snippetsettingsbase.ui index 9d1d0c9d..9d816561 100644 --- a/parts/snippet/snippetsettingsbase.ui +++ b/parts/snippet/snippetsettingsbase.ui @@ -92,9 +92,6 @@ <property name="text"> <string>Single dialog for each variable within a snippet</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -109,9 +106,6 @@ <property name="text"> <string>One dialog for all variables within a snippet</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>false</bool> </property> @@ -207,9 +201,6 @@ <property name="text"> <string>The group's language is supported by the project</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>false</bool> </property> diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp index 4453030a..26cb14de 100644 --- a/parts/texttools/texttoolspart.cpp +++ b/parts/texttools/texttoolspart.cpp @@ -25,19 +25,19 @@ typedef KDevGenericFactory<TextToolsPart> TextToolsFactory; -static const KDevPluginInfo data("kdevtexttools"); -K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) ) +static const KDevPluginInfo pluginData("kdevtexttools"); +K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( pluginData ) ) TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "TextToolsPart") + : KDevPlugin(&pluginData, parent, name ? name : "TextToolsPart") { setInstance(TextToolsFactory::instance()); // setXMLFile("kdevfileview.rc"); 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/texttoolspart.h b/parts/texttools/texttoolspart.h index 0d822a65..7b428c83 100644 --- a/parts/texttools/texttoolspart.h +++ b/parts/texttools/texttoolspart.h @@ -21,7 +21,7 @@ class TextToolsWidget; class TextToolsPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index db2f0acc..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&)) ); } @@ -128,7 +128,7 @@ void TextToolsWidget::slotItemPressed(int button, TQListViewItem *item) cursorIface->setCursorPosition(line, col); } - if (button == Qt::MidButton) { + if (button == TQt::MidButton) { KTextEditor::SelectionInterface *selectionIface = dynamic_cast<KTextEditor::SelectionInterface*>(rwpart); if (selectionIface) { @@ -144,7 +144,7 @@ void TextToolsWidget::slotItemPressed(int button, TQListViewItem *item) void TextToolsWidget::slotReturnPressed(TQListViewItem *item) { - slotItemPressed(Qt::LeftButton, item); + slotItemPressed(TQt::LeftButton, item); } @@ -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/texttools/texttoolswidget.h b/parts/texttools/texttoolswidget.h index eaca3ac7..0b435ac4 100644 --- a/parts/texttools/texttoolswidget.h +++ b/parts/texttools/texttoolswidget.h @@ -23,7 +23,7 @@ namespace KTextEditor { class EditInterface; } class TextToolsWidget : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index 6cd63deb..3668783d 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -12,20 +12,20 @@ #include <kdevplugininfo.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktextbrowser.h> #include <ktip.h> #include "kdevapi.h" #include "kdevcore.h" -static const KDevPluginInfo data("kdevtipofday"); +static const KDevPluginInfo pluginData("kdevtipofday"); typedef KDevGenericFactory<TipOfDayPart> TipOfDayFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( pluginData ) ) TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "TipOfDayPart") + : KDevPlugin(&pluginData, parent, name ? name : "TipOfDayPart") { setInstance(TipOfDayFactory::instance()); @@ -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/tipofday/tipofday_part.h b/parts/tipofday/tipofday_part.h index 4b982800..a347946f 100644 --- a/parts/tipofday/tipofday_part.h +++ b/parts/tipofday/tipofday_part.h @@ -12,7 +12,7 @@ class TipOfDayPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: 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/kapplicationtree.h b/parts/tools/kapplicationtree.h index 0ba2cc9f..ddd9f68a 100644 --- a/parts/tools/kapplicationtree.h +++ b/parts/tools/kapplicationtree.h @@ -73,7 +73,7 @@ protected: */ class KDevApplicationTree : public TDEListView { - Q_OBJECT + TQ_OBJECT public: KDevApplicationTree( TQWidget *parent, const char* name = 0 ); diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index 8734eadc..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" @@ -34,13 +34,13 @@ #define TOOLSSETTINGS 1 #define EXTRATOOLSSETTINGS 2 -static const KDevPluginInfo data("kdevtools"); -K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) ) +static const KDevPluginInfo pluginData("kdevtools"); +K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( pluginData ) ) TQMap<int, TQString> externalToolMenuEntries; ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin( &data, parent, name ? name : "ToolsPart") + : KDevPlugin( &pluginData, parent, name ? name : "ToolsPart") { setInstance(ToolsFactory::instance()); @@ -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); } @@ -113,8 +113,8 @@ void ToolsPart::updateMenu() void ToolsPart::slotToolActivated() { - TQString df = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); - kapp->startServiceByDesktopPath(df); + TQString df = sender()->name(); + 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,19 +212,19 @@ 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) ); } } void ToolsPart::toolsMenuActivated() { - TQString menutext = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); + TQString menutext = sender()->name(); TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tool Menu " + menutext); TQString cmdline = config->readPathEntry("CommandLine"); @@ -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/tools_part.h b/parts/tools/tools_part.h index 20af2ea8..8c87fd4f 100644 --- a/parts/tools/tools_part.h +++ b/parts/tools/tools_part.h @@ -22,7 +22,7 @@ class ToolsWidget; class ToolsPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: 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/toolsconfig.h b/parts/tools/toolsconfig.h index 074d5900..2c1158fa 100644 --- a/parts/tools/toolsconfig.h +++ b/parts/tools/toolsconfig.h @@ -26,7 +26,7 @@ public: class ToolsConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: 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/toolsconfigwidget.h b/parts/tools/toolsconfigwidget.h index 99b2c95d..d8baa9c5 100644 --- a/parts/tools/toolsconfigwidget.h +++ b/parts/tools/toolsconfigwidget.h @@ -22,7 +22,7 @@ struct ToolsConfigEntry; class ToolsConfigWidget : public ToolsConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: 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 fdc9fa6a..a8b40350 100644 --- a/parts/uimode/uichooser_part.cpp +++ b/parts/uimode/uichooser_part.cpp @@ -15,18 +15,18 @@ #define UICHOOSERSETTINGSPAGE 1 typedef KDevGenericFactory<UIChooserPart> UIChooserFactory; -static const KDevPluginInfo data("kdevuichooser"); -K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) ) +static const KDevPluginInfo pluginData("kdevuichooser"); +K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( pluginData ) ) UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin( &data, parent, name ? name : "UIChooserPart") + : KDevPlugin( &pluginData, parent, name ? name : "UIChooserPart") { setInstance(UIChooserFactory::instance()); _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_part.h b/parts/uimode/uichooser_part.h index ff822e1d..98c92707 100644 --- a/parts/uimode/uichooser_part.h +++ b/parts/uimode/uichooser_part.h @@ -14,7 +14,7 @@ class ConfigWidgetProxy; class UIChooserPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: 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/uimode/uichooser_widget.h b/parts/uimode/uichooser_widget.h index 11cb031d..e1ee25bf 100644 --- a/parts/uimode/uichooser_widget.h +++ b/parts/uimode/uichooser_widget.h @@ -11,7 +11,7 @@ class UIChooserPart; class UIChooserWidget : public UIChooser { - Q_OBJECT + TQ_OBJECT public: 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_dialog.h b/parts/valgrind/valgrind_dialog.h index 99e7bd55..6e4f598b 100644 --- a/parts/valgrind/valgrind_dialog.h +++ b/parts/valgrind/valgrind_dialog.h @@ -13,7 +13,7 @@ class DialogWidget; **/ class ValgrindDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: enum Type { Memcheck = 0, Calltree = 1 }; diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp index 1b262175..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> @@ -23,26 +23,26 @@ #include "valgrinditem.h" typedef KDevGenericFactory<ValgrindPart> ValgrindFactory; -static const KDevPluginInfo data("kdevvalgrind"); -K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) ) +static const KDevPluginInfo pluginData("kdevvalgrind"); +K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( pluginData ) ) ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin( &data, parent, name ? name : "ValgrindPart" ) + : KDevPlugin( &pluginData, parent, name ? name : "ValgrindPart" ) { setInstance( ValgrindFactory::instance() ); 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_part.h b/parts/valgrind/valgrind_part.h index 6a05737b..b1464104 100644 --- a/parts/valgrind/valgrind_part.h +++ b/parts/valgrind/valgrind_part.h @@ -15,7 +15,7 @@ class TDEProcess; class ValgrindPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: 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/valgrind/valgrind_widget.h b/parts/valgrind/valgrind_widget.h index bb525758..e0539ee2 100644 --- a/parts/valgrind/valgrind_widget.h +++ b/parts/valgrind/valgrind_widget.h @@ -14,7 +14,7 @@ class TQPopupMenu; class ValgrindWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp index ec176c47..e1719371 100644 --- a/parts/vcsmanager/vcsmanagerpart.cpp +++ b/parts/vcsmanager/vcsmanagerpart.cpp @@ -42,14 +42,14 @@ #include "vcsmanagerprojectconfig.h" typedef KDevGenericFactory<VCSManagerPart> VCSManagerFactory; -KDevPluginInfo data("kdevvcsmanager"); -K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) ) +KDevPluginInfo pluginData("kdevvcsmanager"); +K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( pluginData ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "VCSManagerPart") + : KDevPlugin(&pluginData, parent, name ? name : "VCSManagerPart") { kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl; @@ -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/parts/vcsmanager/vcsmanagerpart.h b/parts/vcsmanager/vcsmanagerpart.h index 1fbccbff..7347f134 100644 --- a/parts/vcsmanager/vcsmanagerpart.h +++ b/parts/vcsmanager/vcsmanagerpart.h @@ -37,7 +37,7 @@ Please read the README.dox file for more info about this part */ class VCSManagerPart: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: VCSManagerPart(TQObject *parent, const char *name, const TQStringList &args); diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.h b/parts/vcsmanager/vcsmanagerprojectconfig.h index 7e33497c..a3baf19a 100644 --- a/parts/vcsmanager/vcsmanagerprojectconfig.h +++ b/parts/vcsmanager/vcsmanagerprojectconfig.h @@ -28,7 +28,7 @@ class VCSManagerPart; class VCSManagerProjectConfig: public VCSManagerProjectConfigBase { - Q_OBJECT + TQ_OBJECT public: VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent = 0, const char *name = 0); |