summaryrefslogtreecommitdiffstats
path: root/ksmserver
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
commita5430e4b98efd05937bd3bfe78c56eb826f145fa (patch)
tree1af88f74a9d800399de58491b215fb303cbfb1f3 /ksmserver
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'ksmserver')
-rw-r--r--ksmserver/shutdowndlg.cpp2
-rw-r--r--ksmserver/startupdlg.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index c5a01353f..f67dda720 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -63,7 +63,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#include <stdlib.h>
#include <math.h>
#include <dmctl.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <netwm.h>
#include <X11/Xlib.h>
diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp
index 0ec5d02d5..383649e88 100644
--- a/ksmserver/startupdlg.cpp
+++ b/ksmserver/startupdlg.cpp
@@ -54,7 +54,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#include <stdlib.h>
#include <math.h>
#include <dmctl.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <netwm.h>
#include <X11/Xlib.h>