From a8323de17a2c8845803f3c39fad0204cad3322c2 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Tue, 8 Nov 2016 15:16:11 +0000
Subject: [PATCH] generic: misc cleanups

this fixes build without QStringBuilder and with QT_NO_IM defined, also
setBackgroundColor() is deprecated

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 bluedevil/src/wizard/wizardagent.cpp                        | 1 +
 kolourpaint/views/manager/kpViewManager_TextCursor.cpp      | 4 ++++
 ksystemlog/src/lib/logViewSearchWidget.cpp                  | 2 +-
 print-manager/print-manager-kded/NewPrinterNotification.cpp | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bluedevil/src/wizard/wizardagent.cpp b/bluedevil/src/wizard/wizardagent.cpp
index 56b2ad7d..34b26510 100644
--- a/bluedevil/src/wizard/wizardagent.cpp
+++ b/bluedevil/src/wizard/wizardagent.cpp
@@ -20,6 +20,7 @@
 
 #include "wizardagent.h"
 
+#include <QFile>
 #include <QDBusMessage>
 #include <bluedevil/bluedevil.h>
 #include <KDebug>
diff --git a/kolourpaint/views/manager/kpViewManager_TextCursor.cpp b/kolourpaint/views/manager/kpViewManager_TextCursor.cpp
index 509bfd73..cefe014c 100644
--- a/kolourpaint/views/manager/kpViewManager_TextCursor.cpp
+++ b/kolourpaint/views/manager/kpViewManager_TextCursor.cpp
@@ -53,7 +53,9 @@
 #include <qapplication.h>
 #include <qlist.h>
 #include <qtimer.h>
+#ifndef QT_NO_IM
 #include <QInputContext>
+#endif
 
 #include <kdebug.h>
 
@@ -162,12 +164,14 @@ void kpViewManager::setTextCursorPosition (int row, int col)
     restoreQueueUpdates ();
     restoreFastUpdates ();
 
+#ifndef QT_NO_IM
     if (d->viewUnderCursor) {
         QInputContext *inputContext = d->viewUnderCursor->inputContext ();
         if (inputContext) {
             inputContext->update ();
         }
     }
+#endif
 }
 
 
diff --git a/ksystemlog/src/lib/logViewSearchWidget.cpp b/ksystemlog/src/lib/logViewSearchWidget.cpp
index e10f4104..1f9431d5 100644
--- a/ksystemlog/src/lib/logViewSearchWidget.cpp
+++ b/ksystemlog/src/lib/logViewSearchWidget.cpp
@@ -305,7 +305,7 @@ void LogViewSearchWidget::highlightAll() {
 			LogViewWidgetItem* item=static_cast<LogViewWidgetItem*> (*it);
 
 			if (compareItem(item) == true) {
-				item->setBackgroundColor(item->columnCount()-1, QColor(255, 255, 16*8+11));
+				item->setBackground(item->columnCount()-1, QColor(255, 255, 16*8+11));
 			}
 
 			++it;
diff --git a/print-manager/print-manager-kded/NewPrinterNotification.cpp b/print-manager/print-manager-kded/NewPrinterNotification.cpp
index aa1be150..6478d4b5 100644
--- a/print-manager/print-manager-kded/NewPrinterNotification.cpp
+++ b/print-manager/print-manager-kded/NewPrinterNotification.cpp
@@ -278,7 +278,7 @@ void NewPrinterNotification::setupPrinter()
     // in this case the printer was not added
     QStringList args;
     args << "--new-printer-from-device";
-    args << sender()->property(PRINTER_NAME).toString() % QLatin1Char('/') % sender()->property(DEVICE_ID).toString();
+    args << sender()->property(PRINTER_NAME).toString() + QLatin1Char('/') + sender()->property(DEVICE_ID).toString();
     KToolInvocation::kdeinitExec(QLatin1String("kde-add-printer"), args);
 }
 
-- 
2.11.0