Finish TQt4 port of kpowersave

This enables both Qt3 and Qt4 builds


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpowersave@1228282 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 24 insertions, 24 deletions

diff --git a/src/settings.h b/src/settings.h
index 2cf589e..1769ccc 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -29,8 +29,8 @@
 #include <kconfig.h>
 
 // QT - Header
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 
 // own headers
 #include "hardware.h"
@@ -44,9 +44,9 @@ enum action{
 	GO_SUSPEND2DISK,
 	SWITCH_SCHEME,
 	BRIGHTNESS,
-	CPUFREQ_POWERSAVE,
-	CPUFREQ_DYNAMIC,
-	CPUFREQ_PERFORMANCE
+	CPUFRETQ_POWERSAVE,
+	CPUFRETQ_DYNAMIC,
+	CPUFRETQ_PERFORMANCE
 };
 
 /*! 
@@ -131,26 +131,26 @@ public:
 	
 	/* START ************************** General settings *******************************/
 	//! name of the default "onAC" scheme
-	QString ac_scheme;
+	TQString ac_scheme;
 	//! name of the default "on Battery" scheme
-	QString battery_scheme;
+	TQString battery_scheme;
 	//! a list with the names of the currently available schemes.
 	/*!
 	 * List with the names of the currently configured schemes. The name of the 
 	 * schemes are the same as we use for the related selection in the configure file.
 	 * Note: Be sure that the name for the default schemes is not translated !!!
 	 */
-	QStringList schemes;
+	TQStringList schemes;
 
 	//! the name of the lock method
 	/*!
-	 * This QString contains a alias to the selected method for lock screen. Possible values:
+	 * This TQString contains a alias to the selected method for lock screen. Possible values:
 	 * \li automatic for automatically selected (sequence: kscreensaver, xscreensaver, xlock)
 	 * \li kscreensaver for KDE KScreensaver
 	 * \li xscreensaver for XScreensaver (default used on GNOME)
 	 * \li xlock for xlock
 	 */
-	QString lockmethod;
+	TQString lockmethod;
 
 	//! if the messages from powersave should popup as Kpassivepopup
 	/*!
@@ -267,7 +267,7 @@ public:
 	/* START ************************ Scheme settings and values ***********************/
 
 	//! name of the scheme representing the current settings
-	QString currentScheme;
+	TQString currentScheme;
 	
 	// ---------- Screensaver/DPMS section ------------ //
 	//! if kpowersave use own screensaver settings
@@ -371,23 +371,23 @@ public:
 	int autoInactiveActionAfter;
 	//! action which execute after a defined time of inactivity 
 	/*!
-	 * This QString contains the action/command which should be execute
+	 * This TQString contains the action/command which should be execute
 	 * after a trough \ref autoInactiveActionAfter defined time. If nothing
-	 * should happens this QString is empty or '_NONE_'
+	 * should happens this TQString is empty or '_NONE_'
 	 */
-	QString autoInactiveAction;
+	TQString autoInactiveAction;
 	//! general list with running programs which prevent the autosuspend
 	/*!
-	 * This QStringList contains names of programs which prevent, if one of
+	 * This TQStringList contains names of programs which prevent, if one of
 	 * them is running/active the autossuspend. 
 	 */ 
-	QStringList autoInactiveGBlist;
+	TQStringList autoInactiveGBlist;
 	//! scheme list with running programs which prevent the autosuspend
 	/*!
-	 * This QStringList contains names of programs which prevent, if one of
+	 * This TQStringList contains names of programs which prevent, if one of
 	 * them is running/active the autossuspend. 
 	 */ 
-	QStringList autoInactiveSBlist;
+	TQStringList autoInactiveSBlist;
 
 	// ------ Autosuspend countdown dialog section -------- //
 	//! if KPowersave should display a dialog with a warning for autosuspend
@@ -438,17 +438,17 @@ public:
 	int autoDimmTo;
 	//! general list with running programs which prevent the autodimm
 	/*!
-	 * This QStringList contains names of programs which prevent, if one of
+	 * This TQStringList contains names of programs which prevent, if one of
 	 * them is running/active the autodimm of the display panel. 
 	 */ 
-	QStringList autoDimmGBlist;
+	TQStringList autoDimmGBlist;
 	//! scheme specific list with running programs which prevent the autodimm
 	/*!
-	 * This QStringList contains names of programs which prevent, if one of
+	 * This TQStringList contains names of programs which prevent, if one of
 	 * them is running/active the autodimm of the display panel. This list is 
 	 * scheme specific.
 	 */ 
-	QStringList autoDimmSBlist;
+	TQStringList autoDimmSBlist;
 	
 
 	// ------------ CPU Frequency section ---------------- //
@@ -483,7 +483,7 @@ public:
 	//! to load the global KDE settings
 	void load_kde();
 	//! to load settings of a specific scheme
-	bool load_scheme_settings(QString);
+	bool load_scheme_settings(TQString);
 	
 private:
 	
@@ -491,6 +491,6 @@ private:
 	KConfig *kconfig;
 
 	//! to map a battery action string to the related type
-	action mapActionToType (QString _action);
+	action mapActionToType (TQString _action);
 };
 #endif