author | zautrix <zautrix> | 2005-02-01 12:22:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-01 12:22:08 (UTC) |
commit | 3295269ea601147ea60ba4d20ad225048d9d47c0 (patch) (unidiff) | |
tree | d3bd36c91a0687257bb6b3fac464631770d7f79b | |
parent | d1aa72f683fb264cca6936a8119d0abe9b310325 (diff) | |
download | kdepimpi-3295269ea601147ea60ba4d20ad225048d9d47c0.zip kdepimpi-3295269ea601147ea60ba4d20ad225048d9d47c0.tar.gz kdepimpi-3295269ea601147ea60ba4d20ad225048d9d47c0.tar.bz2 |
fixes
-rw-r--r-- | kaddressbook/xxport/csvimportdialog.cpp | 4 | ||||
-rw-r--r-- | microkde/kresources/configpage.cpp | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 1093f9c..cc55a24 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp | |||
@@ -17,33 +17,37 @@ | |||
17 | along with this library; see the file COPYING.LIB. If not, write to | 17 | along with this library; see the file COPYING.LIB. If not, write to |
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
19 | Boston, MA 02111-1307, USA. | 19 | Boston, MA 02111-1307, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | /* | 22 | /* |
23 | Enhanced Version of the file for platform independent KDE tools. | 23 | Enhanced Version of the file for platform independent KDE tools. |
24 | Copyright (c) 2004 Ulf Schenk | 24 | Copyright (c) 2004 Ulf Schenk |
25 | 25 | ||
26 | $Id$ | 26 | $Id$ |
27 | */ | 27 | */ |
28 | 28 | ||
29 | 29 | ||
30 | #include <qbuttongroup.h> | 30 | #include <qbuttongroup.h> |
31 | #include <qcheckbox.h> | 31 | #include <qcheckbox.h> |
32 | #include <qcombobox.h> | 32 | #include <qcombobox.h> |
33 | #ifdef DESKTOP_VERSION | ||
33 | #include <qinputdialog.h> | 34 | #include <qinputdialog.h> |
35 | #else | ||
36 | #include <qtcompat/qinputdialog.h> | ||
37 | #endif | ||
34 | #include <qlabel.h> | 38 | #include <qlabel.h> |
35 | #include <qlineedit.h> | 39 | #include <qlineedit.h> |
36 | #include <qpushbutton.h> | 40 | #include <qpushbutton.h> |
37 | #include <qradiobutton.h> | 41 | #include <qradiobutton.h> |
38 | #include <qtable.h> | 42 | #include <qtable.h> |
39 | #include <qlayout.h> | 43 | #include <qlayout.h> |
40 | #include <qtextstream.h> | 44 | #include <qtextstream.h> |
41 | #include <qfile.h> | 45 | #include <qfile.h> |
42 | 46 | ||
43 | #include <kapplication.h> | 47 | #include <kapplication.h> |
44 | #include <kdebug.h> | 48 | #include <kdebug.h> |
45 | #include <kdialogbase.h> | 49 | #include <kdialogbase.h> |
46 | #include <kfiledialog.h> | 50 | #include <kfiledialog.h> |
47 | #include <klineedit.h> | 51 | #include <klineedit.h> |
48 | #include <klocale.h> | 52 | #include <klocale.h> |
49 | #include <kglobal.h> | 53 | #include <kglobal.h> |
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp index 011e47e..fc7a42e 100644 --- a/microkde/kresources/configpage.cpp +++ b/microkde/kresources/configpage.cpp | |||
@@ -16,36 +16,40 @@ | |||
16 | Library General Public License for more details. | 16 | Library General Public License for more details. |
17 | 17 | ||
18 | You should have received a copy of the GNU Library General Public License | 18 | You should have received a copy of the GNU Library General Public License |
19 | along with this library; see the file COPYING.LIB. If not, write to | 19 | along with this library; see the file COPYING.LIB. If not, write to |
20 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 20 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
21 | Boston, MA 02111-1307, USA. | 21 | Boston, MA 02111-1307, USA. |
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 <qgroupbox.h> | 31 | #include <qgroupbox.h> |
32 | |||
33 | #ifdef DESKTOP_VERSION | ||
32 | #include <qinputdialog.h> | 34 | #include <qinputdialog.h> |
35 | #else | ||
36 | #include <qtcompat/qinputdialog.h> | ||
37 | #endif | ||
33 | #include <qlabel.h> | 38 | #include <qlabel.h> |
34 | #include <qlayout.h> | 39 | #include <qlayout.h> |
35 | |||
36 | #include <kapplication.h> | 40 | #include <kapplication.h> |
37 | #include <kcombobox.h> | 41 | #include <kcombobox.h> |
38 | #include <kdebug.h> | 42 | #include <kdebug.h> |
39 | #include <klocale.h> | 43 | #include <klocale.h> |
40 | #include <kmessagebox.h> | 44 | #include <kmessagebox.h> |
41 | #include <ksimpleconfig.h> | 45 | #include <ksimpleconfig.h> |
42 | #include <kstandarddirs.h> | 46 | #include <kstandarddirs.h> |
43 | #include <kurlrequester.h> | 47 | #include <kurlrequester.h> |
44 | #include <klistview.h> | 48 | #include <klistview.h> |
45 | #include <kbuttonbox.h> | 49 | #include <kbuttonbox.h> |
46 | //US #include <ktrader.h> | 50 | //US #include <ktrader.h> |
47 | 51 | ||
48 | #include "resource.h" | 52 | #include "resource.h" |
49 | #include "configdialog.h" | 53 | #include "configdialog.h" |
50 | 54 | ||
51 | #include "configpage.h" | 55 | #include "configpage.h" |