summaryrefslogtreecommitdiffstats
path: root/src
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 /src
parent480b2ec3207b367dc7323cfbdda69da451320908 (diff)
downloadkpowersave-254ea2e3e71d153b886d1c72fb01d415996a0a50.tar.gz
kpowersave-254ea2e3e71d153b886d1c72fb01d415996a0a50.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src')
-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
5 files changed, 2 insertions, 2 deletions
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>