fix build of external software by not including config-misc header and place BUG_REPORT_URL and BUG_REPORT_EMAIL into kglobalsettings header

CMakeLists.txt

@@ -28,15 +28,6 @@ endif(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
 ############### Give the user the option to build the udisks2 solid backend instead of the udisks backend ###############
 option(WITH_SOLID_UDISKS2 "Enable the udisks2 solid backend instead" "ON")
 
-############### Misc options ###############
-
-# FIXME: are those needed globally? maybe define them in kglobalsettings.h for external use?
-set(BUG_REPORT_URL "https://github.com/fluxer/katana/issues"
-    CACHE STRING "Specifies the URL that will be used to report issues.")
-
-set(BUG_REPORT_EMAIL "xakepa10@gmail.com"
-    CACHE STRING "Specifies the E-Mail that will be used as contact for issues.")
-
 ############### Load the CTest options ###############
 # CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
 # in the KDE build system, this is the same as CMAKE_BINARY_DIR.
@@ -239,7 +230,6 @@ configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h
 configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.h )
 configure_file(config-pty.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-pty.h )
 configure_file(kdemacros.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h )
-configure_file(config-misc.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-misc.h)
 
 # these two calls here should go somewhere else, Alex
 check_library_exists(nsl gethostbyname "" HAVE_NSL_LIBRARY)

config-misc.h.cmake

@@ -1,2 +0,0 @@
-#define BUG_REPORT_URL "${BUG_REPORT_URL}"
-#define BUG_REPORT_EMAIL "${BUG_REPORT_EMAIL}"

kconf_update/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 project(kconf_update)
 
-include_directories( ${KDE4_KDECORE_INCLUDES} )
+include_directories( ${KDE4_KDECORE_INCLUDES} ${KDE4_KDEUI_INCLUDES} )
 
 
 ########### next target ###############

kconf_update/tests/test_kconf_update.cpp

@@ -40,7 +40,10 @@ static void writeFile(const QString &path, const QString &content)
 {
     QFile file(path);
     bool ok = file.open(QIODevice::WriteOnly);
-    Q_ASSERT(ok);
+    // prevent a compiler warning, marvelous isn't it?
+    if (!ok) {
+        Q_ASSERT(ok);
+    }
     file.write(content.toUtf8());
 }
 

kdecore/CMakeLists.txt

@@ -49,7 +49,7 @@ include(util/ConfigureChecks.cmake)
 configure_file(util/config-util.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-util.h)
 
 
-include_directories( ${KDE4_KDECORE_INCLUDES} )
+include_directories( ${KDE4_KDECORE_INCLUDES} ${KDE4_KDEUI_INCLUDES})
 include_directories( ${ZLIB_INCLUDE_DIR} )
 include_directories( ${QT_INCLUDES} )
 

kdecore/kernel/kaboutdata.h

@@ -26,12 +26,12 @@
 
 #include <kdecore_export.h>
 #include <klocale.h>
+#include <kglobalsettings.h>
+
 // Qt
 #include <QtCore/QString>
 #include <QtCore/QSharedDataPointer>
 
-#include <config-misc.h>
-
 template <class T> class QList;
 class QVariant;
 class KAboutData;

kdecore/kernel/kcmdlineargs.cpp

@@ -18,9 +18,9 @@
 
 #include "kcmdlineargs.h"
 #include <kdebug.h>
+#include <kglobalsettings.h>
 
 #include <config.h>
-#include <config-misc.h>
 
 #include <sys/param.h>
 
@@ -913,7 +913,7 @@ KCmdLineArgsStatic::parseAllArgs()
        {
          if (!s->about->customAuthorTextEnabled ())
          {
-           if (s->about->bugAddress().isEmpty() )
+           if (s->about->bugAddress().isEmpty() || s->about->bugAddress() == QLatin1String(BUG_REPORT_EMAIL))
              s->printQ( i18n( "Please use %1.\n", QLatin1String(BUG_REPORT_URL) ) );
            else
              s->printQ( i18n( "Please report bugs to %1.\n", s->about->bugAddress()) );

kdecore/services/kmimetype.cpp

@@ -17,7 +17,7 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include <config-misc.h>
+#include <kglobalsettings.h>
 
 #include "kmimetype.h"
 #include "kmimetype_p.h"

kdecore/tests/kaboutdatatest.cpp

@@ -26,7 +26,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 
-#include <config-misc.h>
+#include <kglobalsettings.h>
 
 static const char AppName[] =            "app";
 static const char CatalogName[] =        "Catalog";

kdeui/dialogs/kaboutapplicationdialog.cpp

@@ -42,7 +42,7 @@
 #include <QtGui/QScrollBar>
 #include <QtGui/QTabWidget>
 
-#include <config-misc.h>
+#include <kglobalsettings.h>
 
 class KAboutApplicationDialog::Private
 {
@@ -184,7 +184,7 @@ void KAboutApplicationDialog::Private::init( const KAboutData *ad, Options opt )
             bugsLabel->setContentsMargins( 4, 2, 0, 4 );
             bugsLabel->setOpenExternalLinks( true );
             if (!aboutData->customAuthorTextEnabled()) {
-                if (aboutData->bugAddress().isEmpty())
+                if (aboutData->bugAddress().isEmpty() || aboutData->bugAddress() == BUG_REPORT_EMAIL)
                     bugsLabel->setText( i18n("Please use <a href=\"%1\">%2</a> to report bugs.\n", BUG_REPORT_URL, BUG_REPORT_URL) );
                 else {
                     if( ( aboutData->authors().count() == 1 ) &&

kdeui/kernel/kglobalsettings.h

@@ -55,6 +55,10 @@
 #define HTML_DEFAULT_VIEW_FANTASY_FONT "Sans Serif"
 #define HTML_DEFAULT_MIN_FONT_SIZE 7
 
+// misc overrides
+#define BUG_REPORT_URL "https://github.com/fluxer/katana/issues"
+#define BUG_REPORT_EMAIL "xakepa10@gmail.com"
+
 class KUrl;
 
 class QColor;

kdeui/widgets/khelpmenu.cpp

@@ -53,7 +53,7 @@
 #include <QX11EmbedWidget>
 #endif
 
-#include <config-misc.h>
+#include <kglobalsettings.h>
 
 using namespace KDEPrivate;
 

kio/kio/global.cpp

@@ -20,8 +20,8 @@
 #include "job.h"
 
 #include <config.h>
-#include <config-misc.h>
 
+#include <kglobalsettings.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>

kio/misc/ksendbugmail/main.cpp

@@ -32,10 +32,10 @@
 #include <kaboutdata.h>
 #include <kdebug.h>
 #include <kconfig.h>
+#include <kglobalsettings.h>
 
 #include "smtp.h"
 
-#include <config-misc.h>
 
 void BugMailer::slotError(int errornum) {
     QString lstr;

kunitconversion/CMakeLists.txt

@@ -56,7 +56,7 @@ if(NOT KUNITCONVERSION_NO_SOLID)
     set(KUNITCONVERSION_EXTRA_LIBS ${KUNITCONVERSION_EXTRA_LIBS} ${KDE4_SOLID_LIBS})
 endif(NOT KUNITCONVERSION_NO_SOLID)
 
-include_directories (${CMAKE_SOURCE_DIR} ${KDE4_KDECORE_INCLUDES})
+include_directories (${CMAKE_SOURCE_DIR} ${KDE4_KDECORE_INCLUDES} ${KDE4_KDEUI_INCLUDES})
 
 
 kde4_add_library(kunitconversion ${LIBRARY_TYPE} ${kunitconversion_LIB_SRCS})

kunitconversion/tests/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${KDE4_KDECORE_INCLUDES})
+include_directories(${KDE4_KDECORE_INCLUDES} ${KDE4_KDEUI_INCLUDES})
 
 macro(KUNITCONVERSION_UNIT_TESTS)
     foreach(_testname ${ARGN})