From c961eb1bf0c918199b3dea47e5389b48a5b96d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 29 Apr 2014 08:10:41 +0200 Subject: [PATCH] Adjust libkdecorations for new ki18n Adds TRANSLATION_DOMAIN as define in CMakeLists.txt. Removes the left-over from porting. --- libkdecorations/CMakeLists.txt | 3 +++ libkdecorations/kdecoration_plugins_p.cpp | 14 -------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/libkdecorations/CMakeLists.txt b/libkdecorations/CMakeLists.txt index 1ac9e4fad9..137ae861ae 100644 --- a/libkdecorations/CMakeLists.txt +++ b/libkdecorations/CMakeLists.txt @@ -1,3 +1,6 @@ +# KI18N Translation Domain for this library +add_definitions(-DTRANSLATION_DOMAIN=\"libkdecorations\") + # kdecorations library set(kdecorations_LIB_SRCS kdecoration.cpp diff --git a/libkdecorations/kdecoration_plugins_p.cpp b/libkdecorations/kdecoration_plugins_p.cpp index a7f804d495..9dec7f2285 100644 --- a/libkdecorations/kdecoration_plugins_p.cpp +++ b/libkdecorations/kdecoration_plugins_p.cpp @@ -139,20 +139,6 @@ bool KDecorationPlugins::loadPlugin(QString nameStr) pluginStr = nameStr; - // For clients in kdeartwork -#warning insertCatalog needs porting -#if KWIN_QT5_PORTING - QString catalog = nameStr; - catalog.replace("kwin3_", "kwin_"); - KGlobal::locale()->insertCatalog(catalog); - // For KCommonDecoration based clients - KGlobal::locale()->insertCatalog("libkdecorations"); - // For clients in kdebase - KGlobal::locale()->insertCatalog("kwin_clients"); - // For clients in kdeartwork - KGlobal::locale()->insertCatalog("kwin_art_clients"); -#endif - old_fact = fact; fact = factory;