-rw-r--r-- | kabc/kabc.pro | 4 | ||||
-rw-r--r-- | kabc/plugins/dir/dir.pro | 29 | ||||
-rw-r--r-- | kabc/plugins/dir/resourcedir.cpp | 6 | ||||
-rw-r--r-- | kabc/plugins/file/file.pro | 30 | ||||
-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 6 |
5 files changed, 69 insertions, 6 deletions
diff --git a/kabc/kabc.pro b/kabc/kabc.pro index ea4bbb7..4a8d73a 100644 --- a/kabc/kabc.pro +++ b/kabc/kabc.pro | |||
@@ -42,7 +42,6 @@ distributionlist.h \ | |||
42 | distributionlistdialog.h \ | 42 | distributionlistdialog.h \ |
43 | distributionlisteditor.h \ | 43 | distributionlisteditor.h \ |
44 | vcardformatplugin.h \ | 44 | vcardformatplugin.h \ |
45 | formats/binaryformat.h \ | ||
46 | formats/vcardformatplugin2.h \ | 45 | formats/vcardformatplugin2.h \ |
47 | picture.h \ | 46 | picture.h \ |
48 | secrecy.h \ | 47 | secrecy.h \ |
@@ -134,6 +133,7 @@ vcard/include/generated/TextListValue-generated.h | |||
134 | 133 | ||
135 | # plugins/ldap/resourceldap.h \ | 134 | # plugins/ldap/resourceldap.h \ |
136 | # plugins/ldap/resourceldapconfig.h \ | 135 | # plugins/ldap/resourceldapconfig.h \ |
136 | #formats/binary/binaryformat.h \ | ||
137 | 137 | ||
138 | 138 | ||
139 | SOURCES = \ | 139 | SOURCES = \ |
@@ -141,7 +141,6 @@ distributionlist.cpp \ | |||
141 | distributionlistdialog.cpp \ | 141 | distributionlistdialog.cpp \ |
142 | distributionlisteditor.cpp \ | 142 | distributionlisteditor.cpp \ |
143 | vcardformatplugin.cpp \ | 143 | vcardformatplugin.cpp \ |
144 | formats/binaryformat.cpp \ | ||
145 | formats/vcardformatplugin2.cpp \ | 144 | formats/vcardformatplugin2.cpp \ |
146 | formatfactory.cpp \ | 145 | formatfactory.cpp \ |
147 | resource.cpp \ | 146 | resource.cpp \ |
@@ -212,3 +211,4 @@ vcard/TextListValue.cpp | |||
212 | # plugins/ldap/resourceldap.cpp \ | 211 | # plugins/ldap/resourceldap.cpp \ |
213 | # plugins/ldap/resourceldapconfig.cpp \ | 212 | # plugins/ldap/resourceldapconfig.cpp \ |
214 | 213 | ||
214 | #formats/binary/binaryformat.cpp \ | ||
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro new file mode 100644 index 0000000..3db201f --- a/dev/null +++ b/kabc/plugins/dir/dir.pro | |||
@@ -0,0 +1,29 @@ | |||
1 | TEMPLATE= lib | ||
2 | CONFIG += qt warn_on release | ||
3 | #release debug | ||
4 | |||
5 | TARGET = microkabc_dir | ||
6 | INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat | ||
7 | DESTDIR = ../../../bin | ||
8 | #LIBS += -lmicrokde -lmicrokabc | ||
9 | #LIBS += -L$(QPEDIR)/lib | ||
10 | |||
11 | INTERFACES = \ | ||
12 | |||
13 | HEADERS = \ | ||
14 | resourcedir.h \ | ||
15 | resourcedirconfig.h | ||
16 | |||
17 | SOURCES = \ | ||
18 | resourcedir.cpp \ | ||
19 | resourcedirconfig.cpp | ||
20 | |||
21 | unix : { | ||
22 | OBJECTS_DIR = obj/unix | ||
23 | MOC_DIR = moc/unix | ||
24 | } | ||
25 | win32: { | ||
26 | DEFINES += _WIN32_ | ||
27 | OBJECTS_DIR = obj/win | ||
28 | MOC_DIR = moc/win | ||
29 | } \ No newline at end of file | ||
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp index be19821..6ea2f4b 100644 --- a/kabc/plugins/dir/resourcedir.cpp +++ b/kabc/plugins/dir/resourcedir.cpp | |||
@@ -260,9 +260,11 @@ bool ResourceDir::lock( const QString &path ) | |||
260 | file.close(); | 260 | file.close(); |
261 | 261 | ||
262 | // Create lock file | 262 | // Create lock file |
263 | int result = ::link( QFile::encodeName( mLockUniqueName ), | 263 | int result = 0; |
264 | #ifndef _WIN32_ | ||
265 | result = ::link( QFile::encodeName( mLockUniqueName ), | ||
264 | QFile::encodeName( lockName ) ); | 266 | QFile::encodeName( lockName ) ); |
265 | 267 | #endif | |
266 | if ( result == 0 ) { | 268 | if ( result == 0 ) { |
267 | addressBook()->emitAddressBookLocked(); | 269 | addressBook()->emitAddressBookLocked(); |
268 | return true; | 270 | return true; |
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro new file mode 100644 index 0000000..a5ade93 --- a/dev/null +++ b/kabc/plugins/file/file.pro | |||
@@ -0,0 +1,30 @@ | |||
1 | TEMPLATE= lib | ||
2 | CONFIG += qt warn_on release | ||
3 | #release debug | ||
4 | |||
5 | TARGET = microkabc_file | ||
6 | INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat | ||
7 | |||
8 | DESTDIR = ../../../bin | ||
9 | #LIBS += -lmicrokde -lmicrokabc | ||
10 | #LIBS += -L$(QPEDIR)/lib | ||
11 | |||
12 | INTERFACES = \ | ||
13 | |||
14 | HEADERS = \ | ||
15 | resourcefile.h \ | ||
16 | resourcefileconfig.h | ||
17 | |||
18 | SOURCES = \ | ||
19 | resourcefile.cpp \ | ||
20 | resourcefileconfig.cpp | ||
21 | |||
22 | unix : { | ||
23 | OBJECTS_DIR = obj/unix | ||
24 | MOC_DIR = moc/unix | ||
25 | } | ||
26 | win32: { | ||
27 | DEFINES += _WIN32_ | ||
28 | OBJECTS_DIR = obj/win | ||
29 | MOC_DIR = moc/win | ||
30 | } \ No newline at end of file | ||
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 3920f69..4b4c935 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp | |||
@@ -286,9 +286,11 @@ bool ResourceFile::lock( const QString &fileName ) | |||
286 | file.close(); | 286 | file.close(); |
287 | 287 | ||
288 | // Create lock file | 288 | // Create lock file |
289 | int result = ::link( QFile::encodeName( mLockUniqueName ), | 289 | int result = 0; |
290 | #ifndef _WIN32_ | ||
291 | result = ::link( QFile::encodeName( mLockUniqueName ), | ||
290 | QFile::encodeName( lockName ) ); | 292 | QFile::encodeName( lockName ) ); |
291 | 293 | #endif | |
292 | if ( result == 0 ) { | 294 | if ( result == 0 ) { |
293 | addressBook()->emitAddressBookLocked(); | 295 | addressBook()->emitAddressBookLocked(); |
294 | return true; | 296 | return true; |