summaryrefslogtreecommitdiffstats
path: root/tderesources/scalix
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
commitd318087925a540a204c9d3820d5a09fbda58b8b2 (patch)
treeb8dde6aa5d6559b81c6667d8364a4364c27bcba4 /tderesources/scalix
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/scalix')
-rw-r--r--tderesources/scalix/kabc/resourcescalix.cpp2
-rw-r--r--tderesources/scalix/kcal/resourcescalix.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/delegateview.h2
-rw-r--r--tderesources/scalix/scalixadmin/ldapview.h2
-rw-r--r--tderesources/scalix/scalixadmin/mainwindow.h2
-rw-r--r--tderesources/scalix/scalixadmin/otheruserview.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp
index 13ee99ec8..6fd4f9761 100644
--- a/tderesources/scalix/kabc/resourcescalix.cpp
+++ b/tderesources/scalix/kabc/resourcescalix.cpp
@@ -40,7 +40,7 @@
#include <ktempfile.h>
#include <tdeio/observer.h>
#include <tdeio/uiserver_stub.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kapplication.h>
#include <dcopclient.h>
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index 672a7bfbf..ab9cc0408 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -40,7 +40,7 @@
#include <libkcal/icalformat.h>
#include <libtdepim/kincidencechooser.h>
#include <kabc/locknull.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <klocale.h>
#include <tqobject.h>
diff --git a/tderesources/scalix/scalixadmin/delegateview.h b/tderesources/scalix/scalixadmin/delegateview.h
index aef034059..0416b8a01 100644
--- a/tderesources/scalix/scalixadmin/delegateview.h
+++ b/tderesources/scalix/scalixadmin/delegateview.h
@@ -21,7 +21,7 @@
#ifndef DELEGATEVIEW_H
#define DELEGATEVIEW_H
-#include <klistview.h>
+#include <tdelistview.h>
namespace Scalix {
class Delegate;
diff --git a/tderesources/scalix/scalixadmin/ldapview.h b/tderesources/scalix/scalixadmin/ldapview.h
index cd71a17f6..3cb635e8b 100644
--- a/tderesources/scalix/scalixadmin/ldapview.h
+++ b/tderesources/scalix/scalixadmin/ldapview.h
@@ -20,7 +20,7 @@
#ifndef LDAPVIEW_H
#define LDAPVIEW_H
-#include <klistview.h>
+#include <tdelistview.h>
namespace KABC {
class LdapClient;
diff --git a/tderesources/scalix/scalixadmin/mainwindow.h b/tderesources/scalix/scalixadmin/mainwindow.h
index a682ec065..bd682954c 100644
--- a/tderesources/scalix/scalixadmin/mainwindow.h
+++ b/tderesources/scalix/scalixadmin/mainwindow.h
@@ -21,7 +21,7 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
class MainWindow : public TDEMainWindow
{
diff --git a/tderesources/scalix/scalixadmin/otheruserview.h b/tderesources/scalix/scalixadmin/otheruserview.h
index 89dbd8c0e..832b09b8a 100644
--- a/tderesources/scalix/scalixadmin/otheruserview.h
+++ b/tderesources/scalix/scalixadmin/otheruserview.h
@@ -21,7 +21,7 @@
#ifndef OTHERUSERVIEW_H
#define OTHERUSERVIEW_H
-#include <klistview.h>
+#include <tdelistview.h>
class OtherUserManager;