Rename additional header files to avoid conflicts with KDE4

src/abakuscommon.h

@@ -5,8 +5,8 @@
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>

src/abakuslistview.cpp

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 

src/mainwindow.cpp

@@ -20,13 +20,13 @@
 #include "abakuscommon.h"
 
 #include <tdeaccel.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdeshortcut.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfigbase.h>
 #include <tdeactionclasses.h>
 #include <kinputdialog.h>

src/numerictypes.cpp

@@ -21,8 +21,8 @@
 #include "hmath.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 Abakus::TrigMode Abakus::m_trigMode = Abakus::Degrees;
 int Abakus::m_prec = -1;

src/parser.yy

@@ -20,8 +20,8 @@
 
 /* Add necessary includes here. */
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include <stdio.h>
 #include <stdlib.h>

src/resultlistview.cpp

@@ -18,7 +18,7 @@
  */
 #include <kdebug.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqclipboard.h>
 #include <tqapplication.h>

src/rpnmuncher.cpp

@@ -19,7 +19,7 @@
 #include <math.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqvaluestack.h>
 #include <tqregexp.h>

src/valuemanager.cpp

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqregexp.h>