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

---
 tderesources/kolab/kabc/resourcekolab.cpp | 2 +-
 tderesources/kolab/kcal/resourcekolab.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tderesources/kolab')

diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp
index 51c3a4b42..889c4811b 100644
--- a/tderesources/kolab/kabc/resourcekolab.cpp
+++ b/tderesources/kolab/kabc/resourcekolab.cpp
@@ -41,7 +41,7 @@
 #include <tdeio/observer.h>
 #include <tdeio/uiserver_stub.h>
 #include <kabc/vcardconverter.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 #include <dcopclient.h>
 
diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index 50f8b5b82..bfcb3c89f 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -43,7 +43,7 @@
 #include <dcopclient.h>
 #include <libtdepim/kincidencechooser.h>
 #include <kabc/locknull.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <ktempfile.h>
-- 
cgit v1.2.1