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

---
 kbabel/catalogmanager/catalogmanager.cpp     | 8 ++++----
 kbabel/catalogmanager/catalogmanager.h       | 2 +-
 kbabel/catalogmanager/catalogmanagerview.cpp | 6 +++---
 kbabel/catalogmanager/main.cpp               | 2 +-
 kbabel/catalogmanager/validateprogress.cpp   | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kbabel/catalogmanager')

diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index d18f59d2..b63fdca3 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -50,7 +50,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcmenumngr.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
@@ -63,13 +63,13 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <twin.h>
 
 #include <tqfileinfo.h>
diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h
index 8a0fe6fd..971b86e8 100644
--- a/kbabel/catalogmanager/catalogmanager.h
+++ b/kbabel/catalogmanager/catalogmanager.h
@@ -42,7 +42,7 @@
 #include <tqmap.h>
 
 #include <tdeversion.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdirwatch.h>
 #include <kprocess.h>
 #include <tqptrlist.h>
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 5543c0f6..da21075b 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -65,7 +65,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
 #include <kprogress.h>
@@ -434,7 +434,7 @@ void CatalogManagerView::markModifiedFiles()
 
 void CatalogManagerView::loadMarks()
 {
-    const KURL url = KFileDialog::getOpenURL( TQString(),"*.marklist", this );
+    const KURL url = KFileDialog::getOpenURL( TQString(),"*.martdelist", this );
     if( url.isEmpty() ) return;
 
     TQString filename;
@@ -510,7 +510,7 @@ void CatalogManagerView::loadMarks()
 
 void CatalogManagerView::saveMarks()
 {
-    const KURL url2 = KFileDialog::getSaveURL( TQString(), "*.marklist", this );
+    const KURL url2 = KFileDialog::getSaveURL( TQString(), "*.martdelist", this );
     if( url2.isEmpty() ) return;
 
     // ### FIXME: why is the file dialog not doing this?
diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp
index 9c321b71..f02b9302 100644
--- a/kbabel/catalogmanager/main.cpp
+++ b/kbabel/catalogmanager/main.cpp
@@ -51,7 +51,7 @@
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <twin.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index e01585f3..76728e04 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -39,7 +39,7 @@
 #include <kdatatool.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <ksqueezedtextlabel.h>
 
-- 
cgit v1.2.1