summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Małek <michalm@jabster.pl>2014-08-06 09:48:42 (GMT)
committerMichał Małek <michalm@jabster.pl>2014-08-06 09:48:42 (GMT)
commit0a0deb48888561290bb29fabb13f8292f06d2a77 (patch)
treee9f6d364303e87b13ff9937f4ed557c198c39b6c
parentd02cc713a9cfe46221ad7045f2d3855d20c666a0 (diff)
Commented out KGlobal::locale()->insertCatalog() usage and showing
warning instead
-rw-r--r--kcmcddb/kcmcddb.cpp20
-rw-r--r--libkcddb/cdinfodialog.cpp13
2 files changed, 17 insertions, 16 deletions
diff --git a/kcmcddb/kcmcddb.cpp b/kcmcddb/kcmcddb.cpp
index 49d106f..d6afb21 100644
--- a/kcmcddb/kcmcddb.cpp
+++ b/kcmcddb/kcmcddb.cpp
@@ -25,16 +25,14 @@
#include "libkcddb/cache.h"
#include "libkcddb/submit.h"
-#include <QCheckBox>
-#include <qradiobutton.h>
-#include <QVBoxLayout>
-
-#include <kconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kgenericfactory.h>
+#include <QtCore/QDebug>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QVBoxLayout>
+
+#include <KI18n/KLocalizedString>
+#include <KCoreAddons/KPluginFactory>
#include <kmessagebox.h>
-#include <kconfigdialogmanager.h>
K_PLUGIN_FACTORY(KCDDBFactory, registerPlugin<CDDBModule>();)
K_EXPORT_PLUGIN(KCDDBFactory( "kcmcddb" ))
@@ -43,7 +41,9 @@ K_EXPORT_PLUGIN(KCDDBFactory( "kcmcddb" ))
CDDBModule::CDDBModule(QWidget *parent, const QVariantList &args)
: KCModule(parent, args)
{
- KGlobal::locale()->insertCatalog( QLatin1String( "libkcddb" ));
+ // TODO: ensure we get our translations
+ // KGlobal::locale()->insertCatalog( QLatin1String( "libkcddb" ));
+ qWarning() << "KGlobal::locale()->insertCatalog( QLatin1String( \"libkcddb\" )) needs to be ported to KF5. See the Ki18n programmers guide.";
setButtons(Default | Apply | Help);
widget_ = new CDDBConfigWidget(this);
diff --git a/libkcddb/cdinfodialog.cpp b/libkcddb/cdinfodialog.cpp
index f6763ea..8b58e30 100644
--- a/libkcddb/cdinfodialog.cpp
+++ b/libkcddb/cdinfodialog.cpp
@@ -23,16 +23,16 @@
#include "cdinfoencodingwidget.h"
#include "ui_cdinfodialog.h"
+#include <KCodecs/KCharsets>
+#include <KI18n/KLocalizedString>
+
+#include <QtCore/QDebug>
#include <QtCore/QStringList>
#include <QtCore/QTextCodec>
#include <QtCore/QTime>
#include <QtGui/QStandardItemModel>
#include <QtWidgets/QVBoxLayout>
-#include <QtCore/QDebug>
-#include <kglobal.h>
-#include <KCodecs/KCharsets>
-
using KCDDB::TrackInfo;
namespace KCDDB
@@ -83,8 +83,9 @@ class CDInfoDialog::Private
// We want control over the visibility of this column. See artistChanged().
// d->ui->m_trackList->setColumnWidthMode(Private::TRACK_ARTIST, Q3ListView::Manual);
- // ensure we get our translations
- KGlobal::locale()->insertCatalog( QLatin1String( "libkcddb" ));
+ // TODO: ensure we get our translations
+ // KGlobal::locale()->insertCatalog( QLatin1String( "libkcddb" ));
+ qWarning() << "KGlobal::locale()->insertCatalog( QLatin1String( \"libkcddb\" )) needs to be ported to KF5. See the Ki18n programmers guide.";
connect( d->ui->m_trackList, SIGNAL(activated(QModelIndex)), this, SLOT(slotTrackSelected(QModelIndex)) );
connect( d->ui->m_trackList, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(slotTrackDoubleClicked(QModelIndex)) );
connect( d->ui->m_artist, SIGNAL(textChanged(QString)), this, SLOT(artistChanged(QString)) );