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

---
 kppp/docking.cpp         | 2 +-
 kppp/logview/main.h      | 2 +-
 kppp/logview/monthly.cpp | 2 +-
 kppp/miniterm.cpp        | 2 +-
 kppp/miniterm.h          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kppp')

diff --git a/kppp/docking.cpp b/kppp/docking.cpp
index d67b6683..b569b3c1 100644
--- a/kppp/docking.cpp
+++ b/kppp/docking.cpp
@@ -27,7 +27,7 @@
 #include <twin.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "docking.h"
 #include "main.h"
diff --git a/kppp/logview/main.h b/kppp/logview/main.h
index 8b90481e..dcbf2cb8 100644
--- a/kppp/logview/main.h
+++ b/kppp/logview/main.h
@@ -21,7 +21,7 @@
 #ifndef __MAIN__H__
 #define __MAIN__H__
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqtabwidget.h>
 #include <kmenubar.h>
 #include "monthly.h"
diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp
index 35937219..0fd6e83e 100644
--- a/kppp/logview/monthly.cpp
+++ b/kppp/logview/monthly.cpp
@@ -26,7 +26,7 @@
 #include <kcalendarsystem.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 
diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp
index 51d1b9d2..ff9bfcff 100644
--- a/kppp/miniterm.cpp
+++ b/kppp/miniterm.cpp
@@ -33,7 +33,7 @@
 #include "modem.h"
 #include "miniterm.h"
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kglobalsettings.h>
 #include <kapplication.h>
 #include <kmenubar.h>
diff --git a/kppp/miniterm.h b/kppp/miniterm.h
index e58e5603..984083a8 100644
--- a/kppp/miniterm.h
+++ b/kppp/miniterm.h
@@ -32,7 +32,7 @@
 #include <tqpixmap.h>
 #include <tqevent.h>
 #include <tqmultilineedit.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 class KHelpMenu;
 
-- 
cgit v1.2.1