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

List:       kde-commits
Subject:    KDE/kdenetwork/krfb
From:       George Kiagiadakis <kiagiadakis.george () gmail ! com>
Date:       2012-03-06 17:10:13
Message-ID: 20120306171013.9E7F2AC899 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1283925 by gkiagia:

Port to telepathy-qt 0.9

 M  +1 -1      CMakeLists.txt  
 D             cmake/modules/FindTelepathyQt4.cmake  
 M  +10 -10    krfb/CMakeLists.txt  
 M  +1 -1      krfb/tubesrfbclient.h  
 M  +8 -8      krfb/tubesrfbserver.cpp  
 M  +1 -1      krfb/tubesrfbserver.h  


--- trunk/KDE/kdenetwork/krfb/CMakeLists.txt #1283924:1283925
@@ -16,7 +16,7 @@
         message(WARNING "You enabled experimental Tubes support. Expect breakage!!")
 
         macro_optional_find_package(TelepathyQt4)
-        macro_log_feature(TELEPATHY_QT4_FOUND "telepathy-qt4" "Telepathy Qt \
Bindings" "http://telepathy.freedesktop.org" FALSE "0.18" "Needed to build Telepathy \
Tubes support.") +        macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" \
"Telepathy Qt Bindings" "http://telepathy.freedesktop.org" FALSE "0.9" "Needed to \
build Telepathy Tubes support.")  endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT)
 
     set(CMAKE_REQUIRED_DEFINITIONS ${_KDE_PLATFORM_DEFINITIONS})
--- trunk/KDE/kdenetwork/krfb/krfb/CMakeLists.txt #1283924:1283925
@@ -41,10 +41,10 @@
 # Second target: krfb - the app
 # itself.
 
-if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
+if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
     add_definitions(-DKRFB_WITH_TELEPATHY_TUBES)
     include_directories(${TELEPATHY_QT4_INCLUDE_DIR})
-endif(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
+endif()
 
 set (krfb_SRCS
      connectiondialog.cpp
@@ -65,13 +65,13 @@
      invitationsrfbclient.cpp
 )
 
-if (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
+if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
     set (krfb_SRCS
          ${krfb_SRCS}
          tubesrfbserver.cpp
          tubesrfbclient.cpp
     )
-endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
+endif()
 
 kde4_add_kcfg_files (krfb_SRCS
                      krfbconfig.kcfgc
@@ -86,9 +86,9 @@
                    ui/personalinvitewidget.ui
 )
 
-if (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
+if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
     kde4_add_ui_files(krfb_SRCS ui/tubesconnectionwidget.ui)
-endif(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
+endif()
 
 kde4_add_executable (krfb
                      ${krfb_SRCS}
@@ -106,11 +106,11 @@
                        ${KDE4_KDEUI_LIBS}
 )
 
-if (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
+if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
     target_link_libraries(krfb
                           ${TELEPATHY_QT4_LIBRARIES}
     )
-endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
+endif()
 
 if (X11_XTest_FOUND)
     target_link_libraries (krfb
@@ -122,14 +122,14 @@
          ${INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
-if (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
+if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
     configure_file(org.freedesktop.Telepathy.Client.krfb_rfb_handler.service.in
                    org.freedesktop.Telepathy.Client.krfb_rfb_handler.service)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.krfb_rfb_handler.service
  DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
 
     install(FILES krfb_rfb_handler.client DESTINATION \
                ${CMAKE_INSTALL_PREFIX}/share/telepathy/clients/)
-endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
+endif()
 
 ########### install files ###############
 
--- trunk/KDE/kdenetwork/krfb/krfb/tubesrfbclient.h #1283924:1283925
@@ -19,7 +19,7 @@
 #define TUBESRFBCLIENT_H
 
 #include "rfbclient.h"
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/Contact>
 
 class TubesRfbClient : public RfbClient
 {
--- trunk/KDE/kdenetwork/krfb/krfb/tubesrfbserver.cpp #1283924:1283925
@@ -23,14 +23,14 @@
 #include <KDebug>
 #include <KRandom>
 
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/AccountFactory>
-#include <TelepathyQt4/ConnectionFactory>
-#include <TelepathyQt4/ContactFactory>
-#include <TelepathyQt4/ChannelFactory>
-#include <TelepathyQt4/OutgoingStreamTubeChannel>
-#include <TelepathyQt4/StreamTubeServer>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/AccountFactory>
+#include <TelepathyQt/ConnectionFactory>
+#include <TelepathyQt/ContactFactory>
+#include <TelepathyQt/ChannelFactory>
+#include <TelepathyQt/OutgoingStreamTubeChannel>
+#include <TelepathyQt/StreamTubeServer>
 
 
 struct TubesRfbServer::Private
--- trunk/KDE/kdenetwork/krfb/krfb/tubesrfbserver.h #1283924:1283925
@@ -21,7 +21,7 @@
 
 #include "rfbserver.h"
 #include <QtNetwork/QHostAddress>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
 
 class TubesRfbServer : public RfbServer
 {


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