29 files changed, 25 insertions, 147 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
deleted file mode 100644
index a8b8de4..0000000
--- a/doc/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_auto_add_subdirectories()
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 40baf08..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# the SUBDIRS is filled automatically by am_edit. If files are 
-# in this directory they are installed into the english dir
-
-KDE_LANG = en
-KDE_DOCS = AUTO 
-SUBDIRS = $(AUTODIRS)  
diff --git a/doc/cs/CMakeLists.txt b/doc/cs/CMakeLists.txt
deleted file mode 100644
index bf6d4a5..0000000
--- a/doc/cs/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( LANG cs DESTINATION tdepowersave )
diff --git a/doc/cs/Makefile.am b/doc/cs/Makefile.am
deleted file mode 100644
index d84e212..0000000
--- a/doc/cs/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_DOCS = tdepowersave
-KDE_LANG = cs
diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt
deleted file mode 100644
index b94a5a6..0000000
--- a/doc/de/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( LANG de DESTINATION tdepowersave )
diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am
deleted file mode 100644
index df4330f..0000000
--- a/doc/de/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_DOCS = tdepowersave
-KDE_LANG = de
diff --git a/doc/de/index.docbook b/doc/de/index.docbook
index 8446afe..4fc8c4d 100644
--- a/doc/de/index.docbook
+++ b/doc/de/index.docbook
@@ -184,8 +184,8 @@ Entries which require special treatment are marked with comments starting with '
   <title>Suspendieren des Systems</title>
    <para>
 	Sie können das System jederzeit mit Rechtsklick auf das TDEPowersave
-	Symbol und das Auswählen von <guimenu>Suspend to Disk</guimenu>,
-	<guimenu>Suspend to RAM</guimenu>, oder <guimenu>Stand-by</guimenu>
+	Symbol und das Auswählen von <guimenu>Hibernate</guimenu>,
+	<guimenu>Suspend</guimenu>, oder <guimenu>Stand-by</guimenu>
 	(wenn dies von Ihrem Gerät unterstützt wird) suspendieren bzw. in 
 	den Stand-by Zustand versetzen.
    </para>
@@ -193,15 +193,15 @@ Entries which require special treatment are marked with comments starting with '
    <itemizedlist>
     <listitem>
       <para>
-		Suspend to Disk sichert alle offenen Daten und Prozesse auf die Festplatte
+		Hibernate sichert alle offenen Daten und Prozesse auf die Festplatte
 		bevor der Computer suspendiert wird. Dadurch werden Ihre Daten geschützt,
 		wenn Sie den Netzstecker enfernen und die Batterie leer bzw. entfernt wird.
       </para>
     </listitem> 
     <listitem>
       <para>
-		Suspend to RAM sichert die Daten in den Hauptspeicher. Dadurch wird das 
-		Aufwecken des Computers schneller als bei Suspend to Disk.
+		Suspend sichert die Daten in den Hauptspeicher. Dadurch wird das 
+		Aufwecken des Computers schneller als bei Hibernate.
       </para>
     </listitem>
     <listitem>
@@ -238,7 +238,7 @@ Entries which require special treatment are marked with comments starting with '
 	im TDEPowersave Applet Menü der Eintrag 
 	<guimenu>Aktionen bei Inaktivität deaktivieren</guimenu>. Wenn Sie diesen
 	Menüeintrag auswählen, werden alle konfigurierten Aktionen, wie bsplw. 
-	Suspend to Disk, bei Inaktivität des Benutzers verhindert. Dies bedeutet
+	Hibernate, bei Inaktivität des Benutzers verhindert. Dies bedeutet
 	das Autosuspend abgeschalten wird.
    </para> 
 
@@ -474,7 +474,7 @@ Entries which require special treatment are marked with comments starting with '
 	  Diese Option ist in der Regel nicht vorausgewählt und muss von Ihnen
 	  erst aktiviert und konfiguriert werden.</para> 
      <para> Wenn Sie beispielsweise wollen, das Ihr System nach 30 Minuten
-	  in den Suspend to Disk versetzt wird, dann wählen Sie die betreffenden 
+	  in den Hibernate versetzt wird, dann wählen Sie die betreffenden 
 	  Optionen. Hat der Benutzer 30 Minuten lang keine Eingaben vongenommen - 
 	  also die Maus bewegt oder Eingaben über die Tastatur vorgenommen, so wird
 	  automatisch der Computer suspendiert und alle Daten auf die Festplatte
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
deleted file mode 100644
index 03f6d32..0000000
--- a/doc/en/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( LANG en DESTINATION tdepowersave )
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
deleted file mode 100644
index 3a62a55..0000000
--- a/doc/en/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_DOCS = tdepowersave
-KDE_LANG = en
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 40439ee..5a29662 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -175,8 +175,8 @@ Entries which require special treatment are marked with comments starting with '
   <title>Suspending the System</title>
    <para>
     You can suspend the system at any time by right-clicking the
-    TDEPowersave icon and selecting <guimenu>Suspend to Disk</guimenu>,
-    <guimenu>Suspend to RAM</guimenu>, or 
+    TDEPowersave icon and selecting <guimenu>Hibernate</guimenu>,
+    <guimenu>Suspend</guimenu>, or 
     <guimenu>Standby</guimenu> (if standby is supported by the
     computer).
    </para>
@@ -184,13 +184,13 @@ Entries which require special treatment are marked with comments starting with '
    <itemizedlist>
     <listitem>
       <para>
-	Suspend to Disk saves all open data to disk before the computer is suspended. 
+	Hibernate saves all open data to disk before the computer is suspended. 
         This protects your data if power is cut off or the battery dies.
       </para>
     </listitem> 
     <listitem>
       <para>
-        Suspend to RAM saves the data to RAM, making data retrieval faster when 
+        Suspend saves the data to RAM, making data retrieval faster when 
         the computer is brought out of suspend mode.
       </para>
     </listitem>
@@ -421,7 +421,7 @@ Entries which require special treatment are marked with comments starting with '
       TDEPowersave to suspend the system automatically if the current desktop
       user is inactive for a specified amount of time then use the dialog to
       configure specific autosuspend settings.</para> 
-     <para>For example, if you want the system to suspend to disk after 30
+     <para>For example, if you want the hibernate the system after 30
       minutes, select the settings to do so. After 30 minutes, all open files
       are saved to disk and the computer is suspended.</para> 
     </step>
diff --git a/doc/fi/CMakeLists.txt b/doc/fi/CMakeLists.txt
deleted file mode 100644
index d1a05d6..0000000
--- a/doc/fi/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( LANG fi DESTINATION tdepowersave )
diff --git a/doc/fi/Makefile.am b/doc/fi/Makefile.am
deleted file mode 100644
index ae1fef4..0000000
--- a/doc/fi/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_DOCS = tdepowersave
-KDE_LANG = fi
diff --git a/doc/hu/CMakeLists.txt b/doc/hu/CMakeLists.txt
deleted file mode 100644
index 0526f81..0000000
--- a/doc/hu/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( LANG hu DESTINATION tdepowersave )
diff --git a/doc/hu/Makefile.am b/doc/hu/Makefile.am
deleted file mode 100644
index 1868e28..0000000
--- a/doc/hu/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_DOCS = tdepowersave
-KDE_LANG = hu
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
deleted file mode 100644
index 8512250..0000000
--- a/doc/man/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-INSTALL(
-    FILES ${PROJECT_NAME}.1
-    DESTINATION ${MAN_INSTALL_DIR}/man1
-    COMPONENT doc
-)
diff --git a/doc/man/tdepowersave.1 b/doc/man/tdepowersave.1
index d79cfd2..1428e20 100644
--- a/doc/man/tdepowersave.1
+++ b/doc/man/tdepowersave.1
@@ -4,7 +4,7 @@
 tdepowersave
 \- A TDE KPart Application
 .SH SYNOPSIS
-tdepowersave [Qt\-options] [TDE\-options] 
+tdepowersave [TQt\-options] [TDE\-options] 
 .SH DESCRIPTION
 A TDE KPart Application
 .SH OPTIONS
@@ -13,8 +13,8 @@ A TDE KPart Application
 .B  \-\-help  
 Show help about options
 .TP
-.B  \-\-help\-qt  
-Show Qt specific options
+.B  \-\-help\-tqt  
+Show TQt specific options
 .TP
 .B  \-\-help\-tde  
 Show TDE specific options
@@ -65,7 +65,7 @@ sets the client geometry of the main widget - see man X for the argument format
 .TP
 .B  \-\-nofork  
 Don't run in the background.
-.SS Qt options:
+.SS TQt options:
 .TP
 .B  \-\-display  <displayname>
 Use the X-server display 'displayname'
@@ -84,7 +84,7 @@ using the QApplication::ManyColor color
 specification
 .TP
 .B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
+tells TQt to never grab the mouse or the keyboard
 .TP
 .B  \-\-dograb  
 running under a debugger can cause an implicit
diff --git a/doc/nb/CMakeLists.txt b/doc/nb/CMakeLists.txt
deleted file mode 100644
index f7235d3..0000000
--- a/doc/nb/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( LANG nb DESTINATION tdepowersave )
diff --git a/doc/nb/Makefile.am b/doc/nb/Makefile.am
deleted file mode 100644
index a5b5f87..0000000
--- a/doc/nb/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_DOCS = tdepowersave
-KDE_LANG = nb
diff --git a/doc/online/Makefile b/doc/online/Makefile
deleted file mode 100644
index e51b7a2..0000000
--- a/doc/online/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-all:
-	meinproc --stylesheet /opt/trinity/share/apps/ksgmltools2/customization/tde-web.xsl ../en/index.docbook
-	./replace
-	rm *.bak
-	cp ../en/*.png .
-
-clean:
-	rm *.png *.html
diff --git a/doc/online/replace b/doc/online/replace
deleted file mode 100755
index 9b99c81..0000000
--- a/doc/online/replace
+++ /dev/null
@@ -1,2 +0,0 @@
-von='..\/common\/kde_logo.png' nach='kde_logo.png'; filetype='*.html'; OLDIFS=$IFS; IFS='
-' ; files=`find . -name "$filetype"`; for f in $files;do cp $f $f.bak; g="$f.mettytmp"; echo "Searching in $f ..."; cat "$f" | sed "s/$von/$nach/" > "$g" && mv "$g" "$f"; rm -f *.mettytmp; done; IFS=$OLDIFS;
diff --git a/doc/doxy/README b/doc/other/doxy/README
index e6cdd2c..e6cdd2c 100644
--- a/doc/doxy/README
+++ b/doc/other/doxy/README
diff --git a/doc/doxy/changelog.dox b/doc/other/doxy/changelog.dox
index 2813a67..8cf824a 100644
--- a/doc/doxy/changelog.dox
+++ b/doc/other/doxy/changelog.dox
@@ -10,7 +10,7 @@
 *	        policy for each scheme)
 *	      - general settings (define battery warning levels and actions if a level reached as e.g. 
 *	        Suspend to disk/Shutdown or change the display brightness, configure actions for button
-		events (Power/Lid/Suspend/Sleep buttons), define the default AC and battery schemes)
+		events (Power/Lid/Suspend/Suspend buttons), define the default AC and battery schemes)
 *	    - show the power consumtion of the battery in the detailed info dialog
 *	    - umount external media before suspend (need a patch of the KDE media manager) to avoid data
 *	      loss and remount on resume
@@ -274,7 +274,7 @@
 *	  - added set scheme specific brigthness settings to tdepowersave and the configuration dialog
 *	  - added patch to fix compiler warning from Daniel Gollub <dgollub@suse.de>
 *	  - updated translation (nl) and code documentation
-*	  - replaced usage of QString::null with QString()
+*	  - replaced usage of TQString::null with TQString()
 *	  - added warning if 'Aggressive Powersave' scheme is selected
 *	  - updated version strings
 *
diff --git a/doc/doxy/enhance.dox b/doc/other/doxy/enhance.dox
index b506354..a9ca05e 100644
--- a/doc/doxy/enhance.dox
+++ b/doc/other/doxy/enhance.dox
@@ -33,7 +33,7 @@
 * \subsection enh_tooltip Tooltip
 *	\li \b CPU \b Tooltip \b like \b kicker \b mouseover \b effects \n \n 
 *	\b [Priority: \b I] \n \n
-*	I like the nice mouseover effects on Kicker. Unforunately there is currently no QWidget for this.
+*	I like the nice mouseover effects on Kicker. Unforunately there is currently no TQWidget for this.
 *	If we would implement this we need to adapt the wifget from amarok/src/tracktooltip.cpp.
 *
 *       \li \b Battery \b estimated \b empty \b at \b xx:yy \b in \b Tooltip \n \n 
diff --git a/doc/doxy/fixed_bugs.dox b/doc/other/doxy/fixed_bugs.dox
index e478b96..65911f9 100644
--- a/doc/doxy/fixed_bugs.dox
+++ b/doc/other/doxy/fixed_bugs.dox
@@ -11,10 +11,10 @@
 * \li   Bug \b #245081 - TDEPowersave does not set (ondemand) governor on startup \n
 * \li   Bug \b #244052 - Close lid of a laptop and suspend to ram cause TDEPowersave 100% CPU \n \n
 *	Needed to uncouple Action calls (as e.g. suspend on lidclose) which include blocking dialogs
-*	from the related events. This is needed because otherwise the D-Bus QT3 bindings run amok
-*	if the dialog block the filterfunction, since signals in QT are not really independent 
+*	from the related events. This is needed because otherwise the D-Bus TQt bindings run amok
+*	if the dialog block the filterfunction, since signals in TQt are not really independent 
 *	(they are more function calls). Used QTimer:SingleShot() for this since they go into the 
-*	QT event loop and don't follow the workflow of the rest of the program. \n \n
+*	TQt event loop and don't follow the workflow of the rest of the program. \n \n
 * \li   Bug \b #229960 - CPUFREQ_DYNAMIC_PERFORMANCE seems to be ignored during boot and scheme change \n
 * \li   Bug \b #230686 - TDEPowersave need to be restarted to set changed DPMS settings \n
 * \li   Bug \b #230965 - puzzling battery state info \n
@@ -140,7 +140,7 @@
 * \li   Bug \b #95279 -  tdepowersave progress bar popup does not handle "close" event. \n \n
 *	If the progressbar popup does not get closed by a "101%"-event, it does never
 *	close. If you close it via the window manager, tdepowersave never opens a popup again.
-*	Fix: Now the suspend/progress dialog is Qt::WDestructiveClose and TDEPowersave connect to the 
+*	Fix: Now the suspend/progress dialog is TQt::WDestructiveClose and TDEPowersave connect to the 
 *	destroyed() signal of the dialog \n \n
 * \li	Bug \b #82880 - KDE: KMessageBox::error not on top since KDE 3.4 \n \n
 *	All TDEPowersave error messages are not on the top, and popup in the background. \n \n
diff --git a/doc/doxy/footer.html b/doc/other/doxy/footer.html
index 96b8825..96b8825 100644
--- a/doc/doxy/footer.html
+++ b/doc/other/doxy/footer.html
diff --git a/doc/doxy/header.html b/doc/other/doxy/header.html
index 58e906f..58e906f 100644
--- a/doc/doxy/header.html
+++ b/doc/other/doxy/header.html
diff --git a/doc/doxy/main.dox b/doc/other/doxy/main.dox
index 727cf2f..d029839 100644
--- a/doc/doxy/main.dox
+++ b/doc/other/doxy/main.dox
@@ -2,7 +2,7 @@
 \mainpage TDEPowersave - a KDE Kickerapplet/fontend for Powermanagement
 \section intro_sec Introduction
 	TDEPowersave provides battery monitoring and suspend/standby triggers.
-	It is based on HAL and D-Bus and therefore supports APM, ACPI and PMU.
+	It supports APM, ACPI and PMU.
 
 	Together with the powersave package (to provide powermanagement if TDEPowersave 
 	is not running) and the YaST Powermanagement module it is the preferred package 
@@ -34,11 +34,6 @@
 \section using_sec Using tdepowersave
 	This Applet work under <a href="http://www.kde.org">KDE</a> (and also <a href="http://www.gnome.org">GNOME</a>).
 
-	To use tdepowersave, you need the following programms/packages:
-	- linux kernel 2.6.x (<a href="http://www.kernel.org">Homepage</a>)
-	- HAL (Hardware Abstraction Layer) >= 0.5.8.1 (<a href="http://www.freedesktop.org/Software/hal">Homepage</a>)
-	- D-Bus >= >= 0.6.x (recommended >= 0.9.x) (<a href="http://www.freedesktop.org/Software/dbus">Homepage</a>)
-
 	Dependig on some features you maybe need also: 
 	- PolicyKit (<a href="http://gitweb.freedesktop.org/?p=PolicyKit.git;a=summary">git repository</a>)
 
diff --git a/doc/doxy/process.dox b/doc/other/doxy/process.dox
index 2fe265e..2fe265e 100644
--- a/doc/doxy/process.dox
+++ b/doc/other/doxy/process.dox
diff --git a/doc/doxy/styleSheet.css b/doc/other/doxy/styleSheet.css
index 1d4d631..1d4d631 100644
--- a/doc/doxy/styleSheet.css
+++ b/doc/other/doxy/styleSheet.css