Fix build with KDE_DEFAULT_CXXFLAGS

Fix FTBFS with GCC6

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

11 files changed, 21 insertions, 14 deletions

diff --git a/src/calendarhandler.cpp b/src/calendarhandler.cpp
index 8a30619..03935f7 100644
--- a/src/calendarhandler.cpp
+++ b/src/calendarhandler.cpp
@@ -228,7 +228,7 @@ void CalendarHandler::populateTodo(KCal::Todo* todo_, Data::LoanPtr loan_) {
 TQString CalendarHandler::timezone() {
   TQString zone;
 
-  TDEConfig korgcfg(locate(TQString::fromLatin1("config"), TQString::fromLatin1("korganizerrc")));
+  TDEConfig korgcfg(locate("config", TQString::fromLatin1("korganizerrc")));
   korgcfg.setGroup("Time & Date");
   TQString tz(korgcfg.readEntry("TimeZoneId"));
   if(!tz.isEmpty()) {
diff --git a/src/cite/openoffice.cpp b/src/cite/openoffice.cpp
index 91e96ed..7ae0712 100644
--- a/src/cite/openoffice.cpp
+++ b/src/cite/openoffice.cpp
@@ -87,7 +87,7 @@ bool OpenOffice::connect() {
     d->port = config.readNumEntry("Port", 2083);
     d->pipe = config.readPathEntry("Pipe");
     // the ooohandler will depend on pipe.isEmpty() to indicate the port should be used
-    d->handler->setHost(d->host);
+    d->handler->setHost(d->host.ascii());
     d->handler->setPort(d->port);
     if(!d->pipe.isEmpty()) {
       d->handler->setPipe(TQFile::encodeName(d->pipe));
@@ -246,7 +246,7 @@ bool OpenOffice::connectionDialog() {
   d->pipe = s;
 
   if(!d->host.isEmpty()) {
-    d->handler->setHost(d->host);
+    d->handler->setHost(d->host.ascii());
   }
   d->handler->setPort(d->port);
   if(!d->pipe.isEmpty()) {
diff --git a/src/fetch/z3950connection.cpp b/src/fetch/z3950connection.cpp
index 71cc6a2..8a58aaa 100644
--- a/src/fetch/z3950connection.cpp
+++ b/src/fetch/z3950connection.cpp
@@ -22,11 +22,9 @@
 #include <config.h>
 
 #ifdef HAVE_YAZ
-extern "C" {
 #include <yaz/zoom.h>
 #include <yaz/marcdisp.h>
 #include <yaz/yaz-version.h>
-}
 #endif
 
 #include <tdelocale.h>
diff --git a/src/filterdialog.cpp b/src/filterdialog.cpp
index 8d0a877..ab9677c 100644
--- a/src/filterdialog.cpp
+++ b/src/filterdialog.cpp
@@ -113,7 +113,7 @@ void FilterRuleWidget::slotEditRegExp() {
                                                                                     TQString(), TQT_TQOBJECT(this));
   }
 
-  KRegExpEditorInterface* iface = static_cast<KRegExpEditorInterface *>(m_editRegExpDialog->tqt_cast(TQString::fromLatin1("KRegExpEditorInterface")));
+  KRegExpEditorInterface* iface = static_cast<KRegExpEditorInterface *>(m_editRegExpDialog->tqt_cast("KRegExpEditorInterface"));
   if(iface) {
     iface->setRegExp(m_ruleValue->text());
     if(m_editRegExpDialog->exec() == TQDialog::Accepted) {
diff --git a/src/gui/counteditem.cpp b/src/gui/counteditem.cpp
index c890dea..fe15b65 100644
--- a/src/gui/counteditem.cpp
+++ b/src/gui/counteditem.cpp
@@ -57,7 +57,7 @@ void CountedItem::paintCell(TQPainter* p_, const TQColorGroup& cg_,
   // but still benefit from TDEListView::paintCell
   TQString oldText = text(column_);
 //  if(oldText.isEmpty()) {
-  if(oldText == '\t') {
+  if(oldText == "\t") {
     return; // avoid endless loop!
   }
 
diff --git a/src/image.cpp b/src/image.cpp
index cc015ae..56473b5 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -46,12 +46,12 @@ Image::Image(const TQString& filename_) : TQImage(filename_), m_linkOnly(false)
   calculateID();
 }
 
-Image::Image(const TQImage& img_, const TQString& format_) : TQImage(img_), m_format(format_), m_linkOnly(false) {
+Image::Image(const TQImage& img_, const TQString& format_) : TQImage(img_), m_format(format_.ascii()), m_linkOnly(false) {
   calculateID();
 }
 
 Image::Image(const TQByteArray& data_, const TQString& format_, const TQString& id_)
-    : TQImage(data_), m_id(idClean(id_)), m_format(format_), m_linkOnly(false) {
+    : TQImage(data_), m_id(idClean(id_)), m_format(format_.ascii()), m_linkOnly(false) {
   if(isNull()) {
     m_id = TQString();
   }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 04f3c56..55312b5 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2386,7 +2386,7 @@ bool MainWindow::importCollection(Data::CollPtr coll_, Import::Action action_) {
 void MainWindow::slotURLAction(const KURL& url_) {
   Q_ASSERT(url_.protocol() == Latin1Literal("tc"));
   TQString actionName = url_.fileName();
-  TDEAction* action = this->action(actionName);
+  TDEAction* action = this->action(actionName.ascii());
   if(action) {
     action->activate();
   } else {
diff --git a/src/reportdialog.cpp b/src/reportdialog.cpp
index c073802..b33c529 100644
--- a/src/reportdialog.cpp
+++ b/src/reportdialog.cpp
@@ -105,7 +105,7 @@ ReportDialog::ReportDialog(TQWidget* parent_, const char* name_/*=0*/)
                                      "margin:20% auto auto auto;text-align:center;"
                                      "background:white;color:%1;}</style><body><p>").arg(contrastColor.name())
                + i18n("Select a report template and click <em>Generate</em>.") + ' '
-               + i18n("Some reports may take several seconds to generate for large collections.");
+               + i18n("Some reports may take several seconds to generate for large collections.")
                + TQString::fromLatin1("</p></body></html>");
   m_HTMLPart->begin();
   m_HTMLPart->write(text);
diff --git a/src/rtf2html/rtf2html.cpp b/src/rtf2html/rtf2html.cpp
index e6e8b34..eec9caa 100644
--- a/src/rtf2html/rtf2html.cpp
+++ b/src/rtf2html/rtf2html.cpp
@@ -14,6 +14,12 @@
  *                                                                         *
  ***************************************************************************/
 
+// force to use QT with STL
+#if defined(QT_NO_STL)
+# define DISABLE_QT_NO_STL
+# undef QT_NO_STL
+#endif
+
 #include "rtf2html.h"
 #include "rtf_table.h"
 #include "rtf_tools.h"
@@ -529,3 +535,8 @@ TQString RTF2HTML::toHTML() const {
    return html;
 }
 
+// restore QT_NO_STL
+#if defined(DISABLE_QT_NO_STL)
+# undef DISABLE_QT_NO_STL
+# define QT_NO_STL
+#endif
diff --git a/src/translators/xsltexporter.cpp b/src/translators/xsltexporter.cpp
index b0642b3..07e9bc9 100644
--- a/src/translators/xsltexporter.cpp
+++ b/src/translators/xsltexporter.cpp
@@ -47,7 +47,7 @@ TQString XSLTExporter::fileFilter() const {
 bool XSLTExporter::exec() {
   KURL u = m_URLRequester->url();
   if(u.isEmpty() || !u.isValid()) {
-    return TQString();
+    return false;
   }
   //  XSLTHandler handler(FileHandler::readXMLFile(url));
   XSLTHandler handler(u);
diff --git a/src/translators/xslthandler.h b/src/translators/xslthandler.h
index a7f4a76..ddf2cb9 100644
--- a/src/translators/xslthandler.h
+++ b/src/translators/xslthandler.h
@@ -16,12 +16,10 @@
 
 #include <tqmap.h>
 
-extern "C" {
 // for xmlDocPtr
 #include <libxml/tree.h>
 // for xsltStyleSheetPtr
 #include <libxslt/xsltInternals.h>
-}
 
 class KURL;
 class TQDomDocument;