summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgberg <gberg@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-10-24 11:21:41 (GMT)
committergberg <gberg@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-10-24 11:21:41 (GMT)
commitcefc56d9b7d0e9498a2398d38b2e26461c4b6943 (patch)
treef4bd1c7bc08d9d01a49f7254ec8ebd6eaf14eced
parent654699a9aea6e6099f723e25d6a0a001b19f79e1 (diff)
downloadkrfb-cefc56d9b7d0e9498a2398d38b2e26461c4b6943.tar.gz
krfb-cefc56d9b7d0e9498a2398d38b2e26461c4b6943.tar.xz
Reorganise krfb codebase to make it easier to work with.
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdenetwork/krfb@1189252 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--CMakeLists.txt118
-rw-r--r--krfb/CMakeLists.txt111
-rw-r--r--krfb/Messages.sh (renamed from Messages.sh)2
-rw-r--r--krfb/abstractconnectioncontroller.cpp (renamed from abstractconnectioncontroller.cpp)0
-rw-r--r--krfb/abstractconnectioncontroller.h (renamed from abstractconnectioncontroller.h)0
-rw-r--r--krfb/abstractrfbserver.cpp (renamed from abstractrfbserver.cpp)0
-rw-r--r--krfb/abstractrfbserver.h (renamed from abstractrfbserver.h)0
-rw-r--r--krfb/config-krfb.h.cmake (renamed from config-krfb.h.cmake)0
-rw-r--r--krfb/connectiondialog.cpp (renamed from connectiondialog.cpp)0
-rw-r--r--krfb/connectiondialog.h (renamed from connectiondialog.h)0
-rw-r--r--krfb/events.cpp (renamed from events.cpp)0
-rw-r--r--krfb/events.h (renamed from events.h)0
-rw-r--r--krfb/framebuffer.cpp (renamed from framebuffer.cpp)0
-rw-r--r--krfb/framebuffer.h (renamed from framebuffer.h)0
-rw-r--r--krfb/framebuffermanager.cpp (renamed from framebuffermanager.cpp)0
-rw-r--r--krfb/framebuffermanager.h (renamed from framebuffermanager.h)0
-rw-r--r--krfb/framebufferplugin.cpp (renamed from framebufferplugin.cpp)0
-rw-r--r--krfb/framebufferplugin.h (renamed from framebufferplugin.h)0
-rw-r--r--krfb/invitation.cpp (renamed from invitation.cpp)0
-rw-r--r--krfb/invitation.h (renamed from invitation.h)0
-rw-r--r--krfb/invitationmanager.cpp (renamed from invitationmanager.cpp)0
-rw-r--r--krfb/invitationmanager.h (renamed from invitationmanager.h)0
-rw-r--r--krfb/invitedialog.cpp (renamed from invitedialog.cpp)0
-rw-r--r--krfb/invitedialog.h (renamed from invitedialog.h)0
-rw-r--r--krfb/krfb-framebuffer.desktop (renamed from krfb-framebuffer.desktop)0
-rwxr-xr-xkrfb/krfb.desktop (renamed from krfb.desktop)0
-rw-r--r--krfb/krfb.kcfg (renamed from krfb.kcfg)0
-rw-r--r--krfb/krfb.notifyrc (renamed from krfb.notifyrc)0
-rw-r--r--krfb/krfbconfig.kcfgc (renamed from krfbconfig.kcfgc)0
-rw-r--r--krfb/krfbconnectioncontroller.cpp (renamed from krfbconnectioncontroller.cpp)0
-rw-r--r--krfb/krfbconnectioncontroller.h (renamed from krfbconnectioncontroller.h)0
-rw-r--r--krfb/krfbserver.cpp (renamed from krfbserver.cpp)0
-rw-r--r--krfb/krfbserver.h (renamed from krfbserver.h)0
-rw-r--r--krfb/main.cpp (renamed from main.cpp)0
-rw-r--r--krfb/manageinvitationsdialog.cpp (renamed from manageinvitationsdialog.cpp)0
-rw-r--r--krfb/manageinvitationsdialog.h (renamed from manageinvitationsdialog.h)0
-rw-r--r--krfb/personalinvitedialog.cpp (renamed from personalinvitedialog.cpp)0
-rw-r--r--krfb/personalinvitedialog.h (renamed from personalinvitedialog.h)0
-rw-r--r--krfb/rfb.h (renamed from rfb.h)0
-rw-r--r--krfb/servermanager.cpp (renamed from servermanager.cpp)0
-rw-r--r--krfb/servermanager.h (renamed from servermanager.h)0
-rw-r--r--krfb/sockethelpers.cpp (renamed from sockethelpers.cpp)0
-rw-r--r--krfb/sockethelpers.h (renamed from sockethelpers.h)0
-rw-r--r--krfb/trayicon.cpp (renamed from trayicon.cpp)0
-rw-r--r--krfb/trayicon.h (renamed from trayicon.h)0
-rw-r--r--krfb/ui/configsecurity.ui (renamed from configsecurity.ui)0
-rw-r--r--krfb/ui/configtcp.ui (renamed from configtcp.ui)0
-rw-r--r--krfb/ui/connectionwidget.ui (renamed from connectionwidget.ui)0
-rw-r--r--krfb/ui/invitewidget.ui (renamed from invitewidget.ui)0
-rw-r--r--krfb/ui/manageinvitations.ui (renamed from manageinvitations.ui)0
-rw-r--r--krfb/ui/personalinvitewidget.ui (renamed from personalinvitewidget.ui)0
51 files changed, 125 insertions, 106 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2f2988..c2f5079 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,11 +19,16 @@ if(NOT INSIDE_KDENETWORK)
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
endif(NOT INSIDE_KDENETWORK)
-check_symbol_exists(rfbInitServer "rfb/rfb.h" HAVE_LIBVNCSERVER)
+# FIXME: Can we merge this check back into FindLibVNCServer.cmake?
+check_symbol_exists(rfbInitServer "rfb/rfb.h" HAVE_LIBVNCSERVER)
+
macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE)
macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-krfb.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krfb.h )
-include_directories(${CMAKE_CURRENT_BINARY_DIR}) # for config-krfb.h
+
+include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
+ "${CMAKE_CURRENT_SOURCE_DIR}/krfb"
+ "${CMAKE_CURRENT_SOURCE_DIR}/krfb/ui"
+)
if(Q_WS_X11)
if(NOT X11_XTest_FOUND)
@@ -31,107 +36,10 @@ if(Q_WS_X11)
endif(NOT X11_XTest_FOUND)
endif(Q_WS_X11)
-#add_subdirectory(kinetd)
-#add_subdirectory(kcm_krfb)
if (HAVE_LIBVNCSERVER)
-
-#####################################
-# First target: libkrfb - a library
-# for linking plugins against.
-
-set (krfbprivate_SRCS
- framebuffer.cpp
- framebufferplugin.cpp
-)
-
-kde4_add_library (krfbprivate
- SHARED
- ${krfbprivate_SRCS}
-)
-
-target_link_libraries (krfbprivate
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${X11_X11_LIB}
- ${LIBVNCSERVER_LIBRARIES}
-)
-
-set_target_properties (krfbprivate PROPERTIES
- VERSION ${GENERIC_LIB_VERSION}
- SOVERSION ${GENERIC_LIB_VERSION}
-)
-
-install (TARGETS krfbprivate
- ${INSTALL_TARGETS_DEFAULT_ARGS}
-)
-
-install (FILES
- krfb-framebuffer.desktop
- DESTINATION ${SERVICETYPES_INSTALL_DIR}
-)
-
-#####################################
-# Build the plugins
-
-include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-add_subdirectory (framebuffers)
-
-#####################################
-# Second target: krfb - the app
-# itself.
-
-set(krfb_SRCS
- main.cpp
- trayicon.cpp
- manageinvitationsdialog.cpp
- invitationmanager.cpp
- invitedialog.cpp
- invitation.cpp
- connectiondialog.cpp
- personalinvitedialog.cpp
- events.cpp
- framebuffermanager.cpp
- servermanager.cpp
- sockethelpers.cpp
- abstractrfbserver.cpp
- abstractconnectioncontroller.cpp
- krfbserver.cpp
- krfbconnectioncontroller.cpp
-)
-
-kde4_add_kcfg_files(krfb_SRCS krfbconfig.kcfgc)
-
-kde4_add_ui_files(krfb_SRCS connectionwidget.ui
- manageinvitations.ui
- personalinvitewidget.ui
- invitewidget.ui
- configtcp.ui
- configsecurity.ui
- )
-
-kde4_add_executable(krfb ${krfb_SRCS})
-
-target_link_libraries(krfb
- krfbprivate
- ${JPEG_LIBRARIES}
- ${LIBVNCSERVER_LIBRARIES}
- ${X11_Xext_LIB}
- ${X11_X11_LIB}
- ${X11_Xdamage_LIB}
- ${QT_QTNETWORK_LIBRARY}
- ${KDE4_KDNSSD_LIBS}
- ${KDE4_KDEUI_LIBS}
-)
-
-if(X11_XTest_FOUND)
- target_link_libraries(krfb ${X11_XTest_LIB})
-endif(X11_XTest_FOUND)
-
-install(TARGETS krfb ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-########### install files ###############
-
-install(PROGRAMS krfb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-install(FILES krfb.notifyrc DESTINATION ${DATA_INSTALL_DIR}/krfb)
-
+ #add_subdirectory(kinetd)
+ #add_subdirectory(kcm_krfb)
+ add_subdirectory(krfb)
+ add_subdirectory (framebuffers)
endif (HAVE_LIBVNCSERVER)
+
diff --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt
new file mode 100644
index 0000000..972b77e
--- /dev/null
+++ b/krfb/CMakeLists.txt
@@ -0,0 +1,111 @@
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config-krfb.h.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/config-krfb.h
+)
+
+#####################################
+# First target: libkrfbprivate - a library
+# for linking plugins against.
+
+set (krfbprivate_SRCS
+ framebuffer.cpp
+ framebufferplugin.cpp
+)
+
+kde4_add_library (krfbprivate
+ SHARED
+ ${krfbprivate_SRCS}
+)
+
+target_link_libraries (krfbprivate
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${X11_X11_LIB}
+ ${LIBVNCSERVER_LIBRARIES}
+)
+
+set_target_properties (krfbprivate PROPERTIES
+ VERSION ${GENERIC_LIB_VERSION}
+ SOVERSION ${GENERIC_LIB_VERSION}
+)
+
+install (TARGETS krfbprivate
+ ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+install (FILES
+ krfb-framebuffer.desktop
+ DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
+
+#####################################
+# Second target: krfb - the app
+# itself.
+
+set (krfb_SRCS
+ abstractconnectioncontroller.cpp
+ abstractrfbserver.cpp
+ connectiondialog.cpp
+ events.cpp
+ framebuffermanager.cpp
+ invitation.cpp
+ invitedialog.cpp
+ invitationmanager.cpp
+ krfbconnectioncontroller.cpp
+ krfbserver.cpp
+ main.cpp
+ manageinvitationsdialog.cpp
+ personalinvitedialog.cpp
+ servermanager.cpp
+ sockethelpers.cpp
+ trayicon.cpp
+)
+
+kde4_add_kcfg_files (krfb_SRCS
+ krfbconfig.kcfgc
+)
+
+kde4_add_ui_files (krfb_SRCS
+ ui/configtcp.ui
+ ui/configsecurity.ui
+ ui/connectionwidget.ui
+ ui/invitewidget.ui
+ ui/manageinvitations.ui
+ ui/personalinvitewidget.ui
+)
+
+kde4_add_executable (krfb
+ ${krfb_SRCS}
+)
+
+target_link_libraries (krfb
+ krfbprivate
+ ${JPEG_LIBRARIES}
+ ${LIBVNCSERVER_LIBRARIES}
+ ${X11_Xext_LIB}
+ ${X11_X11_LIB}
+ ${X11_Xdamage_LIB}
+ ${QT_QTNETWORK_LIBRARY}
+ ${KDE4_KDNSSD_LIBS}
+ ${KDE4_KDEUI_LIBS}
+)
+
+if (X11_XTest_FOUND)
+ target_link_libraries (krfb
+ ${X11_XTest_LIB}
+ )
+endif (X11_XTest_FOUND)
+
+install (TARGETS krfb
+ ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+########### install files ###############
+
+install (PROGRAMS krfb.desktop
+ DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
+install (FILES krfb.notifyrc
+ DESTINATION ${DATA_INSTALL_DIR}/krfb
+)
+
diff --git a/Messages.sh b/krfb/Messages.sh
index 8cdee07..ce9a456 100644
--- a/Messages.sh
+++ b/krfb/Messages.sh
@@ -1,3 +1,3 @@
#! /bin/sh
-$EXTRACTRC *.ui *.kcfg >> rc.cpp
+$EXTRACTRC ui/*.ui *.kcfg >> rc.cpp
$XGETTEXT *.cpp -o $podir/krfb.pot
diff --git a/abstractconnectioncontroller.cpp b/krfb/abstractconnectioncontroller.cpp
index edb23f7..edb23f7 100644
--- a/abstractconnectioncontroller.cpp
+++ b/krfb/abstractconnectioncontroller.cpp
diff --git a/abstractconnectioncontroller.h b/krfb/abstractconnectioncontroller.h
index 846a48a..846a48a 100644
--- a/abstractconnectioncontroller.h
+++ b/krfb/abstractconnectioncontroller.h
diff --git a/abstractrfbserver.cpp b/krfb/abstractrfbserver.cpp
index f255a3c..f255a3c 100644
--- a/abstractrfbserver.cpp
+++ b/krfb/abstractrfbserver.cpp
diff --git a/abstractrfbserver.h b/krfb/abstractrfbserver.h
index e7f4671..e7f4671 100644
--- a/abstractrfbserver.h
+++ b/krfb/abstractrfbserver.h
diff --git a/config-krfb.h.cmake b/krfb/config-krfb.h.cmake
index 38d479c..38d479c 100644
--- a/config-krfb.h.cmake
+++ b/krfb/config-krfb.h.cmake
diff --git a/connectiondialog.cpp b/krfb/connectiondialog.cpp
index 4f3d148..4f3d148 100644
--- a/connectiondialog.cpp
+++ b/krfb/connectiondialog.cpp
diff --git a/connectiondialog.h b/krfb/connectiondialog.h
index d9a407c..d9a407c 100644
--- a/connectiondialog.h
+++ b/krfb/connectiondialog.h
diff --git a/events.cpp b/krfb/events.cpp
index 47ddccf..47ddccf 100644
--- a/events.cpp
+++ b/krfb/events.cpp
diff --git a/events.h b/krfb/events.h
index e40f9f3..e40f9f3 100644
--- a/events.h
+++ b/krfb/events.h
diff --git a/framebuffer.cpp b/krfb/framebuffer.cpp
index d529ab5..d529ab5 100644
--- a/framebuffer.cpp
+++ b/krfb/framebuffer.cpp
diff --git a/framebuffer.h b/krfb/framebuffer.h
index 1f55acf..1f55acf 100644
--- a/framebuffer.h
+++ b/krfb/framebuffer.h
diff --git a/framebuffermanager.cpp b/krfb/framebuffermanager.cpp
index 2fba1cc..2fba1cc 100644
--- a/framebuffermanager.cpp
+++ b/krfb/framebuffermanager.cpp
diff --git a/framebuffermanager.h b/krfb/framebuffermanager.h
index 56ed6d6..56ed6d6 100644
--- a/framebuffermanager.h
+++ b/krfb/framebuffermanager.h
diff --git a/framebufferplugin.cpp b/krfb/framebufferplugin.cpp
index c775e73..c775e73 100644
--- a/framebufferplugin.cpp
+++ b/krfb/framebufferplugin.cpp
diff --git a/framebufferplugin.h b/krfb/framebufferplugin.h
index 11ab081..11ab081 100644
--- a/framebufferplugin.h
+++ b/krfb/framebufferplugin.h
diff --git a/invitation.cpp b/krfb/invitation.cpp
index 91441be..91441be 100644
--- a/invitation.cpp
+++ b/krfb/invitation.cpp
diff --git a/invitation.h b/krfb/invitation.h
index 67ca95d..67ca95d 100644
--- a/invitation.h
+++ b/krfb/invitation.h
diff --git a/invitationmanager.cpp b/krfb/invitationmanager.cpp
index c9df012..c9df012 100644
--- a/invitationmanager.cpp
+++ b/krfb/invitationmanager.cpp
diff --git a/invitationmanager.h b/krfb/invitationmanager.h
index bc3270b..bc3270b 100644
--- a/invitationmanager.h
+++ b/krfb/invitationmanager.h
diff --git a/invitedialog.cpp b/krfb/invitedialog.cpp
index 1cf7c18..1cf7c18 100644
--- a/invitedialog.cpp
+++ b/krfb/invitedialog.cpp
diff --git a/invitedialog.h b/krfb/invitedialog.h
index 4db35df..4db35df 100644
--- a/invitedialog.h
+++ b/krfb/invitedialog.h
diff --git a/krfb-framebuffer.desktop b/krfb/krfb-framebuffer.desktop
index 3af1d15..3af1d15 100644
--- a/krfb-framebuffer.desktop
+++ b/krfb/krfb-framebuffer.desktop
diff --git a/krfb.desktop b/krfb/krfb.desktop
index 48d8fbb..48d8fbb 100755
--- a/krfb.desktop
+++ b/krfb/krfb.desktop
diff --git a/krfb.kcfg b/krfb/krfb.kcfg
index acae17f..acae17f 100644
--- a/krfb.kcfg
+++ b/krfb/krfb.kcfg
diff --git a/krfb.notifyrc b/krfb/krfb.notifyrc
index dcb544c..dcb544c 100644
--- a/krfb.notifyrc
+++ b/krfb/krfb.notifyrc
diff --git a/krfbconfig.kcfgc b/krfb/krfbconfig.kcfgc
index 7bbb14f..7bbb14f 100644
--- a/krfbconfig.kcfgc
+++ b/krfb/krfbconfig.kcfgc
diff --git a/krfbconnectioncontroller.cpp b/krfb/krfbconnectioncontroller.cpp
index c3f1486..c3f1486 100644
--- a/krfbconnectioncontroller.cpp
+++ b/krfb/krfbconnectioncontroller.cpp
diff --git a/krfbconnectioncontroller.h b/krfb/krfbconnectioncontroller.h
index 958c717..958c717 100644
--- a/krfbconnectioncontroller.h
+++ b/krfb/krfbconnectioncontroller.h
diff --git a/krfbserver.cpp b/krfb/krfbserver.cpp
index 500f4ba..500f4ba 100644
--- a/krfbserver.cpp
+++ b/krfb/krfbserver.cpp
diff --git a/krfbserver.h b/krfb/krfbserver.h
index bb89dbb..bb89dbb 100644
--- a/krfbserver.h
+++ b/krfb/krfbserver.h
diff --git a/main.cpp b/krfb/main.cpp
index 424cee7..424cee7 100644
--- a/main.cpp
+++ b/krfb/main.cpp
diff --git a/manageinvitationsdialog.cpp b/krfb/manageinvitationsdialog.cpp
index 44781ea..44781ea 100644
--- a/manageinvitationsdialog.cpp
+++ b/krfb/manageinvitationsdialog.cpp
diff --git a/manageinvitationsdialog.h b/krfb/manageinvitationsdialog.h
index 3a869de..3a869de 100644
--- a/manageinvitationsdialog.h
+++ b/krfb/manageinvitationsdialog.h
diff --git a/personalinvitedialog.cpp b/krfb/personalinvitedialog.cpp
index cb30d06..cb30d06 100644
--- a/personalinvitedialog.cpp
+++ b/krfb/personalinvitedialog.cpp
diff --git a/personalinvitedialog.h b/krfb/personalinvitedialog.h
index d3f4491..d3f4491 100644
--- a/personalinvitedialog.h
+++ b/krfb/personalinvitedialog.h
diff --git a/rfb.h b/krfb/rfb.h
index 1386439..1386439 100644
--- a/rfb.h
+++ b/krfb/rfb.h
diff --git a/servermanager.cpp b/krfb/servermanager.cpp
index a56a6e9..a56a6e9 100644
--- a/servermanager.cpp
+++ b/krfb/servermanager.cpp
diff --git a/servermanager.h b/krfb/servermanager.h
index 35d6146..35d6146 100644
--- a/servermanager.h
+++ b/krfb/servermanager.h
diff --git a/sockethelpers.cpp b/krfb/sockethelpers.cpp
index ecb2274..ecb2274 100644
--- a/sockethelpers.cpp
+++ b/krfb/sockethelpers.cpp
diff --git a/sockethelpers.h b/krfb/sockethelpers.h
index dae2dcc..dae2dcc 100644
--- a/sockethelpers.h
+++ b/krfb/sockethelpers.h
diff --git a/trayicon.cpp b/krfb/trayicon.cpp
index 5d30cb4..5d30cb4 100644
--- a/trayicon.cpp
+++ b/krfb/trayicon.cpp
diff --git a/trayicon.h b/krfb/trayicon.h
index 757bbcf..757bbcf 100644
--- a/trayicon.h
+++ b/krfb/trayicon.h
diff --git a/configsecurity.ui b/krfb/ui/configsecurity.ui
index 1a74a9a..1a74a9a 100644
--- a/configsecurity.ui
+++ b/krfb/ui/configsecurity.ui
diff --git a/configtcp.ui b/krfb/ui/configtcp.ui
index a47538f..a47538f 100644
--- a/configtcp.ui
+++ b/krfb/ui/configtcp.ui
diff --git a/connectionwidget.ui b/krfb/ui/connectionwidget.ui
index 76bb2bb..76bb2bb 100644
--- a/connectionwidget.ui
+++ b/krfb/ui/connectionwidget.ui
diff --git a/invitewidget.ui b/krfb/ui/invitewidget.ui
index 0aa7016..0aa7016 100644
--- a/invitewidget.ui
+++ b/krfb/ui/invitewidget.ui
diff --git a/manageinvitations.ui b/krfb/ui/manageinvitations.ui
index f727af6..f727af6 100644
--- a/manageinvitations.ui
+++ b/krfb/ui/manageinvitations.ui
diff --git a/personalinvitewidget.ui b/krfb/ui/personalinvitewidget.ui
index 5d12c2a..5d12c2a 100644
--- a/personalinvitewidget.ui
+++ b/krfb/ui/personalinvitewidget.ui