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

---
 knotes/knote.cpp          | 6 +++---
 knotes/knoteconfigdlg.cpp | 2 +-
 knotes/knoteedit.cpp      | 2 +-
 knotes/knotesapp.cpp      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'knotes')

diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index ea96d4c80..c19b1ec10 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -34,11 +34,11 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kcombobox.h>
-#include <ktoolbar.h>
-#include <kpopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdepopupmenu.h>
 #include <kxmlguibuilder.h>
 #include <kxmlguifactory.h>
 #include <kcolordrag.h>
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index 17ede6699..752061a60 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -32,7 +32,7 @@
 #include <kcolorbutton.h>
 #include <knuminput.h>
 #include <klineedit.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <twin.h>
 
 #include "knote.h"
diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp
index 62fe2a4be..7ebb44354 100644
--- a/knotes/knoteedit.cpp
+++ b/knotes/knoteedit.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurldrag.h>
 #include <kstdaction.h>
 #include <kcolordialog.h>
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 069bf9da8..c31be4803 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -23,14 +23,14 @@
 #include <tqtooltip.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kxmlguifactory.h>
 #include <kxmlguibuilder.h>
 #include <ksystemtray.h>
 #include <klocale.h>
 #include <kiconeffect.h>
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <khelpmenu.h>
 #include <kfind.h>
 #include <kfinddialog.h>
-- 
cgit v1.2.1