From bcc684e28ad6f9ebeeae5d334a4dc297cef3e816 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:35:27 -0600 Subject: Rename old tq methods that no longer need a unique name --- kmilo/kmilo_kvaio/kcmkvaio/main.cpp | 2 +- kmilo/kmilo_kvaio/kvaio.cpp | 26 +++++++++++++------------- kmilo/kmilo_kvaio/kvaio.h | 4 ++-- kmilo/kmilo_kvaio/kvaiodriverinterface.cpp | 2 +- kmilo/kmilo_kvaio/kvaiodriverinterface.h | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kmilo/kmilo_kvaio') diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index 0624c1e..e5d9f67 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -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->getBatterytqStatus(bat1Avail, bat1Remaining, bat1Max, + if(mDriver->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max, bat2Avail, bat2Remaining, bat2Max, acConnected) ) { diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index 3f52ae9..ff97087 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) { - showBatterytqStatus (true); + showBatteryStatus (true); } break; default: @@ -306,7 +306,7 @@ void KVaio::loadConfiguration(KConfig *k) mReportUnknownEvents = k->readBoolEntry("Report_Unknown_Events", false); - mReportPowertqStatus = + mReportPowerStatus = k->readBoolEntry("PeriodicallyReportPowerStatus", false); mShowPowerStatusOnBackButton = k->readBoolEntry("PowerStatusOnBackButton", true); @@ -315,7 +315,7 @@ void KVaio::loadConfiguration(KConfig *k) << " mReportUnknownEvents: " << mReportUnknownEvents << endl << " mReportPowerStatus: " - << mReportPowertqStatus << endl + << mReportPowerStatus << endl << "mShowPowerStatusOnBackButton: " << mShowPowerStatusOnBackButton << endl; } @@ -327,31 +327,31 @@ const KVaioDriverInterface* KVaio::driver() void KVaio::slotTimeout () { - showBatterytqStatus (); + showBatteryStatus (); mTimer->start (4000, true); } -bool KVaio::showBatterytqStatus ( bool force ) +bool KVaio::showBatteryStatus ( 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 displayACtqStatus = false; + bool displayACStatus = false; TQString text, acMsg; TQTextStream stream(text, IO_WriteOnly); // ----- - // only display on startup if mReportPowertqStatus is true: - if (mReportPowertqStatus==false || !force) + // only display on startup if mReportPowerStatus is true: + if (mReportPowerStatus==false || !force) { return true; } // query all necessary information: - (void) mDriver->getBatterytqStatus(bat1Avail, bat1Remaining, bat1Max, + (void) mDriver->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max, bat2Avail, bat2Remaining, bat2Max, acConnected); @@ -364,7 +364,7 @@ bool KVaio::showBatterytqStatus ( bool force ) if (acConnectedCache != acConnected || force) { - displayACtqStatus = true; + displayACStatus = true; acConnectedCache = acConnected; } @@ -379,10 +379,10 @@ bool KVaio::showBatterytqStatus ( bool force ) } // ----- prepare text messages - if (displayACtqStatus || displayBatteryMsg) + if (displayACStatus || displayBatteryMsg) { - if (displayACtqStatus) + if (displayACStatus) { acMsg = acConnected ? i18n ("AC Connected") : i18n ("AC Disconnected"); } @@ -410,7 +410,7 @@ bool KVaio::showBatterytqStatus ( bool force ) }; // show a message if the battery status changed by more then 10% or on startup - if (displayACtqStatus) + if (displayACStatus) { stream << endl << acMsg; } diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h index c012c66..ba2bf98 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 showBatterytqStatus ( bool force = false); + bool showBatteryStatus ( bool force = false); protected slots: void slotVaioEvent(int); void slotTimeout(); @@ -106,7 +106,7 @@ private: int m_BrightnessStep; bool mReportUnknownEvents; - bool mReportPowertqStatus; + bool mReportPowerStatus; bool mShowPowerStatusOnBackButton; TQTimer *mTimer; }; diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp index 3aa8e4f..088ae51 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp @@ -162,7 +162,7 @@ void KVaioDriverInterface::setBrightness(int value) } } -bool KVaioDriverInterface::getBatterytqStatus( +bool KVaioDriverInterface::getBatteryStatus( 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 2cf7fee..2d051c2 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 getBatterytqStatus(bool& bat1Avail, int& bat1Remaining, int& bat1Max, + bool getBatteryStatus(bool& bat1Avail, int& bat1Remaining, int& bat1Max, bool& bat2Avail, int& bat2Remaining, int& bat2Max, bool& acConnected); public slots: -- cgit v1.2.3