summaryrefslogtreecommitdiffstats
path: root/ksysv
diff options
context:
space:
mode:
Diffstat (limited to 'ksysv')
-rw-r--r--ksysv/IOCore.cpp50
-rw-r--r--ksysv/OldView.cpp58
-rw-r--r--ksysv/PreferencesDialog.cpp4
-rw-r--r--ksysv/Properties.cpp6
-rw-r--r--ksysv/RunlevelAuthIcon.cpp8
-rw-r--r--ksysv/ServiceDlg.cpp8
-rw-r--r--ksysv/TopWidget.cpp46
-rw-r--r--ksysv/configwizard.ui16
-rw-r--r--ksysv/kdltooltip.cpp10
-rw-r--r--ksysv/kscroller.cpp20
-rw-r--r--ksysv/kscroller.h6
-rw-r--r--ksysv/ksv_conf.cpp2
-rw-r--r--ksysv/ksv_core.cpp2
-rw-r--r--ksysv/ksvconfigwizard.cpp2
-rw-r--r--ksysv/ksvdrag.cpp4
-rw-r--r--ksysv/ksvdrag.h2
-rw-r--r--ksysv/ksvdraglist.cpp8
-rw-r--r--ksysv/ksvlookandfeel.cpp2
-rw-r--r--ksysv/ksvmiscconfig.cpp2
-rw-r--r--ksysv/lookandfeelconfig.ui28
-rw-r--r--ksysv/miscconfig.ui6
-rw-r--r--ksysv/pathconfig.ui8
-rw-r--r--ksysv/trash.cpp8
-rw-r--r--ksysv/trash.h2
24 files changed, 154 insertions, 154 deletions
diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp
index 8c7dc90..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::tqfromLatin1("RUNLEVEL %1").tqarg(i))
+ if (rlMagic != TQString::fromLatin1("RUNLEVEL %1").arg(i))
return false;
if (section != "START")
@@ -240,14 +240,14 @@ bool ksv::IO::saveConfiguration (TQDataStream& s,
s << TQCString("KSysV")
<< version
- << TQDateTime::tqcurrentDateTime(); // save date
+ << TQDateTime::currentDateTime(); // save date
for (int i = 0; i < ksv::runlevelNumber; ++i)
{
TQ_INT32 numberOfItems = start[i]->childCount();
- s << TQString::tqfromLatin1 ("RUNLEVEL %1").arg (i)
- << TQString::tqfromLatin1 ("START")
+ s << TQString::fromLatin1 ("RUNLEVEL %1").arg (i)
+ << TQString::fromLatin1 ("START")
<< numberOfItems;
for (TQListViewItemIterator it (start[i]);
@@ -259,7 +259,7 @@ bool ksv::IO::saveConfiguration (TQDataStream& s,
numberOfItems = stop[i]->childCount();
- s << TQString::tqfromLatin1 ("STOP")
+ s << TQString::fromLatin1 ("STOP")
<< numberOfItems;
for (TQListViewItemIterator it (stop[i]);
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,
diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp
index 2c92baa..f02a145 100644
--- a/ksysv/PreferencesDialog.cpp
+++ b/ksysv/PreferencesDialog.cpp
@@ -1,7 +1,7 @@
// (c) 2000 Peter Putzer
#include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <tqvbox.h>
@@ -33,7 +33,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent)
parent, "KSysV Preferences", true, true),
mConfig (KSVConfig::self())
{
- setMinimumSize (tqsizeHint ());
+ setMinimumSize (sizeHint ());
/**
* Look & Feel Page
diff --git a/ksysv/Properties.cpp b/ksysv/Properties.cpp
index 1e2e8bf..423e9b5 100644
--- a/ksysv/Properties.cpp
+++ b/ksysv/Properties.cpp
@@ -2,8 +2,8 @@
#include <tqframe.h>
#include <tqlabel.h>
-#include <tqtextview.h>
-#include <tqlayout.h>
+#include <textview.h>
+#include <layout.h>
#include <tqhbox.h>
#include <tqvbox.h>
#include <tqbuttongroup.h>
@@ -48,7 +48,7 @@ KSVServicesPage::KSVServicesPage (KSVData& data, KPropertiesDialog* props)
desc->setSpacing (1);
TQLabel* label = new TQLabel(i18n("Description:"), desc);
- label->setFixedHeight (label->tqsizeHint().height());
+ label->setFixedHeight (label->sizeHint().height());
TQString text;
ksv::getServiceDescription (data.filename(), text);
diff --git a/ksysv/RunlevelAuthIcon.cpp b/ksysv/RunlevelAuthIcon.cpp
index 5c31402..3d6745e 100644
--- a/ksysv/RunlevelAuthIcon.cpp
+++ b/ksysv/RunlevelAuthIcon.cpp
@@ -2,7 +2,7 @@
#include <tqtimer.h>
#include <tqfileinfo.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <kdebug.h>
@@ -37,14 +37,14 @@ RunlevelAuthIcon::RunlevelAuthIcon (const TQString& servicesPath, const TQString
lockBox->setMargin (1);
lockBox->setFrameStyle (TQFrame::NoFrame);
- lockBox->setFixedSize (lockBox->tqsizeHint());
+ lockBox->setFixedSize (lockBox->sizeHint());
connect (mTimer, TQT_SIGNAL (timeout()), this, TQT_SLOT (timerEvent()));
mTimer->start (mInterval);
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/ServiceDlg.cpp b/ksysv/ServiceDlg.cpp
index b4687d6..af885a7 100644
--- a/ksysv/ServiceDlg.cpp
+++ b/ksysv/ServiceDlg.cpp
@@ -12,7 +12,7 @@
* *
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqfileinfo.h>
#include <tqcombobox.h>
@@ -25,7 +25,7 @@
#include "ksvdraglist.h"
#include "ServiceDlg.h"
-#define MIN_SIZE(A) A->setMinimumSize(A->tqsizeHint())
+#define MIN_SIZE(A) A->setMinimumSize(A->sizeHint())
ServiceDlg::ServiceDlg (const TQString& action, const TQString& label,
TQWidget* parent, const char* name)
@@ -40,14 +40,14 @@ ServiceDlg::ServiceDlg (const TQString& action, const TQString& label,
MIN_SIZE(desc);
desc->setBuddy(mServices);
MIN_SIZE(mServices);
- mServices->setMinimumWidth(mServices->tqminimumSize().width() * 2);
+ mServices->setMinimumWidth(mServices->minimumSize().width() * 2);
TQBoxLayout* serv_layout = new TQHBoxLayout();
top->addLayout (serv_layout);
serv_layout->addWidget(desc);
serv_layout->addWidget(mServices);
- setFixedSize (tqsizeHint());
+ setFixedSize (sizeHint());
}
ServiceDlg::~ServiceDlg()
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index f039d63..b428b90 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -38,16 +38,16 @@
#include <kprinter.h>
#include <tqpaintdevicemetrics.h>
#include <tqbuttongroup.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqtooltip.h>
#include <tqcheckbox.h>
#include <tqhbox.h>
#include <tqregexp.h>
#include <tqdatastream.h>
#include <tqpixmapcache.h>
-#include <tqtextview.h>
+#include <textview.h>
#include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqwhatsthis.h>
#include <tqsimplerichtext.h>
@@ -87,12 +87,12 @@
#include <tqlabel.h>
#include <kstatusbar.h>
-namespace tqStatus
+namespace Status
{
enum {
Changed, Checklist, Writable
};
-} // namespace tqStatus
+} // namespace Status
KSVTopLevel::KSVTopLevel()
: KMainWindow(0, 0L, WStyle_ContextHelp|WDestructiveClose),
@@ -426,16 +426,16 @@ 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->tqminimumSizeHint());
- visBox->setMinimumSize (visBox->tqminimumSizeHint());
+ authIconBox->setMinimumSize (authIconBox->minimumSizeHint());
+ visBox->setMinimumSize (visBox->minimumSizeHint());
status->addWidget (authIconBox, 0, false);
- status->insertItem ("", tqStatus::Changed, 100);
+ status->insertItem ("", Status::Changed, 100);
status->addWidget (visBox, 0, true);
- status->setItemAlignment (tqStatus::Changed, AlignLeft|AlignVCenter);
+ status->setItemAlignment (Status::Changed, AlignLeft|AlignVCenter);
}
void KSVTopLevel::slotShowConfig()
@@ -499,7 +499,7 @@ void KSVTopLevel::saveOptions()
void KSVTopLevel::slotUpdateRunning (const TQString& text)
{
- statusBar()->changeItem(text, tqStatus::Changed);
+ statusBar()->changeItem(text, Status::Changed);
}
void KSVTopLevel::editCut() {
@@ -508,7 +508,7 @@ void KSVTopLevel::editCut() {
if (list && list->currentItem())
{
KSVDrag* mime = new KSVDrag (*list->currentItem()->data(), 0L, 0L);
- kapp->tqclipboard()->setData (mime);
+ kapp->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->tqclipboard()->setData (mime);
+ kapp->clipboard()->setData (mime);
}
}
@@ -537,7 +537,7 @@ void KSVTopLevel::editPaste()
{
KSVData data;
- if (KSVDrag::decodeNative (kapp->tqclipboard()->data(), data))
+ if (KSVDrag::decodeNative (kapp->clipboard()->data(), data))
{
KSVAction* action = 0L;
@@ -563,7 +563,7 @@ void KSVTopLevel::setChanged (bool val)
mFileSave->setEnabled (val);
// update statusbar
- statusBar()->changeItem(val ? i18n(" Changed") : TQString(), tqStatus::Changed);
+ statusBar()->changeItem(val ? i18n(" Changed") : TQString(), Status::Changed);
// clear messages
statusBar()->clear();
@@ -651,7 +651,7 @@ void KSVTopLevel::print()
// .arg (ksv::hostname()));
// y += fm.lineSpacing();
-// p.drawText (10, y, TQDateTime::tqcurrentDateTime().toString());
+// p.drawText (10, y, TQDateTime::currentDateTime().toString());
// y += fm.lineSpacing() * 2; // an extra empty line
// for (int i = 0; i < ksv::runlevelNumber; ++i)
@@ -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
@@ -771,17 +771,17 @@ void KSVTopLevel::printLog()
rheading.setWidth (&p, width);
int tmp_h = rheading.height();
TQRegion region (0, y, width, tmp_h);
- rheading.draw (&p, 0, y, region, tqcolorGroup(), 0L);
+ rheading.draw (&p, 0, y, region, colorGroup(), 0L);
y += tmp_h;
- TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())),
+ 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);
tmp_h = rdate.height();
TQRegion r2 (0, y, width, tmp_h);
- rdate.draw (&p, 0, y, r2, tqcolorGroup(), 0L);
+ rdate.draw (&p, 0, y, r2, colorGroup(), 0L);
y += tmp_h;
}
@@ -799,7 +799,7 @@ void KSVTopLevel::printLog()
break;
TQRegion region (0, y, width, tmp_h);
- rich.draw (&p, 0, y, region, tqcolorGroup(), 0L);
+ rich.draw (&p, 0, y, region, colorGroup(), 0L);
y += tmp_h;
++line;
@@ -890,7 +890,7 @@ void KSVTopLevel::dispatchEdit ()
}
else
{
- TQMimeSource* mime = kapp->tqclipboard()->data();
+ TQMimeSource* mime = kapp->clipboard()->data();
if (mime && mime->provides ("application/x-ksysv"))
setPaste (true);
@@ -938,7 +938,7 @@ void KSVTopLevel::slotSaveLog()
s << "KDE System V Init Editor"
<< endl
- << TQDateTime::tqcurrentDateTime().toString()
+ << TQDateTime::currentDateTime().toString()
<< endl << endl
<< mView->log()
<< endl;
diff --git a/ksysv/configwizard.ui b/ksysv/configwizard.ui
index 15dc5b9..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>
@@ -137,7 +137,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>tqsizeHint</name>
+ <name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
@@ -281,7 +281,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>tqsizeHint</name>
+ <name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
@@ -367,7 +367,7 @@
<cstring>mServicesPath</cstring>
</property>
<property stdset="1">
- <name>tqminimumSize</name>
+ <name>minimumSize</name>
<size>
<width>100</width>
<height>0</height>
@@ -430,7 +430,7 @@
</sizepolicy>
</property>
<property stdset="1">
- <name>tqminimumSize</name>
+ <name>minimumSize</name>
<size>
<width>0</width>
<height>10</height>
@@ -489,7 +489,7 @@
<cstring>mRunlevelPath</cstring>
</property>
<property stdset="1">
- <name>tqminimumSize</name>
+ <name>minimumSize</name>
<size>
<width>100</width>
<height>0</height>
@@ -544,7 +544,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>tqsizeHint</name>
+ <name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
@@ -590,7 +590,7 @@ You have finished the initial configuration of SysV-Init Editor. &lt;b&gt;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 95af765..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,14 +66,14 @@ 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();
}
else if (item)
{
- rect = mParent->tqitemRect (i);
+ rect = mParent->itemRect (i);
rect.moveTopLeft (mParent->viewport()->mapToParent (rect.topLeft()));
text = item->tooltip();
@@ -84,7 +84,7 @@ void KDLToolTip::maybeTip (const TQPoint& p)
TQListViewItem* last = mParent->lastItem();
if (last)
- rect.setTop (mParent->viewport()->mapToParent (mParent->tqitemRect(last).bottomRight()).y());
+ rect.setTop (mParent->viewport()->mapToParent (mParent->itemRect(last).bottomRight()).y());
text = mParent->tooltip();
}
diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp
index 986e805..e2b4b30 100644
--- a/ksysv/kscroller.cpp
+++ b/ksysv/kscroller.cpp
@@ -1,7 +1,7 @@
// (c) 2000 Peter Putzer
#include <tqscrollbar.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqstyle.h>
#include <kdebug.h>
@@ -77,18 +77,18 @@ void KScroller::resizeEvent (TQResizeEvent* e)
updateScrollBars();
}
-TQSize KScroller::tqminimumSizeHint() const
+TQSize KScroller::minimumSizeHint() const
{
- TQSize size = tqsizeHint();
+ TQSize size = sizeHint();
if (size.width() > 300)
size.setWidth(300);
return size;
}
-TQSize KScroller::tqsizeHint() const
+TQSize KScroller::sizeHint() const
{
- TQSize size = mContent->tqminimumSize();
- int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+ TQSize size = mContent->minimumSize();
+ int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
size += TQSize( extra, extra );
return size;
}
@@ -97,7 +97,7 @@ void KScroller::updateScrollBars ()
{
int w = width();
int h = height();
- TQSize cs = mContent->tqminimumSize();
+ TQSize cs = mContent->minimumSize();
setupVertical ( cs.width(), cs.height(), w, h);
setupHorizontal ( cs.width(), cs.height(), w, h);
@@ -113,7 +113,7 @@ void KScroller::setupHorizontal (int cw, int, int w, int h)
if (cw > w)
{
- int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+ int extra = kapp->tqstyle().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->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+ int extra = kapp->tqstyle().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->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+ int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
mCornerWidget->raise();
mCornerWidget->setGeometry (w - extra, h - extra, extra, extra);
diff --git a/ksysv/kscroller.h b/ksysv/kscroller.h
index 77a78f9..5b63346 100644
--- a/ksysv/kscroller.h
+++ b/ksysv/kscroller.h
@@ -70,7 +70,7 @@ public slots:
void setCornerWidget (TQWidget* corner);
/**
- * Update the scrollbars. Call whenever you change the contents tqminimumSize.
+ * Update the scrollbars. Call whenever you change the contents minimumSize.
*/
void updateScrollBars ();
@@ -83,12 +83,12 @@ protected:
/**
* Reimplemented for internal reasons, the API is not affected.
*/
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
/**
* Reimplemented for internal reasons, the API is not affected.
*/
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize minimumSizeHint() const;
private slots:
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/ksv_core.cpp b/ksysv/ksv_core.cpp
index b71ab78..de9cea8 100644
--- a/ksysv/ksv_core.cpp
+++ b/ksysv/ksv_core.cpp
@@ -13,7 +13,7 @@
***************************************************************************/
#include <tqpushbutton.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <kapplication.h>
#include <kglobalsettings.h>
diff --git a/ksysv/ksvconfigwizard.cpp b/ksysv/ksvconfigwizard.cpp
index a869d46..ad908bc 100644
--- a/ksysv/ksvconfigwizard.cpp
+++ b/ksysv/ksvconfigwizard.cpp
@@ -25,7 +25,7 @@
*/
#include "ksvconfigwizard.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <kdialog.h>
#include <kfiledialog.h>
diff --git a/ksysv/ksvdrag.cpp b/ksysv/ksvdrag.cpp
index e524bef..7d94536 100644
--- a/ksysv/ksvdrag.cpp
+++ b/ksysv/ksvdrag.cpp
@@ -65,7 +65,7 @@ const char* KSVDrag::format (int i) const
}
}
-TQByteArray KSVDrag::tqencodedData (const char* format) const
+TQByteArray KSVDrag::encodedData (const char* format) const
{
TQByteArray res;
@@ -90,7 +90,7 @@ bool KSVDrag::decodeNative (const TQMimeSource* mime, KSVData& data)
{
if (mime && mime->provides ("application/x-ksysv"))
{
- TQDataStream ds (mime->tqencodedData ("application/x-ksysv"), IO_ReadOnly);
+ TQDataStream ds (mime->encodedData ("application/x-ksysv"), IO_ReadOnly);
ds >> data;
return true;
diff --git a/ksysv/ksvdrag.h b/ksysv/ksvdrag.h
index 00bb1a3..3c2010c 100644
--- a/ksysv/ksvdrag.h
+++ b/ksysv/ksvdrag.h
@@ -20,7 +20,7 @@ public:
virtual ~KSVDrag();
virtual const char* format (int i) const;
- TQByteArray tqencodedData (const char*) const;
+ TQByteArray encodedData (const char*) const;
static bool decodeNative (const TQMimeSource*, KSVData&);
diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp
index 6c57f55..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)
@@ -532,7 +532,7 @@ void KSVDragList::startDrag ()
if (d)
{
- d->setPixmap (mItemToDrag->paintDragIcon (font(), tqcolorGroup()));
+ d->setPixmap (mItemToDrag->paintDragIcon (font(), colorGroup()));
d->drag();
}
@@ -762,7 +762,7 @@ void KSVDragList::setEnabled (bool enable)
{
if (!testWState(WState_Disabled))
{
- if (tqfocusWidget() == this)
+ if (focusWidget() == this)
focusNextPrevChild (TRUE);
setWState (WState_Disabled);
// setBackgroundFromMode(); // this is private in TQWidget...
@@ -793,7 +793,7 @@ void KServiceDragList::startDrag ()
if (d)
{
- d->setPixmap (mItemToDrag->paintDragIcon (font(), tqcolorGroup()));
+ d->setPixmap (mItemToDrag->paintDragIcon (font(), colorGroup()));
d->dragCopy();
}
diff --git a/ksysv/ksvlookandfeel.cpp b/ksysv/ksvlookandfeel.cpp
index 9c68cfb..1a1a658 100644
--- a/ksysv/ksvlookandfeel.cpp
+++ b/ksysv/ksvlookandfeel.cpp
@@ -26,7 +26,7 @@
#include "ksvlookandfeel.h"
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kdialog.h>
#include <kfontdialog.h>
diff --git a/ksysv/ksvmiscconfig.cpp b/ksysv/ksvmiscconfig.cpp
index d894262..821fb9a 100644
--- a/ksysv/ksvmiscconfig.cpp
+++ b/ksysv/ksvmiscconfig.cpp
@@ -26,7 +26,7 @@
#include "ksvmiscconfig.h"
#include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kdialog.h>
diff --git a/ksysv/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui
index 07911b3..9a902a5 100644
--- a/ksysv/lookandfeelconfig.ui
+++ b/ksysv/lookandfeelconfig.ui
@@ -82,7 +82,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -110,7 +110,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -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">
@@ -182,7 +182,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>10</height>
@@ -238,7 +238,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
@@ -265,7 +265,7 @@
<property name="text">
<string>&amp;Changed:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -286,7 +286,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
@@ -313,7 +313,7 @@
<property name="text">
<string>&amp;New:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -334,7 +334,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
@@ -366,7 +366,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
@@ -393,7 +393,7 @@
<property name="text">
<string>New &amp;&amp; &amp;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 &amp;&amp; s&amp;elected:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -432,7 +432,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/ksysv/miscconfig.ui b/ksysv/miscconfig.ui
index 6d45733..ca19113 100644
--- a/ksysv/miscconfig.ui
+++ b/ksysv/miscconfig.ui
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -130,7 +130,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>10</height>
@@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/ksysv/pathconfig.ui b/ksysv/pathconfig.ui
index 051e267..109a9e8 100644
--- a/ksysv/pathconfig.ui
+++ b/ksysv/pathconfig.ui
@@ -94,7 +94,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -134,7 +134,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>10</height>
@@ -198,7 +198,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -236,7 +236,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/ksysv/trash.cpp b/ksysv/trash.cpp
index 089ebe5..aab746c 100644
--- a/ksysv/trash.cpp
+++ b/ksysv/trash.cpp
@@ -47,7 +47,7 @@ KSVTrash::KSVTrash (TQWidget* parent, const char* name)
TQToolTip::add(mLabel, i18n("Drag here to remove services"));
TQToolTip::add(this, i18n("Drag here to remove services"));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
setAcceptDrops(true);
mLabel->installEventFilter(this);
@@ -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;
}
}
@@ -131,7 +131,7 @@ bool KSVTrash::eventFilter( TQObject *, TQEvent *e )
}
}
-TQSize KSVTrash::tqsizeHint() const
+TQSize KSVTrash::sizeHint() const
{
static TQSize size = TQSize (mPixmapWidth + 2 * 5, mPixmapWidth + 2 * 7);
diff --git a/ksysv/trash.h b/ksysv/trash.h
index eb62562..13596a4 100644
--- a/ksysv/trash.h
+++ b/ksysv/trash.h
@@ -34,7 +34,7 @@ public:
KSVTrash (TQWidget* parent = 0, const char* name = 0);
virtual ~KSVTrash();
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
protected:
/**
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 08:02:21 +0000