diff options
Diffstat (limited to 'ksysv')
| -rw-r--r-- | ksysv/IOCore.cpp | 42 | ||||
| -rw-r--r-- | ksysv/OldView.cpp | 36 | ||||
| -rw-r--r-- | ksysv/RunlevelAuthIcon.cpp | 4 | ||||
| -rw-r--r-- | ksysv/TopWidget.cpp | 6 | ||||
| -rw-r--r-- | ksysv/configwizard.ui | 4 | ||||
| -rw-r--r-- | ksysv/kdltooltip.cpp | 6 | ||||
| -rw-r--r-- | ksysv/ksv_conf.cpp | 2 | ||||
| -rw-r--r-- | ksysv/ksvdraglist.cpp | 2 | ||||
| -rw-r--r-- | ksysv/lookandfeelconfig.ui | 12 | ||||
| -rw-r--r-- | ksysv/trash.cpp | 4 |
10 files changed, 59 insertions, 59 deletions
diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp index 001227d..1951aa2 100644 --- a/ksysv/IOCore.cpp +++ b/ksysv/IOCore.cpp @@ -49,23 +49,23 @@ void ksv::IO::removeFile (const TQFileInfo& info, TQDir& dir, TQString& rich, TQ if (!dir.remove(info.fileName(), FALSE)) { rich = (i18n ("<error>FAILED</error> to remove <cmd>%1</cmd> from <cmd>%2</cmd>: \"%3\"<br/>") - .tqarg(info.fileName()) - .tqarg(dir.path()) - .tqarg(strerror(errno))); + .arg(info.fileName()) + .arg(dir.path()) + .arg(strerror(errno))); plain = (i18n ("FAILED to remove %1 from %2: \"%3\"\n") - .tqarg(info.fileName()) - .tqarg(dir.path()) - .tqarg(strerror(errno))); + .arg(info.fileName()) + .arg(dir.path()) + .arg(strerror(errno))); } else { rich = i18n("removed <cmd>%1</cmd> from <cmd>%2</cmd><br/>") - .tqarg(info.fileName()) - .tqarg(dir.path()); + .arg(info.fileName()) + .arg(dir.path()); plain = i18n("removed %1 from %2\n") - .tqarg(info.fileName()) - .tqarg(dir.path()); + .arg(info.fileName()) + .arg(dir.path()); } } @@ -80,8 +80,8 @@ void ksv::IO::dissectFilename (const TQString& file, TQString& base, int& nr) void ksv::IO::makeSymlink (const KSVData& data, int runlevel, bool start, TQString& rich, TQString& plain) { - const TQString symName = TQString("%1%2%3").tqarg(start ? "S" : "K").tqarg(data.numberString()).tqarg(data.label()); - const TQString symPath = TQString("%1/rc%2.d/").tqarg(KSVConfig::self()->runlevelPath()).tqarg(runlevel); + const TQString symName = TQString("%1%2%3").arg(start ? "S" : "K").arg(data.numberString()).arg(data.label()); + const TQString symPath = TQString("%1/rc%2.d/").arg(KSVConfig::self()->runlevelPath()).arg(runlevel); const TQString symbol = symPath + symName; TQString target = data.filename(); @@ -92,20 +92,20 @@ void ksv::IO::makeSymlink (const KSVData& data, int runlevel, bool start, if (symlink(target.local8Bit(), symbol.local8Bit()) == 0) { - rich = i18n("created <cmd>%1</cmd> in <cmd>%2</cmd><br/>").tqarg(symName).tqarg(symPath); - plain = i18n("created %1 in %2\n").tqarg(symName).tqarg(symPath); + rich = i18n("created <cmd>%1</cmd> in <cmd>%2</cmd><br/>").arg(symName).arg(symPath); + plain = i18n("created %1 in %2\n").arg(symName).arg(symPath); } else { rich = i18n("<error>FAILED</error> to create <cmd>%1</cmd> in <cmd>%2</cmd>: \"%3\"<br/>") - .tqarg(symName) - .tqarg(symPath) - .tqarg(strerror(errno)); + .arg(symName) + .arg(symPath) + .arg(strerror(errno)); plain = i18n("FAILED to create %1 in %2: \"%3\"\n") - .tqarg(symName) - .tqarg(symPath) - .tqarg(strerror(errno)); + .arg(symName) + .arg(symPath) + .arg(strerror(errno)); } } @@ -201,7 +201,7 @@ bool ksv::IO::loadSavedConfiguration (TQDataStream& s, s >> rlMagic; s >> section; - if (rlMagic != TQString::fromLatin1("RUNLEVEL %1").tqarg(i)) + if (rlMagic != TQString::fromLatin1("RUNLEVEL %1").arg(i)) return false; if (section != "START") diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp index 2a7523c..efd1878 100644 --- a/ksysv/OldView.cpp +++ b/ksysv/OldView.cpp @@ -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); diff --git a/ksysv/RunlevelAuthIcon.cpp b/ksysv/RunlevelAuthIcon.cpp index e766e77..bac5b30 100644 --- a/ksysv/RunlevelAuthIcon.cpp +++ b/ksysv/RunlevelAuthIcon.cpp @@ -44,7 +44,7 @@ RunlevelAuthIcon::RunlevelAuthIcon (const TQString& servicesPath, const TQString for (int i = 0; i < ksv::runlevelNumber; ++i) { - mRLInfo[i] = new TQFileInfo ((runlevelPath + "/rc%1.d").tqarg(i)); + mRLInfo[i] = new TQFileInfo ((runlevelPath + "/rc%1.d").arg(i)); } updateStatus(); @@ -122,7 +122,7 @@ void RunlevelAuthIcon::setRunlevelPath (const TQString& path) for (int i = 0; i < ksv::runlevelNumber; ++i) { - mRLInfo[i]->setFile ((path + "/rc%1.d").tqarg(i)); + mRLInfo[i]->setFile ((path + "/rc%1.d").arg(i)); } mTimer->start(mInterval); diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp index 4dedbe3..5530f97 100644 --- a/ksysv/TopWidget.cpp +++ b/ksysv/TopWidget.cpp @@ -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>") - .tqarg (kapp->aboutData()->programName()).tqarg(kapp->aboutData()->programName())); + .arg (kapp->aboutData()->programName()).arg(kapp->aboutData()->programName())); authIconBox->setMinimumSize (authIconBox->minimumSizeHint()); visBox->setMinimumSize (visBox->minimumSizeHint()); @@ -659,7 +659,7 @@ void KSVTopLevel::print() // p.setFont (TQFont("courier", 16, TQFont::Bold)); // TQFontMetrics fm = p.fontMetrics(); -// p.drawText (10, y, i18n ("Runlevel %1").tqarg(i)); +// p.drawText (10, y, i18n ("Runlevel %1").arg(i)); // y += fm.lineSpacing(); // checkPage @@ -775,7 +775,7 @@ void KSVTopLevel::printLog() y += tmp_h; - TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())), + TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())), TQFont("times"), TQString(), ksv::styleSheet(), TQMimeSourceFactory::defaultFactory()); rdate.setWidth (&p, width); diff --git a/ksysv/configwizard.ui b/ksysv/configwizard.ui index 7255ac6..2594b01 100644 --- a/ksysv/configwizard.ui +++ b/ksysv/configwizard.ui @@ -10,7 +10,7 @@ <cstring>ConfigWizard</cstring> </property> <property stdset="1"> - <name>tqgeometry</name> + <name>geometry</name> <rect> <x>0</x> <y>0</y> @@ -590,7 +590,7 @@ You have finished the initial configuration of SysV-Init Editor. <b>Press& <enum>RichText</enum> </property> <property stdset="1"> - <name>tqalignment</name> + <name>alignment</name> <set>AlignTop|AlignLeft</set> </property> <property> diff --git a/ksysv/kdltooltip.cpp b/ksysv/kdltooltip.cpp index 1ff34e2..7b3a421 100644 --- a/ksysv/kdltooltip.cpp +++ b/ksysv/kdltooltip.cpp @@ -39,8 +39,8 @@ void KDLToolTip::maybeTip (const TQPoint& p) TQString text; TQRect rect; - const TQRect vert = mParent->verticalScrollBar()->tqgeometry(); - const TQRect horiz = mParent->horizontalScrollBar()->tqgeometry(); + const TQRect vert = mParent->verticalScrollBar()->geometry(); + const TQRect horiz = mParent->horizontalScrollBar()->geometry(); if (vert.contains(p)) { @@ -66,7 +66,7 @@ void KDLToolTip::maybeTip (const TQPoint& p) TQListViewItem* i = mParent->itemAt (rp); KSVItem* item = static_cast<KSVItem*> (i); - rect = mParent->header()->tqgeometry(); + rect = mParent->header()->geometry(); if (rect.contains (p)) { text = mParent->tooltip(); diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp index a4a713d..7ad9090 100644 --- a/ksysv/ksv_conf.cpp +++ b/ksysv/ksv_conf.cpp @@ -100,7 +100,7 @@ void KSVConfig::writeSettings() { mConfig->writeEntry("Service Font", mServiceFont); mConfig->writeEntry("Number Font", mNumberFont); - // save screen tqgeometry + // save screen geometry KMainWindow* mw = static_cast<KMainWindow*>(kapp->mainWidget()); if (mw) diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp index f4e8770..65a1b3e 100644 --- a/ksysv/ksvdraglist.cpp +++ b/ksysv/ksvdraglist.cpp @@ -385,7 +385,7 @@ void KSVDragList::initItem (TQString file, TQString path, TQString name, TQ_INT8 tmp->setChanged (false); setUpdatesEnabled(true); - tqrepaint(false); + repaint(false); } void KSVDragList::setDefaultIcon (const TQPixmap& icon) diff --git a/ksysv/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui index 75fefc8..9a902a5 100644 --- a/ksysv/lookandfeelconfig.ui +++ b/ksysv/lookandfeelconfig.ui @@ -133,7 +133,7 @@ <property name="text"> <string>Services:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -149,7 +149,7 @@ <property name="text"> <string>Sorting numbers:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -265,7 +265,7 @@ <property name="text"> <string>&Changed:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -313,7 +313,7 @@ <property name="text"> <string>&New:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -393,7 +393,7 @@ <property name="text"> <string>New && &selected:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -409,7 +409,7 @@ <property name="text"> <string>Changed && s&elected:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> diff --git a/ksysv/trash.cpp b/ksysv/trash.cpp index 1ecf522..aab746c 100644 --- a/ksysv/trash.cpp +++ b/ksysv/trash.cpp @@ -75,7 +75,7 @@ void KSVTrash::dropEvent (TQDropEvent* e) if (mOpen) { - mLabel->tqrepaint(); + mLabel->repaint(); mOpen = false; } } @@ -102,7 +102,7 @@ void KSVTrash::dragLeaveEvent ( TQDragLeaveEvent* ) { if (mOpen) { - mLabel->tqrepaint(); + mLabel->repaint(); mOpen = false; } } |