From bc5f7885f33854441e4cdd977b3411f9d458bf75 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 16 Feb 2014 11:41:12 -0600 Subject: [PATCH] Fix unintended renaming --- src/configuredialog.cpp | 12 ++++++------ src/kpowersave.cpp | 26 +++++++++++++------------- src/kpowersave.h | 4 ++-- src/settings.cpp | 12 ++++++------ src/settings.h | 6 +++--- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp index 6932fc5..d4902b1 100644 --- a/src/configuredialog.cpp +++ b/src/configuredialog.cpp @@ -1785,13 +1785,13 @@ TQString ConfigureDialog::mapActionToDescription( TQString action ) { } else if (action.startsWith("SUSPEND2RAM")) { if (actions.contains("Suspend to RAM")) ret = i18n("Suspend to RAM"); - } else if (action.startsWith("CPUFRETQ_POWERSAVE")) { + } else if (action.startsWith("CPUFREQ_POWERSAVE")) { if (hwinfo->supportCPUFreq()) ret = i18n("CPU Powersave policy"); - } else if (action.startsWith("CPUFRETQ_DYNAMIC")) { + } else if (action.startsWith("CPUFREQ_DYNAMIC")) { if (hwinfo->supportCPUFreq()) ret = i18n("CPU Dynamic policy"); - } else if (action.startsWith("CPUFRETQ_PERFORMANCE")) { + } else if (action.startsWith("CPUFREQ_PERFORMANCE")) { if (hwinfo->supportCPUFreq()) ret = i18n("CPU Performance policy"); } else if (action.startsWith("BRIGHTNESS")) { @@ -1826,13 +1826,13 @@ TQString ConfigureDialog::mapDescriptionToAction( TQString description ) { ret = "SUSPEND2RAM"; } else if (description.startsWith("CPU Powersave policy") || description.startsWith(i18n("CPU Powersave policy"))) { - ret = "CPUFRETQ_POWERSAVE"; + ret = "CPUFREQ_POWERSAVE"; } else if (description.startsWith("CPU Dynamic policy") || description.startsWith(i18n("CPU Dynamic policy"))) { - ret = "CPUFRETQ_DYNAMIC"; + ret = "CPUFREQ_DYNAMIC"; } else if (description.startsWith("CPU Performance policy") || description.startsWith(i18n("CPU Performance policy"))) { - ret = "CPUFRETQ_PERFORMANCE"; + ret = "CPUFREQ_PERFORMANCE"; } else if (description.startsWith("Set Brightness to") || description.startsWith(i18n("Set Brightness to"))) { ret = "BRIGHTNESS"; diff --git a/src/kpowersave.cpp b/src/kpowersave.cpp index b73420e..d6d98c2 100644 --- a/src/kpowersave.cpp +++ b/src/kpowersave.cpp @@ -196,9 +196,9 @@ void kpowersave::initMenu() { speed_menu->insertItem(i18n("Dynamic"), DYNAMIC); speed_menu->insertItem(i18n("Powersave"), POWERSAVE); - CPUFRETQ_SEPARATOR_MENU_ID = contextMenu()->insertSeparator(); + CPUFREQ_SEPARATOR_MENU_ID = contextMenu()->insertSeparator(); - CPUFRETQ_MENU_ID = contextMenu()->insertItem(i18n("Set CPU Frequency Policy"), speed_menu); + CPUFREQ_MENU_ID = contextMenu()->insertItem(i18n("Set CPU Frequency Policy"), speed_menu); connect(speed_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(do_setSpeedPolicy(int))); connect(hwinfo, TQT_SIGNAL(currentCPUFreqPolicyChanged()), this, TQT_SLOT(updateCPUFreqMenu())); @@ -1299,7 +1299,7 @@ void kpowersave::_quit (){ } /*! - * \b TQT_SLOT called if the user select a 'CPU Frequency Policy' from the menu ( \ref CPUFRETQ_MENU_ID ). + * \b TQT_SLOT called if the user select a 'CPU Frequency Policy' from the menu ( \ref CPUFREQ_MENU_ID ). */ void kpowersave::do_setSpeedPolicy(int menu_id){ if (trace) kdDebug() << funcinfo << "IN: " << "menu_id/set policy to: " << menu_id << endl; @@ -1452,9 +1452,9 @@ void kpowersave::updateCPUFreqMenu(){ if (hwinfo->supportCPUFreq() && hwinfo->isOnline() && hwinfo->isCpuFreqAllowed()) { /* set CPU frequency menu entries *********/ /* speed menu has id 3 in context menu */ - contextMenu()->setItemVisible(CPUFRETQ_MENU_ID, true); - contextMenu()->setItemEnabled(CPUFRETQ_MENU_ID, true); - contextMenu()->setItemVisible(CPUFRETQ_SEPARATOR_MENU_ID, true); + contextMenu()->setItemVisible(CPUFREQ_MENU_ID, true); + contextMenu()->setItemEnabled(CPUFREQ_MENU_ID, true); + contextMenu()->setItemVisible(CPUFREQ_SEPARATOR_MENU_ID, true); switch (hwinfo->getCurrentCPUFreqPolicy()){ case PERFORMANCE: @@ -1478,13 +1478,13 @@ void kpowersave::updateCPUFreqMenu(){ if (!speed_menu) { return ; } else if (hwinfo->supportCPUFreq() && (hwinfo->isCpuFreqAllowed() != 1)) { - contextMenu()->setItemEnabled(CPUFRETQ_MENU_ID, false); - contextMenu()->setItemVisible(CPUFRETQ_SEPARATOR_MENU_ID, true); + contextMenu()->setItemEnabled(CPUFREQ_MENU_ID, false); + contextMenu()->setItemVisible(CPUFREQ_SEPARATOR_MENU_ID, true); } else{ /* there were CPU freq policies, but they are not accessible any more */ /* delete speed_menu */ - contextMenu()->setItemVisible(CPUFRETQ_MENU_ID, false); - contextMenu()->setItemVisible(CPUFRETQ_SEPARATOR_MENU_ID, false); + contextMenu()->setItemVisible(CPUFREQ_MENU_ID, false); + contextMenu()->setItemVisible(CPUFREQ_SEPARATOR_MENU_ID, false); } } @@ -2088,13 +2088,13 @@ void kpowersave::handleActionCall ( action action, int value , bool checkAC, boo case BRIGHTNESS: hwinfo->setBrightness( -1, value ); break; - case CPUFRETQ_POWERSAVE: + case CPUFREQ_POWERSAVE: hwinfo->setCPUFreq( POWERSAVE ); break; - case CPUFRETQ_DYNAMIC: + case CPUFREQ_DYNAMIC: hwinfo->setCPUFreq( DYNAMIC, settings->cpuFreqDynamicPerformance ); break; - case CPUFRETQ_PERFORMANCE: + case CPUFREQ_PERFORMANCE: hwinfo->setCPUFreq( PERFORMANCE ); break; case SWITCH_SCHEME: // not supported atm diff --git a/src/kpowersave.h b/src/kpowersave.h index e78c7bf..74cdb8f 100644 --- a/src/kpowersave.h +++ b/src/kpowersave.h @@ -200,10 +200,10 @@ private: int STANDBY_MENU_ID; //! a menu seperator ID /*! contains the ID of the separator between sleep-states-entries and the cpufreq-submenu */ - int CPUFRETQ_SEPARATOR_MENU_ID; + int CPUFREQ_SEPARATOR_MENU_ID; //! a submenu ID /*! contains the ID of the cpufreq sub menu*/ - int CPUFRETQ_MENU_ID; + int CPUFREQ_MENU_ID; //! a menu seperator ID /*! contains the ID of the separator between cpufreq- and scheme-submenu*/ int SCHEME_SEPARATOR_MENU_ID; diff --git a/src/settings.cpp b/src/settings.cpp index ea1aa4a..34285e3 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -332,12 +332,12 @@ action Settings::mapActionToType (TQString _action) { return GO_SUSPEND2DISK; } else if (_action.startsWith("SUSPEND2RAM")) { return GO_SUSPEND2RAM; - } else if (_action.startsWith("CPUFRETQ_POWERSAVE")) { - return CPUFRETQ_POWERSAVE; - } else if (_action.startsWith("CPUFRETQ_DYNAMIC")) { - return CPUFRETQ_DYNAMIC; - } else if (_action.startsWith("CPUFRETQ_PERFORMANCE")) { - return CPUFRETQ_PERFORMANCE; + } else if (_action.startsWith("CPUFREQ_POWERSAVE")) { + return CPUFREQ_POWERSAVE; + } else if (_action.startsWith("CPUFREQ_DYNAMIC")) { + return CPUFREQ_DYNAMIC; + } else if (_action.startsWith("CPUFREQ_PERFORMANCE")) { + return CPUFREQ_PERFORMANCE; } else if (_action.startsWith("BRIGHTNESS")) { return BRIGHTNESS; } else { diff --git a/src/settings.h b/src/settings.h index 9a083a0..b972583 100644 --- a/src/settings.h +++ b/src/settings.h @@ -44,9 +44,9 @@ enum action{ GO_SUSPEND2DISK, SWITCH_SCHEME, BRIGHTNESS, - CPUFRETQ_POWERSAVE, - CPUFRETQ_DYNAMIC, - CPUFRETQ_PERFORMANCE + CPUFREQ_POWERSAVE, + CPUFREQ_DYNAMIC, + CPUFREQ_PERFORMANCE }; /*!