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

---
 kalzium/src/detailinfodlg.cpp     | 2 +-
 kalzium/src/elementdataviewer.cpp | 2 +-
 kalzium/src/kalzium.cpp           | 2 +-
 kalzium/src/kalzium.h             | 2 +-
 kalzium/src/molcalcwidget.cpp     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kalzium/src')

diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp
index 2d15a89d..32f3caa6 100644
--- a/kalzium/src/detailinfodlg.cpp
+++ b/kalzium/src/detailinfodlg.cpp
@@ -24,7 +24,7 @@
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
 #include <kstandarddirs.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kcombobox.h>
 #include <kapplication.h>
 
diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp
index 5f3dba55..2efda7a4 100644
--- a/kalzium/src/elementdataviewer.cpp
+++ b/kalzium/src/elementdataviewer.cpp
@@ -22,7 +22,7 @@
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kapplication.h>
 
 //QT-Includes
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index bc266e5e..cb5cae59 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -43,7 +43,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
diff --git a/kalzium/src/kalzium.h b/kalzium/src/kalzium.h
index 41faf36a..3184b555 100644
--- a/kalzium/src/kalzium.h
+++ b/kalzium/src/kalzium.h
@@ -17,7 +17,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDESelectAction;
 class TDEToggleAction;
diff --git a/kalzium/src/molcalcwidget.cpp b/kalzium/src/molcalcwidget.cpp
index 60eb5108..435f6d7a 100644
--- a/kalzium/src/molcalcwidget.cpp
+++ b/kalzium/src/molcalcwidget.cpp
@@ -29,12 +29,12 @@
 #include "parser.h"
 #include "moleculeparser.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-- 
cgit v1.2.1