diff options
Diffstat (limited to 'tderesources')
26 files changed, 33 insertions, 33 deletions
diff --git a/tderesources/birthdays/resourcekabcconfig.h b/tderesources/birthdays/resourcekabcconfig.h index 4016c727c..41cf1b88a 100644 --- a/tderesources/birthdays/resourcekabcconfig.h +++ b/tderesources/birthdays/resourcekabcconfig.h @@ -26,7 +26,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <klistview.h> +#include <tdelistview.h> #include <krestrictedline.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp index 0a07aafc9..5aeb2ddf6 100644 --- a/tderesources/caldav/config.cpp +++ b/tderesources/caldav/config.cpp @@ -23,7 +23,7 @@ #include <kdialog.h> #include <klocale.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurlrequester.h> #include <tqlabel.h> diff --git a/tderesources/carddav/config.cpp b/tderesources/carddav/config.cpp index 9b01eb5d4..ecfff25e0 100644 --- a/tderesources/carddav/config.cpp +++ b/tderesources/carddav/config.cpp @@ -22,7 +22,7 @@ #include <kdialog.h> #include <klocale.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurlrequester.h> #include <tqlabel.h> diff --git a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp index 4634495e9..317c82b6f 100644 --- a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp @@ -28,7 +28,7 @@ #include <kdialog.h> #include <klocale.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurlrequester.h> #include <tqlabel.h> 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 <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> #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 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> 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 <kdialog.h> #include <klocale.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurlrequester.h> #include <tqlabel.h> 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 <tqcheckbox.h> #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdebug.h> #include <kdialogbase.h> #include <kstandarddirs.h> 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"/>
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> diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp index 20fa6fa1b..81c65af48 100644 --- a/tderesources/lib/folderconfig.cpp +++ b/tderesources/lib/folderconfig.cpp @@ -27,7 +27,7 @@ #include "groupwaredataadaptor.h" #include "folderlistview.h" -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kdebug.h> #include <kdialog.h> diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp index 68995aef2..be719d95a 100644 --- a/tderesources/lib/folderlistview.cpp +++ b/tderesources/lib/folderlistview.cpp @@ -24,10 +24,10 @@ #include "folderlistview.h" #include "folderlister.h" -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <tqlistview.h> diff --git a/tderesources/lib/folderlistview.h b/tderesources/lib/folderlistview.h index f4837ecf6..ce6243df0 100644 --- a/tderesources/lib/folderlistview.h +++ b/tderesources/lib/folderlistview.h @@ -24,7 +24,7 @@ #ifndef FOLDERLISTVIEW_H #define FOLDERLISTVIEW_H -#include <klistview.h> +#include <tdelistview.h> #include "folderlister.h" class FolderListItem; 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; diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp index 0d6a756bb..f7d19697d 100644 --- a/tderesources/slox/sloxfolderdialog.cpp +++ b/tderesources/slox/sloxfolderdialog.cpp @@ -19,7 +19,7 @@ #include <kiconloader.h> #include <kguiitem.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include "sloxfolderdialog.h" |