diff options
Diffstat (limited to 'ksysv')
| -rw-r--r-- | ksysv/OldView.cpp | 206 | ||||
| -rw-r--r-- | ksysv/PreferencesDialog.cpp | 10 | ||||
| -rw-r--r-- | ksysv/Properties.cpp | 20 | ||||
| -rw-r--r-- | ksysv/RunlevelAuthIcon.cpp | 2 | ||||
| -rw-r--r-- | ksysv/SpinBox.cpp | 10 | ||||
| -rw-r--r-- | ksysv/TopWidget.cpp | 172 | ||||
| -rw-r--r-- | ksysv/kbusymanager.cpp | 4 | ||||
| -rw-r--r-- | ksysv/kscroller.cpp | 16 | ||||
| -rw-r--r-- | ksysv/ksv_conf.cpp | 2 | ||||
| -rw-r--r-- | ksysv/ksv_core.cpp | 2 | ||||
| -rw-r--r-- | ksysv/ksvapplication.h | 4 | ||||
| -rw-r--r-- | ksysv/ksvconfigwizard.cpp | 4 | ||||
| -rw-r--r-- | ksysv/ksvdraglist.cpp | 8 | ||||
| -rw-r--r-- | ksysv/lookandfeelconfig.ui | 4 | ||||
| -rw-r--r-- | ksysv/main.cpp | 8 | ||||
| -rw-r--r-- | ksysv/miscconfig.ui | 4 | ||||
| -rw-r--r-- | ksysv/pathconfig.ui | 4 | ||||
| -rw-r--r-- | ksysv/trash.cpp | 2 |
18 files changed, 241 insertions, 241 deletions
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp index e24b422..7f35b7f 100644 --- a/ksysv/OldView.cpp +++ b/ksysv/OldView.cpp @@ -44,8 +44,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kiconloader.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <kcursor.h> #include <tdepopupmenu.h> #include <tdemessagebox.h> @@ -102,12 +102,12 @@ KSVContent::KSVContent (TDEPopupMenu* openWithMenu, KSVTopLevel* parent, const c // watch services dir KDirWatch* dirwatch = KDirWatch::self(); dirwatch->addDir (conf->scriptPath ()); - connect (dirwatch, TQT_SIGNAL (dirty (const TQString&)), - this, TQT_SLOT (updateServicesAfterChange (const TQString&))); - connect (dirwatch, TQT_SIGNAL (created (const TQString&)), - this, TQT_SLOT (updateServicesAfterChange (const TQString&))); - connect (dirwatch, TQT_SIGNAL (deleted (const TQString&)), - this, TQT_SLOT (updateServicesAfterChange (const TQString&))); + connect (dirwatch, TQ_SIGNAL (dirty (const TQString&)), + this, TQ_SLOT (updateServicesAfterChange (const TQString&))); + connect (dirwatch, TQ_SIGNAL (created (const TQString&)), + this, TQ_SLOT (updateServicesAfterChange (const TQString&))); + connect (dirwatch, TQ_SIGNAL (deleted (const TQString&)), + this, TQ_SLOT (updateServicesAfterChange (const TQString&))); setSizes(KSVContent::panningFactorToSplitter (conf->panningFactor())); @@ -126,7 +126,7 @@ KSVContent::KSVContent (TDEPopupMenu* openWithMenu, KSVTopLevel* parent, const c textDisplay->setStyleSheet (ksv::styleSheet()); // Open With... menu - connect (mOpenWithMenu, TQT_SIGNAL (activated (int)), this, TQT_SLOT (openWith (int))); + connect (mOpenWithMenu, TQ_SIGNAL (activated (int)), this, TQ_SLOT (openWith (int))); calcMinSize(); } @@ -219,25 +219,25 @@ void KSVContent::initLList() servL->setBuddy(scripts); // doubleclick && return - connect (scripts, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotScriptProperties(TQListViewItem*))); - connect (scripts, TQT_SIGNAL (returnPressed (TQListViewItem*)), - this, TQT_SLOT (slotScriptProperties (TQListViewItem*))); + connect (scripts, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotScriptProperties(TQListViewItem*))); + connect (scripts, TQ_SIGNAL (returnPressed (TQListViewItem*)), + this, TQ_SLOT (slotScriptProperties (TQListViewItem*))); // context menus - connect (scripts, TQT_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT (popupServicesMenu (TDEListView*, TQListViewItem*, const TQPoint&))); + connect (scripts, TQ_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT (popupServicesMenu (TDEListView*, TQListViewItem*, const TQPoint&))); // for cut & copy - connect (scripts, TQT_SIGNAL (newOrigin ()), - this, TQT_SLOT (fwdOrigin ())); + connect (scripts, TQ_SIGNAL (newOrigin ()), + this, TQ_SLOT (fwdOrigin ())); // for origin updates - connect (scripts, TQT_SIGNAL (newOrigin (KSVDragList*)), - this, TQT_SLOT (fwdOrigin (KSVDragList*))); + connect (scripts, TQ_SIGNAL (newOrigin (KSVDragList*)), + this, TQ_SLOT (fwdOrigin (KSVDragList*))); trash = new KSVTrash(mScriptBox, "Trash"); - connect (trash, TQT_SIGNAL (undoAction (KSVAction*)), this, TQT_SLOT (fwdUndoAction (KSVAction*))); + connect (trash, TQ_SIGNAL (undoAction (KSVAction*)), this, TQ_SLOT (fwdUndoAction (KSVAction*))); TQWhatsThis::add (trash, i18n ("<p>You can drag services from a runlevel onto " \ "the <img src=\"small|trash\"/> <strong>trashcan</strong> to " \ @@ -290,21 +290,21 @@ void KSVContent::initLList() rlL->setBuddy(startRL[i]); // for cut'n'paste - connect (startRL[i], TQT_SIGNAL (newOrigin ()), - this, TQT_SLOT (fwdOrigin ())); - connect (startRL[i], TQT_SIGNAL (newOrigin (KSVDragList*)), - this, TQT_SLOT (fwdOrigin (KSVDragList*))); - - connect (stopRL[i], TQT_SIGNAL (newOrigin ()), - this, TQT_SLOT (fwdOrigin ())); - connect (stopRL[i], TQT_SIGNAL (newOrigin (KSVDragList*)), - this, TQT_SLOT (fwdOrigin (KSVDragList*))); + connect (startRL[i], TQ_SIGNAL (newOrigin ()), + this, TQ_SLOT (fwdOrigin ())); + connect (startRL[i], TQ_SIGNAL (newOrigin (KSVDragList*)), + this, TQ_SLOT (fwdOrigin (KSVDragList*))); + + connect (stopRL[i], TQ_SIGNAL (newOrigin ()), + this, TQ_SLOT (fwdOrigin ())); + connect (stopRL[i], TQ_SIGNAL (newOrigin (KSVDragList*)), + this, TQ_SLOT (fwdOrigin (KSVDragList*))); } lay->addStretch(1); - connect (scripts, TQT_SIGNAL(undoAction(KSVAction*)), - this, TQT_SLOT(fwdUndoAction(KSVAction*))); + connect (scripts, TQ_SIGNAL(undoAction(KSVAction*)), + this, TQ_SLOT(fwdUndoAction(KSVAction*))); // add text-diplay widget textDisplay = new TQTextEdit( TQString(), TQString(), this, "TextDisplayWidget" ); @@ -313,41 +313,41 @@ void KSVContent::initLList() for (int i = 0; i < ksv::runlevelNumber; ++i) { - connect (startRL[i], TQT_SIGNAL(newOrigin()), stopRL[i], TQT_SLOT(slotNewOrigin())); - connect (stopRL[i], TQT_SIGNAL(newOrigin()), startRL[i], TQT_SLOT(slotNewOrigin())); + connect (startRL[i], TQ_SIGNAL(newOrigin()), stopRL[i], TQ_SLOT(slotNewOrigin())); + connect (stopRL[i], TQ_SIGNAL(newOrigin()), startRL[i], TQ_SLOT(slotNewOrigin())); - connect (startRL[i], TQT_SIGNAL(undoAction(KSVAction*)), - this, TQT_SLOT(fwdUndoAction(KSVAction*))); - connect (stopRL[i], TQT_SIGNAL(undoAction(KSVAction*)), - this, TQT_SLOT(fwdUndoAction(KSVAction*))); + connect (startRL[i], TQ_SIGNAL(undoAction(KSVAction*)), + this, TQ_SLOT(fwdUndoAction(KSVAction*))); + connect (stopRL[i], TQ_SIGNAL(undoAction(KSVAction*)), + this, TQ_SLOT(fwdUndoAction(KSVAction*))); // doubleclick && return - connect (startRL[i], TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotDoubleClick(TQListViewItem*))); - connect (stopRL[i], TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotDoubleClick(TQListViewItem*))); - connect (startRL[i], TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotDoubleClick(TQListViewItem*))); - connect (stopRL[i], TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotDoubleClick(TQListViewItem*))); + connect (startRL[i], TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotDoubleClick(TQListViewItem*))); + connect (stopRL[i], TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotDoubleClick(TQListViewItem*))); + connect (startRL[i], TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotDoubleClick(TQListViewItem*))); + connect (stopRL[i], TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotDoubleClick(TQListViewItem*))); // context menus - connect (startRL[i], TQT_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT (popupRunlevelMenu (TDEListView*, TQListViewItem*, const TQPoint&))); - connect (stopRL[i], TQT_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT (popupRunlevelMenu (TDEListView*, TQListViewItem*, const TQPoint&))); + connect (startRL[i], TQ_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT (popupRunlevelMenu (TDEListView*, TQListViewItem*, const TQPoint&))); + connect (stopRL[i], TQ_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT (popupRunlevelMenu (TDEListView*, TQListViewItem*, const TQPoint&))); // cannot generate sorting number - connect (startRL[i], TQT_SIGNAL(cannotGenerateNumber()), - this, TQT_SLOT(fwdCannotGenerateNumber())); - connect (stopRL[i], TQT_SIGNAL(cannotGenerateNumber()), - this, TQT_SLOT(fwdCannotGenerateNumber())); + connect (startRL[i], TQ_SIGNAL(cannotGenerateNumber()), + this, TQ_SLOT(fwdCannotGenerateNumber())); + connect (stopRL[i], TQ_SIGNAL(cannotGenerateNumber()), + this, TQ_SLOT(fwdCannotGenerateNumber())); // connecting origin things for "Scripts", too - connect (scripts, TQT_SIGNAL(newOrigin()), startRL[i], TQT_SLOT(slotNewOrigin())); - connect (scripts, TQT_SIGNAL(newOrigin()), stopRL[i], TQT_SLOT(slotNewOrigin())); - connect (startRL[i], TQT_SIGNAL(newOrigin()), scripts, TQT_SLOT(slotNewOrigin())); - connect (stopRL[i], TQT_SIGNAL(newOrigin()), scripts, TQT_SLOT(slotNewOrigin())); + connect (scripts, TQ_SIGNAL(newOrigin()), startRL[i], TQ_SLOT(slotNewOrigin())); + connect (scripts, TQ_SIGNAL(newOrigin()), stopRL[i], TQ_SLOT(slotNewOrigin())); + connect (startRL[i], TQ_SIGNAL(newOrigin()), scripts, TQ_SLOT(slotNewOrigin())); + connect (stopRL[i], TQ_SIGNAL(newOrigin()), scripts, TQ_SLOT(slotNewOrigin())); // use this loop for setting tooltips startRL[i]->setToolTip (i18n("Drag here to start services\n" \ @@ -359,11 +359,11 @@ void KSVContent::initLList() { if (i != j) { - connect (startRL[i], TQT_SIGNAL (newOrigin()), startRL[j], TQT_SLOT (slotNewOrigin())); - connect (stopRL[i], TQT_SIGNAL (newOrigin()), stopRL[j], TQT_SLOT (slotNewOrigin())); + connect (startRL[i], TQ_SIGNAL (newOrigin()), startRL[j], TQ_SLOT (slotNewOrigin())); + connect (stopRL[i], TQ_SIGNAL (newOrigin()), stopRL[j], TQ_SLOT (slotNewOrigin())); - connect (startRL[i], TQT_SIGNAL(newOrigin()), stopRL[j], TQT_SLOT(slotNewOrigin())); - connect (stopRL[i], TQT_SIGNAL(newOrigin()), startRL[j], TQT_SLOT(slotNewOrigin())); + connect (startRL[i], TQ_SIGNAL(newOrigin()), stopRL[j], TQ_SLOT(slotNewOrigin())); + connect (stopRL[i], TQ_SIGNAL(newOrigin()), startRL[j], TQ_SLOT(slotNewOrigin())); } } } @@ -572,16 +572,16 @@ void KSVContent::infoOnData (KSVItem* item) { KSVData oldState = *item->data(); KSVData newState = oldState; - KSVEntryPropertiesDialog* props = new KSVEntryPropertiesDialog (newState, kapp->mainWidget()); + KSVEntryPropertiesDialog* props = new KSVEntryPropertiesDialog (newState, tdeApp->mainWidget()); - connect (props, TQT_SIGNAL (editService (const TQString&)), - this, TQT_SLOT (editService (const TQString&))); - connect (props, TQT_SIGNAL (startService (const TQString&)), - this, TQT_SLOT (startService (const TQString&))); - connect (props, TQT_SIGNAL (stopService (const TQString&)), - this, TQT_SLOT (stopService (const TQString&))); - connect (props, TQT_SIGNAL (restartService (const TQString&)), - this, TQT_SLOT (restartService (const TQString&))); + connect (props, TQ_SIGNAL (editService (const TQString&)), + this, TQ_SLOT (editService (const TQString&))); + connect (props, TQ_SIGNAL (startService (const TQString&)), + this, TQ_SLOT (startService (const TQString&))); + connect (props, TQ_SIGNAL (stopService (const TQString&)), + this, TQ_SLOT (stopService (const TQString&))); + connect (props, TQ_SIGNAL (restartService (const TQString&)), + this, TQ_SLOT (restartService (const TQString&))); int res = props->exec(); @@ -608,9 +608,9 @@ void KSVContent::stopService (const TQString& path) *_proc << path << "stop"; - connect(_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitedProcess(TDEProcess*))); - connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); - connect(_proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotExitedProcess(TDEProcess*))); + connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(_proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); // refresh textDisplay appendLog(i18n("** <stop>Stopping</stop> <cmd>%1</cmd> **<br/>").arg(path), @@ -634,9 +634,9 @@ void KSVContent::startService (const TQString& path) *_proc << path << "start"; - connect(_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitedProcess(TDEProcess*))); - connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); - connect(_proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotExitedProcess(TDEProcess*))); + connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(_proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); // refresh textDisplay appendLog(i18n("** <start>Starting</start> <cmd>%1</cmd> **<br/>").arg(path), @@ -674,9 +674,9 @@ void KSVContent::restartService (const TQString& path) *_proc << path << "restart"; - connect(_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitDuringRestart(TDEProcess*))); - connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); - connect(_proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotExitDuringRestart(TDEProcess*))); + connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(_proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); // refresh textDisplay appendLog(i18n("** Re-starting <cmd>%1</cmd> **</br>").arg(path), @@ -714,16 +714,16 @@ void KSVContent::slotDoubleClick (TQListViewItem* item) { void KSVContent::slotScriptProperties(TQListViewItem* item) { KSVServicePropertiesDialog* prop = - new KSVServicePropertiesDialog (*static_cast<KSVItem*> (item)->data(), kapp->mainWidget()); + new KSVServicePropertiesDialog (*static_cast<KSVItem*> (item)->data(), tdeApp->mainWidget()); - connect (prop, TQT_SIGNAL (editService (const TQString&)), - this, TQT_SLOT (editService (const TQString&))); - connect (prop, TQT_SIGNAL (startService (const TQString&)), - this, TQT_SLOT (startService (const TQString&))); - connect (prop, TQT_SIGNAL (stopService (const TQString&)), - this, TQT_SLOT (stopService (const TQString&))); - connect (prop, TQT_SIGNAL (restartService (const TQString&)), - this, TQT_SLOT (restartService (const TQString&))); + connect (prop, TQ_SIGNAL (editService (const TQString&)), + this, TQ_SLOT (editService (const TQString&))); + connect (prop, TQ_SIGNAL (startService (const TQString&)), + this, TQ_SLOT (startService (const TQString&))); + connect (prop, TQ_SIGNAL (stopService (const TQString&)), + this, TQ_SLOT (stopService (const TQString&))); + connect (prop, TQ_SIGNAL (restartService (const TQString&)), + this, TQ_SLOT (restartService (const TQString&))); prop->exec(); @@ -737,9 +737,9 @@ void KSVContent::slotExitDuringRestart( TDEProcess* proc ) // signals connected that screw up our output proc->clearArguments(); - connect(proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitedProcess(TDEProcess*))); - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotExitedProcess(TDEProcess*))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } @@ -856,7 +856,7 @@ void KSVContent::pasteAppend() { KSVData data; - if (KSVDrag::decodeNative (kapp->clipboard()->data(), data)) + if (KSVDrag::decodeNative (tdeApp->clipboard()->data(), data)) { KSVAction* action = 0L; @@ -933,7 +933,7 @@ void KSVContent::multiplexEnabled (bool val) if ( !file->exists() ) { int choice = KMessageBox::warningYesNo - (kapp->mainWidget(), + (tdeApp->mainWidget(), i18n ("<p>You have specified that your system's init " \ "scripts are located in the folder " \ "<tt><b>%1</b></tt>, but this folder does not "\ @@ -948,9 +948,9 @@ void KSVContent::multiplexEnabled (bool val) "edit your system's init configuration.</p>" \ "<p>Would you like to reconfigure %4?</p>") .arg (config->scriptPath()) - .arg (kapp->aboutData()->programName()) - .arg (kapp->aboutData()->programName()) - .arg (kapp->aboutData()->programName()), + .arg (tdeApp->aboutData()->programName()) + .arg (tdeApp->aboutData()->programName()) + .arg (tdeApp->aboutData()->programName()), i18n("Folder Does Not Exist"),i18n("Reconfigure"),i18n("Do Not Reconfigure")); if ( choice == KMessageBox::Yes ) @@ -961,7 +961,7 @@ void KSVContent::multiplexEnabled (bool val) } else { - KMessageBox::information (kapp->mainWidget(), + KMessageBox::information (tdeApp->mainWidget(), i18n ("<p>You do not have the right permissions " \ "to edit your system's init configuration. " \ "However, you are free to browse the runlevels.</p>" \ @@ -972,8 +972,8 @@ void KSVContent::multiplexEnabled (bool val) "<em>suid</em> or <em>sgid</em>.</p>" \ "<p>The latter way is not recommended though, " \ "due to security issues.</p>") - .arg (kapp->aboutData()->programName()) - .arg (kapp->aboutData()->programName()), + .arg (tdeApp->aboutData()->programName()) + .arg (tdeApp->aboutData()->programName()), i18n("Insufficient Permissions"), ksv::notifications[ksv::RunlevelsReadOnly]); } @@ -1026,7 +1026,7 @@ void KSVContent::popupServicesMenu (TDEListView*, TQListViewItem* i, const TQPoi if (i >= 1) mOpenWithMenu->insertSeparator(); - mOpenWithMenu->insertItem (i18n ("&Other..."), this, TQT_SLOT (openWith())); + mOpenWithMenu->insertItem (i18n ("&Other..."), this, TQ_SLOT (openWith())); mScriptMenu->exec (p, 1); } @@ -1123,7 +1123,7 @@ void KSVContent::merge (TQValueList<KSVData>& list, KSVDragList* widget) emit undoAction (new AddAction (widget, item->data())); } - kapp->processEvents (); + tdeApp->processEvents (); } TQPtrList<KSVItem> deleteList; @@ -1140,11 +1140,11 @@ void KSVContent::merge (TQValueList<KSVData>& list, KSVDragList* widget) emit undoAction (new RemoveAction (widget, item->data())); } - kapp->processEvents (); + tdeApp->processEvents (); } widget->sort(); - kapp->processEvents(); + tdeApp->processEvents(); } #include "OldView.moc" diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp index 8189924..9ec0008 100644 --- a/ksysv/PreferencesDialog.cpp +++ b/ksysv/PreferencesDialog.cpp @@ -40,7 +40,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent) */ TQFrame* lafPage = addPage (i18n ("Look & Feel"), TQString(), DesktopIcon ("colorize", 32)); mLookAndFeel = new KSVLookAndFeel (lafPage); - connect( mLookAndFeel, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mLookAndFeel, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); TQVBoxLayout* lafLayout = new TQVBoxLayout (lafPage); lafLayout->addWidget (mLookAndFeel); @@ -68,7 +68,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent) */ TQFrame* pathPage = addPage (i18n ("Paths"), TQString(), DesktopIcon ("kfm", 32)); mPathConfig = new KSVPathConfig(pathPage); - connect( mPathConfig, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mPathConfig, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); TQVBoxLayout *pathLayout = new TQVBoxLayout (pathPage); pathLayout->addWidget (mPathConfig); @@ -79,12 +79,12 @@ KSVPreferences::KSVPreferences (TQWidget* parent) TQFrame* miscPage = addPage (i18n ("Miscellaneous"), i18n("Settings Not Fitting Anywhere Else"), DesktopIcon ("misc", 32)); mMiscConfig = new KSVMiscConfig(miscPage); - connect( mMiscConfig, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mMiscConfig, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); TQVBoxLayout *miscLayout = new TQVBoxLayout (miscPage); miscLayout->addWidget (mMiscConfig); - connect (mMiscConfig->mShowAll, TQT_SIGNAL (clicked()), this, TQT_SLOT (showAllMessages())); + connect (mMiscConfig->mShowAll, TQ_SIGNAL (clicked()), this, TQ_SLOT (showAllMessages())); reReadConfig(); enableButton( Apply, false ); @@ -194,7 +194,7 @@ TQColor KSVPreferences::changedSelected() const KSVPreferences* KSVPreferences::self () { - static KSVPreferences* prefs = new KSVPreferences (kapp->mainWidget()); + static KSVPreferences* prefs = new KSVPreferences (tdeApp->mainWidget()); return prefs; } diff --git a/ksysv/Properties.cpp b/ksysv/Properties.cpp index 96e0ebf..dd5fccd 100644 --- a/ksysv/Properties.cpp +++ b/ksysv/Properties.cpp @@ -56,19 +56,19 @@ KSVServicesPage::KSVServicesPage (KSVData& data, KPropertiesDialog* props) TQButtonGroup* buttons = new TQButtonGroup (1,TQt::Vertical, i18n ("Actions"), mPage); TQPushButton* b = new TQPushButton (i18n ("&Edit"), buttons); - connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doEdit())); + connect (b, TQ_SIGNAL (clicked()), props, TQ_SLOT (doEdit())); TQFrame* spacer = new TQFrame (buttons); spacer->setMinimumWidth (KDialog::spacingHint()); b = new TQPushButton (i18n ("&Start"), buttons); - connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doStart())); + connect (b, TQ_SIGNAL (clicked()), props, TQ_SLOT (doStart())); b = new TQPushButton (i18n ("S&top"), buttons); - connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doStop())); + connect (b, TQ_SIGNAL (clicked()), props, TQ_SLOT (doStop())); b = new TQPushButton (i18n ("&Restart"), buttons); - connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doRestart())); + connect (b, TQ_SIGNAL (clicked()), props, TQ_SLOT (doRestart())); } KSVServicesPage::~KSVServicesPage () @@ -150,12 +150,12 @@ KSVEntryPage::KSVEntryPage (KSVData& data, KPropertiesDialog* props) top->addWidget (mNumberEdit, 2, 1); top->addWidget (iconLabel, 3, 0); - connect (mServiceEdit, TQT_SIGNAL (textChanged (const TQString&)), - this, TQT_SLOT (emitChanged())); - connect (mLabelEdit, TQT_SIGNAL (textChanged (const TQString&)), - this, TQT_SLOT (emitChanged())); - connect (mNumberEdit, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (emitChanged())); + connect (mServiceEdit, TQ_SIGNAL (textChanged (const TQString&)), + this, TQ_SLOT (emitChanged())); + connect (mLabelEdit, TQ_SIGNAL (textChanged (const TQString&)), + this, TQ_SLOT (emitChanged())); + connect (mNumberEdit, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (emitChanged())); } KSVEntryPage::~KSVEntryPage () diff --git a/ksysv/RunlevelAuthIcon.cpp b/ksysv/RunlevelAuthIcon.cpp index 6199e16..2093464 100644 --- a/ksysv/RunlevelAuthIcon.cpp +++ b/ksysv/RunlevelAuthIcon.cpp @@ -39,7 +39,7 @@ RunlevelAuthIcon::RunlevelAuthIcon (const TQString& servicesPath, const TQString lockBox->setFrameStyle (TQFrame::NoFrame); lockBox->setFixedSize (lockBox->sizeHint()); - connect (mTimer, TQT_SIGNAL (timeout()), this, TQT_SLOT (timerEvent())); + connect (mTimer, TQ_SIGNAL (timeout()), this, TQ_SLOT (timerEvent())); mTimer->start (mInterval); for (int i = 0; i < ksv::runlevelNumber; ++i) diff --git a/ksysv/SpinBox.cpp b/ksysv/SpinBox.cpp index cb56bbe..9e52fd0 100644 --- a/ksysv/SpinBox.cpp +++ b/ksysv/SpinBox.cpp @@ -17,10 +17,10 @@ KSVSpinBox::KSVSpinBox (TQWidget* parent, const char* name) editor()->installEventFilter (this); - connect (editor(), TQT_SIGNAL (textChanged (const TQString&)), - comp, TQT_SLOT (slotMakeCompletion (const TQString&))); - connect (comp, TQT_SIGNAL (match (const TQString&)), - this, TQT_SLOT (handleMatch (const TQString&))); + connect (editor(), TQ_SIGNAL (textChanged (const TQString&)), + comp, TQ_SLOT (slotMakeCompletion (const TQString&))); + connect (comp, TQ_SIGNAL (match (const TQString&)), + this, TQ_SLOT (handleMatch (const TQString&))); } KSVSpinBox::~KSVSpinBox () @@ -67,7 +67,7 @@ bool KSVSpinBox::eventFilter (TQObject* o, TQEvent* e) Q_UNUSED(o); if (e->type() == TQEvent::KeyPress) { - TQKeyEvent* ke = TQT_TQKEYEVENT(e); + TQKeyEvent* ke = static_cast<TQKeyEvent*>(e); switch (ke->key()) { diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp index 2dfa585..43f043a 100644 --- a/ksysv/TopWidget.cpp +++ b/ksysv/TopWidget.cpp @@ -113,8 +113,8 @@ KSVTopLevel::KSVTopLevel() mOpenWith (0L), mOpenDefault (0L), - mUndoList (new ActionList (TQT_TQOBJECT(this), "UndoList")), - mRedoList (new ActionList (TQT_TQOBJECT(this), "RedoList")), + mUndoList (new ActionList (this, "UndoList")), + mRedoList (new ActionList (this, "RedoList")), mStartDlg (new ServiceDlg (i18n("Start Service"), i18n("&Choose which service to start:"), this)), @@ -139,27 +139,27 @@ KSVTopLevel::KSVTopLevel() setCentralWidget(mView); // ensure that the statusbar gets updated correctly - connect (mView, TQT_SIGNAL(sigRun(const TQString&)), this, TQT_SLOT(slotUpdateRunning(const TQString&))); - connect (mView, TQT_SIGNAL(sigStop()), statusBar(), TQT_SLOT(clear())); - connect (mView, TQT_SIGNAL(cannotGenerateNumber()), this, TQT_SLOT(catchCannotGenerateNumber())); - connect (mView, TQT_SIGNAL(undoAction(KSVAction*)), this, TQT_SLOT(pushUndoAction(KSVAction*))); - connect (mView, TQT_SIGNAL(logChanged()), this, TQT_SLOT(enableLogActions())); + connect (mView, TQ_SIGNAL(sigRun(const TQString&)), this, TQ_SLOT(slotUpdateRunning(const TQString&))); + connect (mView, TQ_SIGNAL(sigStop()), statusBar(), TQ_SLOT(clear())); + connect (mView, TQ_SIGNAL(cannotGenerateNumber()), this, TQ_SLOT(catchCannotGenerateNumber())); + connect (mView, TQ_SIGNAL(undoAction(KSVAction*)), this, TQ_SLOT(pushUndoAction(KSVAction*))); + connect (mView, TQ_SIGNAL(logChanged()), this, TQ_SLOT(enableLogActions())); // cut & copy - connect (mView, TQT_SIGNAL (newOrigin()), - this, TQT_SLOT (dispatchEdit())); + connect (mView, TQ_SIGNAL (newOrigin()), + this, TQ_SLOT (dispatchEdit())); // undo - connect (mUndoList, TQT_SIGNAL(empty()), this, TQT_SLOT(disableUndo())); - connect (mUndoList, TQT_SIGNAL(filled()), this, TQT_SLOT(enableUndo())); + connect (mUndoList, TQ_SIGNAL(empty()), this, TQ_SLOT(disableUndo())); + connect (mUndoList, TQ_SIGNAL(filled()), this, TQ_SLOT(enableUndo())); // and redo - connect (mRedoList, TQT_SIGNAL(empty()), this, TQT_SLOT(disableRedo())); - connect (mRedoList, TQT_SIGNAL(filled()), this, TQT_SLOT(enableRedo())); + connect (mRedoList, TQ_SIGNAL(empty()), this, TQ_SLOT(disableRedo())); + connect (mRedoList, TQ_SIGNAL(filled()), this, TQ_SLOT(enableRedo())); // paste - connect (kapp->clipboard(), TQT_SIGNAL (dataChanged()), - this, TQT_SLOT (dispatchEdit())); + connect (tdeApp->clipboard(), TQ_SIGNAL (dataChanged()), + this, TQ_SLOT (dispatchEdit())); // init mView according to saved preferences slotReadConfig(); @@ -186,23 +186,23 @@ KSVTopLevel::~KSVTopLevel() void KSVTopLevel::initTools() { - connect (mStartDlg, TQT_SIGNAL(doAction(const TQString&)), - mView, TQT_SLOT(startService(const TQString&))); - connect (mStopDlg, TQT_SIGNAL(doAction(const TQString&)), - mView, TQT_SLOT(editService(const TQString&))); - connect (mRestartDlg, TQT_SIGNAL(doAction(const TQString&)), - mView, TQT_SLOT(restartService(const TQString&))); - connect (mEditDlg, TQT_SIGNAL(doAction(const TQString&)), - mView, TQT_SLOT(editService(const TQString&))); - - connect (mStartDlg, TQT_SIGNAL (display (bool)), - this, TQT_SLOT (dispatchStartService (bool))); - connect (mStopDlg, TQT_SIGNAL (display (bool)), - this, TQT_SLOT (dispatchStopService (bool))); - connect (mRestartDlg, TQT_SIGNAL (display (bool)), - this, TQT_SLOT (dispatchRestartService (bool))); - connect (mEditDlg, TQT_SIGNAL (display (bool)), - this, TQT_SLOT (dispatchEditService (bool))); + connect (mStartDlg, TQ_SIGNAL(doAction(const TQString&)), + mView, TQ_SLOT(startService(const TQString&))); + connect (mStopDlg, TQ_SIGNAL(doAction(const TQString&)), + mView, TQ_SLOT(editService(const TQString&))); + connect (mRestartDlg, TQ_SIGNAL(doAction(const TQString&)), + mView, TQ_SLOT(restartService(const TQString&))); + connect (mEditDlg, TQ_SIGNAL(doAction(const TQString&)), + mView, TQ_SLOT(editService(const TQString&))); + + connect (mStartDlg, TQ_SIGNAL (display (bool)), + this, TQ_SLOT (dispatchStartService (bool))); + connect (mStopDlg, TQ_SIGNAL (display (bool)), + this, TQ_SLOT (dispatchStopService (bool))); + connect (mRestartDlg, TQ_SIGNAL (display (bool)), + this, TQ_SLOT (dispatchRestartService (bool))); + connect (mEditDlg, TQ_SIGNAL (display (bool)), + this, TQ_SLOT (dispatchEditService (bool))); } @@ -211,48 +211,48 @@ void KSVTopLevel::initActions () TDEActionCollection* coll = actionCollection(); // setup File menu - mFileRevert = KStdAction::revert (TQT_TQOBJECT(this), TQT_SLOT (slotClearChanges()), coll); + mFileRevert = KStdAction::revert (this, TQ_SLOT (slotClearChanges()), coll); mFileRevert->setText (i18n("Re&vert Configuration")); - mFileLoad = KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT (load()), coll); + mFileLoad = KStdAction::open (this, TQ_SLOT (load()), coll); mFileLoad->setText (i18n ("&Open...")); - mFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotAcceptChanges()), coll); + mFileSave = KStdAction::save(this, TQ_SLOT(slotAcceptChanges()), coll); mFileSave->setText (i18n("&Save Configuration")); - mFileSaveAs = KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT (saveAs ()), coll); + mFileSaveAs = KStdAction::saveAs (this, TQ_SLOT (saveAs ()), coll); - mFileSaveLog = KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT(slotSaveLog()), coll, "ksysv_save_log"); + mFileSaveLog = KStdAction::save (this, TQ_SLOT(slotSaveLog()), coll, "ksysv_save_log"); mFileSaveLog->setText (i18n("Save &Log...")); mFileSaveLog->setShortcut (Key_L+CTRL); mFileSaveLog->setEnabled (false); // disabled due to complexity - // mFilePrint = KStdAction::print (this, TQT_SLOT (print()), coll); + // mFilePrint = KStdAction::print (this, TQ_SLOT (print()), coll); - mFilePrintLog = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printLog()), coll, "ksysv_print_log"); + mFilePrintLog = KStdAction::print(this, TQ_SLOT(printLog()), coll, "ksysv_print_log"); mFilePrintLog->setText( i18n("&Print Log...")); mFilePrintLog->setEnabled (false); - mFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), coll); + mFileQuit = KStdAction::quit(this, TQ_SLOT(close()), coll); // setup Edit menu - mEditUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(editUndo()), coll); + mEditUndo = KStdAction::undo(this, TQ_SLOT(editUndo()), coll); mEditUndo->setEnabled (false); - mEditRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(editRedo()), coll); + mEditRedo = KStdAction::redo(this, TQ_SLOT(editRedo()), coll); mEditUndo->setEnabled (false); - mEditCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(editCut()), coll); - mEditCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(editCopy()), coll); - mEditPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(editPaste()), coll); - mPasteAppend = KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT (pasteAppend()), + mEditCut = KStdAction::cut(this, TQ_SLOT(editCut()), coll); + mEditCopy = KStdAction::copy(this, TQ_SLOT(editCopy()), coll); + mEditPaste = KStdAction::paste(this, TQ_SLOT(editPaste()), coll); + mPasteAppend = KStdAction::paste (this, TQ_SLOT (pasteAppend()), coll, "ksysv_paste_append"); mEditProperties = new TDEAction (i18n("P&roperties"), 0, - TQT_TQOBJECT(this), TQT_SLOT(properties()), + this, TQ_SLOT(properties()), coll, "ksysv_properties"); mOpenDefault = new TDEAction (i18n ("&Open"), 0, - TQT_TQOBJECT(this), TQT_SLOT (editService()), + this, TQ_SLOT (editService()), coll, "ksysv_open_service"); mOpenWith = new TDEActionMenu (i18n ("Open &With"), coll, "ksysv_open_with"); @@ -260,30 +260,30 @@ void KSVTopLevel::initActions () // setup Settings menu createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings (TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), coll); - KStdAction::configureToolbars (TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), coll); - KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(saveOptions()), coll); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), coll); + KStdAction::keyBindings (this, TQ_SLOT(configureKeys()), coll); + KStdAction::configureToolbars (this, TQ_SLOT(configureToolbars()), coll); + KStdAction::saveOptions(this, TQ_SLOT(saveOptions()), coll); + KStdAction::preferences(this, TQ_SLOT(slotShowConfig()), coll); mOptionsToggleLog = new TDEToggleAction (i18n("Show &Log"), "toggle_log", 0, - TQT_TQOBJECT(this), TQT_SLOT (toggleLog()), + this, TQ_SLOT (toggleLog()), coll, "ksysv_toggle_log"); mOptionsToggleLog->setCheckedState(i18n("Hide &Log")); // setup Tools menu mToolsStartService = new TDEToggleAction (i18n("&Start Service..."), "ksysv_start", 0, - TQT_TQOBJECT(mStartDlg), TQT_SLOT (toggle()), + mStartDlg, TQ_SLOT (toggle()), coll, "ksysv_start_service"); mToolsStopService = new TDEToggleAction (i18n("&Stop Service..."), "ksysv_stop", 0, - TQT_TQOBJECT(mStopDlg), TQT_SLOT (toggle()), + mStopDlg, TQ_SLOT (toggle()), coll, "ksysv_stop_service"); mToolsRestartService = new TDEToggleAction (i18n("&Restart Service..."), 0, - TQT_TQOBJECT(mRestartDlg), TQT_SLOT (toggle()), + mRestartDlg, TQ_SLOT (toggle()), coll, "ksysv_restart_service"); mToolsEditService = new TDEToggleAction (i18n("&Edit Service..."), 0, - TQT_TQOBJECT(mEditDlg), TQT_SLOT (toggle()), + mEditDlg, TQ_SLOT (toggle()), coll, "ksysv_edit_service"); createGUI(xmlFile()); @@ -295,7 +295,7 @@ bool KSVTopLevel::queryExit() uint res = KMessageBox::Continue; if (mChanged) { - res = KMessageBox::warningContinueCancel(kapp->mainWidget(), + res = KMessageBox::warningContinueCancel(tdeApp->mainWidget(), i18n("There are unsaved changes. Are you sure you want to quit?"), i18n("Quit"), KStdGuiItem::quit()); @@ -309,7 +309,7 @@ void KSVTopLevel::slotClearChanges() { if (mChanged && KMessageBox::Yes == - KMessageBox::questionYesNo(kapp->mainWidget(), + KMessageBox::questionYesNo(tdeApp->mainWidget(), i18n("Do you really want to revert all unsaved changes?"), i18n("Revert Configuration"), i18n("&Revert"), @@ -322,7 +322,7 @@ void KSVTopLevel::slotClearChanges() void KSVTopLevel::slotAcceptChanges() { if (KMessageBox::Continue == - KMessageBox::warningContinueCancel(kapp->mainWidget(), + KMessageBox::warningContinueCancel(tdeApp->mainWidget(), i18n("You're about to save the changes made to your init " "configuration. Wrong settings can " "make your system hang on startup.\n" @@ -393,7 +393,7 @@ void KSVTopLevel::initStatusBar() TQHBox* visBox = new TQHBox (status, "visBox"); TQButtonGroup* group = new TQButtonGroup (this, "visButtonGroup"); group->hide(); - connect (group, TQT_SIGNAL (clicked (int)), this, TQT_SLOT (toggleRunlevel (int))); + connect (group, TQ_SIGNAL (clicked (int)), this, TQ_SLOT (toggleRunlevel (int))); TQWhatsThis::add (visBox, i18n ("<p>Click on the checkboxes to <strong>show</strong> or "\ "<strong>hide</strong> runlevels.</p> " \ @@ -416,8 +416,8 @@ void KSVTopLevel::initStatusBar() TQWidget* strut = new TQWidget (authIconBox, "Strut"); strut->setFixedWidth (KDialog::spacingHint()); mAuth = new RunlevelAuthIcon (mConfig->scriptPath(), mConfig->runlevelPath(), authIconBox); - connect (mAuth, TQT_SIGNAL (authChanged(bool)), mView, TQT_SLOT(multiplexEnabled(bool))); - connect (mAuth, TQT_SIGNAL (authChanged(bool)), this, TQT_SLOT(writingEnabled(bool))); + connect (mAuth, TQ_SIGNAL (authChanged(bool)), mView, TQ_SLOT(multiplexEnabled(bool))); + connect (mAuth, TQ_SIGNAL (authChanged(bool)), this, TQ_SLOT(writingEnabled(bool))); TQWhatsThis::add (authIconBox, i18n ("<p>If the lock is closed <img src=\"user|ksysv_locked\"/>, "\ "you don't have the right " \ @@ -426,7 +426,7 @@ void KSVTopLevel::initStatusBar() "or ask your sysadmin to install %1 <em>suid</em> or " \ "<em>sgid</em>.</p><p>The latter way is <strong>not</strong> "\ "recommended though, due to security issues.</p>") - .arg (kapp->aboutData()->programName()).arg(kapp->aboutData()->programName())); + .arg (tdeApp->aboutData()->programName()).arg(tdeApp->aboutData()->programName())); authIconBox->setMinimumSize (authIconBox->minimumSizeHint()); visBox->setMinimumSize (visBox->minimumSizeHint()); @@ -444,17 +444,17 @@ void KSVTopLevel::slotShowConfig() { mPreferences = KSVPreferences::self(); - connect (mPreferences, TQT_SIGNAL (updateColors ()), - this, TQT_SLOT (updateColors ())); + connect (mPreferences, TQ_SIGNAL (updateColors ()), + this, TQ_SLOT (updateColors ())); - connect (mPreferences, TQT_SIGNAL (updateServicesPath ()), - this, TQT_SLOT (updateServicesPath ())); + connect (mPreferences, TQ_SIGNAL (updateServicesPath ()), + this, TQ_SLOT (updateServicesPath ())); - connect (mPreferences, TQT_SIGNAL (updateRunlevelsPath ()), - this, TQT_SLOT (updateRunlevelsPath ())); + connect (mPreferences, TQ_SIGNAL (updateRunlevelsPath ()), + this, TQ_SLOT (updateRunlevelsPath ())); - connect (mPreferences, TQT_SIGNAL (updateFonts ()), - mView, TQT_SLOT (repaintRunlevels ())); + connect (mPreferences, TQ_SIGNAL (updateFonts ()), + mView, TQ_SLOT (repaintRunlevels ())); } // mPreferences->setInitialSize (TQSize (400,300), true); @@ -508,7 +508,7 @@ void KSVTopLevel::editCut() { if (list && list->currentItem()) { KSVDrag* mime = new KSVDrag (*list->currentItem()->data(), 0L, 0L); - kapp->clipboard()->setData (mime); + tdeApp->clipboard()->setData (mime); KSVData data = *list->currentItem()->data(); delete list->currentItem(); @@ -525,7 +525,7 @@ void KSVTopLevel::editCopy() if (list) { KSVDrag* mime = new KSVDrag (*static_cast<KSVItem*> (list->currentItem()), 0L, 0L); - kapp->clipboard()->setData (mime); + tdeApp->clipboard()->setData (mime); } } @@ -537,7 +537,7 @@ void KSVTopLevel::editPaste() { KSVData data; - if (KSVDrag::decodeNative (kapp->clipboard()->data(), data)) + if (KSVDrag::decodeNative (tdeApp->clipboard()->data(), data)) { KSVAction* action = 0L; @@ -629,11 +629,11 @@ void KSVTopLevel::print() // #define checkPage if (metrics.height() - y < fm.lineSpacing()) prt.newPage(); // static KPrinter prt; -// prt.setDocName(kapp->aboutData()->programName() + " Configuration"); -// prt.setCreator(kapp->aboutData()->programName()); +// prt.setDocName(tdeApp->aboutData()->programName() + " Configuration"); +// prt.setCreator(tdeApp->aboutData()->programName()); // static TQPrintDialog* dlg = new TQPrintDialog (&prt, this, "KSysV Print Dialog"); -// dlg->setCaption(kapp->makeStdCaption (i18n("Print"))); +// dlg->setCaption(tdeApp->makeStdCaption (i18n("Print"))); // if (dlg->exec() == TQDialog::Accepted) // { @@ -647,7 +647,7 @@ void KSVTopLevel::print() // TQFontMetrics fm = p.fontMetrics(); // p.drawText (10, y, i18n("%1 Configuration of %2") -// .arg (kapp->aboutData()->programName()) +// .arg (tdeApp->aboutData()->programName()) // .arg (ksv::hostname())); // y += fm.lineSpacing(); @@ -747,8 +747,8 @@ void KSVTopLevel::print() void KSVTopLevel::printLog() { KPrinter *prt = new KPrinter(); - prt->setDocName(kapp->aboutData()->programName() + " Log File"); - prt->setCreator(kapp->aboutData()->programName()); + prt->setDocName(tdeApp->aboutData()->programName() + " Log File"); + prt->setCreator(tdeApp->aboutData()->programName()); if (prt->setup(this, i18n("Print Log File"))) { @@ -807,7 +807,7 @@ void KSVTopLevel::printLog() if (line == lines.end()) goto printing_finished; - kapp->processEvents(); + tdeApp->processEvents(); } prt->newPage(); @@ -826,7 +826,7 @@ void KSVTopLevel::printLog() void KSVTopLevel::catchCannotGenerateNumber() { if (mConfig->showMessage (ksv::CouldNotGenerateSortingNumber)) { - KMessageBox::information (kapp->mainWidget(), + KMessageBox::information (tdeApp->mainWidget(), i18n ("<p>Unable to generate a valid " \ "sorting number for this position. This means " \ "that there was no number available between "\ @@ -890,7 +890,7 @@ void KSVTopLevel::dispatchEdit () } else { - TQMimeSource* mime = kapp->clipboard()->data(); + TQMimeSource* mime = tdeApp->clipboard()->data(); if (mime && mime->provides ("application/x-ksysv")) setPaste (true); @@ -954,7 +954,7 @@ void KSVTopLevel::enableLogActions () void KSVTopLevel::setCaption (bool changed) { - setPlainCaption (kapp->makeStdCaption(KNetwork::KResolver::localHostName(), true, changed)); + setPlainCaption (tdeApp->makeStdCaption(KNetwork::KResolver::localHostName(), true, changed)); } TDEActionCollection* KSVTopLevel::filteredActions () @@ -981,7 +981,7 @@ void KSVTopLevel::configureKeys () void KSVTopLevel::configureToolbars () { KEditToolbar dlg(filteredActions(), xmlFile(), true, this); - connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } diff --git a/ksysv/kbusymanager.cpp b/ksysv/kbusymanager.cpp index 2a5c9f9..a46abfa 100644 --- a/ksysv/kbusymanager.cpp +++ b/ksysv/kbusymanager.cpp @@ -66,7 +66,7 @@ void KBusyManager::setBusy (bool val) if (val) TQApplication::setOverrideCursor (KCursor::waitCursor()); - kapp->mainWidget()->setEnabled (!val); + tdeApp->mainWidget()->setEnabled (!val); } void KBusyManager::restore () @@ -79,7 +79,7 @@ void KBusyManager::restore () if (oldBusy) TQApplication::restoreOverrideCursor(); - kapp->mainWidget()->setEnabled (!d->Stack.top()); + tdeApp->mainWidget()->setEnabled (!d->Stack.top()); } KBusyManager::KBusyManager () diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp index 87d8b71..013cb07 100644 --- a/ksysv/kscroller.cpp +++ b/ksysv/kscroller.cpp @@ -37,10 +37,10 @@ KScroller::KScroller (TQWidget* parent, const char* name) mVertical->hide(); mHorizontal->hide(); - connect (mVertical, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (scrollVertical (int))); - connect (mHorizontal, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (scrollHorizontal (int))); + connect (mVertical, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (scrollVertical (int))); + connect (mHorizontal, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (scrollHorizontal (int))); } KScroller::~KScroller () @@ -88,7 +88,7 @@ TQSize KScroller::minimumSizeHint() const TQSize KScroller::sizeHint() const { TQSize size = mContent->minimumSize(); - int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); size += TQSize( extra, extra ); return size; } @@ -113,7 +113,7 @@ void KScroller::setupHorizontal (int cw, int, int w, int h) if (cw > w) { - int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); if (!mVertical->isHidden()) w -= extra; @@ -139,7 +139,7 @@ void KScroller::setupVertical (int, int ch, int w, int h) if (ch > h) { - int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); mVertical->setRange (0, ch - h); mVertical->setPageStep (h); mVertical->setLineStep (25); @@ -175,7 +175,7 @@ void KScroller::setupCornerWidget (int w, int h) { if (!mVertical->isHidden() && !mHorizontal->isHidden()) { - int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); mCornerWidget->raise(); mCornerWidget->setGeometry (w - extra, h - extra, extra, extra); diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp index dfe13fd..772d9f0 100644 --- a/ksysv/ksv_conf.cpp +++ b/ksysv/ksv_conf.cpp @@ -101,7 +101,7 @@ void KSVConfig::writeSettings() { mConfig->writeEntry("Number Font", mNumberFont); // save screen geometry - TDEMainWindow* mw = static_cast<TDEMainWindow*>(kapp->mainWidget()); + TDEMainWindow* mw = static_cast<TDEMainWindow*>(tdeApp->mainWidget()); if (mw) { diff --git a/ksysv/ksv_core.cpp b/ksysv/ksv_core.cpp index caf0dfe..3268bb4 100644 --- a/ksysv/ksv_core.cpp +++ b/ksysv/ksv_core.cpp @@ -152,7 +152,7 @@ TDECompletion* ksv::numberCompletion () const TQString& ksv::logFileFilter () { static TQString filter = "*" + ksv::logFileExtension() + "|" + - TQString(kapp->caption() + i18n(" log files") + " (*" + ksv::logFileExtension() + ")"); + TQString(tdeApp->caption() + i18n(" log files") + " (*" + ksv::logFileExtension() + ")"); return filter; } diff --git a/ksysv/ksvapplication.h b/ksysv/ksvapplication.h index 5da7ab6..dcbc502 100644 --- a/ksysv/ksvapplication.h +++ b/ksysv/ksvapplication.h @@ -3,9 +3,9 @@ #ifndef KSVAPPLICATION_H #define KSVAPPLICATION_H -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> -class KSVApplication : public KUniqueApplication +class KSVApplication : public TDEUniqueApplication { TQ_OBJECT diff --git a/ksysv/ksvconfigwizard.cpp b/ksysv/ksvconfigwizard.cpp index 54450fa..86aaf24 100644 --- a/ksysv/ksvconfigwizard.cpp +++ b/ksysv/ksvconfigwizard.cpp @@ -55,8 +55,8 @@ KSVConfigWizard::KSVConfigWizard (TQWidget* parent, const char* name, bool modal setFinishEnabled (mFinishedPage, true); // some connections - connect (this, TQT_SIGNAL (selected (const TQString&)), - this, TQT_SLOT (selectedPage (const TQString&))); + connect (this, TQ_SIGNAL (selected (const TQString&)), + this, TQ_SLOT (selectedPage (const TQString&))); // hide cancel-button cancelButton()->hide(); diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp index e5798ae..077bad4 100644 --- a/ksysv/ksvdraglist.cpp +++ b/ksysv/ksvdraglist.cpp @@ -358,8 +358,8 @@ KSVDragList::KSVDragList ( TQWidget* parent, const char* name ) mRMList.setAutoDelete(true); // catch drops - connect (this, TQT_SIGNAL (dropped (TQDropEvent*, TQListViewItem*)), - this, TQT_SLOT (drop (TQDropEvent*, TQListViewItem*))); + connect (this, TQ_SIGNAL (dropped (TQDropEvent*, TQListViewItem*)), + this, TQ_SLOT (drop (TQDropEvent*, TQListViewItem*))); } KSVDragList::~KSVDragList() @@ -373,8 +373,8 @@ KSVDragList::~KSVDragList() void KSVDragList::initItem (TQString file, TQString path, TQString name, TQ_INT8 nr) { KSVItem* tmp = new KSVItem(this, file, path, name, nr); - tmp->setRunlevel(TQT_TQOBJECT(this)->name()); - tmp->setOriginalRunlevel(TQT_TQOBJECT(this)->name()); + tmp->setRunlevel(this->name()); + tmp->setOriginalRunlevel(this->name()); tmp->setIcon (mIcon); diff --git a/ksysv/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui index 5046fc7..0a095e3 100644 --- a/ksysv/lookandfeelconfig.ui +++ b/ksysv/lookandfeelconfig.ui @@ -490,11 +490,11 @@ <includes> <include location="global" impldecl="in declaration">tdelocale.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">chooseNumberFont()</slot> <slot access="protected">chooseServiceFont()</slot> <slot access="protected">slotChanged()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>DesktopIcon</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <includes> diff --git a/ksysv/main.cpp b/ksysv/main.cpp index ad7f8bf..d1b87d9 100644 --- a/ksysv/main.cpp +++ b/ksysv/main.cpp @@ -20,7 +20,7 @@ #include <tdeaboutdata.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "ksvapplication.h" #include "ksv_conf.h" @@ -66,9 +66,9 @@ int main( int argc, char **argv ) { ksv::about = &about; TDECmdLineArgs::init(argc, argv, &about); - KUniqueApplication::addCmdLineOptions (); + TDEUniqueApplication::addCmdLineOptions (); - if (!KUniqueApplication::start()) { + if (!TDEUniqueApplication::start()) { cerr << "SysV-Init Editor is already running!" << endl; return -1; } @@ -76,7 +76,7 @@ int main( int argc, char **argv ) { KSVApplication app; // session-management - if (kapp->isRestored()) + if (tdeApp->isRestored()) RESTORE(KSVTopLevel) else { diff --git a/ksysv/miscconfig.ui b/ksysv/miscconfig.ui index 3ee6b0f..fee98a5 100644 --- a/ksysv/miscconfig.ui +++ b/ksysv/miscconfig.ui @@ -179,8 +179,8 @@ <includes> <include location="global" impldecl="in declaration">tdelocale.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">slotChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksysv/pathconfig.ui b/ksysv/pathconfig.ui index adc0988..10d2cd0 100644 --- a/ksysv/pathconfig.ui +++ b/ksysv/pathconfig.ui @@ -282,10 +282,10 @@ <include location="global" impldecl="in declaration">tdelocale.h</include> <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">browseServices()</slot> <slot access="protected">browseRunlevels()</slot> <slot access="protected">slotChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksysv/trash.cpp b/ksysv/trash.cpp index dcd4a88..85c83a7 100644 --- a/ksysv/trash.cpp +++ b/ksysv/trash.cpp @@ -22,7 +22,7 @@ #include <kiconloader.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "ksvdraglist.h" #include "ksvdrag.h" |