From 50b2bf536162a595896d2c25b45bc73193f4cabb Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:14:17 -0600
Subject: [PATCH] Rename many classes and header files to avoid conflicts with
 KDE4

---
 ...lactdelist.png => cs_configdialog_blacklist.png} | Bin
 ...lactdelist.png => de_configdialog_blacklist.png} | Bin
 doc/doxy/enhance.dox                                |   2 +-
 ...lactdelist.png => en_configdialog_blacklist.png} | Bin
 ...lactdelist.png => fi_configdialog_blacklist.png} | Bin
 ...lactdelist.png => hu_configdialog_blacklist.png} | Bin
 ...lactdelist.png => nb_configdialog_blacklist.png} | Bin
 ...delistedit_Dialog.ui => blacklistedit_Dialog.ui} |   0
 ...delisteditdialog.cpp => blacklisteditdialog.cpp} |   0
 ...lactdelisteditdialog.h => blacklisteditdialog.h} |   0
 src/configuredialog.cpp                             |   2 +-
 src/kpowersave.cpp                                  |   2 +-
 12 files changed, 3 insertions(+), 3 deletions(-)
 rename doc/cs/{cs_configdialog_blactdelist.png => cs_configdialog_blacklist.png} (100%)
 rename doc/de/{de_configdialog_blactdelist.png => de_configdialog_blacklist.png} (100%)
 rename doc/en/{en_configdialog_blactdelist.png => en_configdialog_blacklist.png} (100%)
 rename doc/fi/{fi_configdialog_blactdelist.png => fi_configdialog_blacklist.png} (100%)
 rename doc/hu/{hu_configdialog_blactdelist.png => hu_configdialog_blacklist.png} (100%)
 rename doc/nb/{nb_configdialog_blactdelist.png => nb_configdialog_blacklist.png} (100%)
 rename src/{blactdelistedit_Dialog.ui => blacklistedit_Dialog.ui} (100%)
 rename src/{blactdelisteditdialog.cpp => blacklisteditdialog.cpp} (100%)
 rename src/{blactdelisteditdialog.h => blacklisteditdialog.h} (100%)

diff --git a/doc/cs/cs_configdialog_blactdelist.png b/doc/cs/cs_configdialog_blacklist.png
similarity index 100%
rename from doc/cs/cs_configdialog_blactdelist.png
rename to doc/cs/cs_configdialog_blacklist.png
diff --git a/doc/de/de_configdialog_blactdelist.png b/doc/de/de_configdialog_blacklist.png
similarity index 100%
rename from doc/de/de_configdialog_blactdelist.png
rename to doc/de/de_configdialog_blacklist.png
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
similarity index 100%
rename from doc/en/en_configdialog_blactdelist.png
rename to doc/en/en_configdialog_blacklist.png
diff --git a/doc/fi/fi_configdialog_blactdelist.png b/doc/fi/fi_configdialog_blacklist.png
similarity index 100%
rename from doc/fi/fi_configdialog_blactdelist.png
rename to doc/fi/fi_configdialog_blacklist.png
diff --git a/doc/hu/hu_configdialog_blactdelist.png b/doc/hu/hu_configdialog_blacklist.png
similarity index 100%
rename from doc/hu/hu_configdialog_blactdelist.png
rename to doc/hu/hu_configdialog_blacklist.png
diff --git a/doc/nb/nb_configdialog_blactdelist.png b/doc/nb/nb_configdialog_blacklist.png
similarity index 100%
rename from doc/nb/nb_configdialog_blactdelist.png
rename to doc/nb/nb_configdialog_blacklist.png
diff --git a/src/blactdelistedit_Dialog.ui b/src/blacklistedit_Dialog.ui
similarity index 100%
rename from src/blactdelistedit_Dialog.ui
rename to src/blacklistedit_Dialog.ui
diff --git a/src/blactdelisteditdialog.cpp b/src/blacklisteditdialog.cpp
similarity index 100%
rename from src/blactdelisteditdialog.cpp
rename to src/blacklisteditdialog.cpp
diff --git a/src/blactdelisteditdialog.h b/src/blacklisteditdialog.h
similarity index 100%
rename from src/blactdelisteditdialog.h
rename to 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 39fdebe..435f36d 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>