summaryrefslogtreecommitdiffstats
path: root/kbruch/src
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 /kbruch/src
parent273ccce287bccee117bbfff8ca3386d613aec467 (diff)
downloadtdeedu-fccf6d244a4d60c3138afa81266e22ac65adddbc.tar.gz
tdeedu-fccf6d244a4d60c3138afa81266e22ac65adddbc.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kbruch/src')
-rw-r--r--kbruch/src/mainqtwidget.cpp4
-rw-r--r--kbruch/src/mainqtwidget.h2
-rw-r--r--kbruch/src/taskvieweroptionsbase.ui2
3 files changed, 4 insertions, 4 deletions
diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp
index 096bc467..b0b8ee98 100644
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@@ -18,9 +18,9 @@
#include <config.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kjanuswidget.h>
diff --git a/kbruch/src/mainqtwidget.h b/kbruch/src/mainqtwidget.h
index 1868d9c6..4b58000c 100644
--- a/kbruch/src/mainqtwidget.h
+++ b/kbruch/src/mainqtwidget.h
@@ -17,7 +17,7 @@
#ifndef MAINTQTWIDGET_H
#define MAINTQTWIDGET_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
class KJanusWidget;
diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui
index 72f2077a..a35ec107 100644
--- a/kbruch/src/taskvieweroptionsbase.ui
+++ b/kbruch/src/taskvieweroptionsbase.ui
@@ -216,7 +216,7 @@
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kfontdialog.h</includehint>
+ <includehint>tdefontdialog.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>