diff options
Diffstat (limited to 'ksysv/OldView.cpp')
-rw-r--r-- | ksysv/OldView.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp index dabf882..06ab6f7 100644 --- a/ksysv/OldView.cpp +++ b/ksysv/OldView.cpp @@ -28,14 +28,14 @@ #include <tqgroupbox.h> #include <tqaccel.h> #include <tqscrollbar.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqcstring.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqwhatsthis.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqvaluelist.h> #include <tqsplitter.h> @@ -251,9 +251,9 @@ void KSVContent::initLList() mRunlevels[i]->setSpacing (KDialog::spacingHint()); // create TQString for label - TQString _label (i18n("Runlevel &%1").tqarg(i)); + TQString _label (i18n("Runlevel &%1").arg(i)); // and for the name - TQString _name (i18n("Runlevel %1").tqarg(i)); + TQString _name (i18n("Runlevel %1").arg(i)); TQVBox* startBox = new TQVBox (mRunlevels[i]); TQWhatsThis::add (startBox, @@ -262,7 +262,7 @@ void KSVContent::initLList() "determines the order in which the services are started. " \ "You can arrange them via drag and drop, as long as a suitable " \ "<em>sorting number</em> can be generated.</p><p>If that's not possible, you have " \ - "to change the number manually via the <strong>Properties dialog box</strong>.</p>").tqarg(i)); + "to change the number manually via the <strong>Properties dialog box</strong>.</p>").arg(i)); TQLabel* rlL = new TQLabel(_label, startBox); new TQLabel(i18n("Start"), startBox); @@ -280,7 +280,7 @@ void KSVContent::initLList() "determines the order in which the services are stopped. " \ "You can arrange them via drag and drop, as long as a suitable " \ "<em>sorting number</em> can be generated.</p><p>If that's not possible, you have " \ - "to change the number manually via the <strong>Properties dialog box</strong>.</p>").tqarg(i)); + "to change the number manually via the <strong>Properties dialog box</strong>.</p>").arg(i)); // create the "STOP" list: stopRL[i] = new KSVDragList(stopBox, (_name + " STOP").latin1()); @@ -351,9 +351,9 @@ void KSVContent::initLList() // use this loop for setting tooltips startRL[i]->setToolTip (i18n("Drag here to start services\n" \ - "when entering runlevel %1").tqarg(i)); + "when entering runlevel %1").arg(i)); stopRL[i]->setToolTip (i18n("Drag here to stop services\n" \ - "when entering runlevel %1").tqarg(i)); + "when entering runlevel %1").arg(i)); for (int j = 0; j < ksv::runlevelNumber; ++j) { @@ -422,7 +422,7 @@ void KSVContent::initRunlevels() startRL[i]->clear(); stopRL[i]->clear(); - const TQString _path = conf->runlevelPath() + TQString("/rc%1.d").tqarg(i); + const TQString _path = conf->runlevelPath() + TQString("/rc%1.d").arg(i); if (!TQDir(_path).exists()) continue; @@ -476,8 +476,8 @@ void KSVContent::slotWriteSysV() for (int i = 0; i < ksv::runlevelNumber; ++i) { - appendLog(i18n("<rl>RUNLEVEL %1</rl>").tqarg(i), - i18n("** RUNLEVEL %1 **").tqarg(i)); + appendLog(i18n("<rl>RUNLEVEL %1</rl>").arg(i), + i18n("** RUNLEVEL %1 **").arg(i)); clearRL(i); // rm changed/deleted entries @@ -525,7 +525,7 @@ void KSVContent::repaintRunlevels () void KSVContent::clearRL(int _rl) { - TQString path = conf->runlevelPath() + TQString("/rc%1.d").tqarg(_rl); + TQString path = conf->runlevelPath() + TQString("/rc%1.d").arg(_rl); TQDir dir (path); @@ -539,7 +539,7 @@ void KSVContent::clearRL(int _rl) if (d->newEntry() && d->originalRunlevel() != startRL[_rl]->name()) break; - TQFileInfo file (path + TQString("/S%1%2").tqarg(d->numberString()).tqarg(d->label())); + TQFileInfo file (path + TQString("/S%1%2").arg(d->numberString()).arg(d->label())); TQString rich, plain; ksv::IO::removeFile (file, dir, rich, plain); @@ -557,7 +557,7 @@ void KSVContent::clearRL(int _rl) if (d->newEntry() && d->originalRunlevel() != stopRL[_rl]->name()) break; - TQFileInfo file (path + TQString("/K%1%2").tqarg(d->numberString()).tqarg(d->label())); + TQFileInfo file (path + TQString("/K%1%2").arg(d->numberString()).arg(d->label())); TQString rich, plain; ksv::IO::removeFile (file, dir, rich, plain); @@ -613,8 +613,8 @@ void KSVContent::stopService (const TQString& path) connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int))); // refresh textDisplay - appendLog(i18n("** <stop>Stopping</stop> <cmd>%1</cmd> **<br/>").tqarg(path), - i18n("** Stopping %1 **").tqarg(path)); + appendLog(i18n("** <stop>Stopping</stop> <cmd>%1</cmd> **<br/>").arg(path), + i18n("** Stopping %1 **").arg(path)); _proc->start(KProcess::NotifyOnExit, KProcess::AllOutput); @@ -639,8 +639,8 @@ void KSVContent::startService (const TQString& path) connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int))); // refresh textDisplay - appendLog(i18n("** <start>Starting</start> <cmd>%1</cmd> **<br/>").tqarg(path), - i18n("** Starting %1 **").tqarg(path)); + appendLog(i18n("** <start>Starting</start> <cmd>%1</cmd> **<br/>").arg(path), + i18n("** Starting %1 **").arg(path)); _proc->start(KProcess::NotifyOnExit, KProcess::AllOutput); @@ -679,8 +679,8 @@ void KSVContent::restartService (const TQString& path) connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int))); // refresh textDisplay - appendLog(i18n("** Re-starting <cmd>%1</cmd> **</br>").tqarg(path), - i18n("** Re-starting %1 **").tqarg(path)); + appendLog(i18n("** Re-starting <cmd>%1</cmd> **</br>").arg(path), + i18n("** Re-starting %1 **").arg(path)); _proc->start(KProcess::NotifyOnExit, KProcess::AllOutput); @@ -856,7 +856,7 @@ void KSVContent::pasteAppend() { KSVData data; - if (KSVDrag::decodeNative (kapp->tqclipboard()->data(), data)) + if (KSVDrag::decodeNative (kapp->clipboard()->data(), data)) { KSVAction* action = 0L; @@ -1062,22 +1062,22 @@ void KSVContent::calcMinSize () TQCOORD& w = mMinSize.rwidth(); TQCOORD& h = mMinSize.rheight(); - w = 2 * KDialog::marginHint() + mScriptBox->tqsizeHint().width(); - h = 2 * KDialog::marginHint() + mScriptBox->tqsizeHint().height(); + w = 2 * KDialog::marginHint() + mScriptBox->sizeHint().width(); + h = 2 * KDialog::marginHint() + mScriptBox->sizeHint().height(); for (int i = 0; i < ksv::runlevelNumber; ++i) { if (mRunlevels[i]->isHidden()) continue; - w += KDialog::spacingHint() + mRunlevels[i]->tqsizeHint().width(); - h = kMax (h, mRunlevels[i]->tqsizeHint().height()); + w += KDialog::spacingHint() + mRunlevels[i]->sizeHint().width(); + h = kMax (h, mRunlevels[i]->sizeHint().height()); } - mContent->tqlayout()->setEnabled(false); + mContent->layout()->setEnabled(false); mContent->setMinimumSize(mMinSize); mScroller->updateScrollBars(); - mContent->tqlayout()->setEnabled(true); + mContent->layout()->setEnabled(true); } void KSVContent::mergeLoadedPackage (TQValueList<KSVData>* start, |