[Synce-cvslog] SF.net SVN: synce:[3786] trunk/kde4-kcemirror

[<mas...@us...>]

Revision: 3786
          http://synce.svn.sourceforge.net/synce/?rev=3786&view=rev
Author:   masterpatricko
Date:     2009-06-27 15:41:23 +0000 (Sat, 27 Jun 2009)

Log Message:
-----------
* Removed last Qt3support requirements
* Updated cmake build system to generate better source packages from svn

Modified Paths:
--------------
    trunk/kde4-kcemirror/CMakeLists.txt
    trunk/kde4-kcemirror/ChangeLog
    trunk/kde4-kcemirror/INSTALL
    trunk/kde4-kcemirror/kcemirror/CMakeLists.txt
    trunk/kde4-kcemirror/kcemirror/cescreen.cpp
    trunk/kde4-kcemirror/kcemirror/imageviewer.cpp

Property Changed:
----------------
    trunk/kde4-kcemirror/


Property changes on: trunk/kde4-kcemirror
___________________________________________________________________
Added: svn:ignore
   + build
*.kdev4


Modified: trunk/kde4-kcemirror/CMakeLists.txt
===================================================================
--- trunk/kde4-kcemirror/CMakeLists.txt	2009-06-25 10:40:32 UTC (rev 3785)
+++ trunk/kde4-kcemirror/CMakeLists.txt	2009-06-27 15:41:23 UTC (rev 3786)
@@ -13,20 +13,23 @@
 set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING )
 set (CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME kde4-kcemirror-${CPACK_PACKAGE_VERSION} )
+set (CPACK_SOURCE_IGNORE_FILES
+"/\\\\.svn/"
+"/build/"
+".*~$"
+".*kdev4$" )
 set (CPACK_CMAKE_GENERATOR "Unix Makefiles")
 include (CPack)
 
 
 find_package(KDE4 REQUIRED)
-include (UsePkgConfig)
+include(FindPkgConfig)
 include(KDE4Defaults)
 include(MacroLibrary)
 
-PKGCONFIG(librapi2 SYNCE_INCLUDE_DIR SYNCE_LINK_DIR SYNCE_LINK_FLAGS SYNCE_CFLAGS)
+pkg_check_modules( SYNCE REQUIRED librapi2 )
 add_definitions(${SYNCE_CFLAGS} ${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
-add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
 include_directories(${CMAKE_BINARY_DIR} ${SYNCE_INCLUDE_DIRS} ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
 
 

Modified: trunk/kde4-kcemirror/ChangeLog
===================================================================
--- trunk/kde4-kcemirror/ChangeLog	2009-06-25 10:40:32 UTC (rev 3785)
+++ trunk/kde4-kcemirror/ChangeLog	2009-06-27 15:41:23 UTC (rev 3786)
@@ -1,3 +1,9 @@
+2009-06-27  Tejas Guruswamy <mas...@gm...>
+	
+	* Removed last Qt3support requirements
+	* Updated cmake build system to generate better source packages from svn
+
+
 2009-04-30  Mark Ellis <ma...@mp...>
 
 	* initial conversion to kde4

Modified: trunk/kde4-kcemirror/INSTALL
===================================================================
--- trunk/kde4-kcemirror/INSTALL	2009-06-25 10:40:32 UTC (rev 3785)
+++ trunk/kde4-kcemirror/INSTALL	2009-06-27 15:41:23 UTC (rev 3786)
@@ -11,7 +11,7 @@
       provided by your distribution. The package is often named kdelibs4-devel or
       libkde4-devel. To perform the actual configuration of the sources install cmake.
 
-SynCE kde4-kio-rapip compilation and installation
+SynCE kde4-kcemirror compilation and installation
 
 NOTE: This package uses CMAKE, not autotools to configure and build the sources!
 

Modified: trunk/kde4-kcemirror/kcemirror/CMakeLists.txt
===================================================================
--- trunk/kde4-kcemirror/kcemirror/CMakeLists.txt	2009-06-25 10:40:32 UTC (rev 3785)
+++ trunk/kde4-kcemirror/kcemirror/CMakeLists.txt	2009-06-27 15:41:23 UTC (rev 3786)
@@ -14,7 +14,7 @@
 
 kde4_add_executable(kcemirror ${kcemirror_SRCS})
 
-target_link_libraries(kcemirror ${SYNCE_LINK_FLAGS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS})
+target_link_libraries(kcemirror ${SYNCE_LDFLAGS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS})
 
 install(TARGETS kcemirror ${INSTALL_TARGETS_DEFAULT_ARGS})
 

Modified: trunk/kde4-kcemirror/kcemirror/cescreen.cpp
===================================================================
--- trunk/kde4-kcemirror/kcemirror/cescreen.cpp	2009-06-25 10:40:32 UTC (rev 3785)
+++ trunk/kde4-kcemirror/kcemirror/cescreen.cpp	2009-06-27 15:41:23 UTC (rev 3786)
@@ -614,9 +614,9 @@
         return XK_Right;
     case Qt::Key_Down:
         return XK_Down;
-    case Qt::Key_Prior:
+    case Qt::Key_PageUp:
         return XK_Prior;
-    case Qt::Key_Next:
+    case Qt::Key_PageDown:
         return XK_Next;
 
     case Qt::Key_Shift:

Modified: trunk/kde4-kcemirror/kcemirror/imageviewer.cpp
===================================================================
--- trunk/kde4-kcemirror/kcemirror/imageviewer.cpp	2009-06-25 10:40:32 UTC (rev 3785)
+++ trunk/kde4-kcemirror/kcemirror/imageviewer.cpp	2009-06-27 15:41:23 UTC (rev 3786)
@@ -178,8 +178,8 @@
     kDebug(2120) << "Key Press: ASCII = " << e->text() <<
                      ", State = " << e->modifiers() <<
                      ", Key = " << e->key() << endl;
-
-    emit keyPressed(e->ascii(), e->key());
+    int keyCode = e->text().at(0).toAscii();
+    emit keyPressed(keyCode, e->key());
 }
 
 
@@ -189,8 +189,8 @@
     kDebug(2120) << "Key Release: ASCII = " << e->text() <<
                      ", State = " << e->modifiers() <<
                      ", Key = " << e->key() << endl;
-
-    emit keyReleased(e->ascii(), e->key());
+    int keyCode = e->text().at(0).toAscii();
+    emit keyReleased(keyCode, e->key());
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.