diff --git a/akregator/src/mainwidget.h b/akregator/src/mainwidget.h index 79699f96..9e570152 100644 --- a/akregator/src/mainwidget.h +++ b/akregator/src/mainwidget.h @@ -35,6 +35,7 @@ #include #include +#include #include diff --git a/kuser/ku_configdlg.h b/kuser/ku_configdlg.h index a0bd272f..dd529548 100644 --- a/kuser/ku_configdlg.h +++ b/kuser/ku_configdlg.h @@ -29,7 +29,10 @@ #include #include +QT_BEGIN_NAMESPACE class Ui_KU_FilesSettings; +QT_END_NAMESPACE + namespace KIO { class Job; } class KU_ConfigDlg : public KConfigDialog { diff --git a/lokalize/src/catalog/gettext/gettextexport.cpp b/lokalize/src/catalog/gettext/gettextexport.cpp index 4a76781e..085e8f93 100644 --- a/lokalize/src/catalog/gettext/gettextexport.cpp +++ b/lokalize/src/catalog/gettext/gettextexport.cpp @@ -44,7 +44,6 @@ #include #include #include -#include #include #include @@ -121,7 +120,7 @@ ConversionStatus GettextExportPlugin::save(QIODevice* device, const int forms = catalog->numberOfPluralForms(); for ( int i = 0; i < forms; ++i ) { - QString keyword = "msgstr[" % QString::number( i ) % ']'; + QString keyword = "msgstr[" + QString::number( i ) + ']'; writeKeyword( stream, keyword, catalogItem.msgstr(i), true, catalogItem.prependEmptyForMsgstr() ); } } diff --git a/lokalize/src/common/fastsizehintitemdelegate.cpp b/lokalize/src/common/fastsizehintitemdelegate.cpp index e0e1031f..d580393e 100644 --- a/lokalize/src/common/fastsizehintitemdelegate.cpp +++ b/lokalize/src/common/fastsizehintitemdelegate.cpp @@ -25,7 +25,6 @@ #include "fastsizehintitemdelegate.h" #include -#include #include FastSizeHintItemDelegate::FastSizeHintItemDelegate(QObject *parent, const QVector& slc, const QVector& rtc) @@ -126,7 +125,7 @@ QString convertToHtml(QString str, bool italics) str=Qt::convertFromPlainText(str); //FIXME use another routine (this has bugs) if (italics) - str="

" % QString::fromRawData(str.unicode()+3, str.length()-3-4) % "

"; + str="

" + QString::fromRawData(str.unicode()+3, str.length()-3-4) + "

"; return str; } diff --git a/lokalize/src/common/languagelistmodel.cpp b/lokalize/src/common/languagelistmodel.cpp index c350d70d..9b19bde9 100644 --- a/lokalize/src/common/languagelistmodel.cpp +++ b/lokalize/src/common/languagelistmodel.cpp @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -106,7 +105,7 @@ QVariant LanguageListModel::data(const QModelIndex& index, int role) const const QString& code=stringList().at(index.row()); if (code.isEmpty()) return code; //kDebug()<<"languageCodeToName"<(KGlobal::locale()->languageCodeToName(code)%" ("%code%")"); + return QVariant::fromValue(KGlobal::locale()->languageCodeToName(code)+" ("+code+")"); } return QStringListModel::data(index, role); } diff --git a/lokalize/src/lokalizemainwindow.cpp b/lokalize/src/lokalizemainwindow.cpp index 91a68721..8dad8398 100644 --- a/lokalize/src/lokalizemainwindow.cpp +++ b/lokalize/src/lokalizemainwindow.cpp @@ -721,7 +721,7 @@ void LokalizeMainWindow::projectLoaded() // KMessageBox::error(this, i18nc("@info","Error opening the following files:")+ // "
  • "+failedFiles.join("
  • ")+"
  • " ); KNotification* notification=new KNotification("FilesOpenError", this); - notification->setText( i18nc("@info","Error opening the following files:\n\n")%""%failedFiles.join("
    ")%"" ); + notification->setText( i18nc("@info","Error opening the following files:\n\n")+""+failedFiles.join("
    ")+"" ); notification->sendEvent(); } diff --git a/lokalize/src/xlifftextedit.cpp b/lokalize/src/xlifftextedit.cpp index b173679e..ac812387 100644 --- a/lokalize/src/xlifftextedit.cpp +++ b/lokalize/src/xlifftextedit.cpp @@ -34,7 +34,6 @@ #include -#include #include #include #include @@ -1135,9 +1134,9 @@ bool TranslationUnitTextEdit::event(QEvent *event) bool nospell=langCode.isEmpty(); if (nospell) langCode=m_part==DocPosition::Source?m_catalog->sourceLangCode():m_catalog->targetLangCode(); - QString tip=KGlobal::locale()->languageCodeToName(langCode)%" ("%langCode%")"; + QString tip=KGlobal::locale()->languageCodeToName(langCode)+" ("+langCode+")"; if (nospell) - tip+=" - "%i18n("no spellcheck available"); + tip+=" - "+i18n("no spellcheck available"); QToolTip::showText(helpEvent->globalPos(), tip); } return KTextEdit::event(event); diff --git a/print-manager/libkcups/PrinterModel.cpp b/print-manager/libkcups/PrinterModel.cpp index 3b3c77ee..f13831a7 100644 --- a/print-manager/libkcups/PrinterModel.cpp +++ b/print-manager/libkcups/PrinterModel.cpp @@ -374,7 +374,7 @@ void PrinterModel::updateDest(QStandardItem *destItem, const KCupsPrinter &print } int markerChangeTime = printer.markerChangeTime(); - if (markerChangeTime != destItem->data(DestMarkerChangeTime)) { + if (markerChangeTime != destItem->data(DestMarkerChangeTime).toInt()) { destItem->setData(printer.markerChangeTime(), DestMarkerChangeTime); QVariantHash markers; markers["marker-change-time"] = printer.markerChangeTime(); diff --git a/yakuake/app/firstrundialog.h b/yakuake/app/firstrundialog.h index f6a5361a..eed60875 100644 --- a/yakuake/app/firstrundialog.h +++ b/yakuake/app/firstrundialog.h @@ -22,13 +22,13 @@ #ifndef FIRSTRUNDIALOG_H #define FIRSTRUNDIALOG_H - #include - class MainWindow; -class Ui_FirstRunDialog; +QT_BEGIN_NAMESPACE +class Ui_FirstRunDialog; +QT_END_NAMESPACE class FirstRunDialog : public KDialog {