-rw-r--r-- | kaddressbook/kcmconfigs/addresseewidget.cpp | 1 | ||||
-rw-r--r-- | kaddressbook/mainembedded.cpp | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index f84b2ba..eb5bdd9 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp | |||
@@ -17,24 +17,25 @@ | |||
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 | #include <qgroupbox.h> | 24 | #include <qgroupbox.h> |
25 | #include <qlabel.h> | 25 | #include <qlabel.h> |
26 | #include <qlayout.h> | 26 | #include <qlayout.h> |
27 | #include <qlistbox.h> | 27 | #include <qlistbox.h> |
28 | #include <qpushbutton.h> | 28 | #include <qpushbutton.h> |
29 | #include <qapplication.h> | ||
29 | 30 | ||
30 | #include <kbuttonbox.h> | 31 | #include <kbuttonbox.h> |
31 | #include <kcombobox.h> | 32 | #include <kcombobox.h> |
32 | #include <kconfig.h> | 33 | #include <kconfig.h> |
33 | #include <kdialog.h> | 34 | #include <kdialog.h> |
34 | #include <klocale.h> | 35 | #include <klocale.h> |
35 | #include <kglobal.h> | 36 | #include <kglobal.h> |
36 | #include <klineedit.h> | 37 | #include <klineedit.h> |
37 | #include <kstandarddirs.h> | 38 | #include <kstandarddirs.h> |
38 | 39 | ||
39 | #include "addresseewidget.h" | 40 | #include "addresseewidget.h" |
40 | 41 | ||
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index dce6a88..cf1fd3e 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp | |||
@@ -36,38 +36,39 @@ int main( int argc, char **argv ) | |||
36 | } | 36 | } |
37 | } | 37 | } |
38 | if ( ! exitHelp ) { | 38 | if ( ! exitHelp ) { |
39 | 39 | ||
40 | KGlobal::setAppName( "kaddressbook" ); | 40 | KGlobal::setAppName( "kaddressbook" ); |
41 | #ifndef DESKTOP_VERSION | 41 | #ifndef DESKTOP_VERSION |
42 | if ( QApplication::desktop()->width() > 320 ) | 42 | if ( QApplication::desktop()->width() > 320 ) |
43 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); | 43 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); |
44 | else | 44 | else |
45 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); | 45 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); |
46 | #else | 46 | #else |
47 | QString fileName ; | 47 | QString fileName ; |
48 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/"; | 48 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; |
49 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); | 49 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); |
50 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); | ||
50 | 51 | ||
51 | #endif | 52 | #endif |
52 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); | 53 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); |
53 | KAddressBookMain m ; | 54 | KAddressBookMain m ; |
54 | //US MainWindow m; | 55 | //US MainWindow m; |
55 | //US QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve( const QCString&, const QByteArray& ))); | 56 | //US QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve( const QCString&, const QByteArray& ))); |
56 | 57 | ||
57 | #ifndef DESKTOP_VERSION | 58 | #ifndef DESKTOP_VERSION |
58 | a.showMainWidget( &m ); | 59 | a.showMainWidget( &m ); |
59 | #else | 60 | #else |
60 | a.setMainWidget(m ); | 61 | a.setMainWidget( &m ); |
61 | m->show(); | 62 | m.show(); |
62 | #endif | 63 | #endif |
63 | a.exec(); | 64 | a.exec(); |
64 | 65 | ||
65 | } | 66 | } |
66 | qDebug("KA: Bye! "); | 67 | qDebug("KA: Bye! "); |
67 | } | 68 | } |
68 | 69 | ||
69 | /* | 70 | /* |
70 | #include <stdlib.h> | 71 | #include <stdlib.h> |
71 | 72 | ||
72 | #include <qstring.h> | 73 | #include <qstring.h> |
73 | 74 | ||