From 377fa3a2775cdb3194315bb83e21744dc7c97bbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:15 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit d1248617107f659af9d03cf1ef6d783571a0cba8. --- ksysv/IOCore.cpp | 50 +++++++++++++++++++------------------- ksysv/OldView.cpp | 58 ++++++++++++++++++++++----------------------- ksysv/PreferencesDialog.cpp | 4 ++-- ksysv/Properties.cpp | 6 ++--- ksysv/RunlevelAuthIcon.cpp | 8 +++---- ksysv/ServiceDlg.cpp | 8 +++---- ksysv/TopWidget.cpp | 46 +++++++++++++++++------------------ ksysv/configwizard.ui | 16 ++++++------- ksysv/kdltooltip.cpp | 10 ++++---- ksysv/kscroller.cpp | 20 ++++++++-------- ksysv/kscroller.h | 6 ++--- ksysv/ksv_conf.cpp | 2 +- ksysv/ksv_core.cpp | 2 +- ksysv/ksvconfigwizard.cpp | 2 +- ksysv/ksvdrag.cpp | 4 ++-- ksysv/ksvdrag.h | 2 +- ksysv/ksvdraglist.cpp | 8 +++---- ksysv/ksvlookandfeel.cpp | 2 +- ksysv/ksvmiscconfig.cpp | 2 +- ksysv/lookandfeelconfig.ui | 28 +++++++++++----------- ksysv/miscconfig.ui | 6 ++--- ksysv/pathconfig.ui | 8 +++---- ksysv/trash.cpp | 8 +++---- ksysv/trash.h | 2 +- 24 files changed, 154 insertions(+), 154 deletions(-) (limited to 'ksysv') diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp index 1951aa2..8c7dc90 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 ("FAILED to remove %1 from %2: \"%3\"
") - .arg(info.fileName()) - .arg(dir.path()) - .arg(strerror(errno))); + .tqarg(info.fileName()) + .tqarg(dir.path()) + .tqarg(strerror(errno))); plain = (i18n ("FAILED to remove %1 from %2: \"%3\"\n") - .arg(info.fileName()) - .arg(dir.path()) - .arg(strerror(errno))); + .tqarg(info.fileName()) + .tqarg(dir.path()) + .tqarg(strerror(errno))); } else { rich = i18n("removed %1 from %2
") - .arg(info.fileName()) - .arg(dir.path()); + .tqarg(info.fileName()) + .tqarg(dir.path()); plain = i18n("removed %1 from %2\n") - .arg(info.fileName()) - .arg(dir.path()); + .tqarg(info.fileName()) + .tqarg(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").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 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 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 %1 in %2
").arg(symName).arg(symPath); - plain = i18n("created %1 in %2\n").arg(symName).arg(symPath); + rich = i18n("created %1 in %2
").tqarg(symName).tqarg(symPath); + plain = i18n("created %1 in %2\n").tqarg(symName).tqarg(symPath); } else { rich = i18n("FAILED to create %1 in %2: \"%3\"
") - .arg(symName) - .arg(symPath) - .arg(strerror(errno)); + .tqarg(symName) + .tqarg(symPath) + .tqarg(strerror(errno)); plain = i18n("FAILED to create %1 in %2: \"%3\"\n") - .arg(symName) - .arg(symPath) - .arg(strerror(errno)); + .tqarg(symName) + .tqarg(symPath) + .tqarg(strerror(errno)); } } @@ -201,7 +201,7 @@ bool ksv::IO::loadSavedConfiguration (TQDataStream& s, s >> rlMagic; s >> section; - if (rlMagic != TQString::fromLatin1("RUNLEVEL %1").arg(i)) + if (rlMagic != TQString::tqfromLatin1("RUNLEVEL %1").tqarg(i)) return false; if (section != "START") @@ -240,14 +240,14 @@ bool ksv::IO::saveConfiguration (TQDataStream& s, s << TQCString("KSysV") << version - << TQDateTime::currentDateTime(); // save date + << TQDateTime::tqcurrentDateTime(); // save date for (int i = 0; i < ksv::runlevelNumber; ++i) { TQ_INT32 numberOfItems = start[i]->childCount(); - s << TQString::fromLatin1 ("RUNLEVEL %1").arg (i) - << TQString::fromLatin1 ("START") + s << TQString::tqfromLatin1 ("RUNLEVEL %1").arg (i) + << TQString::tqfromLatin1 ("START") << numberOfItems; for (TQListViewItemIterator it (start[i]); @@ -259,7 +259,7 @@ bool ksv::IO::saveConfiguration (TQDataStream& s, numberOfItems = stop[i]->childCount(); - s << TQString::fromLatin1 ("STOP") + s << TQString::tqfromLatin1 ("STOP") << numberOfItems; for (TQListViewItemIterator it (stop[i]); diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp index 06ab6f7..dabf882 100644 --- a/ksysv/OldView.cpp +++ b/ksysv/OldView.cpp @@ -28,14 +28,14 @@ #include #include #include -#include +#include #include -#include +#include #include #include -#include +#include #include -#include +#include #include #include #include @@ -251,9 +251,9 @@ void KSVContent::initLList() mRunlevels[i]->setSpacing (KDialog::spacingHint()); // create TQString for label - TQString _label (i18n("Runlevel &%1").arg(i)); + TQString _label (i18n("Runlevel &%1").tqarg(i)); // and for the name - TQString _name (i18n("Runlevel %1").arg(i)); + TQString _name (i18n("Runlevel %1").tqarg(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 " \ "sorting number can be generated.

If that's not possible, you have " \ - "to change the number manually via the Properties dialog box.

").arg(i)); + "to change the number manually via the Properties dialog box.

").tqarg(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 " \ "sorting number can be generated.

If that's not possible, you have " \ - "to change the number manually via the Properties dialog box.

").arg(i)); + "to change the number manually via the Properties dialog box.

").tqarg(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").arg(i)); + "when entering runlevel %1").tqarg(i)); stopRL[i]->setToolTip (i18n("Drag here to stop services\n" \ - "when entering runlevel %1").arg(i)); + "when entering runlevel %1").tqarg(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").arg(i); + const TQString _path = conf->runlevelPath() + TQString("/rc%1.d").tqarg(i); if (!TQDir(_path).exists()) continue; @@ -476,8 +476,8 @@ void KSVContent::slotWriteSysV() for (int i = 0; i < ksv::runlevelNumber; ++i) { - appendLog(i18n("RUNLEVEL %1").arg(i), - i18n("** RUNLEVEL %1 **").arg(i)); + appendLog(i18n("RUNLEVEL %1").tqarg(i), + i18n("** RUNLEVEL %1 **").tqarg(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").arg(_rl); + TQString path = conf->runlevelPath() + TQString("/rc%1.d").tqarg(_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").arg(d->numberString()).arg(d->label())); + TQFileInfo file (path + TQString("/S%1%2").tqarg(d->numberString()).tqarg(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").arg(d->numberString()).arg(d->label())); + TQFileInfo file (path + TQString("/K%1%2").tqarg(d->numberString()).tqarg(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("** Stopping %1 **
").arg(path), - i18n("** Stopping %1 **").arg(path)); + appendLog(i18n("** Stopping %1 **
").tqarg(path), + i18n("** Stopping %1 **").tqarg(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("** Starting %1 **
").arg(path), - i18n("** Starting %1 **").arg(path)); + appendLog(i18n("** Starting %1 **
").tqarg(path), + i18n("** Starting %1 **").tqarg(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 %1 **
").arg(path), - i18n("** Re-starting %1 **").arg(path)); + appendLog(i18n("** Re-starting %1 **
").tqarg(path), + i18n("** Re-starting %1 **").tqarg(path)); _proc->start(KProcess::NotifyOnExit, KProcess::AllOutput); @@ -856,7 +856,7 @@ void KSVContent::pasteAppend() { KSVData data; - if (KSVDrag::decodeNative (kapp->clipboard()->data(), data)) + if (KSVDrag::decodeNative (kapp->tqclipboard()->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->sizeHint().width(); - h = 2 * KDialog::marginHint() + mScriptBox->sizeHint().height(); + w = 2 * KDialog::marginHint() + mScriptBox->tqsizeHint().width(); + h = 2 * KDialog::marginHint() + mScriptBox->tqsizeHint().height(); for (int i = 0; i < ksv::runlevelNumber; ++i) { if (mRunlevels[i]->isHidden()) continue; - w += KDialog::spacingHint() + mRunlevels[i]->sizeHint().width(); - h = kMax (h, mRunlevels[i]->sizeHint().height()); + w += KDialog::spacingHint() + mRunlevels[i]->tqsizeHint().width(); + h = kMax (h, mRunlevels[i]->tqsizeHint().height()); } - mContent->layout()->setEnabled(false); + mContent->tqlayout()->setEnabled(false); mContent->setMinimumSize(mMinSize); mScroller->updateScrollBars(); - mContent->layout()->setEnabled(true); + mContent->tqlayout()->setEnabled(true); } void KSVContent::mergeLoadedPackage (TQValueList* start, diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp index f02a145..2c92baa 100644 --- a/ksysv/PreferencesDialog.cpp +++ b/ksysv/PreferencesDialog.cpp @@ -1,7 +1,7 @@ // (c) 2000 Peter Putzer #include -#include +#include #include #include #include @@ -33,7 +33,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent) parent, "KSysV Preferences", true, true), mConfig (KSVConfig::self()) { - setMinimumSize (sizeHint ()); + setMinimumSize (tqsizeHint ()); /** * Look & Feel Page diff --git a/ksysv/Properties.cpp b/ksysv/Properties.cpp index 423e9b5..1e2e8bf 100644 --- a/ksysv/Properties.cpp +++ b/ksysv/Properties.cpp @@ -2,8 +2,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -48,7 +48,7 @@ KSVServicesPage::KSVServicesPage (KSVData& data, KPropertiesDialog* props) desc->setSpacing (1); TQLabel* label = new TQLabel(i18n("Description:"), desc); - label->setFixedHeight (label->sizeHint().height()); + label->setFixedHeight (label->tqsizeHint().height()); TQString text; ksv::getServiceDescription (data.filename(), text); diff --git a/ksysv/RunlevelAuthIcon.cpp b/ksysv/RunlevelAuthIcon.cpp index 3d6745e..5c31402 100644 --- a/ksysv/RunlevelAuthIcon.cpp +++ b/ksysv/RunlevelAuthIcon.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include @@ -37,14 +37,14 @@ RunlevelAuthIcon::RunlevelAuthIcon (const TQString& servicesPath, const TQString lockBox->setMargin (1); lockBox->setFrameStyle (TQFrame::NoFrame); - lockBox->setFixedSize (lockBox->sizeHint()); + lockBox->setFixedSize (lockBox->tqsizeHint()); 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").arg(i)); + mRLInfo[i] = new TQFileInfo ((runlevelPath + "/rc%1.d").tqarg(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").arg(i)); + mRLInfo[i]->setFile ((path + "/rc%1.d").tqarg(i)); } mTimer->start(mInterval); diff --git a/ksysv/ServiceDlg.cpp b/ksysv/ServiceDlg.cpp index af885a7..b4687d6 100644 --- a/ksysv/ServiceDlg.cpp +++ b/ksysv/ServiceDlg.cpp @@ -12,7 +12,7 @@ * * ***************************************************************************/ -#include +#include #include #include #include @@ -25,7 +25,7 @@ #include "ksvdraglist.h" #include "ServiceDlg.h" -#define MIN_SIZE(A) A->setMinimumSize(A->sizeHint()) +#define MIN_SIZE(A) A->setMinimumSize(A->tqsizeHint()) 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->minimumSize().width() * 2); + mServices->setMinimumWidth(mServices->tqminimumSize().width() * 2); TQBoxLayout* serv_layout = new TQHBoxLayout(); top->addLayout (serv_layout); serv_layout->addWidget(desc); serv_layout->addWidget(mServices); - setFixedSize (sizeHint()); + setFixedSize (tqsizeHint()); } ServiceDlg::~ServiceDlg() diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp index b428b90..f039d63 100644 --- a/ksysv/TopWidget.cpp +++ b/ksysv/TopWidget.cpp @@ -38,16 +38,16 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include -#include +#include #include #include @@ -87,12 +87,12 @@ #include #include -namespace Status +namespace tqStatus { enum { Changed, Checklist, Writable }; -} // namespace Status +} // namespace tqStatus KSVTopLevel::KSVTopLevel() : KMainWindow(0, 0L, WStyle_ContextHelp|WDestructiveClose), @@ -426,16 +426,16 @@ void KSVTopLevel::initStatusBar() "or ask your sysadmin to install %1 suid or " \ "sgid.

The latter way is not "\ "recommended though, due to security issues.

") - .arg (kapp->aboutData()->programName()).arg(kapp->aboutData()->programName())); + .tqarg (kapp->aboutData()->programName()).tqarg(kapp->aboutData()->programName())); - authIconBox->setMinimumSize (authIconBox->minimumSizeHint()); - visBox->setMinimumSize (visBox->minimumSizeHint()); + authIconBox->setMinimumSize (authIconBox->tqminimumSizeHint()); + visBox->setMinimumSize (visBox->tqminimumSizeHint()); status->addWidget (authIconBox, 0, false); - status->insertItem ("", Status::Changed, 100); + status->insertItem ("", tqStatus::Changed, 100); status->addWidget (visBox, 0, true); - status->setItemAlignment (Status::Changed, AlignLeft|AlignVCenter); + status->setItemAlignment (tqStatus::Changed, AlignLeft|AlignVCenter); } void KSVTopLevel::slotShowConfig() @@ -499,7 +499,7 @@ void KSVTopLevel::saveOptions() void KSVTopLevel::slotUpdateRunning (const TQString& text) { - statusBar()->changeItem(text, Status::Changed); + statusBar()->changeItem(text, tqStatus::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->clipboard()->setData (mime); + kapp->tqclipboard()->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 (list->currentItem()), 0L, 0L); - kapp->clipboard()->setData (mime); + kapp->tqclipboard()->setData (mime); } } @@ -537,7 +537,7 @@ void KSVTopLevel::editPaste() { KSVData data; - if (KSVDrag::decodeNative (kapp->clipboard()->data(), data)) + if (KSVDrag::decodeNative (kapp->tqclipboard()->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(), Status::Changed); + statusBar()->changeItem(val ? i18n(" Changed") : TQString(), tqStatus::Changed); // clear messages statusBar()->clear(); @@ -651,7 +651,7 @@ void KSVTopLevel::print() // .arg (ksv::hostname())); // y += fm.lineSpacing(); -// p.drawText (10, y, TQDateTime::currentDateTime().toString()); +// p.drawText (10, y, TQDateTime::tqcurrentDateTime().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").arg(i)); +// p.drawText (10, y, i18n ("Runlevel %1").tqarg(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, colorGroup(), 0L); + rheading.draw (&p, 0, y, region, tqcolorGroup(), 0L); y += tmp_h; - TQSimpleRichText rdate (i18n("

Printed on %1



").arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())), + TQSimpleRichText rdate (i18n("

Printed on %1



").tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())), 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, colorGroup(), 0L); + rdate.draw (&p, 0, y, r2, tqcolorGroup(), 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, colorGroup(), 0L); + rich.draw (&p, 0, y, region, tqcolorGroup(), 0L); y += tmp_h; ++line; @@ -890,7 +890,7 @@ void KSVTopLevel::dispatchEdit () } else { - TQMimeSource* mime = kapp->clipboard()->data(); + TQMimeSource* mime = kapp->tqclipboard()->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::currentDateTime().toString() + << TQDateTime::tqcurrentDateTime().toString() << endl << endl << mView->log() << endl; diff --git a/ksysv/configwizard.ui b/ksysv/configwizard.ui index 2594b01..15dc5b9 100644 --- a/ksysv/configwizard.ui +++ b/ksysv/configwizard.ui @@ -10,7 +10,7 @@ ConfigWizard - geometry + tqgeometry 0 0 @@ -137,7 +137,7 @@ Expanding - sizeHint + tqsizeHint 20 20 @@ -281,7 +281,7 @@ Expanding - sizeHint + tqsizeHint 20 20 @@ -367,7 +367,7 @@ mServicesPath - minimumSize + tqminimumSize 100 0 @@ -430,7 +430,7 @@ - minimumSize + tqminimumSize 0 10 @@ -489,7 +489,7 @@ mRunlevelPath - minimumSize + tqminimumSize 100 0 @@ -544,7 +544,7 @@ Expanding - sizeHint + tqsizeHint 20 20 @@ -590,7 +590,7 @@ You have finished the initial configuration of SysV-Init Editor. <b>Press& RichText - alignment + tqalignment AlignTop|AlignLeft diff --git a/ksysv/kdltooltip.cpp b/ksysv/kdltooltip.cpp index 7b3a421..95af765 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()->geometry(); - const TQRect horiz = mParent->horizontalScrollBar()->geometry(); + const TQRect vert = mParent->verticalScrollBar()->tqgeometry(); + const TQRect horiz = mParent->horizontalScrollBar()->tqgeometry(); if (vert.contains(p)) { @@ -66,14 +66,14 @@ void KDLToolTip::maybeTip (const TQPoint& p) TQListViewItem* i = mParent->itemAt (rp); KSVItem* item = static_cast (i); - rect = mParent->header()->geometry(); + rect = mParent->header()->tqgeometry(); if (rect.contains (p)) { text = mParent->tooltip(); } else if (item) { - rect = mParent->itemRect (i); + rect = mParent->tqitemRect (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->itemRect(last).bottomRight()).y()); + rect.setTop (mParent->viewport()->mapToParent (mParent->tqitemRect(last).bottomRight()).y()); text = mParent->tooltip(); } diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp index e2b4b30..986e805 100644 --- a/ksysv/kscroller.cpp +++ b/ksysv/kscroller.cpp @@ -1,7 +1,7 @@ // (c) 2000 Peter Putzer #include -#include +#include #include #include @@ -77,18 +77,18 @@ void KScroller::resizeEvent (TQResizeEvent* e) updateScrollBars(); } -TQSize KScroller::minimumSizeHint() const +TQSize KScroller::tqminimumSizeHint() const { - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); if (size.width() > 300) size.setWidth(300); return size; } -TQSize KScroller::sizeHint() const +TQSize KScroller::tqsizeHint() const { - TQSize size = mContent->minimumSize(); - int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + TQSize size = mContent->tqminimumSize(); + int extra = kapp->tqstyle().tqpixelMetric( 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->minimumSize(); + TQSize cs = mContent->tqminimumSize(); 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().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = kapp->tqstyle().tqpixelMetric( 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().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = kapp->tqstyle().tqpixelMetric( 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().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = kapp->tqstyle().tqpixelMetric( 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 5b63346..77a78f9 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 minimumSize. + * Update the scrollbars. Call whenever you change the contents tqminimumSize. */ void updateScrollBars (); @@ -83,12 +83,12 @@ protected: /** * Reimplemented for internal reasons, the API is not affected. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * Reimplemented for internal reasons, the API is not affected. */ - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; private slots: diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp index 7ad9090..a4a713d 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 geometry + // save screen tqgeometry KMainWindow* mw = static_cast(kapp->mainWidget()); if (mw) diff --git a/ksysv/ksv_core.cpp b/ksysv/ksv_core.cpp index de9cea8..b71ab78 100644 --- a/ksysv/ksv_core.cpp +++ b/ksysv/ksv_core.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include -#include +#include #include #include diff --git a/ksysv/ksvconfigwizard.cpp b/ksysv/ksvconfigwizard.cpp index ad908bc..a869d46 100644 --- a/ksysv/ksvconfigwizard.cpp +++ b/ksysv/ksvconfigwizard.cpp @@ -25,7 +25,7 @@ */ #include "ksvconfigwizard.h" -#include +#include #include #include diff --git a/ksysv/ksvdrag.cpp b/ksysv/ksvdrag.cpp index 7d94536..e524bef 100644 --- a/ksysv/ksvdrag.cpp +++ b/ksysv/ksvdrag.cpp @@ -65,7 +65,7 @@ const char* KSVDrag::format (int i) const } } -TQByteArray KSVDrag::encodedData (const char* format) const +TQByteArray KSVDrag::tqencodedData (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->encodedData ("application/x-ksysv"), IO_ReadOnly); + TQDataStream ds (mime->tqencodedData ("application/x-ksysv"), IO_ReadOnly); ds >> data; return true; diff --git a/ksysv/ksvdrag.h b/ksysv/ksvdrag.h index 3c2010c..00bb1a3 100644 --- a/ksysv/ksvdrag.h +++ b/ksysv/ksvdrag.h @@ -20,7 +20,7 @@ public: virtual ~KSVDrag(); virtual const char* format (int i) const; - TQByteArray encodedData (const char*) const; + TQByteArray tqencodedData (const char*) const; static bool decodeNative (const TQMimeSource*, KSVData&); diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp index 65a1b3e..6c57f55 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); - repaint(false); + tqrepaint(false); } void KSVDragList::setDefaultIcon (const TQPixmap& icon) @@ -532,7 +532,7 @@ void KSVDragList::startDrag () if (d) { - d->setPixmap (mItemToDrag->paintDragIcon (font(), colorGroup())); + d->setPixmap (mItemToDrag->paintDragIcon (font(), tqcolorGroup())); d->drag(); } @@ -762,7 +762,7 @@ void KSVDragList::setEnabled (bool enable) { if (!testWState(WState_Disabled)) { - if (focusWidget() == this) + if (tqfocusWidget() == 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(), colorGroup())); + d->setPixmap (mItemToDrag->paintDragIcon (font(), tqcolorGroup())); d->dragCopy(); } diff --git a/ksysv/ksvlookandfeel.cpp b/ksysv/ksvlookandfeel.cpp index 1a1a658..9c68cfb 100644 --- a/ksysv/ksvlookandfeel.cpp +++ b/ksysv/ksvlookandfeel.cpp @@ -26,7 +26,7 @@ #include "ksvlookandfeel.h" #include -#include +#include #include #include diff --git a/ksysv/ksvmiscconfig.cpp b/ksysv/ksvmiscconfig.cpp index 821fb9a..d894262 100644 --- a/ksysv/ksvmiscconfig.cpp +++ b/ksysv/ksvmiscconfig.cpp @@ -26,7 +26,7 @@ #include "ksvmiscconfig.h" #include -#include +#include #include diff --git a/ksysv/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui index 9a902a5..07911b3 100644 --- a/ksysv/lookandfeelconfig.ui +++ b/ksysv/lookandfeelconfig.ui @@ -82,7 +82,7 @@ 0 - + 200 0 @@ -110,7 +110,7 @@ 0 - + 200 0 @@ -133,7 +133,7 @@ Services: - + AlignVCenter|AlignRight @@ -149,7 +149,7 @@ Sorting numbers: - + AlignVCenter|AlignRight @@ -182,7 +182,7 @@ 0 - + 0 10 @@ -238,7 +238,7 @@ 0 - + 80 0 @@ -265,7 +265,7 @@ &Changed: - + AlignVCenter|AlignRight @@ -286,7 +286,7 @@ 0 - + 80 0 @@ -313,7 +313,7 @@ &New: - + AlignVCenter|AlignRight @@ -334,7 +334,7 @@ 0 - + 80 0 @@ -366,7 +366,7 @@ 0 - + 80 0 @@ -393,7 +393,7 @@ New && &selected: - + AlignVCenter|AlignRight @@ -409,7 +409,7 @@ Changed && s&elected: - + AlignVCenter|AlignRight @@ -432,7 +432,7 @@ Expanding - + 20 20 diff --git a/ksysv/miscconfig.ui b/ksysv/miscconfig.ui index ca19113..6d45733 100644 --- a/ksysv/miscconfig.ui +++ b/ksysv/miscconfig.ui @@ -83,7 +83,7 @@ Expanding - + 20 20 @@ -130,7 +130,7 @@ 0 - + 0 10 @@ -153,7 +153,7 @@ Expanding - + 20 20 diff --git a/ksysv/pathconfig.ui b/ksysv/pathconfig.ui index 109a9e8..051e267 100644 --- a/ksysv/pathconfig.ui +++ b/ksysv/pathconfig.ui @@ -94,7 +94,7 @@ 0 - + 100 0 @@ -134,7 +134,7 @@ 0 - + 0 10 @@ -198,7 +198,7 @@ 0 - + 100 0 @@ -236,7 +236,7 @@ Expanding - + 20 20 diff --git a/ksysv/trash.cpp b/ksysv/trash.cpp index aab746c..089ebe5 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(sizeHint()); + setMinimumSize(tqsizeHint()); setAcceptDrops(true); mLabel->installEventFilter(this); @@ -75,7 +75,7 @@ void KSVTrash::dropEvent (TQDropEvent* e) if (mOpen) { - mLabel->repaint(); + mLabel->tqrepaint(); mOpen = false; } } @@ -102,7 +102,7 @@ void KSVTrash::dragLeaveEvent ( TQDragLeaveEvent* ) { if (mOpen) { - mLabel->repaint(); + mLabel->tqrepaint(); mOpen = false; } } @@ -131,7 +131,7 @@ bool KSVTrash::eventFilter( TQObject *, TQEvent *e ) } } -TQSize KSVTrash::sizeHint() const +TQSize KSVTrash::tqsizeHint() const { static TQSize size = TQSize (mPixmapWidth + 2 * 5, mPixmapWidth + 2 * 7); diff --git a/ksysv/trash.h b/ksysv/trash.h index 13596a4..eb62562 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 sizeHint() const; + virtual TQSize tqsizeHint() const; protected: /** -- cgit v1.2.1