summaryrefslogtreecommitdiffstats
path: root/ksirc/KSPrefs
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:21:47 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:21:47 -0600
commitda47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb (patch)
treeb42ba87fcdfa425a31e243a62d71e1de248b6ee8 /ksirc/KSPrefs
parent4ed8d784e29102ed1659f4ccf71fcc6fb0dad5c8 (diff)
downloadtdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.tar.gz
tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'ksirc/KSPrefs')
-rw-r--r--ksirc/KSPrefs/page_autoconnect.cpp2
-rw-r--r--ksirc/KSPrefs/page_autoconnectbase.ui2
-rw-r--r--ksirc/KSPrefs/page_font.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index 964a4acd..86a78c6d 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -12,7 +12,7 @@
#include <tqregexp.h>
#include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqcheckbox.h>
diff --git a/ksirc/KSPrefs/page_autoconnectbase.ui b/ksirc/KSPrefs/page_autoconnectbase.ui
index 664bf30f..ff220588 100644
--- a/ksirc/KSPrefs/page_autoconnectbase.ui
+++ b/ksirc/KSPrefs/page_autoconnectbase.ui
@@ -387,7 +387,7 @@
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
</includehints>
diff --git a/ksirc/KSPrefs/page_font.h b/ksirc/KSPrefs/page_font.h
index 154ff014..ae910a2d 100644
--- a/ksirc/KSPrefs/page_font.h
+++ b/ksirc/KSPrefs/page_font.h
@@ -1,6 +1,6 @@
#ifndef _PAGE_FONT
#define _PAGE_FONT
-#include <kfontdialog.h> // For the font selection widget
+#include <tdefontdialog.h> // For the font selection widget
#include <tqlayout.h> // For the tqlayout
#include "ksopts.h" // For storing the info.