Commit 8d02dd90 authored by Michael Reeves's avatar Michael Reeves
Browse files

*Still will not build for unknown reasons

*ported klocale
parent a031e3c4
...@@ -19,8 +19,10 @@ include(ECMInstallIcons) ...@@ -19,8 +19,10 @@ include(ECMInstallIcons)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n KDELibs4Support) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n KDELibs4Support)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED )
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
SET(KDiff3_LIBRARIES KF5::I18n KF5::KDELibs4Support)
add_definitions(${QT_DEFINITIONS} ${KF5_DEFINITIONS}) add_definitions(${QT_DEFINITIONS} ${KF5_DEFINITIONS})
#remove unnneeded errors #remove unnneeded errors
remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS)
......
find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED )
add_subdirectory(en) add_subdirectory(en)
add_subdirectory(da) add_subdirectory(da)
add_subdirectory(de) add_subdirectory(de)
......
...@@ -3,7 +3,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KIO ...@@ -3,7 +3,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KIO
) )
add_library(kdiff3fileitemaction MODULE kdiff3fileitemaction.cpp) add_library(kdiff3fileitemaction MODULE kdiff3fileitemaction.cpp)
target_link_libraries(kdiff3fileitemaction KF5::WidgetsAddons KF5::KIOWidgets ${LibKDiff3_LIBRARIES}) target_link_libraries(kdiff3fileitemaction ${KDiff3_LIBRARIES} KF5::WidgetsAddons KF5::KIOWidgets ${LibKDiff3_LIBRARIES})
install(TARGETS kdiff3fileitemaction DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS kdiff3fileitemaction DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES kdiff3fileitemaction.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES kdiff3fileitemaction.desktop DESTINATION ${SERVICES_INSTALL_DIR})
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <QAction> #include <QAction>
#include <QMenu> #include <QMenu>
#include <klocale.h>
#include <KPluginFactory> #include <klocalizedstring.h>
#include <KPluginLoader> #include <kpluginfactory.h>
#include <kpluginloader.h>
#include <kurl.h> #include <kurl.h>
#include <kconfig.h> #include <kconfig.h>
#include <kconfiggroup.h> #include <kconfiggroup.h>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <QAction> #include <QAction>
#include <kactionmenu.h> #include <kactionmenu.h>
#include <klocale.h> #include <KLocalizedString>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kurl.h> #include <kurl.h>
#include <kconfig.h> #include <kconfig.h>
...@@ -74,7 +74,7 @@ K_EXPORT_COMPONENT_FACTORY (libkdiff3plugin, KDiff3PluginFactory ("kdiff3plugin" ...@@ -74,7 +74,7 @@ K_EXPORT_COMPONENT_FACTORY (libkdiff3plugin, KDiff3PluginFactory ("kdiff3plugin"
KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupMenu, const QStringList & /* list */ ) KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupMenu, const QStringList & /* list */ )
:KonqPopupMenuPlugin(pPopupMenu) :KonqPopupMenuPlugin(pPopupMenu)
{ {
KGlobal::locale()->insertCatalog("kdiff3plugin"); KLocalizedString::setApplicationDomain("kdiff3plugin");
m_pPopupMenu = pPopupMenu; m_pPopupMenu = pPopupMenu;
m_pParentWidget = pPopupMenu->parentWidget(); m_pParentWidget = pPopupMenu->parentWidget();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment