From 955e20356d63ed405198c8143617a8a0ca8bfc02 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:17 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit bf280726d5d22f33d33e4f9e771220c725249407. --- kmilo/asus/asus.cpp | 2 +- kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui | 8 +++--- kmilo/kmilo_kvaio/kcmkvaio/main.cpp | 10 ++++---- kmilo/kmilo_kvaio/kvaio.cpp | 30 +++++++++++------------ kmilo/kmilo_kvaio/kvaio.h | 4 +-- kmilo/kmilo_kvaio/kvaiodriverinterface.cpp | 2 +- kmilo/kmilo_kvaio/kvaiodriverinterface.h | 2 +- kmilo/kmilod/defaultskin.cpp | 6 ++--- kmilo/kmilod/defaultwidget.ui | 4 +-- kmilo/powerbook2/pb_monitor.cpp | 2 +- kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui | 2 +- kmilo/thinkpad/kcmthinkpad/main.cpp | 10 ++++---- 12 files changed, 41 insertions(+), 41 deletions(-) (limited to 'kmilo') diff --git a/kmilo/asus/asus.cpp b/kmilo/asus/asus.cpp index 1af8780..a83235d 100644 --- a/kmilo/asus/asus.cpp +++ b/kmilo/asus/asus.cpp @@ -183,7 +183,7 @@ bool AsusMonitor::readProc(asus_state_struct* asus_state) int AsusMonitor::readProcEntry(const TQString &name) { - TQFile f(TQString("/proc/acpi/asus/%1").arg(name).local8Bit()); + TQFile f(TQString("/proc/acpi/asus/%1").tqarg(name).local8Bit()); if (f.open(IO_ReadOnly)) { diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui index 27778ef..c9ad68b 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui +++ b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui @@ -71,7 +71,7 @@ Remaining battery capacity: - + AlignVCenter|AlignRight @@ -109,7 +109,7 @@ AC - + AlignVCenter|AlignLeft @@ -150,7 +150,7 @@ Bat 1 - + AlignVCenter|AlignLeft @@ -186,7 +186,7 @@ Bat 2 - + AlignVCenter|AlignLeft diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index 52a5e68..0624c1e 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include #include @@ -61,10 +61,10 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList "mirko@kde.org"); setAboutData( about ); - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); mKVaioGeneral = new KCMKVaioGeneral(this); - layout->addWidget( mKVaioGeneral ); - layout->addStretch(); + tqlayout->addWidget( mKVaioGeneral ); + tqlayout->addStretch(); mDriver = new KVaioDriverInterface(TQT_TQOBJECT(this)); mDriverAvailable = mDriver->connectToDriver(false); @@ -156,7 +156,7 @@ void KVaioModule::timeout() bool bat1Avail = false, bat2Avail = false, acConnected = false; int bat1Remaining = 0, bat1Max = 0, bat2Remaining = 0, bat2Max = 0; - if(mDriver->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max, + if(mDriver->getBatterytqStatus(bat1Avail, bat1Remaining, bat1Max, bat2Avail, bat2Remaining, bat2Max, acConnected) ) { diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index 437d188..3f52ae9 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -163,7 +163,7 @@ void KVaio::slotVaioEvent(int event) case SONYPI_EVENT_BACK_PRESSED: if (mShowPowerStatusOnBackButton) { - showBatteryStatus (true); + showBatterytqStatus (true); } break; default: @@ -306,7 +306,7 @@ void KVaio::loadConfiguration(KConfig *k) mReportUnknownEvents = k->readBoolEntry("Report_Unknown_Events", false); - mReportPowerStatus = + mReportPowertqStatus = k->readBoolEntry("PeriodicallyReportPowerStatus", false); mShowPowerStatusOnBackButton = k->readBoolEntry("PowerStatusOnBackButton", true); @@ -315,7 +315,7 @@ void KVaio::loadConfiguration(KConfig *k) << " mReportUnknownEvents: " << mReportUnknownEvents << endl << " mReportPowerStatus: " - << mReportPowerStatus << endl + << mReportPowertqStatus << endl << "mShowPowerStatusOnBackButton: " << mShowPowerStatusOnBackButton << endl; } @@ -327,31 +327,31 @@ const KVaioDriverInterface* KVaio::driver() void KVaio::slotTimeout () { - showBatteryStatus (); + showBatterytqStatus (); mTimer->start (4000, true); } -bool KVaio::showBatteryStatus ( bool force ) +bool KVaio::showBatterytqStatus ( bool force ) { static bool acConnectedCache = false; static int previousChargeCache = -1; bool bat1Avail = false, bat2Avail = false, acConnected = false; int bat1Remaining = 0, bat1Max = 0, bat2Remaining = 0, bat2Max = 0; bool displayBatteryMsg = false; - bool displayACStatus = false; + bool displayACtqStatus = false; TQString text, acMsg; TQTextStream stream(text, IO_WriteOnly); // ----- - // only display on startup if mReportPowerStatus is true: - if (mReportPowerStatus==false || !force) + // only display on startup if mReportPowertqStatus is true: + if (mReportPowertqStatus==false || !force) { return true; } // query all necessary information: - (void) mDriver->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max, + (void) mDriver->getBatterytqStatus(bat1Avail, bat1Remaining, bat1Max, bat2Avail, bat2Remaining, bat2Max, acConnected); @@ -364,7 +364,7 @@ bool KVaio::showBatteryStatus ( bool force ) if (acConnectedCache != acConnected || force) { - displayACStatus = true; + displayACtqStatus = true; acConnectedCache = acConnected; } @@ -379,10 +379,10 @@ bool KVaio::showBatteryStatus ( bool force ) } // ----- prepare text messages - if (displayACStatus || displayBatteryMsg) + if (displayACtqStatus || displayBatteryMsg) { - if (displayACStatus) + if (displayACtqStatus) { acMsg = acConnected ? i18n ("AC Connected") : i18n ("AC Disconnected"); } @@ -397,7 +397,7 @@ bool KVaio::showBatteryStatus ( bool force ) case 3: case 2: case 1: - stream << i18n("Caution: Battery is Almost Empty (%1% remaining).").arg(remaining); + stream << i18n("Caution: Battery is Almost Empty (%1% remaining).").tqarg(remaining); break; case 0: stream << i18n("Alert: Battery is Empty!"); @@ -406,11 +406,11 @@ bool KVaio::showBatteryStatus ( bool force ) stream << i18n("No Battery Inserted."); break; default: - stream << i18n("Remaining Battery Capacity: %1%").arg( remaining ); + stream << i18n("Remaining Battery Capacity: %1%").tqarg( remaining ); }; // show a message if the battery status changed by more then 10% or on startup - if (displayACStatus) + if (displayACtqStatus) { stream << endl << acMsg; } diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h index ba2bf98..c012c66 100644 --- a/kmilo/kmilo_kvaio/kvaio.h +++ b/kmilo/kmilo_kvaio/kvaio.h @@ -74,7 +74,7 @@ protected: bool isKMiloDAvailable(); bool showTextMsg(const TQString& msg); bool showProgressMsg(const TQString& msg, int progress); - bool showBatteryStatus ( bool force = false); + bool showBatterytqStatus ( bool force = false); protected slots: void slotVaioEvent(int); void slotTimeout(); @@ -106,7 +106,7 @@ private: int m_BrightnessStep; bool mReportUnknownEvents; - bool mReportPowerStatus; + bool mReportPowertqStatus; bool mShowPowerStatusOnBackButton; TQTimer *mTimer; }; diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp index 088ae51..3aa8e4f 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp @@ -162,7 +162,7 @@ void KVaioDriverInterface::setBrightness(int value) } } -bool KVaioDriverInterface::getBatteryStatus( +bool KVaioDriverInterface::getBatterytqStatus( bool& bat1Avail, int& bat1Remaining, int& bat1Max, bool& bat2Avail, int& bat2Remaining, int& bat2Max, bool& acConnected) diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h index 2d051c2..2cf7fee 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h @@ -43,7 +43,7 @@ public: 255. Returns -1 if the setting cannot be retrieved. */ int brightness(); /** Get the battery status. */ - bool getBatteryStatus(bool& bat1Avail, int& bat1Remaining, int& bat1Max, + bool getBatterytqStatus(bool& bat1Avail, int& bat1Remaining, int& bat1Max, bool& bat2Avail, int& bat2Remaining, int& bat2Max, bool& acConnected); public slots: diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp index 6bc35c7..7271ea3 100644 --- a/kmilo/kmilod/defaultskin.cpp +++ b/kmilo/kmilod/defaultskin.cpp @@ -100,10 +100,10 @@ void DefaultSkin::show() { #if KDE_IS_VERSION(3,1,90) TQRect r = KGlobalSettings::splashScreenDesktopGeometry(); #else - TQRect r = TQApplication::desktop()->geometry(); + TQRect r = TQApplication::desktop()->tqgeometry(); #endif - // _label->resize(_label->minimumSizeHint()); - // _widget->resize(_label->minimumSizeHint()); + // _label->resize(_label->tqminimumSizeHint()); + // _widget->resize(_label->tqminimumSizeHint()); _widget->move(r.center() - TQPoint(_widget->width()/2, _widget->height()/2)); _widget->show(); diff --git a/kmilo/kmilod/defaultwidget.ui b/kmilo/kmilod/defaultwidget.ui index 77bc3f3..c987ed3 100644 --- a/kmilo/kmilod/defaultwidget.ui +++ b/kmilo/kmilod/defaultwidget.ui @@ -33,7 +33,7 @@ Released under the terms of the GNU GPL. - + AlignCenter @@ -57,7 +57,7 @@ Released under the terms of the GNU GPL. - + AlignCenter diff --git a/kmilo/powerbook2/pb_monitor.cpp b/kmilo/powerbook2/pb_monitor.cpp index 313a32d..cf3b927 100644 --- a/kmilo/powerbook2/pb_monitor.cpp +++ b/kmilo/powerbook2/pb_monitor.cpp @@ -98,7 +98,7 @@ Monitor::DisplayType PowerBookMonitor::poll() { rc = Monitor::Tap; TQString marg = tpmodes[ tag->data & 3 ]; - m_message = i18n( "Operating mode set to: %1." ).arg( marg ); + m_message = i18n( "Operating mode set to: %1." ).tqarg( marg ); } break; default: diff --git a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui index 5fb8d90..47d3874 100644 --- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui +++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui @@ -62,7 +62,7 @@ - layout27 + tqlayout27 diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index 31a9417..7ad2b08 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include #include #include @@ -68,10 +68,10 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T "jr@jriddell.org"); setAboutData( about ); - TQVBoxLayout* layout = new TQVBoxLayout(this); + TQVBoxLayout* tqlayout = new TQVBoxLayout(this); m_KCMThinkpadGeneral = new KCMThinkpadGeneral(this); - layout->addWidget( m_KCMThinkpadGeneral ); - layout->addStretch(); + tqlayout->addWidget( m_KCMThinkpadGeneral ); + tqlayout->addStretch(); load(); @@ -116,7 +116,7 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T "R30/R31 models and to use a custom volume " "change step, set the nvram device to world " "writeable: chmod 666 " - "/dev/nvram").arg(m_nvramFile)); + "/dev/nvram").tqarg(m_nvramFile)); #endif } else { m_KCMThinkpadGeneral->tlOff->setText(i18n("Thinkpad Buttons KMilo Plugin Ready For Configuration")); -- cgit v1.2.1