diff options
Diffstat (limited to 'kcron')
-rw-r--r-- | kcron/ctcron.cpp | 2 | ||||
-rw-r--r-- | kcron/ktapp.cpp | 34 | ||||
-rw-r--r-- | kcron/kttask.cpp | 38 | ||||
-rw-r--r-- | kcron/ktvariable.cpp | 10 | ||||
-rw-r--r-- | kcron/ktview.cpp | 32 |
5 files changed, 58 insertions, 58 deletions
diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp index 6dbbad5..488cc45 100644 --- a/kcron/ctcron.cpp +++ b/kcron/ctcron.cpp @@ -24,7 +24,7 @@ #include <tqfile.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <tdetempfile.h> diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp index 6db4cb3..e5a1d93 100644 --- a/kcron/ktapp.cpp +++ b/kcron/ktapp.cpp @@ -35,7 +35,7 @@ const int KTApp::statusMessage (1001); KTApp::KTApp() : TDEMainWindow(0) { - config=kapp->config(); + config=tdeApp->config(); setIcon(KTIcon::application(true)); @@ -59,8 +59,8 @@ KTApp::KTApp() : TDEMainWindow(0) TDEPopupMenu *editMenu = static_cast<TDEPopupMenu*>(guiFactory()->container("edit", this)); TDEPopupMenu *settingsMenu = static_cast<TDEPopupMenu*>(guiFactory()->container("settings", this)); - connect(editMenu,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(statusEditCallback(int))); - connect(settingsMenu,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(statusSettingsCallback(int))); + connect(editMenu,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(statusEditCallback(int))); + connect(settingsMenu,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(statusSettingsCallback(int))); // Read options. readOptions(); } @@ -113,31 +113,31 @@ const CTHost& KTApp::getCTHost() const TQString KTApp::caption() { - TQString cap(kapp->caption()); + TQString cap(tdeApp->caption()); return cap; } void KTApp::setupActions() { //File Menu - 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()); + KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); + KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); //Edit menu - 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 TDEAction(i18n("&New..."), TDEStdAccel::openNew(), TQT_TQOBJECT(this),TQT_SLOT(slotEditNew()),actionCollection(),"edit_new"); + KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); + KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); + (void)new TDEAction(i18n("&New..."), TDEStdAccel::openNew(), this,TQ_SLOT(slotEditNew()),actionCollection(),"edit_new"); //I don't like this TDEStdAccel::open() for modifying, but I'm just porting this to xmlui - (void)new TDEAction(i18n("M&odify..."), TDEStdAccel::open(), TQT_TQOBJECT(this),TQT_SLOT(slotEditModify()),actionCollection(),"edit_modify"); - (void)new TDEAction(i18n("&Delete"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditDelete()),actionCollection(),"edit_delete"); - (void)new TDEAction(i18n("&Enabled"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditEnable()),actionCollection(),"edit_enable"); - (void)new TDEAction(i18n("&Run Now"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditRunNow()),actionCollection(),"edit_run"); + (void)new TDEAction(i18n("M&odify..."), TDEStdAccel::open(), this,TQ_SLOT(slotEditModify()),actionCollection(),"edit_modify"); + (void)new TDEAction(i18n("&Delete"), 0, this,TQ_SLOT(slotEditDelete()),actionCollection(),"edit_delete"); + (void)new TDEAction(i18n("&Enabled"), 0, this,TQ_SLOT(slotEditEnable()),actionCollection(),"edit_enable"); + (void)new TDEAction(i18n("&Run Now"), 0, this,TQ_SLOT(slotEditRunNow()),actionCollection(),"edit_run"); //Settings menu - (void)new TDEAction(i18n("Show &Toolbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewToolBar()),actionCollection(),"show_toolbar"); - (void)new TDEAction(i18n("Show &Statusbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewStatusBar()),actionCollection(),"show_statusbar"); + (void)new TDEAction(i18n("Show &Toolbar"), 0, this,TQ_SLOT(slotViewToolBar()),actionCollection(),"show_toolbar"); + (void)new TDEAction(i18n("Show &Statusbar"), 0, this,TQ_SLOT(slotViewStatusBar()),actionCollection(),"show_statusbar"); } diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp index b0e3cce..34d7ce1 100644 --- a/kcron/kttask.cpp +++ b/kcron/kttask.cpp @@ -365,42 +365,42 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption) } // connect them up - connect(pbBrowse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse())); - connect(leCommand, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotCommandChanged())); - connect(cbEveryDay, TQT_SIGNAL(clicked()), TQT_SLOT(slotDailyChanged())); - connect(pbOk, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK())); - connect(pbCancel, TQT_SIGNAL(clicked()), TQT_SLOT(slotCancel())); - connect(pbAllMonths, TQT_SIGNAL(clicked()), TQT_SLOT(slotAllMonths())); + connect(pbBrowse, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowse())); + connect(leCommand, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotCommandChanged())); + connect(cbEveryDay, TQ_SIGNAL(clicked()), TQ_SLOT(slotDailyChanged())); + connect(pbOk, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK())); + connect(pbCancel, TQ_SIGNAL(clicked()), TQ_SLOT(slotCancel())); + connect(pbAllMonths, TQ_SIGNAL(clicked()), TQ_SLOT(slotAllMonths())); for (int mo = 1; mo <= 12; mo++) { - connect(cbMonth[mo], TQT_SIGNAL(clicked()), TQT_SLOT(slotMonthChanged())); + connect(cbMonth[mo], TQ_SIGNAL(clicked()), TQ_SLOT(slotMonthChanged())); } - connect(pbAllDaysOfMonth, TQT_SIGNAL(clicked()), TQT_SLOT(slotAllDaysOfMonth())); + connect(pbAllDaysOfMonth, TQ_SIGNAL(clicked()), TQ_SLOT(slotAllDaysOfMonth())); for (int dm = 1; dm <= 31; dm++) { - connect(pbDayOfMonth[dm], TQT_SIGNAL(clicked()), TQT_SLOT(slotDayOfMonthChanged())); + connect(pbDayOfMonth[dm], TQ_SIGNAL(clicked()), TQ_SLOT(slotDayOfMonthChanged())); } - connect(pbAllDaysOfWeek, TQT_SIGNAL(clicked()), TQT_SLOT(slotAllDaysOfWeek())); + connect(pbAllDaysOfWeek, TQ_SIGNAL(clicked()), TQ_SLOT(slotAllDaysOfWeek())); for (int dw = 1; dw <= 7; dw++) { - connect(cbDayOfWeek[dw], TQT_SIGNAL(clicked()), TQT_SLOT(slotDayOfWeekChanged())); + connect(cbDayOfWeek[dw], TQ_SIGNAL(clicked()), TQ_SLOT(slotDayOfWeekChanged())); } - connect(pbAllHours, TQT_SIGNAL(clicked()), TQT_SLOT(slotAllHours())); + connect(pbAllHours, TQ_SIGNAL(clicked()), TQ_SLOT(slotAllHours())); for (int ho = 0; ho <= 23; ho++) { - connect(pbHour[ho], TQT_SIGNAL(clicked()), TQT_SLOT(slotHourChanged())); + connect(pbHour[ho], TQ_SIGNAL(clicked()), TQ_SLOT(slotHourChanged())); } - connect(pbAllMinutes, TQT_SIGNAL(clicked()), TQT_SLOT(slotAllMinutes())); + connect(pbAllMinutes, TQ_SIGNAL(clicked()), TQ_SLOT(slotAllMinutes())); for (int mi = 0; mi <= 55; mi+=5) { - connect(pbMinute[mi], TQT_SIGNAL(clicked()), TQT_SLOT(slotMinuteChanged())); + connect(pbMinute[mi], TQ_SIGNAL(clicked()), TQ_SLOT(slotMinuteChanged())); } // key acceleration key_accel = new TDEAccel(this); - key_accel->insert(TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT(slotOK())); - key_accel->insert(TDEStdAccel::Close, TQT_TQOBJECT(this), TQT_SLOT(slotCancel())); - key_accel->insert(TDEStdAccel::Quit, TQT_TQOBJECT(this), TQT_SLOT(slotCancel())); + key_accel->insert(TDEStdAccel::Open, this, TQ_SLOT(slotOK())); + key_accel->insert(TDEStdAccel::Close, this, TQ_SLOT(slotCancel())); + key_accel->insert(TDEStdAccel::Quit, this, TQ_SLOT(slotCancel())); key_accel->readSettings(); setFixedSize( minimumSize() ); diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp index 34b35ee..47950fe 100644 --- a/kcron/ktvariable.cpp +++ b/kcron/ktvariable.cpp @@ -13,7 +13,7 @@ #include <tqlayout.h> -#include <tdeapplication.h> // kapp +#include <tdeapplication.h> // tdeApp #include <tdelocale.h> // i18n() #include <tdemessagebox.h> #include <ktextedit.h> @@ -87,10 +87,10 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) : cmbVariable->setFocus(); // connect them up - connect(cmbVariable,TQT_SIGNAL(highlighted(const TQString&)), - TQT_SLOT(slotVariableChanged())); - connect(cmbVariable,TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotVariableChanged())); + connect(cmbVariable,TQ_SIGNAL(highlighted(const TQString&)), + TQ_SLOT(slotVariableChanged())); + connect(cmbVariable,TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotVariableChanged())); } KTVariable::~KTVariable() diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp index beab6a1..b9c3869 100644 --- a/kcron/ktview.cpp +++ b/kcron/ktview.cpp @@ -62,17 +62,17 @@ KTView::KTView(TQWidget *parent, const char* name) : refresh(); listView->setSelected(listView->firstChild(), true); - connect(this, TQT_SIGNAL(enableModificationButtons(bool)), parent, - TQT_SLOT(slotEnableModificationButtons(bool))); + connect(this, TQ_SIGNAL(enableModificationButtons(bool)), parent, + TQ_SLOT(slotEnableModificationButtons(bool))); - connect(this, TQT_SIGNAL(enablePaste(bool)), parent, - TQT_SLOT(slotEnablePaste(bool))); + connect(this, TQ_SIGNAL(enablePaste(bool)), parent, + TQ_SLOT(slotEnablePaste(bool))); - connect(this, TQT_SIGNAL(enableRunNow(bool)), parent, - TQT_SLOT(slotEnableRunNow(bool))); + connect(this, TQ_SIGNAL(enableRunNow(bool)), parent, + TQ_SLOT(slotEnableRunNow(bool))); - connect(this, TQT_SIGNAL(enableEnabled(bool)), parent, - TQT_SLOT(slotEnableEnabled(bool))); + connect(this, TQ_SIGNAL(enableEnabled(bool)), parent, + TQ_SLOT(slotEnableEnabled(bool))); } void KTView::disableIcons() @@ -158,17 +158,17 @@ void KTView::refresh() resizeEvent(); - connect(listView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(slotMenu(TQListViewItem*, const TQPoint&, int))); + connect(listView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotMenu(TQListViewItem*, const TQPoint&, int))); - connect(listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSetCurrent(TQListViewItem*))); + connect(listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSetCurrent(TQListViewItem*))); - connect(listView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(slotEdit(TQListViewItem*))); + connect(listView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(slotEdit(TQListViewItem*))); - connect(listView, TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(slotEdit(TQListViewItem*))); + connect(listView, TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotEdit(TQListViewItem*))); // switch to the new view if (tmpListView) |