From b836ed566cdce05ae8408705487cd10a423f3a90 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:28:18 -0600 Subject: Rename old tq methods that no longer need a unique name --- ksysv/IOCore.cpp | 10 +++++----- ksysv/OldView.cpp | 8 ++++---- ksysv/PreferencesDialog.cpp | 2 +- ksysv/Properties.cpp | 2 +- ksysv/RunlevelAuthIcon.cpp | 2 +- ksysv/ServiceDlg.cpp | 6 +++--- ksysv/TopWidget.cpp | 28 ++++++++++++++-------------- ksysv/configwizard.ui | 12 ++++++------ ksysv/kdltooltip.cpp | 4 ++-- ksysv/kscroller.cpp | 18 +++++++++--------- ksysv/kscroller.h | 6 +++--- ksysv/ksvdrag.cpp | 4 ++-- ksysv/ksvdrag.h | 2 +- ksysv/ksvdraglist.cpp | 6 +++--- ksysv/lookandfeelconfig.ui | 16 ++++++++-------- ksysv/miscconfig.ui | 6 +++--- ksysv/pathconfig.ui | 8 ++++---- ksysv/trash.cpp | 4 ++-- ksysv/trash.h | 2 +- 19 files changed, 73 insertions(+), 73 deletions(-) (limited to 'ksysv') diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp index 8c7dc90..001227d 100644 --- a/ksysv/IOCore.cpp +++ b/ksysv/IOCore.cpp @@ -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").tqarg(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..2a7523c 100644 --- a/ksysv/OldView.cpp +++ b/ksysv/OldView.cpp @@ -1062,16 +1062,16 @@ 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); diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp index 2c92baa..06c7097 100644 --- a/ksysv/PreferencesDialog.cpp +++ b/ksysv/PreferencesDialog.cpp @@ -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..aee06bf 100644 --- a/ksysv/Properties.cpp +++ b/ksysv/Properties.cpp @@ -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..e766e77 100644 --- a/ksysv/RunlevelAuthIcon.cpp +++ b/ksysv/RunlevelAuthIcon.cpp @@ -37,7 +37,7 @@ 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); diff --git a/ksysv/ServiceDlg.cpp b/ksysv/ServiceDlg.cpp index b4687d6..4b7d4ef 100644 --- a/ksysv/ServiceDlg.cpp +++ b/ksysv/ServiceDlg.cpp @@ -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..4dedbe3 100644 --- a/ksysv/TopWidget.cpp +++ b/ksysv/TopWidget.cpp @@ -87,12 +87,12 @@ #include #include -namespace tqStatus +namespace Status { enum { Changed, Checklist, Writable }; -} // namespace tqStatus +} // namespace Status KSVTopLevel::KSVTopLevel() : KMainWindow(0, 0L, WStyle_ContextHelp|WDestructiveClose), @@ -428,14 +428,14 @@ void KSVTopLevel::initStatusBar() "recommended though, due to security issues.

") .tqarg (kapp->aboutData()->programName()).tqarg(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() { @@ -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) @@ -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("

Printed on %1



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

Printed on %1



").tqarg(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; @@ -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..7255ac6 100644 --- a/ksysv/configwizard.ui +++ b/ksysv/configwizard.ui @@ -137,7 +137,7 @@ Expanding - tqsizeHint + sizeHint 20 20 @@ -281,7 +281,7 @@ Expanding - tqsizeHint + sizeHint 20 20 @@ -367,7 +367,7 @@ mServicesPath - tqminimumSize + minimumSize 100 0 @@ -430,7 +430,7 @@ - tqminimumSize + minimumSize 0 10 @@ -489,7 +489,7 @@ mRunlevelPath - tqminimumSize + minimumSize 100 0 @@ -544,7 +544,7 @@ Expanding - tqsizeHint + sizeHint 20 20 diff --git a/ksysv/kdltooltip.cpp b/ksysv/kdltooltip.cpp index 95af765..1ff34e2 100644 --- a/ksysv/kdltooltip.cpp +++ b/ksysv/kdltooltip.cpp @@ -73,7 +73,7 @@ void KDLToolTip::maybeTip (const TQPoint& p) } 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..f79e521 100644 --- a/ksysv/kscroller.cpp +++ b/ksysv/kscroller.cpp @@ -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/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..f4e8770 100644 --- a/ksysv/ksvdraglist.cpp +++ b/ksysv/ksvdraglist.cpp @@ -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/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui index 07911b3..75fefc8 100644 --- a/ksysv/lookandfeelconfig.ui +++ b/ksysv/lookandfeelconfig.ui @@ -82,7 +82,7 @@ 0 - + 200 0 @@ -110,7 +110,7 @@ 0 - + 200 0 @@ -182,7 +182,7 @@ 0 - + 0 10 @@ -238,7 +238,7 @@ 0 - + 80 0 @@ -286,7 +286,7 @@ 0 - + 80 0 @@ -334,7 +334,7 @@ 0 - + 80 0 @@ -366,7 +366,7 @@ 0 - + 80 0 @@ -432,7 +432,7 @@ Expanding - + 20 20 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 @@ 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 051e267..109a9e8 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 089ebe5..1ecf522 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); @@ -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: /** -- cgit v1.2.1