From b09bffed6b43262948018dfb0f11890850ddf7c1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 18 Jun 2011 20:34:22 +0000 Subject: TQt4 port kdeadmin This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1237416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcron/configure.in.in | 2 +- kcron/ctcron.cpp | 8 ++++---- kcron/ctcron.h | 4 ++-- kcron/ctdom.cpp | 2 +- kcron/ctdom.h | 2 +- kcron/ctdow.cpp | 2 +- kcron/ctdow.h | 2 +- kcron/cthost.cpp | 2 +- kcron/cthost.h | 4 ++-- kcron/cthour.h | 2 +- kcron/cti18n.h | 4 ++-- kcron/ctminute.h | 2 +- kcron/ctmonth.cpp | 2 +- kcron/ctmonth.h | 2 +- kcron/cttask.cpp | 2 +- kcron/cttask.h | 2 +- kcron/ctunit.cpp | 6 +++--- kcron/ctunit.h | 2 +- kcron/ctvariable.cpp | 2 +- kcron/ctvariable.h | 2 +- kcron/ktapp.cpp | 34 +++++++++++++++++----------------- kcron/ktapp.h | 5 +++-- kcron/ktlistcron.cpp | 12 ++++++------ kcron/ktlistcron.h | 6 +++--- kcron/ktlistitem.cpp | 8 ++++---- kcron/ktlistitem.h | 6 +++--- kcron/ktlisttask.cpp | 8 ++++---- kcron/ktlisttask.h | 2 +- kcron/ktlisttasks.cpp | 12 ++++++------ kcron/ktlisttasks.h | 4 ++-- kcron/ktlistvar.cpp | 8 ++++---- kcron/ktlistvar.h | 2 +- kcron/ktlistvars.cpp | 12 ++++++------ kcron/ktlistvars.h | 4 ++-- kcron/ktprint.cpp | 6 +++--- kcron/ktprint.h | 4 ++-- kcron/ktprintopt.h | 1 + kcron/kttask.cpp | 34 +++++++++++++++++----------------- kcron/kttask.h | 1 + kcron/ktvariable.cpp | 30 +++++++++++++++--------------- kcron/ktvariable.h | 1 + kcron/ktview.cpp | 42 +++++++++++++++++++++--------------------- kcron/ktview.h | 5 +++-- 43 files changed, 154 insertions(+), 149 deletions(-) (limited to 'kcron') diff --git a/kcron/configure.in.in b/kcron/configure.in.in index be677e4..c64a6b7 100644 --- a/kcron/configure.in.in +++ b/kcron/configure.in.in @@ -1,4 +1,4 @@ AC_LANG_SAVE AC_LANG_CPLUSPLUS -AC_CHECK_HEADERS(sstream) +KDE_CHECK_HEADERS(sstream) AC_LANG_RESTORE diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp index bcc51e4..58d389a 100644 --- a/kcron/ctcron.cpp +++ b/kcron/ctcron.cpp @@ -9,7 +9,7 @@ * (at your option) any later version. * ***************************************************************************/ -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "ctcron.h" @@ -60,7 +60,7 @@ CTCron::CTCron(bool _syscron, string _login) : writeCommand = TQString("crontab -u ") + _login.c_str() + " " + KProcess::quote(tmpFileName); if (!initFromPasswd(getpwnam(_login.c_str()))) { - error = i18n("No password entry found for user '%1'").arg(_login.c_str()); + error = i18n("No password entry found for user '%1'").tqarg(_login.c_str()); } } } @@ -71,7 +71,7 @@ CTCron::CTCron(bool _syscron, string _login) : writeCommand = "crontab " + KProcess::quote(tmpFileName); if (!initFromPasswd(getpwuid(uid))) { - error = i18n("No password entry found for uid '%1'").arg(uid); + error = i18n("No password entry found for uid '%1'").tqarg(uid); } } @@ -178,7 +178,7 @@ istream& operator >> (istream& inputStream, CTCron& cron) if ((line.find("#") == 0) && (line.find("\\") != 1)) { // If the first 10 characters don't contain a character, it's probably a disabled entry. - int first_text = line.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); + int first_text = line.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ"); if (first_text < 0) continue; diff --git a/kcron/ctcron.h b/kcron/ctcron.h index 2aaf01b..485da8d 100644 --- a/kcron/ctcron.h +++ b/kcron/ctcron.h @@ -12,7 +12,7 @@ #ifndef CTCRON_H #define CTCRON_H -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include @@ -94,7 +94,7 @@ public: /** * Return error description */ - TQString errorMessage() { TQString r = error; error = TQString::null; return r; } + TQString errorMessage() { TQString r = error; error = TQString(); return r; } /** diff --git a/kcron/ctdom.cpp b/kcron/ctdom.cpp index b1d7f5e..f4e0cf3 100644 --- a/kcron/ctdom.cpp +++ b/kcron/ctdom.cpp @@ -9,7 +9,7 @@ * (at your option) any later version. * ***************************************************************************/ -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "ctdom.h" diff --git a/kcron/ctdom.h b/kcron/ctdom.h index 4e66747..daadd1f 100644 --- a/kcron/ctdom.h +++ b/kcron/ctdom.h @@ -12,7 +12,7 @@ #ifndef CTDOM_H #define CTDOM_H -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "ctunit.h" diff --git a/kcron/ctdow.cpp b/kcron/ctdow.cpp index fe93c86..1b59eb9 100644 --- a/kcron/ctdow.cpp +++ b/kcron/ctdow.cpp @@ -9,7 +9,7 @@ * (at your option) any later version. * ***************************************************************************/ -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "ctdow.h" diff --git a/kcron/ctdow.h b/kcron/ctdow.h index 05b6357..8616185 100644 --- a/kcron/ctdow.h +++ b/kcron/ctdow.h @@ -12,7 +12,7 @@ #ifndef CTDOW_H #define CTDOW_H -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "ctunit.h" diff --git a/kcron/cthost.cpp b/kcron/cthost.cpp index 356047d..b368b77 100644 --- a/kcron/cthost.cpp +++ b/kcron/cthost.cpp @@ -10,7 +10,7 @@ * (at your option) any later version. * ***************************************************************************/ -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "cthost.h" diff --git a/kcron/cthost.h b/kcron/cthost.h index 022ff54..a738300 100644 --- a/kcron/cthost.h +++ b/kcron/cthost.h @@ -12,7 +12,7 @@ #ifndef CTHOST_H #define CTHOST_H -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include @@ -78,7 +78,7 @@ public: /** * Error message */ - TQString errorMessage() { TQString r = error; error = TQString::null; return r; } + TQString errorMessage() { TQString r = error; error = TQString(); return r; } /** diff --git a/kcron/cthour.h b/kcron/cthour.h index 702c410..f11d0f8 100644 --- a/kcron/cthour.h +++ b/kcron/cthour.h @@ -12,7 +12,7 @@ #ifndef CTHOUR_H #define CTHOUR_H -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "ctunit.h" diff --git a/kcron/cti18n.h b/kcron/cti18n.h index e3a1757..a5b96ec 100644 --- a/kcron/cti18n.h +++ b/kcron/cti18n.h @@ -12,13 +12,13 @@ #ifndef CTI18N_H #define CTI18N_H -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 // // Note: I do make an exception to the above rule for this file, as it is // necessary to support internationalization. // -// Regardless, please don't introduce any other Qt or KDE dependencies here. +// Regardless, please don't introduce any other TQt or KDE dependencies here. // -GM 11/99 #include diff --git a/kcron/ctminute.h b/kcron/ctminute.h index 6d93e08..1f1c7ad 100644 --- a/kcron/ctminute.h +++ b/kcron/ctminute.h @@ -12,7 +12,7 @@ #ifndef CTMINUTE_H #define CTMINUTE_H -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "ctunit.h" diff --git a/kcron/ctmonth.cpp b/kcron/ctmonth.cpp index b66cd39..d07a785 100644 --- a/kcron/ctmonth.cpp +++ b/kcron/ctmonth.cpp @@ -9,7 +9,7 @@ * (at your option) any later version. * ***************************************************************************/ -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "ctmonth.h" diff --git a/kcron/ctmonth.h b/kcron/ctmonth.h index f7aa8af..048dd78 100644 --- a/kcron/ctmonth.h +++ b/kcron/ctmonth.h @@ -12,7 +12,7 @@ #ifndef CTMONTH_H #define CTMONTH_H -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "ctunit.h" diff --git a/kcron/cttask.cpp b/kcron/cttask.cpp index 22fc77b..4851792 100644 --- a/kcron/cttask.cpp +++ b/kcron/cttask.cpp @@ -9,7 +9,7 @@ * (at your option) any later version. * ***************************************************************************/ -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "cttask.h" diff --git a/kcron/cttask.h b/kcron/cttask.h index 061df57..65f8c21 100644 --- a/kcron/cttask.h +++ b/kcron/cttask.h @@ -12,7 +12,7 @@ #ifndef CTTASK_H #define CTTASK_H -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include diff --git a/kcron/ctunit.cpp b/kcron/ctunit.cpp index 0532131..e843b2e 100644 --- a/kcron/ctunit.cpp +++ b/kcron/ctunit.cpp @@ -9,7 +9,7 @@ * (at your option) any later version. * ***************************************************************************/ -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "cti18n.h" @@ -84,7 +84,7 @@ void CTUnit::parse(string tokStr) { subelement = tokStr.substr(0,commapos); - // find "/" to determine step + // tqfind "/" to determine step slashpos = subelement.find("/"); if (slashpos == -1) { @@ -99,7 +99,7 @@ void CTUnit::parse(string tokStr) step = 1; } - // find "=" to determine range + // tqfind "=" to determine range dashpos = subelement.find("-"); if (dashpos == -1) { diff --git a/kcron/ctunit.h b/kcron/ctunit.h index 871a274..5bd39f6 100644 --- a/kcron/ctunit.h +++ b/kcron/ctunit.h @@ -12,7 +12,7 @@ #ifndef CTUNIT_H #define CTUNIT_H -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include diff --git a/kcron/ctvariable.cpp b/kcron/ctvariable.cpp index f736c76..6777341 100644 --- a/kcron/ctvariable.cpp +++ b/kcron/ctvariable.cpp @@ -9,7 +9,7 @@ * (at your option) any later version. * ***************************************************************************/ -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include "ctvariable.h" diff --git a/kcron/ctvariable.h b/kcron/ctvariable.h index 3f20600..11d8af1 100644 --- a/kcron/ctvariable.h +++ b/kcron/ctvariable.h @@ -12,7 +12,7 @@ #ifndef CTVARIABLE_H #define CTVARIABLE_H -// Do not introduce any Qt or KDE dependencies into the "CT"-prefixed classes. +// Do not introduce any TQt or KDE dependencies into the "CT"-prefixed classes. // I want to be able to reuse these classes with another GUI toolkit. -GM 11/99 #include diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp index 35c009c..e767b73 100644 --- a/kcron/ktapp.cpp +++ b/kcron/ktapp.cpp @@ -70,7 +70,7 @@ bool KTApp::init() if (cthost->isError()) { KMessageBox::error(this, i18n("The following error occurred while initializing KCron:" - "\n\n%1\n\nKCron will now exit.\n").arg(cthost->errorMessage())); + "\n\n%1\n\nKCron will now exit.\n").tqarg(cthost->errorMessage())); return false; } @@ -120,31 +120,31 @@ TQString KTApp::caption() void KTApp::setupActions() { //File Menu - KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); - KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); + KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); //Edit menu - KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection()); - KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection()); - KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection()); - (void)new KAction(i18n("&New..."), KStdAccel::openNew(), this,TQT_SLOT(slotEditNew()),actionCollection(),"edit_new"); + KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); + KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); + KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); + (void)new KAction(i18n("&New..."), KStdAccel::openNew(), TQT_TQOBJECT(this),TQT_SLOT(slotEditNew()),actionCollection(),"edit_new"); //I don't like this KStdAccel::open() for modifying, but I'm just porting this to xmlui - (void)new KAction(i18n("M&odify..."), KStdAccel::open(), this,TQT_SLOT(slotEditModify()),actionCollection(),"edit_modify"); - (void)new KAction(i18n("&Delete"), 0, this,TQT_SLOT(slotEditDelete()),actionCollection(),"edit_delete"); - (void)new KAction(i18n("&Enabled"), 0, this,TQT_SLOT(slotEditEnable()),actionCollection(),"edit_enable"); - (void)new KAction(i18n("&Run Now"), 0, this,TQT_SLOT(slotEditRunNow()),actionCollection(),"edit_run"); + (void)new KAction(i18n("M&odify..."), KStdAccel::open(), TQT_TQOBJECT(this),TQT_SLOT(slotEditModify()),actionCollection(),"edit_modify"); + (void)new KAction(i18n("&Delete"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditDelete()),actionCollection(),"edit_delete"); + (void)new KAction(i18n("&Enabled"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditEnable()),actionCollection(),"edit_enable"); + (void)new KAction(i18n("&Run Now"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditRunNow()),actionCollection(),"edit_run"); //Settings menu - (void)new KAction(i18n("Show &Toolbar"), 0, this,TQT_SLOT(slotViewToolBar()),actionCollection(),"show_toolbar"); - (void)new KAction(i18n("Show &Statusbar"), 0, this,TQT_SLOT(slotViewStatusBar()),actionCollection(),"show_statusbar"); + (void)new KAction(i18n("Show &Toolbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewToolBar()),actionCollection(),"show_toolbar"); + (void)new KAction(i18n("Show &Statusbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewStatusBar()),actionCollection(),"show_statusbar"); } void KTApp::initStatusBar() { statusBar()->insertItem(i18n("Ready."), statusMessage, 1); - statusBar()->setItemAlignment(statusMessage, Qt::AlignLeft | Qt::AlignVCenter); + statusBar()->setItemAlignment(statusMessage, TQt::AlignLeft | TQt::AlignVCenter); } void KTApp::saveOptions() @@ -208,11 +208,11 @@ bool KTApp::queryClose() { if(cthost->dirty()) { - KTApp* win = (KTApp*)parent(); + KTApp* win = (KTApp*)tqparent(); int retVal = KMessageBox::warningYesNoCancel(win, i18n("Scheduled tasks have been modified.\nDo you want to save changes?"), - TQString::null, + TQString(), KStdGuiItem::save(), KStdGuiItem::discard() ); diff --git a/kcron/ktapp.h b/kcron/ktapp.h index 0dd560f..6b28354 100644 --- a/kcron/ktapp.h +++ b/kcron/ktapp.h @@ -34,6 +34,7 @@ class CTHost; class KTApp : public KMainWindow { Q_OBJECT + TQ_OBJECT friend class KTView; @@ -237,13 +238,13 @@ private: /** * Read general options again and initialize all variables like the - * geometry. + * tqgeometry. */ void readOptions(); /** * Save general options like all bar positions and status as well as the - * geometry to the configuration file. + * tqgeometry to the configuration file. */ void saveOptions(); diff --git a/kcron/ktlistcron.cpp b/kcron/ktlistcron.cpp index 05dadb3..288f848 100644 --- a/kcron/ktlistcron.cpp +++ b/kcron/ktlistcron.cpp @@ -19,22 +19,22 @@ #include "kticon.h" #include "ktprint.h" -KTListCron::KTListCron(KTListItem* parent, const char* name, +KTListCron::KTListCron(KTListItem* tqparent, const char* name, CTCron* _ctcron) : - KTListItem(parent, name, _ctcron) + KTListItem(tqparent, name, _ctcron) { refresh(); } -KTListCron::KTListCron(TQListView* parent, const char* name, +KTListCron::KTListCron(TQListView* tqparent, const char* name, CTCron* _ctcron) : - KTListItem(parent, name, _ctcron) + KTListItem(tqparent, name, _ctcron) { refresh(); } -KTListCron::KTListCron(TQListView* parent, CTCron* _ctcron) : - KTListItem(parent, (const char*)0, _ctcron) +KTListCron::KTListCron(TQListView* tqparent, CTCron* _ctcron) : + KTListItem(tqparent, (const char*)0, _ctcron) { refresh(); } diff --git a/kcron/ktlistcron.h b/kcron/ktlistcron.h index 713a375..8b475ab 100644 --- a/kcron/ktlistcron.h +++ b/kcron/ktlistcron.h @@ -28,17 +28,17 @@ public: /** * Construct tasks or variables folder from branch. */ - KTListCron(KTListItem* parent, const char* name, CTCron* _ctcron); + KTListCron(KTListItem* tqparent, const char* name, CTCron* _ctcron); /** * Construct tasks or variables folder from root. */ - KTListCron(TQListView* parent, const char* name, CTCron* _ctcron); + KTListCron(TQListView* tqparent, const char* name, CTCron* _ctcron); /** * Construct user folder from root. */ - KTListCron(TQListView* parent, CTCron* _ctcron); + KTListCron(TQListView* tqparent, CTCron* _ctcron); /** * Refresh. diff --git a/kcron/ktlistitem.cpp b/kcron/ktlistitem.cpp index ef2ad0e..d8ef4c2 100644 --- a/kcron/ktlistitem.cpp +++ b/kcron/ktlistitem.cpp @@ -14,14 +14,14 @@ #include "ctcron.h" -KTListItem::KTListItem(KTListItem* parent, const char* name, CTCron* _ctcron) : - TQListViewItem(parent, name), +KTListItem::KTListItem(KTListItem* tqparent, const char* name, CTCron* _ctcron) : + TQListViewItem(tqparent, name), ctcron(_ctcron) { } -KTListItem::KTListItem(TQListView* parent, const char* name, CTCron* _ctcron) : - TQListViewItem(parent, name), +KTListItem::KTListItem(TQListView* tqparent, const char* name, CTCron* _ctcron) : + TQListViewItem(tqparent, name), ctcron(_ctcron) { } diff --git a/kcron/ktlistitem.h b/kcron/ktlistitem.h index 718fb79..fde698e 100644 --- a/kcron/ktlistitem.h +++ b/kcron/ktlistitem.h @@ -25,19 +25,19 @@ class CTCron; * An enhanced TQListViewItem that ensures all list view items have the * same interface. */ -class KTListItem : public QListViewItem +class KTListItem : public TQListViewItem { public: /** * Construct a root list view item from a CTCron. */ - KTListItem(KTListItem* parent, const char* name, CTCron* _ctcron); + KTListItem(KTListItem* tqparent, const char* name, CTCron* _ctcron); /** * Construct a non-root list view item from a CTCron. */ - KTListItem(TQListView* parent, const char* name, CTCron* _ctcron); + KTListItem(TQListView* tqparent, const char* name, CTCron* _ctcron); /** * Destructor. diff --git a/kcron/ktlisttask.cpp b/kcron/ktlisttask.cpp index 17a1378..28329ed 100644 --- a/kcron/ktlisttask.cpp +++ b/kcron/ktlisttask.cpp @@ -18,14 +18,14 @@ #include "kttask.h" #include "ktprint.h" -KTListTask::KTListTask(KTListItem* parent, +KTListTask::KTListTask(KTListItem* tqparent, CTCron* _ctcron, CTTask* _cttask) : - KTListItem(parent, 0, _ctcron), + KTListItem(tqparent, 0, _ctcron), cttask(_cttask) { refresh(); - parent->setOpen(true); + tqparent->setOpen(true); } void KTListTask::refresh() @@ -61,7 +61,7 @@ void KTListTask::edit() { KTTask(cttask,i18n("Modify Task")).exec(); refresh(); - parent()->sortChildItems(1, true); + tqparent()->sortChildItems(1, true); } CTTask* KTListTask::getCTTask() const diff --git a/kcron/ktlisttask.h b/kcron/ktlisttask.h index 3384745..9dfb2b2 100644 --- a/kcron/ktlisttask.h +++ b/kcron/ktlisttask.h @@ -30,7 +30,7 @@ public: /** * Initialize the list view item and task. */ - KTListTask(KTListItem* parent, CTCron* _ctcron, CTTask* _cttask); + KTListTask(KTListItem* tqparent, CTCron* _ctcron, CTTask* _cttask); /** * Refresh from underlying task. diff --git a/kcron/ktlisttasks.cpp b/kcron/ktlisttasks.cpp index 95c7779..1c21556 100644 --- a/kcron/ktlisttasks.cpp +++ b/kcron/ktlisttasks.cpp @@ -24,14 +24,14 @@ #include "kttask.h" #include "ktprint.h" -KTListTasks::KTListTasks(KTListItem* parent, CTCron* _ctcron) : - KTListItem(parent, 0, _ctcron) +KTListTasks::KTListTasks(KTListItem* tqparent, CTCron* _ctcron) : + KTListItem(tqparent, 0, _ctcron) { refresh(); } -KTListTasks::KTListTasks(TQListView* parent, CTCron* _ctcron) : - KTListItem(parent, 0, _ctcron) +KTListTasks::KTListTasks(TQListView* tqparent, CTCron* _ctcron) : + KTListItem(tqparent, 0, _ctcron) { refresh(); } @@ -50,7 +50,7 @@ void KTListTasks::create() if (temptask->dirty()) { getCTCron()->task.push_back(temptask); - new KTListTask(this, getCTCron(), temptask); // Qt will clean up + new KTListTask(this, getCTCron(), temptask); // TQt will clean up } else { @@ -77,7 +77,7 @@ void KTListTasks::print (KTPrint& printer) const printer.setFont(stnd); - //firstChild() does not return null if there are no children, therefore + //firstChild() does not return null if there are no tqchildren, therefore //we need to check the validation of the pointer without terminating //the application. This maybe a bug in QT 1.44 diff --git a/kcron/ktlisttasks.h b/kcron/ktlisttasks.h index ad5e5a3..d413cc8 100644 --- a/kcron/ktlisttasks.h +++ b/kcron/ktlisttasks.h @@ -30,12 +30,12 @@ public: /** * Construct tasks folder from branch. */ - KTListTasks(KTListItem* parent, CTCron* _ctcron); + KTListTasks(KTListItem* tqparent, CTCron* _ctcron); /** * Construct tasks folder from root. */ - KTListTasks(TQListView* parent, CTCron* _ctcron); + KTListTasks(TQListView* tqparent, CTCron* _ctcron); /** * Internationalized description. diff --git a/kcron/ktlistvar.cpp b/kcron/ktlistvar.cpp index e6c4f6a..5850052 100644 --- a/kcron/ktlistvar.cpp +++ b/kcron/ktlistvar.cpp @@ -19,13 +19,13 @@ #include "kticon.h" #include "ktvariable.h" -KTListVar::KTListVar(KTListItem* parent, CTCron* _ctcron, +KTListVar::KTListVar(KTListItem* tqparent, CTCron* _ctcron, CTVariable* _ctvariable) : - KTListItem(parent, 0, _ctcron), + KTListItem(tqparent, 0, _ctcron), ctvar(_ctvariable) { refresh(); - parent->setOpen(true); + tqparent->setOpen(true); } void KTListVar::refresh() @@ -71,7 +71,7 @@ void KTListVar::edit() { KTVariable(ctvar,i18n("Modify Variable")).exec(); refresh(); - parent()->sortChildItems(1, true); + tqparent()->sortChildItems(1, true); } CTVariable* KTListVar::getCTVariable() const diff --git a/kcron/ktlistvar.h b/kcron/ktlistvar.h index 0d4e7f0..6bbb7a9 100644 --- a/kcron/ktlistvar.h +++ b/kcron/ktlistvar.h @@ -30,7 +30,7 @@ public: /** * Initialize the list view item and environment variable. */ - KTListVar(KTListItem* parent, CTCron* _ctcron, CTVariable* _ctvariable); + KTListVar(KTListItem* tqparent, CTCron* _ctcron, CTVariable* _ctvariable); /** * Refresh from underlying variable. diff --git a/kcron/ktlistvars.cpp b/kcron/ktlistvars.cpp index 64d43a1..ec9894a 100644 --- a/kcron/ktlistvars.cpp +++ b/kcron/ktlistvars.cpp @@ -25,14 +25,14 @@ #include "ktvariable.h" #include "ktprint.h" -KTListVars::KTListVars(KTListItem* parent, CTCron* _ctcron) : - KTListItem(parent, 0, _ctcron) +KTListVars::KTListVars(KTListItem* tqparent, CTCron* _ctcron) : + KTListItem(tqparent, 0, _ctcron) { refresh(); } -KTListVars::KTListVars(TQListView* parent, CTCron* _ctcron) : - KTListItem(parent, 0, _ctcron) +KTListVars::KTListVars(TQListView* tqparent, CTCron* _ctcron) : + KTListItem(tqparent, 0, _ctcron) { refresh(); } @@ -46,7 +46,7 @@ void KTListVars::create() if (tempvar->dirty()) { getCTCron()->variable.push_back(tempvar); - new KTListVar(this, getCTCron(), tempvar); // Qt will clean up + new KTListVar(this, getCTCron(), tempvar); // TQt will clean up } else { @@ -73,7 +73,7 @@ void KTListVars::print(KTPrint& printer) const printer.setFont(stnd); - //firstChild() does not return null if there are no children, therefore + //firstChild() does not return null if there are no tqchildren, therefore //we need to check the validation of the pointer without terminating //the application. This maybe a bug in QT 1.44 diff --git a/kcron/ktlistvars.h b/kcron/ktlistvars.h index f455596..07c53b4 100644 --- a/kcron/ktlistvars.h +++ b/kcron/ktlistvars.h @@ -31,12 +31,12 @@ public: /** * Construct variables folder from branch. */ - KTListVars(KTListItem* parent, CTCron* _ctcron); + KTListVars(KTListItem* tqparent, CTCron* _ctcron); /** * Construct variables folder from root. */ - KTListVars(TQListView* parent, CTCron* _ctcron); + KTListVars(TQListView* tqparent, CTCron* _ctcron); /** * Internationalized description. diff --git a/kcron/ktprint.cpp b/kcron/ktprint.cpp index b1de5c6..ceb1482 100644 --- a/kcron/ktprint.cpp +++ b/kcron/ktprint.cpp @@ -104,7 +104,7 @@ TQFont KTPrint :: getFont () const return paint->font(); } -void KTPrint :: print (const TQString &str, int col, int alignment, bool wordWrap) +void KTPrint :: print (const TQString &str, int col, int tqalignment, bool wordWrap) { //Prints the string str into the column col using //the remaining arguments as format flags @@ -115,8 +115,8 @@ void KTPrint :: print (const TQString &str, int col, int alignment, bool wordWra return; - //Setup the alignment - switch (alignment) { + //Setup the tqalignment + switch (tqalignment) { case alignTextLeft : format = AlignLeft | AlignTop | DontClip | ExpandTabs; break; case alignTextCenter : format = AlignHCenter | AlignTop | DontClip | ExpandTabs; break; case alignTextRight : format = AlignRight | AlignTop | DontClip | ExpandTabs; break; diff --git a/kcron/ktprint.h b/kcron/ktprint.h index 16c13b1..34b0254 100644 --- a/kcron/ktprint.h +++ b/kcron/ktprint.h @@ -87,7 +87,7 @@ public: /** * Print text */ - void print (const TQString &str, int col =1, int alignment=KTPrint::defaultLeftMargin, bool wordWrap = true); + void print (const TQString &str, int col =1, int tqalignment=KTPrint::defaultLeftMargin, bool wordWrap = true); /** * Constructs the columns @@ -178,7 +178,7 @@ private: KPrinter *prnt; /** - *Nest a column class to make text layout nicer + *Nest a column class to make text tqlayout nicer */ class Column { diff --git a/kcron/ktprintopt.h b/kcron/ktprintopt.h index f1e3eb5..8673c9d 100644 --- a/kcron/ktprintopt.h +++ b/kcron/ktprintopt.h @@ -31,6 +31,7 @@ class KAccel; class KTPrintOpt : public KPrintDialogPage { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp index 88e5567..46ec77c 100644 --- a/kcron/kttask.cpp +++ b/kcron/kttask.cpp @@ -33,18 +33,18 @@ #include "kticon.h" -class KTPushButton : public QPushButton +class KTPushButton : public TQPushButton { public: - KTPushButton(TQWidget * parent, const char * name = 0 ) - : TQPushButton(parent, name), isSelected(false), isDirty(false) + KTPushButton(TQWidget * tqparent, const char * name = 0 ) + : TQPushButton(tqparent, name), isSelected(false), isDirty(false) { updatePalette(); } void updatePalette() { - palNormal = ((TQWidget *)parent())->palette(); + palNormal = ((TQWidget *)tqparent())->palette(); palSelected = palNormal; for(int cg = (int) TQPalette::Disabled; cg < (int) TQPalette::NColorGroups; cg++) { @@ -156,8 +156,8 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption) leCommand->setText(TQString::fromLocal8Bit(cttask->command.c_str())); - labComment->setFixedWidth( QMAX( labComment->width(), labCommand->width()) ); - labCommand->setFixedWidth( QMAX( labComment->width(), labCommand->width()) ); + labComment->setFixedWidth( TQMAX( labComment->width(), labCommand->width()) ); + labCommand->setFixedWidth( TQMAX( labComment->width(), labCommand->width()) ); slotCommandChanged(); @@ -269,7 +269,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption) v4->addSpacing( 2 * KDialogBase::spacingHint() ); labAM = new TQLabel( i18n("AM"), bgHour, "labAM"); - labAM->setAlignment(AlignRight | AlignVCenter); + labAM->tqsetAlignment(AlignRight | AlignVCenter); v4->addWidget( labAM ); @@ -292,7 +292,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption) } labPM = new TQLabel( i18n("PM"), bgHour, "labPM"); - labPM->setAlignment(AlignRight | AlignVCenter); + labPM->tqsetAlignment(AlignRight | AlignVCenter); v4->addWidget( labPM ); hhours = new TQHBoxLayout( v4, KDialogBase::spacingHint() ); @@ -398,12 +398,12 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption) // key acceleration key_accel = new KAccel(this); - key_accel->insert(KStdAccel::Open, this, TQT_SLOT(slotOK())); - key_accel->insert(KStdAccel::Close, this, TQT_SLOT(slotCancel())); - key_accel->insert(KStdAccel::Quit, this, TQT_SLOT(slotCancel())); + key_accel->insert(KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT(slotOK())); + key_accel->insert(KStdAccel::Close, TQT_TQOBJECT(this), TQT_SLOT(slotCancel())); + key_accel->insert(KStdAccel::Quit, TQT_TQOBJECT(this), TQT_SLOT(slotCancel())); key_accel->readSettings(); - setFixedSize( minimumSize() ); + setFixedSize( tqminimumSize() ); slotDailyChanged(); slotMonthChanged(); slotDayOfMonthChanged(); @@ -421,10 +421,10 @@ void KTTask::slotCommandChanged() /* TQString qs(leCommand->text()); - int beginPos(qs.findRev("/", qs.length()) + 1); + int beginPos(qs.tqfindRev("/", qs.length()) + 1); if (beginPos < 0) beginPos = 0; - int endPos(qs.findRev(" ", qs.length())); + int endPos(qs.tqfindRev(" ", qs.length())); if (endPos < 0) endPos = qs.length(); TQString iconName(qs.mid(beginPos, endPos-beginPos) + ".xpm"); @@ -609,9 +609,9 @@ void KTTask::slotOK() // absolute path TQString qs(leCommand->text()); - if (qs.find("/") == 0) + if (qs.tqfind("/") == 0) { - int spacePos(qs.find(" ")); + int spacePos(qs.tqfind(" ")); if (spacePos < 0) spacePos = qs.length(); TQString programName(qs.left(spacePos)); TQFileInfo file(programName); @@ -636,7 +636,7 @@ void KTTask::slotOK() // save work in process if (!cttask->user.empty()) { - cttask->user = TQFile::encodeName(leUser->text()); + cttask->user = TQFile::encodeName(leUser->text()).data(); } else { diff --git a/kcron/kttask.h b/kcron/kttask.h index be34ddb..3d52f5c 100644 --- a/kcron/kttask.h +++ b/kcron/kttask.h @@ -31,6 +31,7 @@ class CTTask; class KTTask : public KDialog { Q_OBJECT + TQ_OBJECT public: diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp index 19cbba0..60ff101 100644 --- a/kcron/ktvariable.cpp +++ b/kcron/ktvariable.cpp @@ -27,18 +27,18 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) : ctvar( _ctvar) { TQFrame *page = makeMainWidget(); - TQGridLayout *layout = new TQGridLayout( page, 5, 3, 0, spacingHint() ); - layout->setRowStretch(3, 1); - layout->setColStretch(1, 1); + TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 0, spacingHint() ); + tqlayout->setRowStretch(3, 1); + tqlayout->setColStretch(1, 1); setIcon(KTIcon::application(true)); // variable labVariable = new TQLabel(i18n("&Variable:"), page, "labVariable"); - layout->addWidget(labVariable, 1, 0, Qt::AlignLeft | Qt::AlignTop); + tqlayout->addWidget(labVariable, 1, 0, TQt::AlignLeft | TQt::AlignTop); cmbVariable = new TQComboBox(true, page, "cmbVariable"); - layout->addWidget(cmbVariable, 1, 1); + tqlayout->addWidget(cmbVariable, 1, 1); cmbVariable->insertItem("HOME"); cmbVariable->insertItem("MAILTO"); @@ -49,30 +49,30 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) : // icon labIcon = new TQLabel(page, "labIcon"); - layout->addMultiCellWidget(labIcon, 0, 1, 2, 2); + tqlayout->addMultiCellWidget(labIcon, 0, 1, 2, 2); // value labValue = new TQLabel(i18n("Va&lue:"), page, "labValue"); - layout->addWidget(labValue, 2, 0, Qt::AlignLeft | Qt::AlignTop); + tqlayout->addWidget(labValue, 2, 0, TQt::AlignLeft | TQt::AlignTop); leValue = new TQLineEdit(page, "leValue"); - layout->addMultiCellWidget(leValue, 2, 2, 1, 2); + tqlayout->addMultiCellWidget(leValue, 2, 2, 1, 2); leValue->setMaxLength(255); labValue->setBuddy(leValue); // comment labComment = new TQLabel(i18n("Co&mment:"), page, "labComment"); - layout->addWidget(labComment, 3, 0, Qt::AlignLeft | Qt::AlignTop); + tqlayout->addWidget(labComment, 3, 0, TQt::AlignLeft | TQt::AlignTop); teComment = new KTextEdit(page, "teComment"); - teComment->setTextFormat(Qt::PlainText); - layout->addMultiCellWidget(teComment, 3, 3, 1, 2); + teComment->setTextFormat(TQt::PlainText); + tqlayout->addMultiCellWidget(teComment, 3, 3, 1, 2); labComment->setBuddy(teComment); // enabled chkEnabled = new TQCheckBox(i18n("&Enabled"), page, "chkEnabled"); - layout->addWidget(chkEnabled, 4, 0); + tqlayout->addWidget(chkEnabled, 4, 0); // set starting field values cmbVariable->setEditText(TQString::fromLocal8Bit(ctvar->variable.c_str())); @@ -142,9 +142,9 @@ void KTVariable::slotOk() return; } - ctvar->variable = cmbVariable->currentText().local8Bit(); - ctvar->value = leValue->text().local8Bit(); - ctvar->comment = teComment->text().replace('\n',' ').replace('\r',' ').local8Bit(); + ctvar->variable = cmbVariable->currentText().local8Bit().data(); + ctvar->value = leValue->text().local8Bit().data(); + ctvar->comment = teComment->text().tqreplace('\n',' ').tqreplace('\r',' ').local8Bit().data(); ctvar->enabled = chkEnabled->isChecked(); close(); } diff --git a/kcron/ktvariable.h b/kcron/ktvariable.h index 7870ef3..4cc06a4 100644 --- a/kcron/ktvariable.h +++ b/kcron/ktvariable.h @@ -33,6 +33,7 @@ class CTVariable; class KTVariable : public KDialogBase { Q_OBJECT + TQ_OBJECT public: diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp index 27341de..9c5591e 100644 --- a/kcron/ktview.cpp +++ b/kcron/ktview.cpp @@ -51,8 +51,8 @@ #include "kttask.h" #include "ktprint.h" -KTView::KTView(TQWidget *parent, const char* name) : - TQWidget(parent, name), +KTView::KTView(TQWidget *tqparent, const char* name) : + TQWidget(tqparent, name), listView(0), currentCTCron(0), currentIsTask(true), @@ -62,21 +62,21 @@ KTView::KTView(TQWidget *parent, const char* name) : clipboardCTTask(0), clipboardCTVariable(0) { - ktapp = (KTApp*)parentWidget(); + ktapp = (KTApp*)tqparentWidget(); setBackgroundMode(PaletteBase); refresh(); listView->setSelected(listView->firstChild(), true); - connect(this, TQT_SIGNAL(enableModificationButtons(bool)), parent, + connect(this, TQT_SIGNAL(enableModificationButtons(bool)), tqparent, TQT_SLOT(slotEnableModificationButtons(bool))); - connect(this, TQT_SIGNAL(enablePaste(bool)), parent, + connect(this, TQT_SIGNAL(enablePaste(bool)), tqparent, TQT_SLOT(slotEnablePaste(bool))); - connect(this, TQT_SIGNAL(enableRunNow(bool)), parent, + connect(this, TQT_SIGNAL(enableRunNow(bool)), tqparent, TQT_SLOT(slotEnableRunNow(bool))); - connect(this, TQT_SIGNAL(enableEnabled(bool)), parent, + connect(this, TQT_SIGNAL(enableEnabled(bool)), tqparent, TQT_SLOT(slotEnableEnabled(bool))); } @@ -216,7 +216,7 @@ void KTView::print () const //Check that the correct item is selected, they must //select the top level entry for all items to print while (ktli->depth() != 0) - ktli = (KTListItem*)ktli->parent(); + ktli = (KTListItem*)ktli->tqparent(); user = ktli; //Used to store user's name @@ -266,16 +266,16 @@ void KTView :: pageHeading (KTListItem* user, KTPrint &printer) const { TQFont stnd; TQString logonInfo; - TQDateTime now (TQDateTime::currentDateTime()); + TQDateTime now (TQDateTime::tqcurrentDateTime()); char hostName[20]; gethostname(hostName, 20); // SSA : Fix Me user name, logon name and host name musst be // SSA : not only in us-ascii ?? logonInfo = i18n("user on host", "%1 <%2> on %3") - .arg(TQString::fromLocal8Bit(user->getCTCron()->name.c_str())) - .arg(TQString::fromLocal8Bit(user->getCTCron()->login.c_str())) - .arg(TQString::fromLocal8Bit(hostName)); + .tqarg(TQString::fromLocal8Bit(user->getCTCron()->name.c_str())) + .tqarg(TQString::fromLocal8Bit(user->getCTCron()->login.c_str())) + .tqarg(TQString::fromLocal8Bit(hostName)); stnd = printer.getFont(); printer.setFont(TQFont( KGlobalSettings::generalFont().family(), 14, TQFont::Bold )); @@ -315,7 +315,7 @@ void KTView::resizeEvent (TQResizeEvent*) { listView->setFixedWidth(width()); listView->setFixedHeight(height()); - repaint(); + tqrepaint(); } void KTView::copy() @@ -367,7 +367,7 @@ void KTView::create() { KTListItem* ktli = (KTListItem*)listView->currentItem(); if ((ktli->text(0) != KTListTasks::getDescription()) && (ktli->text(0) != KTListVars::getDescription())) { - ktli = (KTListItem*)ktli->parent(); + ktli = (KTListItem*)ktli->tqparent(); } Q_CHECK_PTR(ktli); ktli->create(); @@ -427,10 +427,10 @@ TQString KTView::absolute() const { TQString fullCommand = TQString::fromLocal8Bit(currentCTTask->command.c_str()); TQString command(fullCommand); - int pos(command.find(" ")); + int pos(command.tqfind(" ")); if (pos > 0) command = command.left(pos); - if (command.find("/") == 0) + if (command.tqfind("/") == 0) return fullCommand; TQString path = TQString::fromLocal8Bit(currentCTCron->path().c_str()); @@ -439,7 +439,7 @@ TQString KTView::absolute() const TQString prefix; TQString full; - while ((end = path.find(":", begin)) > 0) + while ((end = path.tqfind(":", begin)) > 0) { prefix = path.mid(begin, begin + end) + "/"; full = prefix + command; @@ -498,7 +498,7 @@ void KTView::slotEdit(TQListViewItem* /*qlvi*/) void KTView::slotSetCurrent (TQListViewItem* qlvi) { - TQListViewItem* parent = qlvi->parent(); + TQListViewItem* tqparent = qlvi->tqparent(); if (qlvi->text(0) == KTListVars::getDescription()) { @@ -527,9 +527,9 @@ void KTView::slotSetCurrent (TQListViewItem* qlvi) emit(enableEnabled(false)); } - else if (parent) + else if (tqparent) { - if (parent->text(0) == KTListVars::getDescription()) + if (tqparent->text(0) == KTListVars::getDescription()) { // variable currentCTCron = ((KTListVar*)qlvi)->getCTCron(); @@ -542,7 +542,7 @@ void KTView::slotSetCurrent (TQListViewItem* qlvi) emit(enableEnabled(currentCTVariable->enabled)); } - else if (parent->text(0) == KTListTasks::getDescription()) + else if (tqparent->text(0) == KTListTasks::getDescription()) { // task currentCTCron = ((KTListTask*)qlvi)->getCTCron(); diff --git a/kcron/ktview.h b/kcron/ktview.h index f6e5a04..8a53478 100644 --- a/kcron/ktview.h +++ b/kcron/ktview.h @@ -31,16 +31,17 @@ class CTTask; /** * Main GUI view of the crontab entries. */ -class KTView : public QWidget +class KTView : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Initializes view. */ - KTView (TQWidget* parent = 0, const char* name=0); + KTView (TQWidget* tqparent = 0, const char* name=0); /** * Destructor. -- cgit v1.2.1