Fix improper use of TQString::ascii().

This resolves issue #4.

Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 1ae603d7a9e7029f6918927738e44f4488d3f4ad)

4 files changed, 26 insertions, 26 deletions

diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp
index 8bacf99..c4273da 100644
--- a/src/configuredialog.cpp
+++ b/src/configuredialog.cpp
@@ -152,7 +152,7 @@ void ConfigureDialog::setSchemeList(){
 	cB_batteryScheme->clear();
 
 	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")) {
 			listBox_schemes->insertItem(SmallIcon("scheme_power", TQIconSet::Automatic), i18n(_tmp));
 			cB_acScheme->insertItem(i18n(_tmp));
@@ -1288,7 +1288,7 @@ void ConfigureDialog::setInactivityBox(){
 	// actions.append("Turn Off Computer");
 
 	for ( TQStringList::Iterator it = actions.begin(); it != actions.end(); ++it ) {
-		cB_autoInactivity->insertItem( i18n( (*it).ascii() ) );
+		cB_autoInactivity->insertItem( i18n( (*it).utf8() ) );
 	}
 
 	kdDebugFuncOut(trace);
diff --git a/src/detaileddialog.cpp b/src/detaileddialog.cpp
index 6a24349..76340b5 100644
--- a/src/detaileddialog.cpp
+++ b/src/detaileddialog.cpp
@@ -356,7 +356,7 @@ void detaileddialog::setProcessorThrottling() {
 			// get max cpu freq and set it to the max of the progressbar
 			ProcessorPBar[i]->setTotalSteps(100);
 			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]->setEnabled(true);
 		} else if (cpuInfo->cpufreq_speed[i] < 0) {
@@ -411,7 +411,7 @@ void detaileddialog::setInfos() {
 
 	if(!config->currentScheme.isEmpty())
 		display += i18n("Current Scheme: ") + "\n";
-		displayValue += i18n(config->currentScheme.ascii()) + "\n";
+		displayValue += i18n(config->currentScheme.utf8()) + "\n";
 		if(config->currentScheme == config->ac_scheme)
 			InfoPictogram->setPixmap(SmallIcon("scheme_power", 22));
 		else if(config->currentScheme == config->battery_scheme)
diff --git a/src/tdepowersave.cpp b/src/tdepowersave.cpp
index 29c4c40..65550ab 100644
--- a/src/tdepowersave.cpp
+++ b/src/tdepowersave.cpp
@@ -199,7 +199,7 @@ void tdepowersave::initMenu() {
 	STANDBY_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("stand_by", TQIconSet::Automatic),
 							   i18n("Standby"), this, TQT_SLOT(do_standby()));
 
-	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("Dynamic"), DYNAMIC);
 	speed_menu->insertItem(i18n("Powersave"), POWERSAVE);
@@ -213,7 +213,7 @@ void tdepowersave::initMenu() {
 
 	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);
 	connect(scheme_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(do_setActiveScheme(int)));
 
@@ -227,7 +227,7 @@ void tdepowersave::initMenu() {
 
 	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"),
 			       this, TQT_SLOT(slotHelp()));
@@ -292,7 +292,7 @@ void tdepowersave::showConfigureDialog() {
 		else {
 			KPassivePopup::message(i18n("WARNING"), i18n("Cannot find any schemes."),
 					       SmallIcon("messagebox_warning", 20), this,
-					       i18n("Warning").ascii(), 15000);
+					       i18n("Warning").utf8(), 15000);
 		}
 	} else {
 		configDlg->setWindowState((configDlg->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
@@ -725,7 +725,7 @@ bool tdepowersave::do_suspend2disk(){
 			} else {
 				KPassivePopup::message( i18n("WARNING"),i18n("Suspend to disk failed"),
 							SmallIcon("messagebox_warning", 20), this,
-							i18n("Warning").ascii(), 15000);
+							i18n("Warning").utf8(), 15000);
 				kdDebugFuncOut(trace);
 				return false;
 			}
@@ -733,7 +733,7 @@ bool tdepowersave::do_suspend2disk(){
 			KPassivePopup::message( i18n("WARNING"),
 						i18n("Suspend to disk disabled by administrator."),
 						SmallIcon("messagebox_warning", 20),
-						this, i18n("Warning").ascii(), 15000);
+						this, i18n("Warning").utf8(), 15000);
 			this->contextMenu()->setItemEnabled(SUSPEND2DISK_MENU_ID, false);
 			kdDebugFuncOut(trace);
 			return false;
@@ -781,7 +781,7 @@ bool tdepowersave::do_suspend2ram(){
 			} else {
 				KPassivePopup::message( i18n("WARNING"),i18n("Suspend to RAM failed"),
 							SmallIcon("messagebox_warning", 20), this,
-							i18n("Warning").ascii(), 15000);
+							i18n("Warning").utf8(), 15000);
 				kdDebugFuncOut(trace);
 				return false;
 			}
@@ -789,7 +789,7 @@ bool tdepowersave::do_suspend2ram(){
 			KPassivePopup::message( i18n("WARNING"),
 						i18n("Suspend to RAM disabled by administrator."),
 						SmallIcon("messagebox_warning", 20), this,
-						i18n("Warning").ascii(), 15000);
+						i18n("Warning").utf8(), 15000);
 			this->contextMenu()->setItemEnabled(SUSPEND2RAM_MENU_ID, false);
 			kdDebugFuncOut(trace);
 			return false;
@@ -837,14 +837,14 @@ bool tdepowersave::do_freeze(){
 			} else {
 				KPassivePopup::message( i18n("WARNING"),i18n("Freeze failed"),
 							SmallIcon("messagebox_warning", 20), this,
-							i18n("Warning").ascii(), 15000);
+							i18n("Warning").utf8(), 15000);
 				kdDebugFuncOut(trace);
 				return false;
 			}
 		} else {
 			KPassivePopup::message( i18n("WARNING"),i18n("Freeze disabled by administrator."),
 						SmallIcon("messagebox_warning", 20), this,
-						i18n("Warning").ascii(), 15000);
+						i18n("Warning").utf8(), 15000);
 			this->contextMenu()->setItemEnabled(FREEZE_MENU_ID, false);
 			kdDebugFuncOut(trace);
 			return false;
@@ -892,14 +892,14 @@ bool tdepowersave::do_standby(){
 			} else {
 				KPassivePopup::message( i18n("WARNING"),i18n("Standby failed"),
 							SmallIcon("messagebox_warning", 20), this,
-							i18n("Warning").ascii(), 15000);
+							i18n("Warning").utf8(), 15000);
 				kdDebugFuncOut(trace);
 				return false;
 			}
 		} else {
 			KPassivePopup::message( i18n("WARNING"),i18n("Standby disabled by administrator."),
 						SmallIcon("messagebox_warning", 20), this,
-						i18n("Warning").ascii(), 15000);
+						i18n("Warning").utf8(), 15000);
 			this->contextMenu()->setItemEnabled(STANDBY_MENU_ID, false);
 			kdDebugFuncOut(trace);
 			return false;
@@ -1287,7 +1287,7 @@ void tdepowersave::handleLidEvent( bool closed ){
 								     "be a problem with the selected \nlock "
 								     "method or something else."),
 								SmallIcon("messagebox_warning", 20), this,
-								i18n("Warning").ascii(), 10000);
+								i18n("Warning").utf8(), 10000);
 
 				}
 			}
@@ -1405,7 +1405,7 @@ void tdepowersave::do_setSpeedPolicy(int menu_id){
 	if(!hwinfo->setCPUFreq((cpufreq_type)menu_id, settings->cpuFreqDynamicPerformance)) {
 		KPassivePopup::message(i18n("WARNING"),
 				 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 {
 		hwinfo->checkCurrentCPUFreqPolicy();
 		update();
@@ -1434,7 +1434,7 @@ void tdepowersave::do_setActiveScheme( int i ){
  	} else if (!settings->schemes[i]){
 		KPassivePopup::message( i18n("WARNING"),
 					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);
@@ -1639,12 +1639,12 @@ void tdepowersave::updateSchemeMenu(){
 
 		if ( *it == settings->ac_scheme ){
 			scheme_menu->insertItem( SmallIcon("scheme_power", TQIconSet::Automatic),
-						 i18n( ((TQString)*it).ascii() ), x, x);
+						 i18n( ((TQString)*it).utf8() ), x, x);
 		}
 		else{
 			if ( *it == settings->battery_scheme ){
 				scheme_menu->insertItem(SmallIcon("scheme_powersave", TQIconSet::Automatic),
-							i18n( (*it).ascii() ), x, x);
+							i18n( (*it).utf8() ), x, x);
 			}
 			else{
 				if ((TQString)*it == "Acoustic"){
@@ -1664,7 +1664,7 @@ void tdepowersave::updateSchemeMenu(){
 								i18n( "Advanced Powersave" ), x, x);
 				}
 				else {
-					scheme_menu->insertItem(i18n( (*it).ascii() ), x, x);
+					scheme_menu->insertItem(i18n( (*it).utf8() ), x, x);
 				}
 			}
 		}
@@ -1765,7 +1765,7 @@ void tdepowersave::showErrorMessage( TQString msg ){
 
 	if(settings->psMsgAsPassivePopup) {
 		KPassivePopup::message("tdepowersave", msg, SmallIcon("messagebox_warning", 20),
-				       this, i18n("Warning").ascii(), 10000);
+				       this, i18n("Warning").utf8(), 10000);
 	} else {
 		kapp->updateUserTimestamp();
 		// KMessageBox::error( 0, msg);
@@ -2249,7 +2249,7 @@ void tdepowersave::notifySchemeSwitch() {
 			eventType = "scheme_" + _scheme;
 
 		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);
@@ -2368,7 +2368,7 @@ void tdepowersave::handleResumeSignal() {
 			KPassivePopup::message( i18n("WARNING"),
 						i18n("Could not remount (all) external storage"
 						" media."), SmallIcon("messagebox_warning", 20),
-						this, i18n("Warning").ascii(), 15000);
+						this, i18n("Warning").utf8(), 15000);
 		}
 	} else {
 		kdError() << "Unknown error while suspend. Errorcode: " << resume_result << endl;
diff --git a/src/tdepowersave_debug.h b/src/tdepowersave_debug.h
index 9585a96..e97ade6 100644
--- a/src/tdepowersave_debug.h
+++ b/src/tdepowersave_debug.h
@@ -48,7 +48,7 @@ extern bool trace;
 /*
  * 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
 
 /*