From d318087925a540a204c9d3820d5a09fbda58b8b2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:21:55 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- tderesources/groupwise/groupwisesettingswidget.cpp | 2 +- tderesources/groupwise/groupwisesettingswidgetbase.ui | 2 +- tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp | 2 +- tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp | 2 +- tderesources/groupwise/soap/groupwiseserver.cpp | 2 +- tderesources/groupwise/soap/gwjobs.cpp | 12 ++++++------ tderesources/groupwise/soap/gwjobs.h | 4 ++-- tderesources/groupwise/soap/soapC.cpp | 2 +- tderesources/groupwise/soap/soapStub.h | 2 +- tderesources/groupwise/soap/types.xsd | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) (limited to 'tderesources/groupwise') diff --git a/tderesources/groupwise/groupwisesettingswidget.cpp b/tderesources/groupwise/groupwisesettingswidget.cpp index ec1bc178d..48de81433 100644 --- a/tderesources/groupwise/groupwisesettingswidget.cpp +++ b/tderesources/groupwise/groupwisesettingswidget.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include "groupwisesettingswidget.h" diff --git a/tderesources/groupwise/groupwisesettingswidgetbase.ui b/tderesources/groupwise/groupwisesettingswidgetbase.ui index 8ad33ea3b..b4b220521 100644 --- a/tderesources/groupwise/groupwisesettingswidgetbase.ui +++ b/tderesources/groupwise/groupwisesettingswidgetbase.ui @@ -75,6 +75,6 @@ - klistview.h + tdelistview.h diff --git a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp index 9f00dab9e..0f35e5b4c 100644 --- a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp index 747b33547..5f0152a21 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include 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 - + -- cgit v1.2.1