summaryrefslogtreecommitdiffstats
path: root/ksysv
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:17:58 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:17:58 -0600
commit09470cb1bf92cbed1abf0f7096af9ed87a262624 (patch)
treee030116c829671f6a75d4fed1e2cfd786e0484fc /ksysv
parent6a1e482053c3400d39984fb5c6cbacf627950676 (diff)
downloadtdeadmin-09470cb1bf92cbed1abf0f7096af9ed87a262624.tar.gz
tdeadmin-09470cb1bf92cbed1abf0f7096af9ed87a262624.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'ksysv')
-rw-r--r--ksysv/OldView.cpp2
-rw-r--r--ksysv/TopWidget.cpp8
-rw-r--r--ksysv/TopWidget.h2
-rw-r--r--ksysv/ksv_conf.cpp2
-rw-r--r--ksysv/ksvdraglist.cpp2
-rw-r--r--ksysv/ksvdraglist.h2
-rw-r--r--ksysv/ksvlookandfeel.cpp2
7 files changed, 10 insertions, 10 deletions
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp
index 2735861..3d42700 100644
--- a/ksysv/OldView.cpp
+++ b/ksysv/OldView.cpp
@@ -47,7 +47,7 @@
#include <kprocess.h>
#include <kstandarddirs.h>
#include <kcursor.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kglobalsettings.h>
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index 67f8404..b80f503 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -52,11 +52,11 @@
#include <tqsimplerichtext.h>
#include <kresolver.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <kkeydialog.h>
#include <kmenubar.h>
#include <kcompletion.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <kdebug.h>
#include <kapplication.h>
@@ -64,7 +64,7 @@
#include <khelpmenu.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kedittoolbar.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
@@ -90,7 +90,7 @@
namespace Status
{
enum {
- Changed, Checklist, Writable
+ Changed, Chectdelist, Writable
};
} // namespace Status
diff --git a/ksysv/TopWidget.h b/ksysv/TopWidget.h
index 2cf56b0..522d535 100644
--- a/ksysv/TopWidget.h
+++ b/ksysv/TopWidget.h
@@ -15,7 +15,7 @@
#ifndef KSV_TOPWIDGET_H
#define KSV_TOPWIDGET_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
class TQCheckBox;
diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp
index 1939d57..ff59c0c 100644
--- a/ksysv/ksv_conf.cpp
+++ b/ksysv/ksv_conf.cpp
@@ -16,7 +16,7 @@
#include <kapplication.h>
#include <kglobal.h>
#include <kglobalsettings.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <tdeconfig.h>
#include "ksv_core.h"
diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp
index 3edaaf0..eebe6fd 100644
--- a/ksysv/ksvdraglist.cpp
+++ b/ksysv/ksvdraglist.cpp
@@ -45,7 +45,7 @@
#include <tqlabel.h>
#include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kglobal.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/ksysv/ksvdraglist.h b/ksysv/ksvdraglist.h
index c086f02..6c75706 100644
--- a/ksysv/ksvdraglist.h
+++ b/ksysv/ksvdraglist.h
@@ -38,7 +38,7 @@
#include <tqcolor.h>
#include <tqpixmap.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include "Data.h"
diff --git a/ksysv/ksvlookandfeel.cpp b/ksysv/ksvlookandfeel.cpp
index 3284107..e5b2137 100644
--- a/ksysv/ksvlookandfeel.cpp
+++ b/ksysv/ksvlookandfeel.cpp
@@ -29,7 +29,7 @@
#include <tqlayout.h>
#include <kdialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
/*
* Constructs a KSVLookAndFeel which is a child of 'parent', with the