summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:14:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:14:14 -0600
commit254ea2e3e71d153b886d1c72fb01d415996a0a50 (patch)
treef634eee0e3791441eca961175753824e1c3fa471
parent480b2ec3207b367dc7323cfbdda69da451320908 (diff)
downloadkpowersave-254ea2e3e71d153b886d1c72fb01d415996a0a50.tar.gz
kpowersave-254ea2e3e71d153b886d1c72fb01d415996a0a50.zip
Rename many classes and header files to avoid conflicts with KDE4
-rw-r--r--doc/cs/cs_configdialog_blacklist.png (renamed from doc/cs/cs_configdialog_blactdelist.png)bin15708 -> 15708 bytes
-rw-r--r--doc/de/de_configdialog_blacklist.png (renamed from doc/de/de_configdialog_blactdelist.png)bin15402 -> 15402 bytes
-rw-r--r--doc/doxy/enhance.dox2
-rw-r--r--doc/en/en_configdialog_blacklist.png (renamed from doc/en/en_configdialog_blactdelist.png)bin14846 -> 14846 bytes
-rw-r--r--doc/fi/fi_configdialog_blacklist.png (renamed from doc/fi/fi_configdialog_blactdelist.png)bin14788 -> 14788 bytes
-rw-r--r--doc/hu/hu_configdialog_blacklist.png (renamed from doc/hu/hu_configdialog_blactdelist.png)bin15962 -> 15962 bytes
-rw-r--r--doc/nb/nb_configdialog_blacklist.png (renamed from doc/nb/nb_configdialog_blactdelist.png)bin15140 -> 15140 bytes
-rw-r--r--src/blacklistedit_Dialog.ui (renamed from src/blactdelistedit_Dialog.ui)0
-rw-r--r--src/blacklisteditdialog.cpp (renamed from src/blactdelisteditdialog.cpp)0
-rw-r--r--src/blacklisteditdialog.h (renamed from src/blactdelisteditdialog.h)0
-rw-r--r--src/configuredialog.cpp2
-rw-r--r--src/kpowersave.cpp2
12 files changed, 3 insertions, 3 deletions
diff --git a/doc/cs/cs_configdialog_blactdelist.png b/doc/cs/cs_configdialog_blacklist.png
index 2348d63..2348d63 100644
--- a/doc/cs/cs_configdialog_blactdelist.png
+++ b/doc/cs/cs_configdialog_blacklist.png
Binary files differ
diff --git a/doc/de/de_configdialog_blactdelist.png b/doc/de/de_configdialog_blacklist.png
index fbbf2dc..fbbf2dc 100644
--- a/doc/de/de_configdialog_blactdelist.png
+++ b/doc/de/de_configdialog_blacklist.png
Binary files differ
diff --git a/doc/doxy/enhance.dox b/doc/doxy/enhance.dox
index 2e8464a..d0f9c22 100644
--- a/doc/doxy/enhance.dox
+++ b/doc/doxy/enhance.dox
@@ -34,7 +34,7 @@
* \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.
-* If we would implement this we need to adapt the wifget from amarok/src/tracktooltip.cpp.
+* If we would implement this we need to adapt the wifget from amarok/src/tractdetooltip.cpp.
*
* \li \b Battery \b estimated \b empty \b at \b xx:yy \b in \b Tooltip \n \n
* \b [Priority: \b I] \n \n
diff --git a/doc/en/en_configdialog_blactdelist.png b/doc/en/en_configdialog_blacklist.png
index e52da58..e52da58 100644
--- a/doc/en/en_configdialog_blactdelist.png
+++ b/doc/en/en_configdialog_blacklist.png
Binary files differ
diff --git a/doc/fi/fi_configdialog_blactdelist.png b/doc/fi/fi_configdialog_blacklist.png
index 0dded0d..0dded0d 100644
--- a/doc/fi/fi_configdialog_blactdelist.png
+++ b/doc/fi/fi_configdialog_blacklist.png
Binary files differ
diff --git a/doc/hu/hu_configdialog_blactdelist.png b/doc/hu/hu_configdialog_blacklist.png
index 649ddbf..649ddbf 100644
--- a/doc/hu/hu_configdialog_blactdelist.png
+++ b/doc/hu/hu_configdialog_blacklist.png
Binary files differ
diff --git a/doc/nb/nb_configdialog_blactdelist.png b/doc/nb/nb_configdialog_blacklist.png
index 043662f..043662f 100644
--- a/doc/nb/nb_configdialog_blactdelist.png
+++ b/doc/nb/nb_configdialog_blacklist.png
Binary files differ
diff --git a/src/blactdelistedit_Dialog.ui b/src/blacklistedit_Dialog.ui
index 375a450..375a450 100644
--- a/src/blactdelistedit_Dialog.ui
+++ b/src/blacklistedit_Dialog.ui
diff --git a/src/blactdelisteditdialog.cpp b/src/blacklisteditdialog.cpp
index d319ae5..d319ae5 100644
--- a/src/blactdelisteditdialog.cpp
+++ b/src/blacklisteditdialog.cpp
diff --git a/src/blactdelisteditdialog.h b/src/blacklisteditdialog.h
index 8ae17db..8ae17db 100644
--- a/src/blactdelisteditdialog.h
+++ b/src/blacklisteditdialog.h
diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp
index 84609a8..80c0226 100644
--- a/src/configuredialog.cpp
+++ b/src/configuredialog.cpp
@@ -32,7 +32,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kinputdialog.h>
- #include <kaccelmanager.h>
+ #include <tdeaccelmanager.h>
// QT - Headers
#include <tqcheckbox.h>
diff --git a/src/kpowersave.cpp b/src/kpowersave.cpp
index bca65c1..55a1c59 100644
--- a/src/kpowersave.cpp
+++ b/src/kpowersave.cpp
@@ -29,7 +29,7 @@
#include <knotifyclient.h>
#include <knotifydialog.h>
#include <kpassivepopup.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
// other TQt headers:
#include <tqcursor.h>