[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/utils/charm/trunk/Charm [POSSIBLY UNSAFE]
From:       Mike Arthur <mike () mikearthur ! co ! uk>
Date:       2010-01-23 17:13:19
Message-ID: 1264266799.903395.27567.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1079112 by mikearthur:

Rename Carbon using OSX files.

 M  +2 -2      Application.h  
 M  +2 -2      CMakeLists.txt  
 M  +2 -2      Idle/IdleDetector.cpp  
 A             Idle/MacCarbonIdleDetector.cpp   Idle/MacOsIdleDetector.cpp#1079111 \
[POSSIBLY UNSAFE: system] [License: UNKNOWN]  A             \
Idle/MacCarbonIdleDetector.h   Idle/MacOsIdleDetector.h#1079111 [License: UNKNOWN]  D \
Idle/MacOsIdleDetector.cpp    D             Idle/MacOsIdleDetector.h  
 A             MacCarbonApplication.cpp   mac_application.cpp#1079111 [License: \
UNKNOWN]  A             MacCarbonApplication.h   [License: UNKNOWN]
 D             mac_application.cpp  
 D             mac_application.h  


--- trunk/playground/utils/charm/trunk/Charm/Application.h #1079111:1079112
@@ -14,7 +14,7 @@
 #include <QMenu>
 #include <QAction>
 #if defined Q_WS_MAC && !defined QT_MAC_USE_COCOA
-#include "mac_application.h"
+#include "MacCarbonApplication.h"
 #else
 #include <QApplication>
 #endif
@@ -38,7 +38,7 @@
 class IdleDetector;
 
 #if defined Q_WS_MAC && !defined QT_MAC_USE_COCOA
-typedef MacApplication ApplicationBase;
+typedef MacCarbonApplication ApplicationBase;
 #else
 typedef QApplication ApplicationBase;
 #endif
--- trunk/playground/utils/charm/trunk/Charm/CMakeLists.txt #1079111:1079112
@@ -63,8 +63,8 @@
 	set(HAVE_LIBXSS 0)
 	IF( APPLE AND NOT QT_MAC_USE_COCOA )
 	   SET( CharmApplication_SRCS 
-		      ${CharmApplication_SRCS} Idle/MacOsIdleDetector.cpp
-              mac_application.cpp )
+              ${CharmApplication_SRCS} Idle/MacCarbonIdleDetector.cpp
+              MacCarbonApplication.cpp )
 	   EXEC_PROGRAM( sw_vers ARGS -buildVersion OUTPUT_VARIABLE DARWIN_BUILDVERSION )
 	   STRING(REGEX MATCH "^[0-9]+" DARWIN_VERSION ${DARWIN_BUILDVERSION})
 #	   MESSAGE(STATUS "DARWIN_VERSION=${DARWIN_VERSION}")
--- trunk/playground/utils/charm/trunk/Charm/Idle/IdleDetector.cpp #1079111:1079112
@@ -7,7 +7,7 @@
 
 // FIXME verify inclusion guard is needed (Q_OBJECT?)
 #if defined Q_WS_MAC
-#include "MacOsIdleDetector.h"
+#include "MacCarbonIdleDetector.h"
 #endif
 
 IdleDetector::IdleDetector( QObject* parent )
@@ -22,7 +22,7 @@
     // FIXME port Carbon Idle Detector to Cocoa
     return 0;
 #else
-    return new MacOsIdleDetector( parent );
+    return new MacCarbonIdleDetector( parent );
 #endif
 #elif defined Q_WS_WIN
     // FIXME implement Windows Idle Detector


[prev in list] [next in list] [prev in thread] [next in thread]