1 files changed, 13 insertions, 14 deletions

diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index 9519d11..9cb9d7a 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -21,3 +21,3 @@
 
-#include <qtopia/global.h>
+#include <opie2/oglobal.h>
 #include <qtopia/qpeapplication.h>
@@ -34,3 +34,3 @@
 #include <crypt.h>
-#endif /* Q_OS_MACX */ 
+#endif /* Q_OS_MACX */
 
@@ -65,3 +65,2 @@
 
-#include "launcherglobal.h"
 
@@ -116,3 +115,3 @@ QString SyncAuthentication::serverId()
     if ( r.isEmpty() ) {
-        r = Opie::Global::uuid();
+        r = OGlobal::generateUuid();
         cfg.writeEntry("serverid", r );
@@ -195,7 +194,7 @@ bool SyncAuthentication::checkPassword( const QString& password )
     int now = time(0);
- 
+
     Config cfg("Security");
-    cfg.setGroup("Sync");    
+    cfg.setGroup("Sync");
     QString syncapp = cfg.readEntry("syncapp","Qtopia");
-    
+
     //No password needed if the user really wants it
@@ -203,6 +202,6 @@ bool SyncAuthentication::checkPassword( const QString& password )
             return TRUE;
-            }
-      
+    }
+
     // Detect old Qtopia Desktop (no password)
-            if ( password.isEmpty() ) {
+    if ( password.isEmpty() ) {
                 if ( denials < 3 || now > lastdenial+600 ) {
@@ -221,6 +220,6 @@ bool SyncAuthentication::checkPassword( const QString& password )
                     lastdenial=now;
-                 } 
+                 }
                 return FALSE;
-           
-    } 
+
+    }
 
@@ -231,3 +230,3 @@ bool SyncAuthentication::checkPassword( const QString& password )
 
-    ++lock;    
+    ++lock;