summaryrefslogtreecommitdiffstats
path: root/blinken
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:21 -0600
commitfccf6d244a4d60c3138afa81266e22ac65adddbc (patch)
treece62ccdaca3fffebeb33ad213dc5cea82ceff580 /blinken
parent273ccce287bccee117bbfff8ca3386d613aec467 (diff)
downloadtdeedu-fccf6d244a4d60c3138afa81266e22ac65adddbc.tar.gz
tdeedu-fccf6d244a4d60c3138afa81266e22ac65adddbc.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'blinken')
-rw-r--r--blinken/src/blinken.cpp4
-rw-r--r--blinken/src/button.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp
index 5e00cd64..9b2291a2 100644
--- a/blinken/src/blinken.cpp
+++ b/blinken/src/blinken.cpp
@@ -12,14 +12,14 @@
#include <tqpixmap.h>
#include <tqtimer.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <khelpmenu.h>
#include <kinputdialog.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include "blinken.h"
diff --git a/blinken/src/button.cpp b/blinken/src/button.cpp
index 0bcc845a..50d49bbe 100644
--- a/blinken/src/button.cpp
+++ b/blinken/src/button.cpp
@@ -7,7 +7,7 @@
* (at your option) any later version. *
***************************************************************************/
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>