summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Winter <[email protected]>2017-09-23 11:38:44 -0400
committerAllen Winter <[email protected]>2017-09-23 11:38:44 -0400
commit52f7d74c53526df1bb114f9f3533c004e67c7523 (patch)
tree49b3daa736275ca4a8bd058adf1b9af3e1ca5063
parentfd591e353c956d078b9717da4464c83f9b8f59ac (diff)
remove config-akregator.h - not needed: we no longer look at SIZEOF_LONG
SIZEOF_LONG was all it was used for.
-rw-r--r--CMakeLists.txt16
-rw-r--r--config-akregator.h.cmake3
-rw-r--r--plugins/mk4storage/metakit/src/header.h3
-rw-r--r--src/akregator_part.cpp5
-rw-r--r--src/articleviewerwidget.h1
-rw-r--r--src/frame/framemanager.cpp1
-rw-r--r--src/frame/mainframe.h2
-rw-r--r--src/mainwidget.h1
8 files changed, 7 insertions, 25 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28e6b70..6a51963 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,10 +30,9 @@ set(KDEPIM_DEV_VERSION alpha1)
# add an extra space
if(DEFINED KDEPIM_DEV_VERSION)
- set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
+ set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
endif()
-
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
set(KDEPIM_LIB_SOVERSION "5")
@@ -77,21 +76,15 @@ find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
-add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-add_definitions(-DQT_USE_QSTRINGBUILDER)
include_directories(${akregator_SOURCE_DIR} ${akregator_BINARY_DIR})
-include(CheckTypeSize)
-check_type_size("long" SIZEOF_LONG)
-
-configure_file(config-akregator.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-akregator.h)
add_definitions(-DTRANSLATION_DOMAIN=\"akregator\")
-
+add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+add_definitions(-DQT_USE_QSTRINGBUILDER)
add_definitions(-DQT_NO_CAST_FROM_ASCII)
add_definitions(-DQT_NO_CAST_TO_ASCII)
add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
-
add_subdirectory(export)
add_subdirectory(interfaces)
add_subdirectory(plugins)
@@ -100,8 +93,7 @@ add_subdirectory(src)
add_subdirectory(kontactplugin)
add_subdirectory(kconf_update)
-install( FILES akregator.renamecategories akregator.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
+install(FILES akregator.renamecategories akregator.categories DESTINATION ${KDE_INSTALL_CONFDIR})
add_subdirectory(doc)
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-
diff --git a/config-akregator.h.cmake b/config-akregator.h.cmake
deleted file mode 100644
index bb4669c..0000000
--- a/config-akregator.h.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-/* config-akregator.h. Generated by cmake from config-akregator.h.cmake */
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG ${SIZEOF_LONG}
diff --git a/plugins/mk4storage/metakit/src/header.h b/plugins/mk4storage/metakit/src/header.h
index e39404f..9263b3c 100644
--- a/plugins/mk4storage/metakit/src/header.h
+++ b/plugins/mk4storage/metakit/src/header.h
@@ -10,9 +10,6 @@
/////////////////////////////////////////////////////////////////////////////
-#include <config-akregator.h>
-
-/////////////////////////////////////////////////////////////////////////////
// A number of preprocessor options are used in the source code
//
// q4_DOS MS-DOS real-mode OS
diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp
index a928753..ece7109 100644
--- a/src/akregator_part.cpp
+++ b/src/akregator_part.cpp
@@ -26,7 +26,6 @@
#include "akregator_part.h"
#include "akregator_debug.h"
-#include "config-akregator.h"
#include "messageviewer/messageviewersettings.h"
#include "akregatorconfig.h"
#include "aboutdata.h"
@@ -156,8 +155,8 @@ static QDomDocument createDefaultFeedList()
}
namespace Akregator {
-K_PLUGIN_FACTORY(AkregatorFactory, registerPlugin<Part>();
- )
+
+K_PLUGIN_FACTORY(AkregatorFactory, registerPlugin<Part>();)
static Part *mySelf = nullptr;
BrowserExtension::BrowserExtension(Part *p, const char *name)
diff --git a/src/articleviewerwidget.h b/src/articleviewerwidget.h
index 1acf56f..4da4778 100644
--- a/src/articleviewerwidget.h
+++ b/src/articleviewerwidget.h
@@ -27,7 +27,6 @@
#include "article.h"
#include "akregator_export.h"
-#include "config-akregator.h"
#include <QWidget>
#include <QPointer>
diff --git a/src/frame/framemanager.cpp b/src/frame/framemanager.cpp
index 0782aba..a3ef963 100644
--- a/src/frame/framemanager.cpp
+++ b/src/frame/framemanager.cpp
@@ -23,7 +23,6 @@
*/
#include "framemanager.h"
-#include "config-akregator.h"
#include "akregatorconfig.h"
#include "frame.h"
#include "actionmanager.h"
diff --git a/src/frame/mainframe.h b/src/frame/mainframe.h
index 7ff4c77..a0e5f0d 100644
--- a/src/frame/mainframe.h
+++ b/src/frame/mainframe.h
@@ -21,7 +21,7 @@
#define MAINFRAME_H
#include "frame.h"
-#include "config-akregator.h"
+
namespace Akregator {
class ArticleViewerWidget;
class AKREGATOR_EXPORT MainFrame : public Frame
diff --git a/src/mainwidget.h b/src/mainwidget.h
index 2addd7d..a69022f 100644
--- a/src/mainwidget.h
+++ b/src/mainwidget.h
@@ -28,7 +28,6 @@
#define AKREGATOR_MAINWIDGET_H
#include "akregatorpart_export.h"
-#include "config-akregator.h"
#include "articleviewer-ng/webengine/articleviewerwebenginewidgetng.h"
#include "feed.h"