author | zautrix <zautrix> | 2004-09-07 20:33:23 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-07 20:33:23 (UTC) |
commit | 64a8ef1629f523df3006de5cb2b9882a50d96a05 (patch) (unidiff) | |
tree | b931dc5397b4eec926603080b20eddda131999ff /kabc/stdaddressbook.cpp | |
parent | 9d5c8750ae671e73ec8ebc0a71f30fd30680f2c0 (diff) | |
download | kdepimpi-64a8ef1629f523df3006de5cb2b9882a50d96a05.zip kdepimpi-64a8ef1629f523df3006de5cb2b9882a50d96a05.tar.gz kdepimpi-64a8ef1629f523df3006de5cb2b9882a50d96a05.tar.bz2 |
Fixed Kopi-Kapi external app communication
-rw-r--r-- | kabc/stdaddressbook.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index 760820e..9f38f08 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp | |||
@@ -34,101 +34,111 @@ $Id$ | |||
34 | #include <kstandarddirs.h> | 34 | #include <kstandarddirs.h> |
35 | 35 | ||
36 | #include "stdaddressbook.h" | 36 | #include "stdaddressbook.h" |
37 | 37 | ||
38 | using namespace KABC; | 38 | using namespace KABC; |
39 | 39 | ||
40 | StdAddressBook *StdAddressBook::mSelf = 0; | 40 | StdAddressBook *StdAddressBook::mSelf = 0; |
41 | bool StdAddressBook::mAutomaticSave = true; | 41 | bool StdAddressBook::mAutomaticSave = true; |
42 | 42 | ||
43 | static KStaticDeleter<StdAddressBook> addressBookDeleter; | 43 | static KStaticDeleter<StdAddressBook> addressBookDeleter; |
44 | 44 | ||
45 | QString StdAddressBook::fileName() | 45 | QString StdAddressBook::fileName() |
46 | { | 46 | { |
47 | return locateLocal( "data", "kabc/std.vcf" ); | 47 | return locateLocal( "data", "kabc/std.vcf" ); |
48 | } | 48 | } |
49 | 49 | ||
50 | QString StdAddressBook::directoryName() | 50 | QString StdAddressBook::directoryName() |
51 | { | 51 | { |
52 | return locateLocal( "data", "kabc/stdvcf" ); | 52 | return locateLocal( "data", "kabc/stdvcf" ); |
53 | } | 53 | } |
54 | 54 | ||
55 | void StdAddressBook::handleCrash() | 55 | void StdAddressBook::handleCrash() |
56 | { | 56 | { |
57 | StdAddressBook::self()->cleanUp(); | 57 | StdAddressBook::self()->cleanUp(); |
58 | } | 58 | } |
59 | 59 | ||
60 | StdAddressBook *StdAddressBook::self() | 60 | StdAddressBook *StdAddressBook::self() |
61 | { | 61 | { |
62 | 62 | ||
63 | if ( !mSelf ) | 63 | if ( !mSelf ) |
64 | { | 64 | { |
65 | QString appdir = StdAddressBook::setTempAppDir(); | 65 | QString appdir = StdAddressBook::setTempAppDir(); |
66 | 66 | qDebug("****************************************************** "); | |
67 | kdDebug(5700) << "StdAddressBook::self()" << endl; | 67 | qDebug("****************************************************** "); |
68 | qDebug("****************************************************** "); | ||
69 | qDebug("****************************************************** "); | ||
70 | qDebug("****************************************************** "); | ||
68 | // US im am not sure why I have to use the other format here?? | 71 | // US im am not sure why I have to use the other format here?? |
69 | #ifdef KAB_EMBEDDED | 72 | #ifdef KAB_EMBEDDED |
70 | mSelf = addressBookDeleter.setObject( new StdAddressBook ); | 73 | mSelf = addressBookDeleter.setObject( new StdAddressBook ); |
71 | #else //KAB_EMBEDDED | 74 | #else //KAB_EMBEDDED |
72 | addressBookDeleter.setObject( mSelf, new StdAddressBook ); | 75 | addressBookDeleter.setObject( mSelf, new StdAddressBook ); |
73 | #endif //KAB_EMBEDDED | 76 | #endif //KAB_EMBEDDED |
74 | KStandardDirs::setAppDir( appdir ); | 77 | KStandardDirs::setAppDir( appdir ); |
75 | } | 78 | } |
76 | 79 | ||
77 | return mSelf; | 80 | return mSelf; |
78 | } | 81 | } |
79 | 82 | ||
80 | QString StdAddressBook::setTempAppDir() | 83 | QString StdAddressBook::setTempAppDir() |
81 | { | 84 | { |
82 | QString appDIR = KStandardDirs::appDir(); | 85 | QString appDIR = KStandardDirs::appDir(); |
83 | #ifdef DESKTOP_VERSION | 86 | #ifdef DESKTOP_VERSION |
84 | QString appdir = QDir::homeDirPath(); | 87 | QString appdir = QDir::homeDirPath(); |
85 | if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) | 88 | if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) |
86 | appdir += "kaddressbook/"; | 89 | appdir += "kaddressbook/"; |
87 | else | 90 | else |
88 | appdir += "/kaddressbook/"; | 91 | appdir += "/kaddressbook/"; |
89 | KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); | 92 | KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); |
90 | #else | 93 | #else |
91 | QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; | 94 | QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; |
92 | 95 | ||
93 | KStandardDirs::setAppDir( appdir ); | 96 | KStandardDirs::setAppDir( appdir ); |
94 | #endif | 97 | #endif |
95 | 98 | ||
96 | return appDIR; | 99 | return appDIR; |
97 | } | 100 | } |
98 | StdAddressBook *StdAddressBook::self( bool onlyFastResources ) | 101 | StdAddressBook *StdAddressBook::self( bool onlyFastResources ) |
99 | { | 102 | { |
100 | 103 | ||
101 | if ( !mSelf ) | 104 | if ( !mSelf ) |
102 | { | 105 | { |
106 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
107 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
108 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
109 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
110 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
111 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
112 | qDebug("++++++++++++++++++++++++++++++++++++++++++++++++ "); | ||
103 | QString appdir =StdAddressBook::setTempAppDir(); | 113 | QString appdir =StdAddressBook::setTempAppDir(); |
104 | #ifdef KAB_EMBEDDED | 114 | #ifdef KAB_EMBEDDED |
105 | mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) ); | 115 | mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) ); |
106 | #else //KAB_EMBEDDED | 116 | #else //KAB_EMBEDDED |
107 | addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) ); | 117 | addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) ); |
108 | #endif //KAB_EMBEDDED | 118 | #endif //KAB_EMBEDDED |
109 | KStandardDirs::setAppDir( appdir ); | 119 | KStandardDirs::setAppDir( appdir ); |
110 | } | 120 | } |
111 | return mSelf; | 121 | return mSelf; |
112 | } | 122 | } |
113 | 123 | ||
114 | StdAddressBook::StdAddressBook() | 124 | StdAddressBook::StdAddressBook() |
115 | : AddressBook( "kabcrc" ) | 125 | : AddressBook( "kabcrc" ) |
116 | { | 126 | { |
117 | 127 | ||
118 | init( false ); | 128 | init( false ); |
119 | } | 129 | } |
120 | 130 | ||
121 | StdAddressBook::StdAddressBook( bool onlyFastResources ) | 131 | StdAddressBook::StdAddressBook( bool onlyFastResources ) |
122 | : AddressBook( "kabcrc" ) | 132 | : AddressBook( "kabcrc" ) |
123 | { | 133 | { |
124 | 134 | ||
125 | init( onlyFastResources ); | 135 | init( onlyFastResources ); |
126 | } | 136 | } |
127 | 137 | ||
128 | StdAddressBook::~StdAddressBook() | 138 | StdAddressBook::~StdAddressBook() |
129 | { | 139 | { |
130 | if ( mAutomaticSave ) | 140 | if ( mAutomaticSave ) |
131 | save(); | 141 | save(); |
132 | } | 142 | } |
133 | 143 | ||
134 | void StdAddressBook::init( bool ) | 144 | void StdAddressBook::init( bool ) |