From 8e517eccf5f6172eaeddc25435035d613cf3c30f Mon Sep 17 00:00:00 2001 From: Lukas Karas Date: Sun, 23 Oct 2011 13:48:56 +0200 Subject: [PATCH] move current 'KDE' gui to separate directory ui-kde --- src/CMakeLists.txt | 131 +-------------------- src/{ => ui-kde}/CMakeLists.txt | 33 +++--- src/{ => ui-kde}/account-presence-button.cpp | 0 src/{ => ui-kde}/account-presence-button.h | 0 src/{ => ui-kde}/add_contact.ui | 0 src/{ => ui-kde}/addcontactdialog.cpp | 0 src/{ => ui-kde}/addcontactdialog.h | 0 src/{ => ui-kde}/call-window.cpp | 2 +- src/{ => ui-kde}/call-window.h | 0 src/{ => ui-kde}/chatinput.cpp | 0 src/{ => ui-kde}/chatinput.h | 0 src/{ => ui-kde}/chatoutput.cpp | 0 src/{ => ui-kde}/chatoutput.h | 0 src/{ => ui-kde}/cmake_uninstall.cmake | 0 src/{ => ui-kde}/contact_detail.ui | 0 src/{ => ui-kde}/contactdetaildialog.cpp | 0 src/{ => ui-kde}/contactdetaildialog.h | 0 src/{ => ui-kde}/icons/CMakeLists.txt | 0 .../icons/hi128-action-makneto-call.png | Bin .../icons/hi128-action-makneto-hang-up.png | Bin src/{ => ui-kde}/icons/hi16-action-maknetoaway.png | Bin src/{ => ui-kde}/icons/hi16-action-maknetodnd.png | Bin .../icons/hi16-action-maknetoinvisible.png | Bin .../icons/hi16-action-maknetooffline.png | Bin .../icons/hi16-action-maknetoonline.png | Bin src/{ => ui-kde}/icons/hi16-action-maknetoxa.png | Bin src/{ => ui-kde}/icons/hi22-action-maknetoaway.png | Bin src/{ => ui-kde}/icons/hi22-action-maknetodnd.png | Bin .../icons/hi22-action-maknetoinvisible.png | Bin .../icons/hi22-action-maknetooffline.png | Bin .../icons/hi22-action-maknetoonline.png | Bin src/{ => ui-kde}/icons/hi22-action-maknetoxa.png | Bin src/{ => ui-kde}/icons/hi32-action-maknetoaway.png | Bin src/{ => ui-kde}/icons/hi32-action-maknetodnd.png | Bin .../icons/hi32-action-maknetoinvisible.png | Bin .../icons/hi32-action-maknetooffline.png | Bin .../icons/hi32-action-maknetoonline.png | Bin src/{ => ui-kde}/icons/hi32-action-maknetoxa.png | Bin src/{ => ui-kde}/icons/hi48-action-maknetoaway.png | Bin src/{ => ui-kde}/icons/hi48-action-maknetodnd.png | Bin .../icons/hi48-action-maknetoinvisible.png | Bin .../icons/hi48-action-maknetooffline.png | Bin .../icons/hi48-action-maknetoonline.png | Bin src/{ => ui-kde}/icons/hi48-action-maknetoxa.png | Bin src/{ => ui-kde}/icons/hi64-action-maknetoaway.png | Bin src/{ => ui-kde}/icons/hi64-action-maknetodnd.png | Bin .../icons/hi64-action-maknetoinvisible.png | Bin .../icons/hi64-action-maknetooffline.png | Bin .../icons/hi64-action-maknetoonline.png | Bin src/{ => ui-kde}/icons/hi64-action-maknetoxa.png | Bin src/{ => ui-kde}/icons/ox16-action-draw-circle.png | Bin .../icons/ox16-action-draw-ellipse.png | Bin src/{ => ui-kde}/icons/ox16-action-draw-line.png | Bin .../icons/ox16-action-draw-rectangle.png | Bin .../icons/ox22-action-draw-rectangle.png | Bin .../icons/ox32-action-draw-rectangle.png | Bin .../icons/ox48-action-draw-rectangle.png | Bin .../icons/ox64-action-draw-rectangle.png | Bin src/{ => ui-kde}/icons/svg/README | 0 src/{ => ui-kde}/icons/svg/draw-circle.svgz | Bin src/{ => ui-kde}/icons/svg/draw-ellipse.svgz | Bin src/{ => ui-kde}/icons/svg/draw-line.svgz | Bin src/{ => ui-kde}/icons/svg/draw-rectangle.svgz.svg | 0 src/{ => ui-kde}/icons/svg/makneto_icons.svg | 0 src/{ => ui-kde}/main.cpp | 0 src/{ => ui-kde}/makneto.cpp | 7 +- src/{ => ui-kde}/makneto.desktop | 0 src/{ => ui-kde}/makneto.h | 0 src/{ => ui-kde}/makneto.kcfg | 0 src/{ => ui-kde}/maknetoaccount.h | 0 src/{ => ui-kde}/maknetofiletransfer.cpp | 0 src/{ => ui-kde}/maknetofiletransfer.h | 0 src/{ => ui-kde}/maknetohtmlbrowser.cpp | 0 src/{ => ui-kde}/maknetohtmlbrowser.h | 0 src/{ => ui-kde}/maknetomainwindow.cpp | 0 src/{ => ui-kde}/maknetomainwindow.h | 0 src/{ => ui-kde}/maknetoui.rc | 0 src/{ => ui-kde}/maknetoview.cpp | 2 +- src/{ => ui-kde}/maknetoview.h | 0 src/{ => ui-kde}/maknetoview_base.ui | 0 src/{ => ui-kde}/mediaplayer.cpp | 0 src/{ => ui-kde}/mediaplayer.h | 0 src/{ => ui-kde}/palettewidget.cpp | 0 src/{ => ui-kde}/palettewidget.h | 0 src/{ => ui-kde}/plugins/plugin.cpp | 0 src/{ => ui-kde}/plugins/plugin.h | 0 src/{ => ui-kde}/plugins/pollplugin.cpp | 0 src/{ => ui-kde}/plugins/pollplugin.h | 0 src/{ => ui-kde}/plugins/pollplugincreate.cpp | 0 src/{ => ui-kde}/plugins/pollplugincreate.h | 0 src/{ => ui-kde}/prefs_base.ui | 0 src/{ => ui-kde}/qgraphicswidgetitem.cpp | 0 src/{ => ui-kde}/qgraphicswidgetitem.h | 0 src/{ => ui-kde}/roster-widget.cpp | 8 +- src/{ => ui-kde}/roster-widget.h | 0 src/{ => ui-kde}/sessiontabmanager.cpp | 2 +- src/{ => ui-kde}/sessiontabmanager.h | 2 +- src/{ => ui-kde}/sessionview.cpp | 0 src/{ => ui-kde}/sessionview.h | 2 +- src/{ => ui-kde}/settings.cpp | 0 src/{ => ui-kde}/settings.h | 0 src/{ => ui-kde}/settings.kcfgc | 0 src/{ => ui-kde}/sidebarwidget.cpp | 0 src/{ => ui-kde}/sidebarwidget.h | 0 src/{ => ui-kde}/wbforeign.cpp | 0 src/{ => ui-kde}/wbforeign.h | 0 src/{ => ui-kde}/wbitems.cpp | 0 src/{ => ui-kde}/wbitems.h | 0 src/{ => ui-kde}/wbscene.cpp | 0 src/{ => ui-kde}/wbscene.h | 0 src/{ => ui-kde}/wbwidget.cpp | 0 src/{ => ui-kde}/wbwidget.h | 0 112 files changed, 35 insertions(+), 154 deletions(-) rewrite src/CMakeLists.txt (98%) copy src/{ => ui-kde}/CMakeLists.txt (85%) rename src/{ => ui-kde}/account-presence-button.cpp (100%) rename src/{ => ui-kde}/account-presence-button.h (100%) rename src/{ => ui-kde}/add_contact.ui (100%) rename src/{ => ui-kde}/addcontactdialog.cpp (100%) rename src/{ => ui-kde}/addcontactdialog.h (100%) rename src/{ => ui-kde}/call-window.cpp (97%) rename src/{ => ui-kde}/call-window.h (100%) rename src/{ => ui-kde}/chatinput.cpp (100%) rename src/{ => ui-kde}/chatinput.h (100%) rename src/{ => ui-kde}/chatoutput.cpp (100%) rename src/{ => ui-kde}/chatoutput.h (100%) rename src/{ => ui-kde}/cmake_uninstall.cmake (100%) rename src/{ => ui-kde}/contact_detail.ui (100%) rename src/{ => ui-kde}/contactdetaildialog.cpp (100%) rename src/{ => ui-kde}/contactdetaildialog.h (100%) rename src/{ => ui-kde}/icons/CMakeLists.txt (100%) rename src/{ => ui-kde}/icons/hi128-action-makneto-call.png (100%) rename src/{ => ui-kde}/icons/hi128-action-makneto-hang-up.png (100%) rename src/{ => ui-kde}/icons/hi16-action-maknetoaway.png (100%) rename src/{ => ui-kde}/icons/hi16-action-maknetodnd.png (100%) rename src/{ => ui-kde}/icons/hi16-action-maknetoinvisible.png (100%) rename src/{ => ui-kde}/icons/hi16-action-maknetooffline.png (100%) rename src/{ => ui-kde}/icons/hi16-action-maknetoonline.png (100%) rename src/{ => ui-kde}/icons/hi16-action-maknetoxa.png (100%) rename src/{ => ui-kde}/icons/hi22-action-maknetoaway.png (100%) rename src/{ => ui-kde}/icons/hi22-action-maknetodnd.png (100%) rename src/{ => ui-kde}/icons/hi22-action-maknetoinvisible.png (100%) rename src/{ => ui-kde}/icons/hi22-action-maknetooffline.png (100%) rename src/{ => ui-kde}/icons/hi22-action-maknetoonline.png (100%) rename src/{ => ui-kde}/icons/hi22-action-maknetoxa.png (100%) rename src/{ => ui-kde}/icons/hi32-action-maknetoaway.png (100%) rename src/{ => ui-kde}/icons/hi32-action-maknetodnd.png (100%) rename src/{ => ui-kde}/icons/hi32-action-maknetoinvisible.png (100%) rename src/{ => ui-kde}/icons/hi32-action-maknetooffline.png (100%) rename src/{ => ui-kde}/icons/hi32-action-maknetoonline.png (100%) rename src/{ => ui-kde}/icons/hi32-action-maknetoxa.png (100%) rename src/{ => ui-kde}/icons/hi48-action-maknetoaway.png (100%) rename src/{ => ui-kde}/icons/hi48-action-maknetodnd.png (100%) rename src/{ => ui-kde}/icons/hi48-action-maknetoinvisible.png (100%) rename src/{ => ui-kde}/icons/hi48-action-maknetooffline.png (100%) rename src/{ => ui-kde}/icons/hi48-action-maknetoonline.png (100%) rename src/{ => ui-kde}/icons/hi48-action-maknetoxa.png (100%) rename src/{ => ui-kde}/icons/hi64-action-maknetoaway.png (100%) rename src/{ => ui-kde}/icons/hi64-action-maknetodnd.png (100%) rename src/{ => ui-kde}/icons/hi64-action-maknetoinvisible.png (100%) rename src/{ => ui-kde}/icons/hi64-action-maknetooffline.png (100%) rename src/{ => ui-kde}/icons/hi64-action-maknetoonline.png (100%) rename src/{ => ui-kde}/icons/hi64-action-maknetoxa.png (100%) rename src/{ => ui-kde}/icons/ox16-action-draw-circle.png (100%) rename src/{ => ui-kde}/icons/ox16-action-draw-ellipse.png (100%) rename src/{ => ui-kde}/icons/ox16-action-draw-line.png (100%) rename src/{ => ui-kde}/icons/ox16-action-draw-rectangle.png (100%) rename src/{ => ui-kde}/icons/ox22-action-draw-rectangle.png (100%) rename src/{ => ui-kde}/icons/ox32-action-draw-rectangle.png (100%) rename src/{ => ui-kde}/icons/ox48-action-draw-rectangle.png (100%) rename src/{ => ui-kde}/icons/ox64-action-draw-rectangle.png (100%) rename src/{ => ui-kde}/icons/svg/README (100%) rename src/{ => ui-kde}/icons/svg/draw-circle.svgz (100%) rename src/{ => ui-kde}/icons/svg/draw-ellipse.svgz (100%) rename src/{ => ui-kde}/icons/svg/draw-line.svgz (100%) rename src/{ => ui-kde}/icons/svg/draw-rectangle.svgz.svg (100%) rename src/{ => ui-kde}/icons/svg/makneto_icons.svg (100%) rename src/{ => ui-kde}/main.cpp (100%) rename src/{ => ui-kde}/makneto.cpp (92%) rename src/{ => ui-kde}/makneto.desktop (100%) rename src/{ => ui-kde}/makneto.h (100%) rename src/{ => ui-kde}/makneto.kcfg (100%) rename src/{ => ui-kde}/maknetoaccount.h (100%) rename src/{ => ui-kde}/maknetofiletransfer.cpp (100%) rename src/{ => ui-kde}/maknetofiletransfer.h (100%) rename src/{ => ui-kde}/maknetohtmlbrowser.cpp (100%) rename src/{ => ui-kde}/maknetohtmlbrowser.h (100%) rename src/{ => ui-kde}/maknetomainwindow.cpp (100%) rename src/{ => ui-kde}/maknetomainwindow.h (100%) rename src/{ => ui-kde}/maknetoui.rc (100%) rename src/{ => ui-kde}/maknetoview.cpp (97%) rename src/{ => ui-kde}/maknetoview.h (100%) rename src/{ => ui-kde}/maknetoview_base.ui (100%) rename src/{ => ui-kde}/mediaplayer.cpp (100%) rename src/{ => ui-kde}/mediaplayer.h (100%) rename src/{ => ui-kde}/palettewidget.cpp (100%) rename src/{ => ui-kde}/palettewidget.h (100%) rename src/{ => ui-kde}/plugins/plugin.cpp (100%) rename src/{ => ui-kde}/plugins/plugin.h (100%) rename src/{ => ui-kde}/plugins/pollplugin.cpp (100%) rename src/{ => ui-kde}/plugins/pollplugin.h (100%) rename src/{ => ui-kde}/plugins/pollplugincreate.cpp (100%) rename src/{ => ui-kde}/plugins/pollplugincreate.h (100%) rename src/{ => ui-kde}/prefs_base.ui (100%) rename src/{ => ui-kde}/qgraphicswidgetitem.cpp (100%) rename src/{ => ui-kde}/qgraphicswidgetitem.h (100%) rename src/{ => ui-kde}/roster-widget.cpp (97%) rename src/{ => ui-kde}/roster-widget.h (100%) rename src/{ => ui-kde}/sessiontabmanager.cpp (99%) rename src/{ => ui-kde}/sessiontabmanager.h (98%) rename src/{ => ui-kde}/sessionview.cpp (100%) rename src/{ => ui-kde}/sessionview.h (99%) rename src/{ => ui-kde}/settings.cpp (100%) rename src/{ => ui-kde}/settings.h (100%) rename src/{ => ui-kde}/settings.kcfgc (100%) rename src/{ => ui-kde}/sidebarwidget.cpp (100%) rename src/{ => ui-kde}/sidebarwidget.h (100%) rename src/{ => ui-kde}/wbforeign.cpp (100%) rename src/{ => ui-kde}/wbforeign.h (100%) rename src/{ => ui-kde}/wbitems.cpp (100%) rename src/{ => ui-kde}/wbitems.h (100%) rename src/{ => ui-kde}/wbscene.cpp (100%) rename src/{ => ui-kde}/wbscene.h (100%) rename src/{ => ui-kde}/wbwidget.cpp (100%) rename src/{ => ui-kde}/wbwidget.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt dissimilarity index 98% index 2a5cdee..13f2c8f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,126 +1,5 @@ -cmake_minimum_required(VERSION 2.6) - -project(makneto) - -SET(CMAKE_BUILD_TYPE Debug) - -list(APPEND CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/CMakeMod") -list(APPEND CMAKE_MODULE_PATH "../CMakeMod") - -find_package(Qt4 REQUIRED) -find_package(QtGStreamer REQUIRED) -find_package(TelepathyQt4 REQUIRED) -find_package(TelepathyQt4Farsight REQUIRED) -find_package(TpFarsight REQUIRED) -find_package(Farsight2 REQUIRED) - -set(KDE4_FIND_QUIETLY false) -find_package(KDE4 REQUIRED) -find_package(QCA2 REQUIRED) - -include(${QT_USE_FILE}) -include (KDE4Defaults) - -message(STATUS "Module path: ${CMAKE_MODULE_PATH}") - -include_directories(${KDE4_INCLUDES} - ${KDE4_PHONON_INCLUDES} - ${KDE4_KDECORE_INCLUDES} - ${QT_INCLUDES} - ${QCA2_INCLUDE_DIR} - ${TELEPATHY_QT4_INCLUDE_DIR} - ${TPFARSIGHT_INCLUDE_DIR} - ${QTGSTREAMER_INCLUDE_DIR} - -) - -set(makneto_SRCS - main.cpp - maknetomainwindow.cpp - maknetoview.cpp - sidebarwidget.cpp - makneto.cpp - wbwidget.cpp - wbscene.cpp - wbitems.cpp - sessionview.cpp - sessiontabmanager.cpp - maknetohtmlbrowser.cpp - mediaplayer.cpp - addcontactdialog.cpp - contactdetaildialog.cpp - chatinput.cpp - chatoutput.cpp - palettewidget.cpp - wbforeign.cpp - qgraphicswidgetitem.cpp - -#plugins - plugins/plugin.cpp - plugins/pollplugin.cpp - plugins/pollplugincreate.cpp - -#Vtheman - backend/telepathy-initializer.cpp - backend/telepathy-client.cpp - backend/accounts-model.cpp - backend/accounts-model-item.cpp - backend/contact-model-item.cpp - backend/flat-model-proxy.cpp - backend/tree-node.cpp - backend/session.cpp - #voip - backend/voip/sleep.cpp - backend/voip/callchannelhandler.cpp - backend/voip/calllog.cpp - backend/voip/callparticipant.cpp - backend/voip/deviceelementfactory.cpp - backend/voip/phononintegration.cpp - - call-window.cpp - roster-widget.cpp - account-presence-button.cpp -) - -#kde4_moc_headers(makneto -#) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") - -kde4_add_ui_files( makneto_SRCS - maknetoview_base.ui - prefs_base.ui - add_contact.ui - contact_detail.ui) - -kde4_add_kcfg_files(makneto_SRCS - settings.kcfgc ) - -kde4_add_executable(makneto - ${makneto_SRCS}) - -SET_TARGET_PROPERTIES(makneto PROPERTIES COMPILE_FLAGS "-g") - -target_link_libraries( makneto - ${KDE4_KDEUI_LIBS} - ${QT_LIBRARIES} - ${KDE4_KHTML_LIBS} - ${KDE4_PHONON_LIBS} - ${TELEPATHY_QT4_FARSIGHT_LIBRARIES} - ${TPFARSIGHT_LIBRARIES} - ${FARSIGHT2_LIBRARIES} - ${QTGSTREAMER_UI_LIBRARIES} - ${QCA2_LIBRARIES} - ${TELEPATHY_QT4_LIBRARIES} - ) -#install(TARGETS makneto DESTINATION ${BIN_INSTALL_DIR} ) -install(TARGETS makneto ${INSTALL_TARGETS_DEFAULT_ARGS} ) - -message(SYSTEM " DATA INSTALL DIR ${DATA_INSTALL_DIR}") -########### install files ############### -install( FILES makneto.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES makneto.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -install( FILES maknetoui.rc DESTINATION ${DATA_INSTALL_DIR}/makneto ) -install( FILES backend/voip/codec-preferences.ini DESTINATION ${DATA_INSTALL_DIR}/makneto) - -add_subdirectory( icons ) +cmake_minimum_required(VERSION 2.6) +#project(makneto) + +add_subdirectory(ui-kde) +#add_subdirectory(src/backend) diff --git a/src/CMakeLists.txt b/src/ui-kde/CMakeLists.txt similarity index 85% copy from src/CMakeLists.txt copy to src/ui-kde/CMakeLists.txt index 2a5cdee..9a2be19 100644 --- a/src/CMakeLists.txt +++ b/src/ui-kde/CMakeLists.txt @@ -61,25 +61,25 @@ set(makneto_SRCS plugins/pollplugincreate.cpp #Vtheman - backend/telepathy-initializer.cpp - backend/telepathy-client.cpp - backend/accounts-model.cpp - backend/accounts-model-item.cpp - backend/contact-model-item.cpp - backend/flat-model-proxy.cpp - backend/tree-node.cpp - backend/session.cpp - #voip - backend/voip/sleep.cpp - backend/voip/callchannelhandler.cpp - backend/voip/calllog.cpp - backend/voip/callparticipant.cpp - backend/voip/deviceelementfactory.cpp - backend/voip/phononintegration.cpp - call-window.cpp roster-widget.cpp account-presence-button.cpp + + ../backend/telepathy-initializer.cpp + ../backend/telepathy-client.cpp + ../backend/accounts-model.cpp + ../backend/accounts-model-item.cpp + ../backend/contact-model-item.cpp + ../backend/flat-model-proxy.cpp + ../backend/tree-node.cpp + ../backend/session.cpp + #voip + ../backend/voip/sleep.cpp + ../backend/voip/callchannelhandler.cpp + ../backend/voip/calllog.cpp + ../backend/voip/callparticipant.cpp + ../backend/voip/deviceelementfactory.cpp + ../backend/voip/phononintegration.cpp ) #kde4_moc_headers(makneto @@ -117,6 +117,7 @@ target_link_libraries( makneto install(TARGETS makneto ${INSTALL_TARGETS_DEFAULT_ARGS} ) message(SYSTEM " DATA INSTALL DIR ${DATA_INSTALL_DIR}") + ########### install files ############### install( FILES makneto.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES makneto.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/src/account-presence-button.cpp b/src/ui-kde/account-presence-button.cpp similarity index 100% rename from src/account-presence-button.cpp rename to src/ui-kde/account-presence-button.cpp diff --git a/src/account-presence-button.h b/src/ui-kde/account-presence-button.h similarity index 100% rename from src/account-presence-button.h rename to src/ui-kde/account-presence-button.h diff --git a/src/add_contact.ui b/src/ui-kde/add_contact.ui similarity index 100% rename from src/add_contact.ui rename to src/ui-kde/add_contact.ui diff --git a/src/addcontactdialog.cpp b/src/ui-kde/addcontactdialog.cpp similarity index 100% rename from src/addcontactdialog.cpp rename to src/ui-kde/addcontactdialog.cpp diff --git a/src/addcontactdialog.h b/src/ui-kde/addcontactdialog.h similarity index 100% rename from src/addcontactdialog.h rename to src/ui-kde/addcontactdialog.h diff --git a/src/call-window.cpp b/src/ui-kde/call-window.cpp similarity index 97% rename from src/call-window.cpp rename to src/ui-kde/call-window.cpp index 752cac9..209c6f8 100644 --- a/src/call-window.cpp +++ b/src/ui-kde/call-window.cpp @@ -6,7 +6,7 @@ #include #include "call-window.h" -#include "backend/session.h" +#include "../backend/session.h" CallWindow::CallWindow(MaknetoBackend::Session *session, QWidget* parent) : QMainWindow(parent), diff --git a/src/call-window.h b/src/ui-kde/call-window.h similarity index 100% rename from src/call-window.h rename to src/ui-kde/call-window.h diff --git a/src/chatinput.cpp b/src/ui-kde/chatinput.cpp similarity index 100% rename from src/chatinput.cpp rename to src/ui-kde/chatinput.cpp diff --git a/src/chatinput.h b/src/ui-kde/chatinput.h similarity index 100% rename from src/chatinput.h rename to src/ui-kde/chatinput.h diff --git a/src/chatoutput.cpp b/src/ui-kde/chatoutput.cpp similarity index 100% rename from src/chatoutput.cpp rename to src/ui-kde/chatoutput.cpp diff --git a/src/chatoutput.h b/src/ui-kde/chatoutput.h similarity index 100% rename from src/chatoutput.h rename to src/ui-kde/chatoutput.h diff --git a/src/cmake_uninstall.cmake b/src/ui-kde/cmake_uninstall.cmake similarity index 100% rename from src/cmake_uninstall.cmake rename to src/ui-kde/cmake_uninstall.cmake diff --git a/src/contact_detail.ui b/src/ui-kde/contact_detail.ui similarity index 100% rename from src/contact_detail.ui rename to src/ui-kde/contact_detail.ui diff --git a/src/contactdetaildialog.cpp b/src/ui-kde/contactdetaildialog.cpp similarity index 100% rename from src/contactdetaildialog.cpp rename to src/ui-kde/contactdetaildialog.cpp diff --git a/src/contactdetaildialog.h b/src/ui-kde/contactdetaildialog.h similarity index 100% rename from src/contactdetaildialog.h rename to src/ui-kde/contactdetaildialog.h diff --git a/src/icons/CMakeLists.txt b/src/ui-kde/icons/CMakeLists.txt similarity index 100% rename from src/icons/CMakeLists.txt rename to src/ui-kde/icons/CMakeLists.txt diff --git a/src/icons/hi128-action-makneto-call.png b/src/ui-kde/icons/hi128-action-makneto-call.png similarity index 100% rename from src/icons/hi128-action-makneto-call.png rename to src/ui-kde/icons/hi128-action-makneto-call.png diff --git a/src/icons/hi128-action-makneto-hang-up.png b/src/ui-kde/icons/hi128-action-makneto-hang-up.png similarity index 100% rename from src/icons/hi128-action-makneto-hang-up.png rename to src/ui-kde/icons/hi128-action-makneto-hang-up.png diff --git a/src/icons/hi16-action-maknetoaway.png b/src/ui-kde/icons/hi16-action-maknetoaway.png similarity index 100% rename from src/icons/hi16-action-maknetoaway.png rename to src/ui-kde/icons/hi16-action-maknetoaway.png diff --git a/src/icons/hi16-action-maknetodnd.png b/src/ui-kde/icons/hi16-action-maknetodnd.png similarity index 100% rename from src/icons/hi16-action-maknetodnd.png rename to src/ui-kde/icons/hi16-action-maknetodnd.png diff --git a/src/icons/hi16-action-maknetoinvisible.png b/src/ui-kde/icons/hi16-action-maknetoinvisible.png similarity index 100% rename from src/icons/hi16-action-maknetoinvisible.png rename to src/ui-kde/icons/hi16-action-maknetoinvisible.png diff --git a/src/icons/hi16-action-maknetooffline.png b/src/ui-kde/icons/hi16-action-maknetooffline.png similarity index 100% rename from src/icons/hi16-action-maknetooffline.png rename to src/ui-kde/icons/hi16-action-maknetooffline.png diff --git a/src/icons/hi16-action-maknetoonline.png b/src/ui-kde/icons/hi16-action-maknetoonline.png similarity index 100% rename from src/icons/hi16-action-maknetoonline.png rename to src/ui-kde/icons/hi16-action-maknetoonline.png diff --git a/src/icons/hi16-action-maknetoxa.png b/src/ui-kde/icons/hi16-action-maknetoxa.png similarity index 100% rename from src/icons/hi16-action-maknetoxa.png rename to src/ui-kde/icons/hi16-action-maknetoxa.png diff --git a/src/icons/hi22-action-maknetoaway.png b/src/ui-kde/icons/hi22-action-maknetoaway.png similarity index 100% rename from src/icons/hi22-action-maknetoaway.png rename to src/ui-kde/icons/hi22-action-maknetoaway.png diff --git a/src/icons/hi22-action-maknetodnd.png b/src/ui-kde/icons/hi22-action-maknetodnd.png similarity index 100% rename from src/icons/hi22-action-maknetodnd.png rename to src/ui-kde/icons/hi22-action-maknetodnd.png diff --git a/src/icons/hi22-action-maknetoinvisible.png b/src/ui-kde/icons/hi22-action-maknetoinvisible.png similarity index 100% rename from src/icons/hi22-action-maknetoinvisible.png rename to src/ui-kde/icons/hi22-action-maknetoinvisible.png diff --git a/src/icons/hi22-action-maknetooffline.png b/src/ui-kde/icons/hi22-action-maknetooffline.png similarity index 100% rename from src/icons/hi22-action-maknetooffline.png rename to src/ui-kde/icons/hi22-action-maknetooffline.png diff --git a/src/icons/hi22-action-maknetoonline.png b/src/ui-kde/icons/hi22-action-maknetoonline.png similarity index 100% rename from src/icons/hi22-action-maknetoonline.png rename to src/ui-kde/icons/hi22-action-maknetoonline.png diff --git a/src/icons/hi22-action-maknetoxa.png b/src/ui-kde/icons/hi22-action-maknetoxa.png similarity index 100% rename from src/icons/hi22-action-maknetoxa.png rename to src/ui-kde/icons/hi22-action-maknetoxa.png diff --git a/src/icons/hi32-action-maknetoaway.png b/src/ui-kde/icons/hi32-action-maknetoaway.png similarity index 100% rename from src/icons/hi32-action-maknetoaway.png rename to src/ui-kde/icons/hi32-action-maknetoaway.png diff --git a/src/icons/hi32-action-maknetodnd.png b/src/ui-kde/icons/hi32-action-maknetodnd.png similarity index 100% rename from src/icons/hi32-action-maknetodnd.png rename to src/ui-kde/icons/hi32-action-maknetodnd.png diff --git a/src/icons/hi32-action-maknetoinvisible.png b/src/ui-kde/icons/hi32-action-maknetoinvisible.png similarity index 100% rename from src/icons/hi32-action-maknetoinvisible.png rename to src/ui-kde/icons/hi32-action-maknetoinvisible.png diff --git a/src/icons/hi32-action-maknetooffline.png b/src/ui-kde/icons/hi32-action-maknetooffline.png similarity index 100% rename from src/icons/hi32-action-maknetooffline.png rename to src/ui-kde/icons/hi32-action-maknetooffline.png diff --git a/src/icons/hi32-action-maknetoonline.png b/src/ui-kde/icons/hi32-action-maknetoonline.png similarity index 100% rename from src/icons/hi32-action-maknetoonline.png rename to src/ui-kde/icons/hi32-action-maknetoonline.png diff --git a/src/icons/hi32-action-maknetoxa.png b/src/ui-kde/icons/hi32-action-maknetoxa.png similarity index 100% rename from src/icons/hi32-action-maknetoxa.png rename to src/ui-kde/icons/hi32-action-maknetoxa.png diff --git a/src/icons/hi48-action-maknetoaway.png b/src/ui-kde/icons/hi48-action-maknetoaway.png similarity index 100% rename from src/icons/hi48-action-maknetoaway.png rename to src/ui-kde/icons/hi48-action-maknetoaway.png diff --git a/src/icons/hi48-action-maknetodnd.png b/src/ui-kde/icons/hi48-action-maknetodnd.png similarity index 100% rename from src/icons/hi48-action-maknetodnd.png rename to src/ui-kde/icons/hi48-action-maknetodnd.png diff --git a/src/icons/hi48-action-maknetoinvisible.png b/src/ui-kde/icons/hi48-action-maknetoinvisible.png similarity index 100% rename from src/icons/hi48-action-maknetoinvisible.png rename to src/ui-kde/icons/hi48-action-maknetoinvisible.png diff --git a/src/icons/hi48-action-maknetooffline.png b/src/ui-kde/icons/hi48-action-maknetooffline.png similarity index 100% rename from src/icons/hi48-action-maknetooffline.png rename to src/ui-kde/icons/hi48-action-maknetooffline.png diff --git a/src/icons/hi48-action-maknetoonline.png b/src/ui-kde/icons/hi48-action-maknetoonline.png similarity index 100% rename from src/icons/hi48-action-maknetoonline.png rename to src/ui-kde/icons/hi48-action-maknetoonline.png diff --git a/src/icons/hi48-action-maknetoxa.png b/src/ui-kde/icons/hi48-action-maknetoxa.png similarity index 100% rename from src/icons/hi48-action-maknetoxa.png rename to src/ui-kde/icons/hi48-action-maknetoxa.png diff --git a/src/icons/hi64-action-maknetoaway.png b/src/ui-kde/icons/hi64-action-maknetoaway.png similarity index 100% rename from src/icons/hi64-action-maknetoaway.png rename to src/ui-kde/icons/hi64-action-maknetoaway.png diff --git a/src/icons/hi64-action-maknetodnd.png b/src/ui-kde/icons/hi64-action-maknetodnd.png similarity index 100% rename from src/icons/hi64-action-maknetodnd.png rename to src/ui-kde/icons/hi64-action-maknetodnd.png diff --git a/src/icons/hi64-action-maknetoinvisible.png b/src/ui-kde/icons/hi64-action-maknetoinvisible.png similarity index 100% rename from src/icons/hi64-action-maknetoinvisible.png rename to src/ui-kde/icons/hi64-action-maknetoinvisible.png diff --git a/src/icons/hi64-action-maknetooffline.png b/src/ui-kde/icons/hi64-action-maknetooffline.png similarity index 100% rename from src/icons/hi64-action-maknetooffline.png rename to src/ui-kde/icons/hi64-action-maknetooffline.png diff --git a/src/icons/hi64-action-maknetoonline.png b/src/ui-kde/icons/hi64-action-maknetoonline.png similarity index 100% rename from src/icons/hi64-action-maknetoonline.png rename to src/ui-kde/icons/hi64-action-maknetoonline.png diff --git a/src/icons/hi64-action-maknetoxa.png b/src/ui-kde/icons/hi64-action-maknetoxa.png similarity index 100% rename from src/icons/hi64-action-maknetoxa.png rename to src/ui-kde/icons/hi64-action-maknetoxa.png diff --git a/src/icons/ox16-action-draw-circle.png b/src/ui-kde/icons/ox16-action-draw-circle.png similarity index 100% rename from src/icons/ox16-action-draw-circle.png rename to src/ui-kde/icons/ox16-action-draw-circle.png diff --git a/src/icons/ox16-action-draw-ellipse.png b/src/ui-kde/icons/ox16-action-draw-ellipse.png similarity index 100% rename from src/icons/ox16-action-draw-ellipse.png rename to src/ui-kde/icons/ox16-action-draw-ellipse.png diff --git a/src/icons/ox16-action-draw-line.png b/src/ui-kde/icons/ox16-action-draw-line.png similarity index 100% rename from src/icons/ox16-action-draw-line.png rename to src/ui-kde/icons/ox16-action-draw-line.png diff --git a/src/icons/ox16-action-draw-rectangle.png b/src/ui-kde/icons/ox16-action-draw-rectangle.png similarity index 100% rename from src/icons/ox16-action-draw-rectangle.png rename to src/ui-kde/icons/ox16-action-draw-rectangle.png diff --git a/src/icons/ox22-action-draw-rectangle.png b/src/ui-kde/icons/ox22-action-draw-rectangle.png similarity index 100% rename from src/icons/ox22-action-draw-rectangle.png rename to src/ui-kde/icons/ox22-action-draw-rectangle.png diff --git a/src/icons/ox32-action-draw-rectangle.png b/src/ui-kde/icons/ox32-action-draw-rectangle.png similarity index 100% rename from src/icons/ox32-action-draw-rectangle.png rename to src/ui-kde/icons/ox32-action-draw-rectangle.png diff --git a/src/icons/ox48-action-draw-rectangle.png b/src/ui-kde/icons/ox48-action-draw-rectangle.png similarity index 100% rename from src/icons/ox48-action-draw-rectangle.png rename to src/ui-kde/icons/ox48-action-draw-rectangle.png diff --git a/src/icons/ox64-action-draw-rectangle.png b/src/ui-kde/icons/ox64-action-draw-rectangle.png similarity index 100% rename from src/icons/ox64-action-draw-rectangle.png rename to src/ui-kde/icons/ox64-action-draw-rectangle.png diff --git a/src/icons/svg/README b/src/ui-kde/icons/svg/README similarity index 100% rename from src/icons/svg/README rename to src/ui-kde/icons/svg/README diff --git a/src/icons/svg/draw-circle.svgz b/src/ui-kde/icons/svg/draw-circle.svgz similarity index 100% rename from src/icons/svg/draw-circle.svgz rename to src/ui-kde/icons/svg/draw-circle.svgz diff --git a/src/icons/svg/draw-ellipse.svgz b/src/ui-kde/icons/svg/draw-ellipse.svgz similarity index 100% rename from src/icons/svg/draw-ellipse.svgz rename to src/ui-kde/icons/svg/draw-ellipse.svgz diff --git a/src/icons/svg/draw-line.svgz b/src/ui-kde/icons/svg/draw-line.svgz similarity index 100% rename from src/icons/svg/draw-line.svgz rename to src/ui-kde/icons/svg/draw-line.svgz diff --git a/src/icons/svg/draw-rectangle.svgz.svg b/src/ui-kde/icons/svg/draw-rectangle.svgz.svg similarity index 100% rename from src/icons/svg/draw-rectangle.svgz.svg rename to src/ui-kde/icons/svg/draw-rectangle.svgz.svg diff --git a/src/icons/svg/makneto_icons.svg b/src/ui-kde/icons/svg/makneto_icons.svg similarity index 100% rename from src/icons/svg/makneto_icons.svg rename to src/ui-kde/icons/svg/makneto_icons.svg diff --git a/src/main.cpp b/src/ui-kde/main.cpp similarity index 100% rename from src/main.cpp rename to src/ui-kde/main.cpp diff --git a/src/makneto.cpp b/src/ui-kde/makneto.cpp similarity index 92% rename from src/makneto.cpp rename to src/ui-kde/makneto.cpp index 644f246..a7d2c46 100644 --- a/src/makneto.cpp +++ b/src/ui-kde/makneto.cpp @@ -9,11 +9,12 @@ #include //Vtheman +#include "../backend/telepathy-initializer.h" +#include "../backend/telepathy-client.h" +#include "../backend/session.h" + #include "sessiontabmanager.h" -#include "backend/telepathy-initializer.h" -#include "backend/telepathy-client.h" #include "maknetoview.h" -#include "backend/session.h" Makneto* Makneto::m_instance = NULL; diff --git a/src/makneto.desktop b/src/ui-kde/makneto.desktop similarity index 100% rename from src/makneto.desktop rename to src/ui-kde/makneto.desktop diff --git a/src/makneto.h b/src/ui-kde/makneto.h similarity index 100% rename from src/makneto.h rename to src/ui-kde/makneto.h diff --git a/src/makneto.kcfg b/src/ui-kde/makneto.kcfg similarity index 100% rename from src/makneto.kcfg rename to src/ui-kde/makneto.kcfg diff --git a/src/maknetoaccount.h b/src/ui-kde/maknetoaccount.h similarity index 100% rename from src/maknetoaccount.h rename to src/ui-kde/maknetoaccount.h diff --git a/src/maknetofiletransfer.cpp b/src/ui-kde/maknetofiletransfer.cpp similarity index 100% rename from src/maknetofiletransfer.cpp rename to src/ui-kde/maknetofiletransfer.cpp diff --git a/src/maknetofiletransfer.h b/src/ui-kde/maknetofiletransfer.h similarity index 100% rename from src/maknetofiletransfer.h rename to src/ui-kde/maknetofiletransfer.h diff --git a/src/maknetohtmlbrowser.cpp b/src/ui-kde/maknetohtmlbrowser.cpp similarity index 100% rename from src/maknetohtmlbrowser.cpp rename to src/ui-kde/maknetohtmlbrowser.cpp diff --git a/src/maknetohtmlbrowser.h b/src/ui-kde/maknetohtmlbrowser.h similarity index 100% rename from src/maknetohtmlbrowser.h rename to src/ui-kde/maknetohtmlbrowser.h diff --git a/src/maknetomainwindow.cpp b/src/ui-kde/maknetomainwindow.cpp similarity index 100% rename from src/maknetomainwindow.cpp rename to src/ui-kde/maknetomainwindow.cpp diff --git a/src/maknetomainwindow.h b/src/ui-kde/maknetomainwindow.h similarity index 100% rename from src/maknetomainwindow.h rename to src/ui-kde/maknetomainwindow.h diff --git a/src/maknetoui.rc b/src/ui-kde/maknetoui.rc similarity index 100% rename from src/maknetoui.rc rename to src/ui-kde/maknetoui.rc diff --git a/src/maknetoview.cpp b/src/ui-kde/maknetoview.cpp similarity index 97% rename from src/maknetoview.cpp rename to src/ui-kde/maknetoview.cpp index e40700b..c2da641 100644 --- a/src/maknetoview.cpp +++ b/src/ui-kde/maknetoview.cpp @@ -22,7 +22,7 @@ #include //vtheman -#include "backend/telepathy-client.h" +#include "../backend/telepathy-client.h" #include "roster-widget.h" MaknetoView::MaknetoView(QWidget *, Makneto *makneto) diff --git a/src/maknetoview.h b/src/ui-kde/maknetoview.h similarity index 100% rename from src/maknetoview.h rename to src/ui-kde/maknetoview.h diff --git a/src/maknetoview_base.ui b/src/ui-kde/maknetoview_base.ui similarity index 100% rename from src/maknetoview_base.ui rename to src/ui-kde/maknetoview_base.ui diff --git a/src/mediaplayer.cpp b/src/ui-kde/mediaplayer.cpp similarity index 100% rename from src/mediaplayer.cpp rename to src/ui-kde/mediaplayer.cpp diff --git a/src/mediaplayer.h b/src/ui-kde/mediaplayer.h similarity index 100% rename from src/mediaplayer.h rename to src/ui-kde/mediaplayer.h diff --git a/src/palettewidget.cpp b/src/ui-kde/palettewidget.cpp similarity index 100% rename from src/palettewidget.cpp rename to src/ui-kde/palettewidget.cpp diff --git a/src/palettewidget.h b/src/ui-kde/palettewidget.h similarity index 100% rename from src/palettewidget.h rename to src/ui-kde/palettewidget.h diff --git a/src/plugins/plugin.cpp b/src/ui-kde/plugins/plugin.cpp similarity index 100% rename from src/plugins/plugin.cpp rename to src/ui-kde/plugins/plugin.cpp diff --git a/src/plugins/plugin.h b/src/ui-kde/plugins/plugin.h similarity index 100% rename from src/plugins/plugin.h rename to src/ui-kde/plugins/plugin.h diff --git a/src/plugins/pollplugin.cpp b/src/ui-kde/plugins/pollplugin.cpp similarity index 100% rename from src/plugins/pollplugin.cpp rename to src/ui-kde/plugins/pollplugin.cpp diff --git a/src/plugins/pollplugin.h b/src/ui-kde/plugins/pollplugin.h similarity index 100% rename from src/plugins/pollplugin.h rename to src/ui-kde/plugins/pollplugin.h diff --git a/src/plugins/pollplugincreate.cpp b/src/ui-kde/plugins/pollplugincreate.cpp similarity index 100% rename from src/plugins/pollplugincreate.cpp rename to src/ui-kde/plugins/pollplugincreate.cpp diff --git a/src/plugins/pollplugincreate.h b/src/ui-kde/plugins/pollplugincreate.h similarity index 100% rename from src/plugins/pollplugincreate.h rename to src/ui-kde/plugins/pollplugincreate.h diff --git a/src/prefs_base.ui b/src/ui-kde/prefs_base.ui similarity index 100% rename from src/prefs_base.ui rename to src/ui-kde/prefs_base.ui diff --git a/src/qgraphicswidgetitem.cpp b/src/ui-kde/qgraphicswidgetitem.cpp similarity index 100% rename from src/qgraphicswidgetitem.cpp rename to src/ui-kde/qgraphicswidgetitem.cpp diff --git a/src/qgraphicswidgetitem.h b/src/ui-kde/qgraphicswidgetitem.h similarity index 100% rename from src/qgraphicswidgetitem.h rename to src/ui-kde/qgraphicswidgetitem.h diff --git a/src/roster-widget.cpp b/src/ui-kde/roster-widget.cpp similarity index 97% rename from src/roster-widget.cpp rename to src/ui-kde/roster-widget.cpp index 477d3b7..2983c98 100644 --- a/src/roster-widget.cpp +++ b/src/ui-kde/roster-widget.cpp @@ -23,7 +23,10 @@ #include #include -#include "backend/flat-model-proxy.h" +#include "../backend/flat-model-proxy.h" +#include "../backend/telepathy-client.h" +#include "../backend/accounts-model-item.h" +#include "../backend/accounts-model.h" //#include #include @@ -39,10 +42,7 @@ #include #include "roster-widget.h" -#include "backend/telepathy-client.h" #include "account-presence-button.h" -#include "backend/accounts-model-item.h" -#include "backend/accounts-model.h" #include "makneto.h" #include "maknetoview.h" #include "sessiontabmanager.h" diff --git a/src/roster-widget.h b/src/ui-kde/roster-widget.h similarity index 100% rename from src/roster-widget.h rename to src/ui-kde/roster-widget.h diff --git a/src/sessiontabmanager.cpp b/src/ui-kde/sessiontabmanager.cpp similarity index 99% rename from src/sessiontabmanager.cpp rename to src/ui-kde/sessiontabmanager.cpp index 06b2aa1..08c6cae 100644 --- a/src/sessiontabmanager.cpp +++ b/src/ui-kde/sessiontabmanager.cpp @@ -19,7 +19,7 @@ #include //vtheman -#include "backend/telepathy-client.h" +#include "../backend/telepathy-client.h" SessionTabManager::SessionTabManager(Makneto *makneto, QWidget *): m_makneto(makneto) diff --git a/src/sessiontabmanager.h b/src/ui-kde/sessiontabmanager.h similarity index 98% rename from src/sessiontabmanager.h rename to src/ui-kde/sessiontabmanager.h index d3a98e8..17b0117 100644 --- a/src/sessiontabmanager.h +++ b/src/ui-kde/sessiontabmanager.h @@ -8,7 +8,7 @@ #define SESSIONTABMANAGER_H #include "makneto.h" -#include "backend/session.h" +#include "../backend/session.h" #include diff --git a/src/sessionview.cpp b/src/ui-kde/sessionview.cpp similarity index 100% rename from src/sessionview.cpp rename to src/ui-kde/sessionview.cpp diff --git a/src/sessionview.h b/src/ui-kde/sessionview.h similarity index 99% rename from src/sessionview.h rename to src/ui-kde/sessionview.h index 8324f0a..b373e68 100644 --- a/src/sessionview.h +++ b/src/ui-kde/sessionview.h @@ -32,7 +32,7 @@ class ChatOutput; #include "settings.h" #include "wbwidget.h" -#include "backend/session.h" +#include "../backend/session.h" class CallWindow; diff --git a/src/settings.cpp b/src/ui-kde/settings.cpp similarity index 100% rename from src/settings.cpp rename to src/ui-kde/settings.cpp diff --git a/src/settings.h b/src/ui-kde/settings.h similarity index 100% rename from src/settings.h rename to src/ui-kde/settings.h diff --git a/src/settings.kcfgc b/src/ui-kde/settings.kcfgc similarity index 100% rename from src/settings.kcfgc rename to src/ui-kde/settings.kcfgc diff --git a/src/sidebarwidget.cpp b/src/ui-kde/sidebarwidget.cpp similarity index 100% rename from src/sidebarwidget.cpp rename to src/ui-kde/sidebarwidget.cpp diff --git a/src/sidebarwidget.h b/src/ui-kde/sidebarwidget.h similarity index 100% rename from src/sidebarwidget.h rename to src/ui-kde/sidebarwidget.h diff --git a/src/wbforeign.cpp b/src/ui-kde/wbforeign.cpp similarity index 100% rename from src/wbforeign.cpp rename to src/ui-kde/wbforeign.cpp diff --git a/src/wbforeign.h b/src/ui-kde/wbforeign.h similarity index 100% rename from src/wbforeign.h rename to src/ui-kde/wbforeign.h diff --git a/src/wbitems.cpp b/src/ui-kde/wbitems.cpp similarity index 100% rename from src/wbitems.cpp rename to src/ui-kde/wbitems.cpp diff --git a/src/wbitems.h b/src/ui-kde/wbitems.h similarity index 100% rename from src/wbitems.h rename to src/ui-kde/wbitems.h diff --git a/src/wbscene.cpp b/src/ui-kde/wbscene.cpp similarity index 100% rename from src/wbscene.cpp rename to src/ui-kde/wbscene.cpp diff --git a/src/wbscene.h b/src/ui-kde/wbscene.h similarity index 100% rename from src/wbscene.h rename to src/ui-kde/wbscene.h diff --git a/src/wbwidget.cpp b/src/ui-kde/wbwidget.cpp similarity index 100% rename from src/wbwidget.cpp rename to src/ui-kde/wbwidget.cpp diff --git a/src/wbwidget.h b/src/ui-kde/wbwidget.h similarity index 100% rename from src/wbwidget.h rename to src/ui-kde/wbwidget.h -- 2.11.4.GIT