-rw-r--r-- | kaddressbook/kabcore.cpp | 3 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 1 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 1 | ||||
-rw-r--r-- | libkdepim/kprefswidget.h | 1 | ||||
-rw-r--r-- | libkdepim/libkdepim.pro | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 1b40d71..df634d0 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -12,53 +12,54 @@ | |||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "kabcore.h" | 31 | #include "kabcore.h" |
32 | 32 | ||
33 | #include <stdaddressbook.h> | 33 | #include <stdaddressbook.h> |
34 | #include <klocale.h> | 34 | #include <klocale.h> |
35 | #include <kfiledialog.h> | 35 | #include <kfiledialog.h> |
36 | #include <qtimer.h> | ||
36 | #include <qprogressbar.h> | 37 | #include <qprogressbar.h> |
37 | 38 | ||
38 | #ifndef KAB_EMBEDDED | 39 | #ifndef KAB_EMBEDDED |
39 | #include <qclipboard.h> | 40 | #include <qclipboard.h> |
40 | #include <qdir.h> | 41 | #include <qdir.h> |
41 | #include <qfile.h> | 42 | #include <qfile.h> |
42 | #include <qapplicaton.h> | 43 | #include <qapplicaton.h> |
43 | #include <qprogressbar.h> | 44 | #include <qprogressbar.h> |
44 | #include <qlayout.h> | 45 | #include <qlayout.h> |
45 | #include <qregexp.h> | 46 | #include <qregexp.h> |
46 | #include <qvbox.h> | 47 | #include <qvbox.h> |
47 | #include <kabc/addresseelist.h> | 48 | #include <kabc/addresseelist.h> |
48 | #include <kabc/errorhandler.h> | 49 | #include <kabc/errorhandler.h> |
49 | #include <kabc/resource.h> | 50 | #include <kabc/resource.h> |
50 | #include <kabc/vcardconverter.h> | 51 | #include <kabc/vcardconverter.h> |
51 | #include <kapplication.h> | 52 | #include <kapplication.h> |
52 | #include <kactionclasses.h> | 53 | #include <kactionclasses.h> |
53 | #include <kcmultidialog.h> | 54 | #include <kcmultidialog.h> |
54 | #include <kdebug.h> | 55 | #include <kdebug.h> |
55 | #include <kdeversion.h> | 56 | #include <kdeversion.h> |
56 | #include <kkeydialog.h> | 57 | #include <kkeydialog.h> |
57 | #include <kmessagebox.h> | 58 | #include <kmessagebox.h> |
58 | #include <kprinter.h> | 59 | #include <kprinter.h> |
59 | #include <kprotocolinfo.h> | 60 | #include <kprotocolinfo.h> |
60 | #include <kresources/selectdialog.h> | 61 | #include <kresources/selectdialog.h> |
61 | #include <kstandarddirs.h> | 62 | #include <kstandarddirs.h> |
62 | #include <ktempfile.h> | 63 | #include <ktempfile.h> |
63 | #include <kxmlguiclient.h> | 64 | #include <kxmlguiclient.h> |
64 | #include <kaboutdata.h> | 65 | #include <kaboutdata.h> |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 073ab74..03034b4 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -15,48 +15,49 @@ | |||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <qlayout.h> | 31 | #include <qlayout.h> |
32 | #include <qtabwidget.h> | 32 | #include <qtabwidget.h> |
33 | #include <qcombobox.h> | 33 | #include <qcombobox.h> |
34 | #include <qgroupbox.h> | 34 | #include <qgroupbox.h> |
35 | #include <qlabel.h> | 35 | #include <qlabel.h> |
36 | #include <qlineedit.h> | 36 | #include <qlineedit.h> |
37 | #include <qbuttongroup.h> | 37 | #include <qbuttongroup.h> |
38 | #include <qfile.h> | 38 | #include <qfile.h> |
39 | #include <qregexp.h> | ||
39 | 40 | ||
40 | #include <kdialog.h> | 41 | #include <kdialog.h> |
41 | #include <klocale.h> | 42 | #include <klocale.h> |
42 | #include <kdateedit.h> | 43 | #include <kdateedit.h> |
43 | #include <kglobal.h> | 44 | #include <kglobal.h> |
44 | #include <stdlib.h> | 45 | #include <stdlib.h> |
45 | 46 | ||
46 | /*US | 47 | /*US |
47 | #include <qcheckbox.h> | 48 | #include <qcheckbox.h> |
48 | #include <qframe.h> | 49 | #include <qframe.h> |
49 | #include <qpushbutton.h> | 50 | #include <qpushbutton.h> |
50 | #include <qcombobox.h> | 51 | #include <qcombobox.h> |
51 | #include <qlineedit.h> | 52 | #include <qlineedit.h> |
52 | #include <qlabel.h> | 53 | #include <qlabel.h> |
53 | #include <qfile.h> | 54 | #include <qfile.h> |
54 | 55 | ||
55 | #include <kconfig.h> | 56 | #include <kconfig.h> |
56 | #include <kdebug.h> | 57 | #include <kdebug.h> |
57 | #include <kdialog.h> | 58 | #include <kdialog.h> |
58 | #include <klistview.h> | 59 | #include <klistview.h> |
59 | #include <klocale.h> | 60 | #include <klocale.h> |
60 | #include <kglobal.h> | 61 | #include <kglobal.h> |
61 | #include <kmessagebox.h> | 62 | #include <kmessagebox.h> |
62 | #include <kstandarddirs.h> | 63 | #include <kstandarddirs.h> |
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index a896a0f..b2b7663 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -13,48 +13,49 @@ | |||
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kconfig.h> | 32 | #include <kconfig.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | #include <kdebug.h> | 34 | #include <kdebug.h> |
35 | #include <kstaticdeleter.h> | 35 | #include <kstaticdeleter.h> |
36 | 36 | ||
37 | #include <qregexp.h> | ||
37 | #include "kpimglobalprefs.h" | 38 | #include "kpimglobalprefs.h" |
38 | 39 | ||
39 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; | 40 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; |
40 | static KStaticDeleter<KPimGlobalPrefs> staticDeleter; | 41 | static KStaticDeleter<KPimGlobalPrefs> staticDeleter; |
41 | 42 | ||
42 | 43 | ||
43 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | 44 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) |
44 | : KPrefs("microkdeglobalrc") | 45 | : KPrefs("microkdeglobalrc") |
45 | { | 46 | { |
46 | 47 | ||
47 | KPrefs::setCurrentGroup("Locale"); | 48 | KPrefs::setCurrentGroup("Locale"); |
48 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); | 49 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); |
49 | addItemInt("PreferredTime",&mPreferredTime,0); | 50 | addItemInt("PreferredTime",&mPreferredTime,0); |
50 | addItemInt("PreferredDate",&mPreferredDate,0); | 51 | addItemInt("PreferredDate",&mPreferredDate,0); |
51 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); | 52 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); |
52 | //addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); | 53 | //addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); |
53 | // addItemBool("ShortDateInViewer",&mShortDateInViewer,false); | 54 | // addItemBool("ShortDateInViewer",&mShortDateInViewer,false); |
54 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); | 55 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); |
55 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); | 56 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); |
56 | 57 | ||
57 | KPrefs::setCurrentGroup("Time & Date"); | 58 | KPrefs::setCurrentGroup("Time & Date"); |
58 | 59 | ||
59 | addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); | 60 | addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); |
60 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); | 61 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); |
diff --git a/libkdepim/kprefswidget.h b/libkdepim/kprefswidget.h index 8a24515..8543a39 100644 --- a/libkdepim/kprefswidget.h +++ b/libkdepim/kprefswidget.h | |||
@@ -6,48 +6,49 @@ | |||
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | // $Id$ | 23 | // $Id$ |
24 | 24 | ||
25 | #ifndef _KPREFSWIDGET_H | 25 | #ifndef _KPREFSWIDGET_H |
26 | #define _KPREFSWIDGET_H | 26 | #define _KPREFSWIDGET_H |
27 | 27 | ||
28 | #include <qptrlist.h> | 28 | #include <qptrlist.h> |
29 | #include <qlineedit.h> | 29 | #include <qlineedit.h> |
30 | #include <qpushbutton.h> | ||
30 | 31 | ||
31 | #include <qwidget.h> | 32 | #include <qwidget.h> |
32 | 33 | ||
33 | class KPrefs; | 34 | class KPrefs; |
34 | 35 | ||
35 | class KColorButton; | 36 | class KColorButton; |
36 | class QCheckBox; | 37 | class QCheckBox; |
37 | class QLabel; | 38 | class QLabel; |
38 | class QSpinBox; | 39 | class QSpinBox; |
39 | class QButtonGroup; | 40 | class QButtonGroup; |
40 | 41 | ||
41 | /** | 42 | /** |
42 | @short Base class for widgets used by @ref KPrefsDialog. | 43 | @short Base class for widgets used by @ref KPrefsDialog. |
43 | @author Cornelius Schumacher | 44 | @author Cornelius Schumacher |
44 | @see KPrefsDialog | 45 | @see KPrefsDialog |
45 | 46 | ||
46 | This class provides the interface for the preferences widgets used by | 47 | This class provides the interface for the preferences widgets used by |
47 | KPrefsDialog. | 48 | KPrefsDialog. |
48 | */ | 49 | */ |
49 | class KPrefsWid : public QObject | 50 | class KPrefsWid : public QObject |
50 | { | 51 | { |
51 | Q_OBJECT | 52 | Q_OBJECT |
52 | public: | 53 | public: |
53 | /** | 54 | /** |
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro index 1fedac7..7231842 100644 --- a/libkdepim/libkdepim.pro +++ b/libkdepim/libkdepim.pro | |||
@@ -9,47 +9,49 @@ DEFINES += DESKTOP_VERSION | |||
9 | include( ../variables.pri ) | 9 | include( ../variables.pri ) |
10 | unix : { | 10 | unix : { |
11 | OBJECTS_DIR = obj/unix | 11 | OBJECTS_DIR = obj/unix |
12 | MOC_DIR = moc/unix | 12 | MOC_DIR = moc/unix |
13 | } | 13 | } |
14 | win32: { | 14 | win32: { |
15 | DEFINES += _WIN32_ | 15 | DEFINES += _WIN32_ |
16 | OBJECTS_DIR = obj/win | 16 | OBJECTS_DIR = obj/win |
17 | MOC_DIR = moc/win | 17 | MOC_DIR = moc/win |
18 | } | 18 | } |
19 | INTERFACES = \ | 19 | INTERFACES = \ |
20 | 20 | ||
21 | HEADERS = \ | 21 | HEADERS = \ |
22 | categoryeditdialog.h \ | 22 | categoryeditdialog.h \ |
23 | categoryeditdialog_base.h \ | 23 | categoryeditdialog_base.h \ |
24 | categoryselectdialog.h \ | 24 | categoryselectdialog.h \ |
25 | categoryselectdialog_base.h \ | 25 | categoryselectdialog_base.h \ |
26 | externalapphandler.h \ | 26 | externalapphandler.h \ |
27 | kdateedit.h \ | 27 | kdateedit.h \ |
28 | kdatepicker.h \ | 28 | kdatepicker.h \ |
29 | kinputdialog.h \ | 29 | kinputdialog.h \ |
30 | kpimprefs.h \ | 30 | kpimprefs.h \ |
31 | kpimglobalprefs.h \ | 31 | kpimglobalprefs.h \ |
32 | kprefsdialog.h \ | 32 | kprefsdialog.h \ |
33 | kprefswidget.h \ | ||
33 | ksyncprofile.h \ | 34 | ksyncprofile.h \ |
34 | ksyncprefsdialog.h \ | 35 | ksyncprefsdialog.h \ |
35 | kcmconfigs/kcmkdepimconfig.h \ | 36 | kcmconfigs/kcmkdepimconfig.h \ |
36 | kcmconfigs/kdepimconfigwidget.h | 37 | kcmconfigs/kdepimconfigwidget.h |
37 | 38 | ||
38 | SOURCES = \ | 39 | SOURCES = \ |
39 | categoryeditdialog.cpp \ | 40 | categoryeditdialog.cpp \ |
40 | categoryeditdialog_base.cpp \ | 41 | categoryeditdialog_base.cpp \ |
41 | categoryselectdialog.cpp \ | 42 | categoryselectdialog.cpp \ |
42 | categoryselectdialog_base.cpp \ | 43 | categoryselectdialog_base.cpp \ |
43 | externalapphandler.cpp \ | 44 | externalapphandler.cpp \ |
44 | kdateedit.cpp \ | 45 | kdateedit.cpp \ |
45 | kdatepicker.cpp \ | 46 | kdatepicker.cpp \ |
46 | kinputdialog.cpp \ | 47 | kinputdialog.cpp \ |
47 | kpimprefs.cpp \ | 48 | kpimprefs.cpp \ |
48 | kpimglobalprefs.cpp \ | 49 | kpimglobalprefs.cpp \ |
49 | kprefsdialog.cpp \ | 50 | kprefsdialog.cpp \ |
51 | kprefswidget.cpp \ | ||
50 | ksyncprofile.cpp \ | 52 | ksyncprofile.cpp \ |
51 | ksyncprefsdialog.cpp \ | 53 | ksyncprefsdialog.cpp \ |
52 | kcmconfigs/kcmkdepimconfig.cpp \ | 54 | kcmconfigs/kcmkdepimconfig.cpp \ |
53 | kcmconfigs/kdepimconfigwidget.cpp | 55 | kcmconfigs/kdepimconfigwidget.cpp |
54 | 56 | ||
55 | 57 | ||