TDE
/
tdepowersave
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepowersave
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix improper use of TQString::ascii().

Browse Source 
This resolves issue #4.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/5/head
Slávek Banko 5 years ago
parent bf279c7e8c
commit 1ae603d7a9
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
src/configuredialog.cpp
Unescape View File

@ -155,7 +155,7 @@ void ConfigureDialog::setSchemeList(){
cB_batteryScheme->clear(); cB_batteryScheme->clear();
for ( TQStringList::Iterator it = schemes.begin(); it != schemes.end(); ++it ) { for ( TQStringList::Iterator it = schemes.begin(); it != schemes.end(); ++it ) {
const char *_tmp = (*it).ascii(); const char *_tmp = (*it).utf8();
if((*it) == "Performance" || (*it) == i18n("Performance")) { if((*it) == "Performance" || (*it) == i18n("Performance")) {
listBox_schemes->insertItem(SmallIcon("scheme_power", TQIconSet::Automatic), i18n(_tmp)); listBox_schemes->insertItem(SmallIcon("scheme_power", TQIconSet::Automatic), i18n(_tmp));
cB_acScheme->insertItem(i18n(_tmp)); cB_acScheme->insertItem(i18n(_tmp));
@ -1291,7 +1291,7 @@ void ConfigureDialog::setInactivityBox(){
// actions.append("Turn Off Computer"); // actions.append("Turn Off Computer");
for ( TQStringList::Iterator it = actions.begin(); it != actions.end(); ++it ) { for ( TQStringList::Iterator it = actions.begin(); it != actions.end(); ++it ) {
cB_autoInactivity->insertItem( i18n( (*it).ascii() ) ); cB_autoInactivity->insertItem( i18n( (*it).utf8() ) );
} }
kdDebugFuncOut(trace); kdDebugFuncOut(trace);

4
src/detaileddialog.cpp
Unescape View File

@ -356,7 +356,7 @@ void detaileddialog::setProcessorThrottling() {
// get max cpu freq and set it to the max of the progressbar // get max cpu freq and set it to the max of the progressbar
ProcessorPBar[i]->setTotalSteps(100); ProcessorPBar[i]->setTotalSteps(100);
TQString ProgressString = TQString("%1% (%2 MHz)").arg(100 - cpuInfo->cpu_throttling[i]).arg(cpuInfo->cpufreq_speed[i]); TQString ProgressString = TQString("%1% (%2 MHz)").arg(100 - cpuInfo->cpu_throttling[i]).arg(cpuInfo->cpufreq_speed[i]);
ProcessorPBar[i]->setFormat(i18n(ProgressString.ascii())); ProcessorPBar[i]->setFormat(i18n(ProgressString.utf8()));
ProcessorPBar[i]->setProgress(100 - cpuInfo->cpu_throttling[i]); ProcessorPBar[i]->setProgress(100 - cpuInfo->cpu_throttling[i]);
ProcessorPBar[i]->setEnabled(true); ProcessorPBar[i]->setEnabled(true);
} else if (cpuInfo->cpufreq_speed[i] < 0) { } else if (cpuInfo->cpufreq_speed[i] < 0) {
@ -411,7 +411,7 @@ void detaileddialog::setInfos() {
if(!config->currentScheme.isEmpty()) if(!config->currentScheme.isEmpty())
display += i18n("Current Scheme: ") + "\n"; display += i18n("Current Scheme: ") + "\n";
displayValue += i18n(config->currentScheme.ascii()) + "\n"; displayValue += i18n(config->currentScheme.utf8()) + "\n";
if(config->currentScheme == config->ac_scheme) if(config->currentScheme == config->ac_scheme)
InfoPictogram->setPixmap(SmallIcon("scheme_power", 22)); InfoPictogram->setPixmap(SmallIcon("scheme_power", 22));
else if(config->currentScheme == config->battery_scheme) else if(config->currentScheme == config->battery_scheme)

46
src/tdepowersave.cpp
Unescape View File

@ -197,7 +197,7 @@ void tdepowersave::initMenu() {
SUSPEND_HYBRID_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_disk", SUSPEND_HYBRID_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_disk",
TQIconSet::Automatic), i18n("Hybrid Suspend"), this, TQT_SLOT(do_suspend_hybrid())); TQIconSet::Automatic), i18n("Hybrid Suspend"), this, TQT_SLOT(do_suspend_hybrid()));
speed_menu = new TQPopupMenu(this, i18n("Set CPU Frequency Policy").ascii()); speed_menu = new TQPopupMenu(this, i18n("Set CPU Frequency Policy").utf8());
speed_menu->insertItem(i18n("Performance"), PERFORMANCE); speed_menu->insertItem(i18n("Performance"), PERFORMANCE);
speed_menu->insertItem(i18n("Dynamic"), DYNAMIC); speed_menu->insertItem(i18n("Dynamic"), DYNAMIC);
speed_menu->insertItem(i18n("Powersave"), POWERSAVE); speed_menu->insertItem(i18n("Powersave"), POWERSAVE);
@ -211,7 +211,7 @@ void tdepowersave::initMenu() {
SCHEME_SEPARATOR_MENU_ID = contextMenu()->insertSeparator(); SCHEME_SEPARATOR_MENU_ID = contextMenu()->insertSeparator();
scheme_menu = new TQPopupMenu(this, i18n("Set Active Scheme").ascii()); scheme_menu = new TQPopupMenu(this, i18n("Set Active Scheme").utf8());
SCHEME_MENU_ID = contextMenu()->insertItem(i18n("Set Active Scheme"), scheme_menu); SCHEME_MENU_ID = contextMenu()->insertItem(i18n("Set Active Scheme"), scheme_menu);
connect(scheme_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(do_setActiveScheme(int))); connect(scheme_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(do_setActiveScheme(int)));
@ -225,7 +225,7 @@ void tdepowersave::initMenu() {
HELP_SEPARATOR_MENU_ID = contextMenu()->insertSeparator(); HELP_SEPARATOR_MENU_ID = contextMenu()->insertSeparator();
help_menu = new TQPopupMenu(this, i18n("&Help").ascii()); help_menu = new TQPopupMenu(this, i18n("&Help").utf8());
help_menu->insertItem( SmallIcon("help", TQIconSet::Automatic), i18n("&TDEPowersave Handbook"), help_menu->insertItem( SmallIcon("help", TQIconSet::Automatic), i18n("&TDEPowersave Handbook"),
this, TQT_SLOT(slotHelp())); this, TQT_SLOT(slotHelp()));
@ -290,7 +290,7 @@ void tdepowersave::showConfigureDialog() {
else { else {
KPassivePopup::message(i18n("WARNING"), i18n("Cannot find any schemes."), KPassivePopup::message(i18n("WARNING"), i18n("Cannot find any schemes."),
SmallIcon("messagebox_warning", 20), this, SmallIcon("messagebox_warning", 20), this,
i18n("Warning").ascii(), 15000); i18n("Warning").utf8(), 15000);
} }
} else { } else {
configDlg->setWindowState((configDlg->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive); configDlg->setWindowState((configDlg->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
@ -723,7 +723,7 @@ bool tdepowersave::do_suspend2disk(){
} else { } else {
KPassivePopup::message( i18n("WARNING"),i18n("Hibernation failed"), KPassivePopup::message( i18n("WARNING"),i18n("Hibernation failed"),
SmallIcon("messagebox_warning", 20), this, SmallIcon("messagebox_warning", 20), this,
i18n("Warning").ascii(), 15000); i18n("Warning").utf8(), 15000);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
} }
@ -731,7 +731,7 @@ bool tdepowersave::do_suspend2disk(){
KPassivePopup::message( i18n("WARNING"), KPassivePopup::message( i18n("WARNING"),
i18n("Hibernation disabled by administrator."), i18n("Hibernation disabled by administrator."),
SmallIcon("messagebox_warning", 20), SmallIcon("messagebox_warning", 20),
this, i18n("Warning").ascii(), 15000); this, i18n("Warning").utf8(), 15000);
this->contextMenu()->setItemEnabled(SUSPEND2DISK_MENU_ID, false); this->contextMenu()->setItemEnabled(SUSPEND2DISK_MENU_ID, false);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
@ -779,7 +779,7 @@ bool tdepowersave::do_suspend_hybrid(){
} else { } else {
KPassivePopup::message( i18n("WARNING"),i18n("Hybrid Suspend failed"), KPassivePopup::message( i18n("WARNING"),i18n("Hybrid Suspend failed"),
SmallIcon("messagebox_warning", 20), this, SmallIcon("messagebox_warning", 20), this,
i18n("Warning").ascii(), 15000); i18n("Warning").utf8(), 15000);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
} }
@ -787,7 +787,7 @@ bool tdepowersave::do_suspend_hybrid(){
KPassivePopup::message( i18n("WARNING"), KPassivePopup::message( i18n("WARNING"),
i18n("Hybrid Suspend disabled by administrator."), i18n("Hybrid Suspend disabled by administrator."),
SmallIcon("messagebox_warning", 20), SmallIcon("messagebox_warning", 20),
this, i18n("Warning").ascii(), 15000); this, i18n("Warning").utf8(), 15000);
this->contextMenu()->setItemEnabled(SUSPEND_HYBRID_MENU_ID, false); this->contextMenu()->setItemEnabled(SUSPEND_HYBRID_MENU_ID, false);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
@ -835,7 +835,7 @@ bool tdepowersave::do_suspend2ram(){
} else { } else {
KPassivePopup::message( i18n("WARNING"),i18n("Suspend mode failed"), KPassivePopup::message( i18n("WARNING"),i18n("Suspend mode failed"),
SmallIcon("messagebox_warning", 20), this, SmallIcon("messagebox_warning", 20), this,
i18n("Warning").ascii(), 15000); i18n("Warning").utf8(), 15000);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
} }
@ -843,7 +843,7 @@ bool tdepowersave::do_suspend2ram(){
KPassivePopup::message( i18n("WARNING"), KPassivePopup::message( i18n("WARNING"),
i18n("Suspend mode disabled by administrator."), i18n("Suspend mode disabled by administrator."),
SmallIcon("messagebox_warning", 20), this, SmallIcon("messagebox_warning", 20), this,
i18n("Warning").ascii(), 15000); i18n("Warning").utf8(), 15000);
this->contextMenu()->setItemEnabled(SUSPEND2RAM_MENU_ID, false); this->contextMenu()->setItemEnabled(SUSPEND2RAM_MENU_ID, false);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
@ -891,14 +891,14 @@ bool tdepowersave::do_freeze(){
} else { } else {
KPassivePopup::message( i18n("WARNING"),i18n("Freeze failed"), KPassivePopup::message( i18n("WARNING"),i18n("Freeze failed"),
SmallIcon("messagebox_warning", 20), this, SmallIcon("messagebox_warning", 20), this,
i18n("Warning").ascii(), 15000); i18n("Warning").utf8(), 15000);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
} }
} else { } else {
KPassivePopup::message( i18n("WARNING"),i18n("Freeze disabled by administrator."), KPassivePopup::message( i18n("WARNING"),i18n("Freeze disabled by administrator."),
SmallIcon("messagebox_warning", 20), this, SmallIcon("messagebox_warning", 20), this,
i18n("Warning").ascii(), 15000); i18n("Warning").utf8(), 15000);
this->contextMenu()->setItemEnabled(FREEZE_MENU_ID, false); this->contextMenu()->setItemEnabled(FREEZE_MENU_ID, false);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
@ -946,14 +946,14 @@ bool tdepowersave::do_standby(){
} else { } else {
KPassivePopup::message( i18n("WARNING"),i18n("Standby failed"), KPassivePopup::message( i18n("WARNING"),i18n("Standby failed"),
SmallIcon("messagebox_warning", 20), this, SmallIcon("messagebox_warning", 20), this,
i18n("Warning").ascii(), 15000); i18n("Warning").utf8(), 15000);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
} }
} else { } else {
KPassivePopup::message( i18n("WARNING"),i18n("Standby disabled by administrator."), KPassivePopup::message( i18n("WARNING"),i18n("Standby disabled by administrator."),
SmallIcon("messagebox_warning", 20), this, SmallIcon("messagebox_warning", 20), this,
i18n("Warning").ascii(), 15000); i18n("Warning").utf8(), 15000);
this->contextMenu()->setItemEnabled(STANDBY_MENU_ID, false); this->contextMenu()->setItemEnabled(STANDBY_MENU_ID, false);
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
return false; return false;
@ -1348,7 +1348,7 @@ void tdepowersave::handleLidEvent( bool closed ){
"be a problem with the selected \nlock " "be a problem with the selected \nlock "
"method or something else."), "method or something else."),
SmallIcon("messagebox_warning", 20), this, SmallIcon("messagebox_warning", 20), this,
i18n("Warning").ascii(), 10000); i18n("Warning").utf8(), 10000);
} }
} }
@ -1466,7 +1466,7 @@ void tdepowersave::do_setSpeedPolicy(int menu_id){
if(!hwinfo->setCPUFreq((cpufreq_type)menu_id, settings->cpuFreqDynamicPerformance)) { if(!hwinfo->setCPUFreq((cpufreq_type)menu_id, settings->cpuFreqDynamicPerformance)) {
KPassivePopup::message(i18n("WARNING"), KPassivePopup::message(i18n("WARNING"),
i18n("CPU Freq Policy %1 could not be set.").arg(speed_menu->text(menu_id)), i18n("CPU Freq Policy %1 could not be set.").arg(speed_menu->text(menu_id)),
SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 10000); SmallIcon("messagebox_warning", 20), this, i18n("Warning").utf8(), 10000);
} else { } else {
hwinfo->checkCurrentCPUFreqPolicy(); hwinfo->checkCurrentCPUFreqPolicy();
update(); update();
@ -1495,7 +1495,7 @@ void tdepowersave::do_setActiveScheme( int i ){
} else if (!settings->schemes[i]){ } else if (!settings->schemes[i]){
KPassivePopup::message( i18n("WARNING"), KPassivePopup::message( i18n("WARNING"),
i18n("Scheme %1 could not be activated.").arg(scheme_menu->text(i)), i18n("Scheme %1 could not be activated.").arg(scheme_menu->text(i)),
SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 5000); SmallIcon("messagebox_warning", 20), this, i18n("Warning").utf8(), 5000);
} }
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
@ -1712,12 +1712,12 @@ void tdepowersave::updateSchemeMenu(){
if ( *it == settings->ac_scheme ){ if ( *it == settings->ac_scheme ){
scheme_menu->insertItem( SmallIcon("scheme_power", TQIconSet::Automatic), scheme_menu->insertItem( SmallIcon("scheme_power", TQIconSet::Automatic),
i18n( ((TQString)*it).ascii() ), x, x); i18n( ((TQString)*it).utf8() ), x, x);
} }
else{ else{
if ( *it == settings->battery_scheme ){ if ( *it == settings->battery_scheme ){
scheme_menu->insertItem(SmallIcon("scheme_powersave", TQIconSet::Automatic), scheme_menu->insertItem(SmallIcon("scheme_powersave", TQIconSet::Automatic),
i18n( (*it).ascii() ), x, x); i18n( (*it).utf8() ), x, x);
} }
else{ else{
if ((TQString)*it == "Acoustic"){ if ((TQString)*it == "Acoustic"){
@ -1737,7 +1737,7 @@ void tdepowersave::updateSchemeMenu(){
i18n( "Advanced Powersave" ), x, x); i18n( "Advanced Powersave" ), x, x);
} }
else { else {
scheme_menu->insertItem(i18n( (*it).ascii() ), x, x); scheme_menu->insertItem(i18n( (*it).utf8() ), x, x);
} }
} }
} }
@ -1838,7 +1838,7 @@ void tdepowersave::showErrorMessage( TQString msg ){
if(settings->psMsgAsPassivePopup) { if(settings->psMsgAsPassivePopup) {
KPassivePopup::message("tdepowersave", msg, SmallIcon("messagebox_warning", 20), KPassivePopup::message("tdepowersave", msg, SmallIcon("messagebox_warning", 20),
this, i18n("Warning").ascii(), 10000); this, i18n("Warning").utf8(), 10000);
} else { } else {
kapp->updateUserTimestamp(); kapp->updateUserTimestamp();
// KMessageBox::error( 0, msg); // KMessageBox::error( 0, msg);
@ -2330,7 +2330,7 @@ void tdepowersave::notifySchemeSwitch() {
eventType = "scheme_" + _scheme; eventType = "scheme_" + _scheme;
KNotifyClient::event( this->winId(), eventType, KNotifyClient::event( this->winId(), eventType,
i18n("Switched to scheme: %1").arg(i18n(_scheme.ascii())).ascii()); i18n("Switched to scheme: %1").arg(i18n(_scheme.utf8())));
} }
kdDebugFuncOut(trace); kdDebugFuncOut(trace);
@ -2459,7 +2459,7 @@ void tdepowersave::handleResumeSignal() {
KPassivePopup::message( i18n("WARNING"), KPassivePopup::message( i18n("WARNING"),
i18n("Could not remount (all) external storage" i18n("Could not remount (all) external storage"
" media."), SmallIcon("messagebox_warning", 20), " media."), SmallIcon("messagebox_warning", 20),
this, i18n("Warning").ascii(), 15000); this, i18n("Warning").utf8(), 15000);
} }
} else { } else {
kdError() << "Unknown error while suspend. Errorcode: " << resume_result << endl; kdError() << "Unknown error while suspend. Errorcode: " << resume_result << endl;

2
src/tdepowersave_debug.h
Unescape View File

@ -48,7 +48,7 @@ extern bool trace;
/* /*
* macro to collect time and k_funcinfo information for kdDebug() * macro to collect time and k_funcinfo information for kdDebug()
*/ */
#define funcinfo "[" << TQString(TQTime::currentTime().toString()).ascii() << \ #define funcinfo "[" << TQString(TQTime::currentTime().toString()) << \
":" << TQTime::currentTime().msec() << "]" << k_funcinfo ":" << TQTime::currentTime().msec() << "]" << k_funcinfo
/* /*

Write Preview
Loading…
Cancel
Save