Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-24 02:42:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: adjust to Katie changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-05-30 02:19:12 +00:00
parent 300bdf0f38
commit 2f7efcdb74
9 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
akregator/src/mainwidget.h
View file

@ -35,6 +35,7 @@
#include <solid/networking.h>
#include <QWidget>
#include <QTimer>
#include <boost/shared_ptr.hpp>

3
kuser/ku_configdlg.h
View file

@ -29,7 +29,10 @@
#include <kprogressdialog.h>
#include <kio/job.h>
QT_BEGIN_NAMESPACE
class Ui_KU_FilesSettings;
QT_END_NAMESPACE
namespace KIO { class Job; }
class KU_ConfigDlg : public KConfigDialog {

3
lokalize/src/catalog/gettext/gettextexport.cpp
View file

@ -44,7 +44,6 @@
#include <QList>
#include <QTextStream>
#include <QEventLoop>
#include <QStringBuilder>
#include <ksavefile.h>
#include <kapplication.h>
@ -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() );
}
}

3
lokalize/src/common/fastsizehintitemdelegate.cpp
View file

@ -25,7 +25,6 @@
#include "fastsizehintitemdelegate.h"
#include <QPainter>
#include <QStringBuilder>
#include <QTextDocument>
FastSizeHintItemDelegate::FastSizeHintItemDelegate(QObject *parent, const QVector<bool>& slc, const QVector<bool>& 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="<p><i>" % QString::fromRawData(str.unicode()+3, str.length()-3-4) % "</i></p>";
str="<p><i>" + QString::fromRawData(str.unicode()+3, str.length()-3-4) + "</i></p>";
return str;
}

3
lokalize/src/common/languagelistmodel.cpp
View file

@ -29,7 +29,6 @@
#include <kicon.h>
#include <klocale.h>
#include <QStringBuilder>
#include <QCoreApplication>
#include <QSortFilterProxyModel>
@ -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"<<code;
return QVariant::fromValue<QString>(KGlobal::locale()->languageCodeToName(code)%" ("%code%")");
return QVariant::fromValue<QString>(KGlobal::locale()->languageCodeToName(code)+" ("+code+")");
}
return QStringListModel::data(index, role);
}

2
lokalize/src/lokalizemainwindow.cpp
View file

@ -721,7 +721,7 @@ void LokalizeMainWindow::projectLoaded()
// KMessageBox::error(this, i18nc("@info","Error opening the following files:")+
// "<br><il><li><filename>"+failedFiles.join("</filename></li><li><filename>")+"</filename></li></il>" );
KNotification* notification=new KNotification("FilesOpenError", this);
notification->setText( i18nc("@info","Error opening the following files:\n\n")%"<filename>"%failedFiles.join("</filename><br><filename>")%"</filename>" );
notification->setText( i18nc("@info","Error opening the following files:\n\n")+"<filename>"+failedFiles.join("</filename><br><filename>")+"</filename>" );
notification->sendEvent();
}

5
lokalize/src/xlifftextedit.cpp
View file

@ -34,7 +34,6 @@
#include <kcompletionbox.h>
#include <QStringBuilder>
#include <QPixmap>
#include <QPushButton>
#include <QPainter>
@ -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);

2
print-manager/libkcups/PrinterModel.cpp
View file

@ -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();

6
yakuake/app/firstrundialog.h
View file

@ -22,13 +22,13 @@
#ifndef FIRSTRUNDIALOG_H
#define FIRSTRUNDIALOG_H
#include <KDialog>
class MainWindow;
class Ui_FirstRunDialog;
QT_BEGIN_NAMESPACE
class Ui_FirstRunDialog;
QT_END_NAMESPACE
class FirstRunDialog : public KDialog
{