Rename many classes and header files to avoid conflicts with KDE4

6 files changed, 12 insertions, 12 deletions

diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp
index cedcde6aa..780708347 100644
--- a/tderesources/groupwise/soap/groupwiseserver.cpp
+++ b/tderesources/groupwise/soap/groupwiseserver.cpp
@@ -1317,7 +1317,7 @@ bool GroupwiseServer::readCalendarSynchronous( KCal::Calendar *cal )
 
   ReadCalendarJob *job = new ReadCalendarJob( this, mSoap, mUrl, mSession );
   job->setCalendarFolder( &mCalendarFolder );
-  job->setChecklistFolder( &mCheckListFolder );
+  job->setChectdelistFolder( &mCheckListFolder );
   job->setCalendar( cal );
 
   job->run();
diff --git a/tderesources/groupwise/soap/gwjobs.cpp b/tderesources/groupwise/soap/gwjobs.cpp
index 4e4d1b28f..343a4a208 100644
--- a/tderesources/groupwise/soap/gwjobs.cpp
+++ b/tderesources/groupwise/soap/gwjobs.cpp
@@ -335,9 +335,9 @@ void ReadCalendarJob::setCalendarFolder( std::string *calendarFolder )
   mCalendarFolder = calendarFolder;
 }
 
-void ReadCalendarJob::setChecklistFolder( std::string *checklistFolder )
+void ReadCalendarJob::setChectdelistFolder( std::string *checklistFolder )
 {
-  mChecklistFolder = checklistFolder;
+  mChectdelistFolder = checklistFolder;
 }
 
 void ReadCalendarJob::setCalendar( KCal::Calendar *calendar )
@@ -402,17 +402,17 @@ void ReadCalendarJob::run()
                 haveReadFolder = true;
                 *mCalendarFolder = *((*it)->id);
               }
-              else if ( *(fld->folderType) == Checklist ) {
-                kdDebug() << "Reading folder " <<  (*(*it)->id).c_str() << ", of type Checklist, physically containing " << count << " items." << endl;
+              else if ( *(fld->folderType) == Chectdelist ) {
+                kdDebug() << "Reading folder " <<  (*(*it)->id).c_str() << ", of type Chectdelist, physically containing " << count << " items." << endl;
                 readCalendarFolder( *(*it)->id, itemCounts );
                 haveReadFolder = true;
-                *mChecklistFolder = *((*it)->id);
+                *mChectdelistFolder = *((*it)->id);
               }
   /*            else if ( fld->folderType == SentItems ) {
                 kdDebug() << "Reading folder " <<  (*(*it)->id).c_str() << ", of type SentItems, physically containing " << count << " items." << endl;
                 readCalendarFolder( *(*it)->id, itemCounts );
                 haveReadFolder = true;
-                *mChecklistFolder = *((*it)->id);
+                *mChectdelistFolder = *((*it)->id);
               }*/
   /*            else if ( fld->folderType == Mailbox ) {
                 kdDebug() << "Reading folder " <<  (*(*it)->id).c_str() << ", of type Mailbox (not yet accepted items), containing " << count << " items." << endl;
diff --git a/tderesources/groupwise/soap/gwjobs.h b/tderesources/groupwise/soap/gwjobs.h
index 815e6261e..bf60ecbd9 100644
--- a/tderesources/groupwise/soap/gwjobs.h
+++ b/tderesources/groupwise/soap/gwjobs.h
@@ -82,7 +82,7 @@ class ReadCalendarJob : public GWJob
       const std::string &session );
 
     void setCalendarFolder( std::string* );
-    void setChecklistFolder( std::string* );
+    void setChectdelistFolder( std::string* );
 
     void setCalendar( KCal::Calendar * );
 
@@ -93,7 +93,7 @@ class ReadCalendarJob : public GWJob
 
   private:
     std::string *mCalendarFolder;
-    std::string *mChecklistFolder;
+    std::string *mChectdelistFolder;
     KCal::Calendar *mCalendar;
 };
 
diff --git a/tderesources/groupwise/soap/soapC.cpp b/tderesources/groupwise/soap/soapC.cpp
index 6decf59f2..f36c24637 100644
--- a/tderesources/groupwise/soap/soapC.cpp
+++ b/tderesources/groupwise/soap/soapC.cpp
@@ -12804,7 +12804,7 @@ static const struct soap_code_map soap_codes_ngwt__FolderType[] =
 	{ (long)Calendar, "Calendar" },
 	{ (long)Contacts, "Contacts" },
 	{ (long)Documents, "Documents" },
-	{ (long)Checklist, "Checklist" },
+	{ (long)Chectdelist, "Chectdelist" },
 	{ (long)Cabinet, "Cabinet" },
 	{ (long)Normal_, "Normal" },
 	{ (long)NNTPServer, "NNTPServer" },
diff --git a/tderesources/groupwise/soap/soapStub.h b/tderesources/groupwise/soap/soapStub.h
index 5566ba0ba..4f42a3372 100644
--- a/tderesources/groupwise/soap/soapStub.h
+++ b/tderesources/groupwise/soap/soapStub.h
@@ -127,7 +127,7 @@ enum ngwt__FolderACLStatus {pending = 0, accepted = 1, deleted = 2, opened = 3,
 #ifndef SOAP_TYPE_ngwt__FolderType
 #define SOAP_TYPE_ngwt__FolderType (359)
 /* ngwt:FolderType */
-enum ngwt__FolderType {Mailbox = 0, SentItems = 1, Draft = 2, Trash = 3, Calendar = 4, Contacts = 5, Documents = 6, Checklist = 7, Cabinet = 8, Normal_ = 9, NNTPServer = 10, NNTPNewsGroup = 11, IMAP = 12, Query = 13, Root = 14, JunkMail = 15, Notes = 16};
+enum ngwt__FolderType {Mailbox = 0, SentItems = 1, Draft = 2, Trash = 3, Calendar = 4, Contacts = 5, Documents = 6, Chectdelist = 7, Cabinet = 8, Normal_ = 9, NNTPServer = 10, NNTPNewsGroup = 11, IMAP = 12, Query = 13, Root = 14, JunkMail = 15, Notes = 16};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__Frequency
diff --git a/tderesources/groupwise/soap/types.xsd b/tderesources/groupwise/soap/types.xsd
index d0416f8e1..096e7a9e6 100644
--- a/tderesources/groupwise/soap/types.xsd
+++ b/tderesources/groupwise/soap/types.xsd
@@ -687,7 +687,7 @@ file by physical or electronic mail, you may find current contact information at
 			<xs:enumeration value="Calendar"/>

 			<xs:enumeration value="Contacts"/>

 			<xs:enumeration value="Documents"/>

-			<xs:enumeration value="Checklist"/>

+			<xs:enumeration value="Chectdelist"/>

 			<xs:enumeration value="Cabinet"/>

 			<xs:enumeration value="Normal"/>

 			<xs:enumeration value="NNTPServer"/>