[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:20:37 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=215bf17
The following commit has been merged in the master branch:
commit 215bf172e85426c1fd737fc851626e5b30071b41
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date: Wed Dec 21 20:17:58 2011 +0200
Rename everything according to our new naming policy.
http://community.kde.org/Real-Time_Communication_and_Collaboration/NamingPolicy
---
CMakeLists.txt | 2 +-
adiumxtra-protocol-handler/CMakeLists.txt | 16 +++-----
.../adiumxtra-protocol-handler.cpp | 2 +-
adiumxtra-protocol-handler/adiumxtra.protocol.in | 2 +-
.../chat-style-installer.cpp | 4 +-
.../emoticon-set-installer.cpp | 4 +-
adiumxtra-protocol-handler/main.cpp | 2 +-
app/CMakeLists.txt | 22 +++++------
app/{KDE.TextUi.client => KTp.TextUi.client} | 0
app/chat-tab.cpp | 2 +-
app/chat-window.cpp | 6 +--
app/chatwindow.rc | 2 +-
app/main.cpp | 4 +-
...edesktop.Telepathy.Client.KDE.TextUi.service.in | 3 --
...edesktop.Telepathy.Client.KTp.TextUi.service.in | 3 ++
config/CMakeLists.txt | 34 ++++++++---------
config/appearance-config.cpp | 12 +++---
config/behavior-config.cpp | 2 +-
...fig.desktop => kcm_ktp_chat_appearance.desktop} | 2 +-
...onfig.desktop => kcm_ktp_chat_behavior.desktop} | 2 +-
lib/CMakeLists.txt | 44 +++++++++++-----------
lib/{KDETelepathy => KTp}/AdiumThemeContentInfo | 0
lib/{KDETelepathy => KTp}/AdiumThemeHeaderInfo | 0
lib/{KDETelepathy => KTp}/AdiumThemeMessageInfo | 0
lib/{KDETelepathy => KTp}/AdiumThemeStatusInfo | 0
lib/{KDETelepathy => KTp}/AdiumThemeView | 0
lib/{KDETelepathy => KTp}/ChatStylePlistFileReader | 0
lib/{KDETelepathy => KTp}/ChatWidget | 0
lib/{KDETelepathy => KTp}/ChatWindowStyle | 0
lib/{KDETelepathy => KTp}/ChatWindowStyleManager | 0
lib/adium-theme-content-info.h | 2 +-
lib/adium-theme-header-info.h | 2 +-
lib/adium-theme-message-info.h | 2 +-
lib/adium-theme-status-info.h | 2 +-
lib/adium-theme-view.h | 2 +-
lib/chat-search-bar.h | 2 +-
lib/chat-style-plist-file-reader.h | 2 +-
lib/chat-widget.cpp | 2 +-
lib/chat-widget.h | 2 +-
lib/chat-window-style-manager.h | 2 +-
lib/chat-window-style.h | 2 +-
...{kdetelepathychat_export.h => ktpchat_export.h} | 0
42 files changed, 94 insertions(+), 98 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2a59ad..dbbce99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project (TELEPATHY_KDE_TEXT_UI)
+project(ktp-text-ui)
# Include our extra FindFoo.cmake files.
set (CMAKE_MODULE_PATH
diff --git a/adiumxtra-protocol-handler/CMakeLists.txt b/adiumxtra-protocol-handler/CMakeLists.txt
index d0f25ae..12208a1 100644
--- a/adiumxtra-protocol-handler/CMakeLists.txt
+++ b/adiumxtra-protocol-handler/CMakeLists.txt
@@ -1,6 +1,6 @@
-include_directories(${TELEPATHY_KDE_TEXT_UI_SOURCE_DIR}/lib)
+include_directories(${CMAKE_SOURCE_DIR}/lib)
-set(telepathy_chat_config_SRCS
+set(ktp-adiumxtra-protocol-handler_SRCS
bundle-installer.cpp
chat-style-installer.cpp
emoticon-set-installer.cpp
@@ -8,23 +8,19 @@ set(telepathy_chat_config_SRCS
main.cpp
)
+kde4_add_executable(ktp-adiumxtra-protocol-handler ${ktp-adiumxtra-protocol-handler_SRCS})
-
-kde4_add_ui_files(telepathy_chat_config_SRCS)
-
-kde4_add_executable(adiumxtra-protocol-handler ${telepathy_chat_config_SRCS})
-
-target_link_libraries(adiumxtra-protocol-handler
+target_link_libraries(ktp-adiumxtra-protocol-handler
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${QT_QTWEBKIT_LIBRARY}
${KDE4_KEMOTICONS_LIBS}
${QT_QTXML_LIBRARY}
${KDE4_KIO_LIBS}
- ktelepathy_chat_lib)
+ ktpchat)
-install(TARGETS adiumxtra-protocol-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
+install(TARGETS ktp-adiumxtra-protocol-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
configure_file(adiumxtra.protocol.in ${CMAKE_CURRENT_BINARY_DIR}/adiumxtra.protocol)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/adiumxtra.protocol DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp b/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
index 0502afb..728a372 100644
--- a/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
+++ b/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
@@ -20,7 +20,7 @@
#include "chat-style-installer.h"
#include "emoticon-set-installer.h"
-#include <KDETelepathy/ChatWindowStyleManager>
+#include <KTp/ChatWindowStyleManager>
#include <KDebug>
#include <KZip>
diff --git a/adiumxtra-protocol-handler/adiumxtra.protocol.in b/adiumxtra-protocol-handler/adiumxtra.protocol.in
index bea4f31..2c16632 100644
--- a/adiumxtra-protocol-handler/adiumxtra.protocol.in
+++ b/adiumxtra-protocol-handler/adiumxtra.protocol.in
@@ -1,6 +1,6 @@
[Protocol]
Type=Service
-exec=@LIBEXEC_INSTALL_DIR@/adiumxtra-protocol-handler "%U"
+exec=@LIBEXEC_INSTALL_DIR@/ktp-adiumxtra-protocol-handler "%U"
protocol=adiumxtra
input=none
output=none
diff --git a/adiumxtra-protocol-handler/chat-style-installer.cpp b/adiumxtra-protocol-handler/chat-style-installer.cpp
index e43b179..1b2a1c9 100644
--- a/adiumxtra-protocol-handler/chat-style-installer.cpp
+++ b/adiumxtra-protocol-handler/chat-style-installer.cpp
@@ -18,8 +18,8 @@
#include "chat-style-installer.h"
-#include <KDETelepathy/ChatWindowStyleManager>
-#include <KDETelepathy/ChatStylePlistFileReader>
+#include <KTp/ChatWindowStyleManager>
+#include <KTp/ChatStylePlistFileReader>
#include <KDebug>
#include <KTemporaryFile>
diff --git a/adiumxtra-protocol-handler/emoticon-set-installer.cpp b/adiumxtra-protocol-handler/emoticon-set-installer.cpp
index 8a3685d..e324df0 100644
--- a/adiumxtra-protocol-handler/emoticon-set-installer.cpp
+++ b/adiumxtra-protocol-handler/emoticon-set-installer.cpp
@@ -18,8 +18,8 @@
#include "emoticon-set-installer.h"
-#include <KDETelepathy/ChatWindowStyleManager>
-#include <KDETelepathy/ChatStylePlistFileReader>
+#include <KTp/ChatWindowStyleManager>
+#include <KTp/ChatStylePlistFileReader>
#include <KDebug>
#include <KTemporaryFile>
diff --git a/adiumxtra-protocol-handler/main.cpp b/adiumxtra-protocol-handler/main.cpp
index 2359418..fd68b1d 100644
--- a/adiumxtra-protocol-handler/main.cpp
+++ b/adiumxtra-protocol-handler/main.cpp
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
{
kDebug();
- KAboutData aboutData("adiumxtra-protocol-handler",
+ KAboutData aboutData("ktp-adiumxtra-protocol-handler",
0,
ki18n("AdiumXtra Protocol Handler"),
"0.1");
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index ae9f43b..88a6571 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,15 +1,15 @@
-include_directories(${TELEPATHY_KDE_TEXT_UI_SOURCE_DIR}/lib)
+include_directories(${CMAKE_SOURCE_DIR}/lib)
-set(telepathy_kde_text_ui_SRCS
+set(ktp-text-ui_SRCS
main.cpp
telepathy-chat-ui.cpp
chat-window.cpp
chat-tab.cpp
)
-kde4_add_executable(telepathy-kde-text-ui ${telepathy_kde_text_ui_SRCS})
+kde4_add_executable(ktp-text-ui ${ktp-text-ui_SRCS})
-target_link_libraries(telepathy-kde-text-ui
+target_link_libraries(ktp-text-ui
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KIO_LIBS}
@@ -17,14 +17,14 @@ target_link_libraries(telepathy-kde-text-ui
${QT_QTWEBKIT_LIBRARY}
${KDE4_KNOTIFYCONFIG_LIBS}
${KDE4_KCMUTILS_LIBS}
- ktelepathy_chat_lib)
+ ktpchat)
-configure_file(org.freedesktop.Telepathy.Client.KDE.TextUi.service.in
- ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.TextUi.service)
+configure_file(org.freedesktop.Telepathy.Client.KTp.TextUi.service.in
+ ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.TextUi.service)
-install(TARGETS telepathy-kde-text-ui DESTINATION ${LIBEXEC_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.TextUi.service
+install(TARGETS ktp-text-ui DESTINATION ${LIBEXEC_INSTALL_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.TextUi.service
DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
-install(FILES KDE.TextUi.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
+install(FILES KTp.TextUi.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
install(FILES chatwindow.rc
- DESTINATION ${DATA_INSTALL_DIR}/telepathy-kde-text-ui/)
+ DESTINATION ${DATA_INSTALL_DIR}/ktp-text-ui/)
diff --git a/app/KDE.TextUi.client b/app/KTp.TextUi.client
similarity index 100%
rename from app/KDE.TextUi.client
rename to app/KTp.TextUi.client
diff --git a/app/chat-tab.cpp b/app/chat-tab.cpp
index 8ea95ac..a8f6626 100644
--- a/app/chat-tab.cpp
+++ b/app/chat-tab.cpp
@@ -80,6 +80,6 @@ void ChatTab::onConnectionStatusChanged(Tp::ConnectionStatus status)
{
// request a new text channel for the chat
if (status == Tp::ConnectionStatusConnected) {
- account()->ensureTextChat(textChannel()->targetId(), QDateTime::currentDateTime(), QLatin1String("org.freedesktop.Telepathy.Client.KDE.TextUi"));
+ account()->ensureTextChat(textChannel()->targetId(), QDateTime::currentDateTime(), QLatin1String("org.freedesktop.Telepathy.Client.KTp.TextUi"));
}
}
diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 68f0295..c328606 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -51,9 +51,9 @@
#include <Sonnet/DictionaryComboBox>
-#define PREFERRED_TEXTCHAT_HANDLER "org.freedesktop.Telepathy.Client.KDE.TextUi"
-#define PREFERRED_FILETRANSFER_HANDLER "org.freedesktop.Telepathy.Client.KDE.FileTransfer"
-#define PREFERRED_AUDIO_VIDEO_HANDLER "org.freedesktop.Telepathy.Client.KDE.CallUi"
+#define PREFERRED_TEXTCHAT_HANDLER "org.freedesktop.Telepathy.Client.KTp.TextUi"
+#define PREFERRED_FILETRANSFER_HANDLER "org.freedesktop.Telepathy.Client.KTp.FileTransfer"
+#define PREFERRED_AUDIO_VIDEO_HANDLER "org.freedesktop.Telepathy.Client.KTp.CallUi"
#define PREFERRED_RFB_HANDLER "org.freedesktop.Telepathy.Client.krfb_rfb_handler"
ChatWindow::ChatWindow()
diff --git a/app/chatwindow.rc b/app/chatwindow.rc
index c5b6496..f65fbd1 100644
--- a/app/chatwindow.rc
+++ b/app/chatwindow.rc
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gui name="telepathy-kde-text-ui"
+<gui name="ktp-text-ui"
version="1"
xmlns="http://www.kde.org/standards/kxmlgui/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/main.cpp b/app/main.cpp
index ce607a9..5d6e55a 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -31,7 +31,7 @@
int main(int argc, char *argv[])
{
- KAboutData aboutData("telepathy-kde-text-ui", 0,
+ KAboutData aboutData("ktp-text-ui", 0,
ki18n("Telepathy Text Ui"),
"0.2.60");
aboutData.addAuthor(ki18n("David Edmundson"), ki18n("Developer"), "david at davidedmundson.co.uk");
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
Tp::SharedPtr<TelepathyChatUi> app = Tp::SharedPtr<TelepathyChatUi>(new TelepathyChatUi);
Tp::AbstractClientPtr handler = Tp::AbstractClientPtr(app);
- registrar->registerClient(handler, QLatin1String("KDE.TextUi"));
+ registrar->registerClient(handler, QLatin1String("KTp.TextUi"));
return app->exec();
}
diff --git a/app/org.freedesktop.Telepathy.Client.KDE.TextUi.service.in b/app/org.freedesktop.Telepathy.Client.KDE.TextUi.service.in
deleted file mode 100644
index d333f8b..0000000
--- a/app/org.freedesktop.Telepathy.Client.KDE.TextUi.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.KDE.TextUi
-Exec=@LIBEXEC_INSTALL_DIR@/telepathy-kde-text-ui
diff --git a/app/org.freedesktop.Telepathy.Client.KTp.TextUi.service.in b/app/org.freedesktop.Telepathy.Client.KTp.TextUi.service.in
new file mode 100644
index 0000000..c8c49c5
--- /dev/null
+++ b/app/org.freedesktop.Telepathy.Client.KTp.TextUi.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.KTp.TextUi
+Exec=@LIBEXEC_INSTALL_DIR@/ktp-text-ui
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index ba8031e..dbe0de9 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -1,42 +1,42 @@
-include_directories(${TELEPATHY_KDE_TEXT_UI_SOURCE_DIR}/lib)
+include_directories(${CMAKE_SOURCE_DIR}/lib)
-set(telepathy_chat_appearance_config_SRCS
+set(kcm_ktp_chat_appearance_SRCS
appearance-config.cpp
)
-set(telepathy_chat_behavior_config_SRCS
+set(kcm_ktp_chat_behavior_SRCS
behavior-config.cpp
)
-set(telepathy_chat_appearance_config_UI
+set(kcm_ktp_chat_appearance_UI
appearance-config.ui
)
-set(telepathy_chat_behavior_config_UI
+set(kcm_ktp_chat_behavior_UI
behavior-config.ui
)
-kde4_add_ui_files(telepathy_chat_appearance_config_SRCS ${telepathy_chat_appearance_config_UI})
+kde4_add_ui_files(kcm_ktp_chat_appearance_SRCS ${kcm_ktp_chat_appearance_UI})
-kde4_add_plugin(kcm_telepathy_chat_appearance_config
- ${telepathy_chat_appearance_config_SRCS})
+kde4_add_plugin(kcm_ktp_chat_appearance
+ ${kcm_ktp_chat_appearance_SRCS})
-target_link_libraries(kcm_telepathy_chat_appearance_config ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KCMUTILS_LIBS} ktelepathy_chat_lib)
+target_link_libraries(kcm_ktp_chat_appearance ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KCMUTILS_LIBS} ktpchat)
-kde4_add_ui_files(telepathy_chat_behavior_config_SRCS ${telepathy_chat_behavior_config_UI})
+kde4_add_ui_files(kcm_ktp_chat_behavior_SRCS ${kcm_ktp_chat_behavior_UI})
-kde4_add_plugin(kcm_telepathy_chat_behavior_config
- ${telepathy_chat_behavior_config_SRCS})
+kde4_add_plugin(kcm_ktp_chat_behavior
+ ${kcm_ktp_chat_behavior_SRCS})
-target_link_libraries(kcm_telepathy_chat_behavior_config ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS} ktelepathy_chat_lib)
+target_link_libraries(kcm_ktp_chat_behavior ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS} ktpchat)
-install(TARGETS kcm_telepathy_chat_appearance_config
- kcm_telepathy_chat_behavior_config
+install(TARGETS kcm_ktp_chat_appearance
+ kcm_ktp_chat_behavior
DESTINATION ${PLUGIN_INSTALL_DIR})
-install (FILES kcm_telepathy_chat_appearance_config.desktop
- kcm_telepathy_chat_behavior_config.desktop
+install (FILES kcm_ktp_chat_appearance.desktop
+ kcm_ktp_chat_behavior.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/config/appearance-config.cpp b/config/appearance-config.cpp
index a80fe75..994d2d7 100644
--- a/config/appearance-config.cpp
+++ b/config/appearance-config.cpp
@@ -20,18 +20,18 @@
#include "appearance-config.h"
#include "ui_appearance-config.h"
-#include <KDETelepathy/ChatWindowStyleManager>
-#include <KDETelepathy/ChatWindowStyle>
-#include <KDETelepathy/AdiumThemeHeaderInfo>
-#include <KDETelepathy/AdiumThemeContentInfo>
-#include <KDETelepathy/AdiumThemeStatusInfo>
+#include <KTp/ChatWindowStyleManager>
+#include <KTp/ChatWindowStyle>
+#include <KTp/AdiumThemeHeaderInfo>
+#include <KTp/AdiumThemeContentInfo>
+#include <KTp/AdiumThemeStatusInfo>
#include <KDebug>
#include <KLocalizedString>
#include <KPluginFactory>
K_PLUGIN_FACTORY(KCMTelepathyChatAppearanceConfigFactory, registerPlugin<AppearanceConfig>();)
-K_EXPORT_PLUGIN(KCMTelepathyChatAppearanceConfigFactory("telepathy_chat_appearance_config", "telepathy-chat-window-config"))
+K_EXPORT_PLUGIN(KCMTelepathyChatAppearanceConfigFactory("ktp_chat_appearance", "kcm_ktp_chat_appearance"))
AppearanceConfig::AppearanceConfig(QWidget *parent, const QVariantList& args)
: KCModule(KCMTelepathyChatAppearanceConfigFactory::componentData(), parent, args),
diff --git a/config/behavior-config.cpp b/config/behavior-config.cpp
index 65ddab9..6e78168 100644
--- a/config/behavior-config.cpp
+++ b/config/behavior-config.cpp
@@ -25,7 +25,7 @@
#include <KPluginFactory>
K_PLUGIN_FACTORY(KCMTelepathyChatBehaviorConfigFactory, registerPlugin<BehaviorConfig>();)
-K_EXPORT_PLUGIN(KCMTelepathyChatBehaviorConfigFactory("telepathy_chat_behavior_config", "telepathy-chat-window-config"))
+K_EXPORT_PLUGIN(KCMTelepathyChatBehaviorConfigFactory("ktp_chat_behavior", "kcm_ktp_chat_behavior"))
BehaviorConfig::BehaviorConfig(QWidget *parent, const QVariantList& args)
diff --git a/config/kcm_telepathy_chat_appearance_config.desktop b/config/kcm_ktp_chat_appearance.desktop
similarity index 97%
rename from config/kcm_telepathy_chat_appearance_config.desktop
rename to config/kcm_ktp_chat_appearance.desktop
index 8140e03..9a48099 100644
--- a/config/kcm_telepathy_chat_appearance_config.desktop
+++ b/config/kcm_ktp_chat_appearance.desktop
@@ -6,7 +6,7 @@ Type=Service
X-KDE-ServiceTypes=KCModule
X-DBUS-StartupType=
X-KDE-HasReadOnlyMode=false
-X-KDE-Library=kcm_telepathy_chat_appearance_config
+X-KDE-Library=kcm_ktp_chat_appearance
X-KDE-SubstituteUID=false
X-KDE-RootOnly=false
Categories=Qt;KDE;X-KDE-settings-network;
diff --git a/config/kcm_telepathy_chat_behavior_config.desktop b/config/kcm_ktp_chat_behavior.desktop
similarity index 94%
rename from config/kcm_telepathy_chat_behavior_config.desktop
rename to config/kcm_ktp_chat_behavior.desktop
index 7824fce..3e01b6f 100644
--- a/config/kcm_telepathy_chat_behavior_config.desktop
+++ b/config/kcm_ktp_chat_behavior.desktop
@@ -6,7 +6,7 @@ Type=Service
X-KDE-ServiceTypes=KCModule
X-DBUS-StartupType=
X-KDE-HasReadOnlyMode=false
-X-KDE-Library=kcm_telepathy_chat_behavior_config
+X-KDE-Library=kcm_ktp_chat_behavior
X-KDE-SubstituteUID=false
X-KDE-RootOnly=false
Categories=Qt;KDE;X-KDE-settings-network;
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 8ffc494..0c5c6a6 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -5,7 +5,7 @@ if(TELEPATHY_LOGGER_QT4_FOUND)
add_definitions( -DTELEPATHY_LOGGER_QT4_FOUND )
endif()
-set(telepathy_chat_handler_lib_SRCS
+set(ktpchat_SRCS
chat-widget.cpp
chat-window-style.cpp
chat-window-style-manager.cpp
@@ -21,7 +21,7 @@ set(telepathy_chat_handler_lib_SRCS
logmanager.cpp
)
-set(telepathy_chat_handler_lib_HDRS
+set(ktpchat_HDRS
adium-theme-content-info.h
adium-theme-header-info.h
adium-theme-message-info.h
@@ -33,25 +33,25 @@ set(telepathy_chat_handler_lib_HDRS
chat-window-style-manager.h
)
-set(telepathy_chat_handler_lib_PRETTY_HDRS
- KDETelepathy/AdiumThemeContentInfo
- KDETelepathy/AdiumThemeHeaderInfo
- KDETelepathy/AdiumThemeMessageInfo
- KDETelepathy/AdiumThemeStatusInfo
- KDETelepathy/AdiumThemeView
- KDETelepathy/ChatStylePlistFileReader
- KDETelepathy/ChatWidget
- KDETelepathy/ChatWindowStyle
- KDETelepathy/ChatWindowStyleManager
+set(ktpchat_PRETTY_HDRS
+ KTp/AdiumThemeContentInfo
+ KTp/AdiumThemeHeaderInfo
+ KTp/AdiumThemeMessageInfo
+ KTp/AdiumThemeStatusInfo
+ KTp/AdiumThemeView
+ KTp/ChatStylePlistFileReader
+ KTp/ChatWidget
+ KTp/ChatWindowStyle
+ KTp/ChatWindowStyleManager
)
-set(telepathy_chat_handler_lib_UI
+set(ktpchat_UI
chat-widget.ui
)
-kde4_add_ui_files(telepathy_chat_handler_lib_SRCS ${telepathy_chat_handler_lib_UI})
+kde4_add_ui_files(ktpchat_SRCS ${ktpchat_UI})
-kde4_add_library(ktelepathy_chat_lib SHARED ${telepathy_chat_handler_lib_SRCS})
+kde4_add_library(ktpchat SHARED ${ktpchat_SRCS})
# telepathy-logger-qt4 related stuff
if(TELEPATHY_LOGGER_QT4_FOUND)
@@ -61,12 +61,12 @@ if(TELEPATHY_LOGGER_QT4_FOUND)
${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS}
)
- target_link_libraries(ktelepathy_chat_lib
+ target_link_libraries(ktpchat
${TELEPATHY_LOGGER_QT4_LIBRARIES}
)
endif()
-target_link_libraries(ktelepathy_chat_lib
+target_link_libraries(ktpchat
${KDE4_KDECORE_LIBS}
${KDE4_KIO_LIBS}
${KDE4_KDEUI_LIBS}
@@ -75,11 +75,11 @@ target_link_libraries(ktelepathy_chat_lib
${KDE4_KEMOTICONS_LIBS}
${KDE4_KCMUTILS_LIBS}
)
-install(TARGETS ktelepathy_chat_lib ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS ktpchat ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
- ${telepathy_chat_handler_lib_HDRS}
- ${telepathy_chat_handler_lib_PRETTY_HDRS}
- kdetelepathychat_export.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/KDETelepathy COMPONENT Devel
+ ${ktpchat_HDRS}
+ ${ktpchat_PRETTY_HDRS}
+ ktpchat_export.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/KTp COMPONENT Devel
)
diff --git a/lib/KDETelepathy/AdiumThemeContentInfo b/lib/KTp/AdiumThemeContentInfo
similarity index 100%
rename from lib/KDETelepathy/AdiumThemeContentInfo
rename to lib/KTp/AdiumThemeContentInfo
diff --git a/lib/KDETelepathy/AdiumThemeHeaderInfo b/lib/KTp/AdiumThemeHeaderInfo
similarity index 100%
rename from lib/KDETelepathy/AdiumThemeHeaderInfo
rename to lib/KTp/AdiumThemeHeaderInfo
diff --git a/lib/KDETelepathy/AdiumThemeMessageInfo b/lib/KTp/AdiumThemeMessageInfo
similarity index 100%
rename from lib/KDETelepathy/AdiumThemeMessageInfo
rename to lib/KTp/AdiumThemeMessageInfo
diff --git a/lib/KDETelepathy/AdiumThemeStatusInfo b/lib/KTp/AdiumThemeStatusInfo
similarity index 100%
rename from lib/KDETelepathy/AdiumThemeStatusInfo
rename to lib/KTp/AdiumThemeStatusInfo
diff --git a/lib/KDETelepathy/AdiumThemeView b/lib/KTp/AdiumThemeView
similarity index 100%
rename from lib/KDETelepathy/AdiumThemeView
rename to lib/KTp/AdiumThemeView
diff --git a/lib/KDETelepathy/ChatStylePlistFileReader b/lib/KTp/ChatStylePlistFileReader
similarity index 100%
rename from lib/KDETelepathy/ChatStylePlistFileReader
rename to lib/KTp/ChatStylePlistFileReader
diff --git a/lib/KDETelepathy/ChatWidget b/lib/KTp/ChatWidget
similarity index 100%
rename from lib/KDETelepathy/ChatWidget
rename to lib/KTp/ChatWidget
diff --git a/lib/KDETelepathy/ChatWindowStyle b/lib/KTp/ChatWindowStyle
similarity index 100%
rename from lib/KDETelepathy/ChatWindowStyle
rename to lib/KTp/ChatWindowStyle
diff --git a/lib/KDETelepathy/ChatWindowStyleManager b/lib/KTp/ChatWindowStyleManager
similarity index 100%
rename from lib/KDETelepathy/ChatWindowStyleManager
rename to lib/KTp/ChatWindowStyleManager
diff --git a/lib/adium-theme-content-info.h b/lib/adium-theme-content-info.h
index 59ef053..e293732 100644
--- a/lib/adium-theme-content-info.h
+++ b/lib/adium-theme-content-info.h
@@ -23,7 +23,7 @@
#include "adium-theme-message-info.h"
-#include "kdetelepathychat_export.h"
+#include "ktpchat_export.h"
class QString;
class AdiumThemeContentInfoPrivate;
diff --git a/lib/adium-theme-header-info.h b/lib/adium-theme-header-info.h
index 03f9734..952dc48 100644
--- a/lib/adium-theme-header-info.h
+++ b/lib/adium-theme-header-info.h
@@ -24,7 +24,7 @@
#include <QtCore/QUrl>
#include <QtCore/QDateTime>
-#include "kdetelepathychat_export.h"
+#include "ktpchat_export.h"
/** Containts all the information needed for the header generation from the Adium/Kopete templates */
diff --git a/lib/adium-theme-message-info.h b/lib/adium-theme-message-info.h
index ddbead2..10c00a2 100644
--- a/lib/adium-theme-message-info.h
+++ b/lib/adium-theme-message-info.h
@@ -20,7 +20,7 @@
#ifndef ADIUMTHEMEMESSAGEINFO_H
#define ADIUMTHEMEMESSAGEINFO_H
-#include "kdetelepathychat_export.h"
+#include "ktpchat_export.h"
class QString;
class QDateTime;
diff --git a/lib/adium-theme-status-info.h b/lib/adium-theme-status-info.h
index 884c82b..926586a 100644
--- a/lib/adium-theme-status-info.h
+++ b/lib/adium-theme-status-info.h
@@ -22,7 +22,7 @@
#define ADIUMTHEMESTATUSINFO_H
#include "adium-theme-message-info.h"
-#include "kdetelepathychat_export.h"
+#include "ktpchat_export.h"
class QString;
class AdiumThemeStatusInfoPrivate;
diff --git a/lib/adium-theme-view.h b/lib/adium-theme-view.h
index d42812c..c2fae74 100644
--- a/lib/adium-theme-view.h
+++ b/lib/adium-theme-view.h
@@ -27,7 +27,7 @@
#include <KEmoticons>
-#include "kdetelepathychat_export.h"
+#include "ktpchat_export.h"
class AdiumThemeContentInfo;
class AdiumThemeHeaderInfo;
diff --git a/lib/chat-search-bar.h b/lib/chat-search-bar.h
index f5ae384..315fd2b 100644
--- a/lib/chat-search-bar.h
+++ b/lib/chat-search-bar.h
@@ -20,7 +20,7 @@
#ifndef CHATSEARCHBAR_H
#define CHATSEARCHBAR_H
-#include "kdetelepathychat_export.h"
+#include "ktpchat_export.h"
#include <QtWebKit/QWebPage>
#include <QtGui/QWidget>
diff --git a/lib/chat-style-plist-file-reader.h b/lib/chat-style-plist-file-reader.h
index 23e4c46..593e889 100644
--- a/lib/chat-style-plist-file-reader.h
+++ b/lib/chat-style-plist-file-reader.h
@@ -22,7 +22,7 @@
#include <QtCore/QMap>
-#include "kdetelepathychat_export.h"
+#include "ktpchat_export.h"
class QString;
class QFile;
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index b55b81d..ff41ef1 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -88,7 +88,7 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
d->account = account;
//load translations for this library. keep this before any i18n() calls in library code
- KGlobal::locale()->insertCatalog(QLatin1String("ktelepathy_chat_lib"));
+ KGlobal::locale()->insertCatalog(QLatin1String("ktpchat"));
d->chatviewlInitialised = false;
d->showFormatToolbarAction = new QAction(i18n("Show format options"), this);
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index 8253816..6255204 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -21,7 +21,7 @@
#ifndef CHATWIDGET_H
#define CHATWIDGET_H
-#include "kdetelepathychat_export.h"
+#include "ktpchat_export.h"
#include <QtCore/QString>
#include <QtGui/QWidget>
diff --git a/lib/chat-window-style-manager.h b/lib/chat-window-style-manager.h
index 86bfe73..c876ba8 100644
--- a/lib/chat-window-style-manager.h
+++ b/lib/chat-window-style-manager.h
@@ -23,7 +23,7 @@
#include <KFileItem>
-#include "kdetelepathychat_export.h"
+#include "ktpchat_export.h"
class ChatWindowStyle;
/**
diff --git a/lib/chat-window-style.h b/lib/chat-window-style.h
index b435382..cd1280d 100644
--- a/lib/chat-window-style.h
+++ b/lib/chat-window-style.h
@@ -20,7 +20,7 @@
#define CHATWINDOWSTYLE_H
#include <QtCore/QHash>
-#include <kdetelepathychat_export.h>
+#include <ktpchat_export.h>
/**
* This class represent a single chat window style.
diff --git a/lib/kdetelepathychat_export.h b/lib/ktpchat_export.h
similarity index 100%
rename from lib/kdetelepathychat_export.h
rename to lib/ktpchat_export.h
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list