[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] /: Use QString
From:       Montel Laurent <montel () kde ! org>
Date:       2016-08-01 6:18:46
Message-ID: E1bU6Yo-0004St-JC () code ! kde ! org
[Download RAW message or body]

Git commit 5b20f0eafe4d20f3e4e172c47a275c1be16e0aa1 by Montel Laurent.
Committed on 01/08/2016 at 06:18.
Pushed by mlaurent into branch 'master'.

Use QString

M  +1    -1    akregator/src/akregator_part.cpp
M  +2    -2    akregator/src/feed/feedpropertiesdialog.cpp
M  +1    -1    akregator/src/feed/feedpropertiesdialog.h
M  +2    -2    akregator/src/mainwidget.cpp
M  +1    -1    akregator/src/mainwidget.h
M  +3    -3    akregator/src/mainwindow.cpp
M  +1    -1    akregator/src/mainwindow.h
M  +2    -2    kaddressbook/src/printing/stylepage.cpp
M  +1    -1    kaddressbook/src/printing/stylepage.h

http://commits.kde.org/kdepim/5b20f0eafe4d20f3e4e172c47a275c1be16e0aa1

diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 1d08757..33e7e77 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -263,7 +263,7 @@ Part::Part(QWidget *parentWidget, QObject *parent, const \
QVariantList &)  
     mCentralWidget = new Akregator::AkregatorCentralWidget(parentWidget);
     connect(mCentralWidget, &AkregatorCentralWidget::restoreSession, this, \
                &Part::slotRestoreSession);
-    m_mainWidget = new Akregator::MainWidget(this, parentWidget, m_actionManager, \
"akregator_view"); +    m_mainWidget = new Akregator::MainWidget(this, parentWidget, \
m_actionManager, QStringLiteral("akregator_view"));  \
mCentralWidget->setMainWidget(m_mainWidget);  m_extension = new \
BrowserExtension(this, "ak_extension");  
diff --git a/akregator/src/feed/feedpropertiesdialog.cpp \
b/akregator/src/feed/feedpropertiesdialog.cpp index a400d9a..7a671d6 100644
--- a/akregator/src/feed/feedpropertiesdialog.cpp
+++ b/akregator/src/feed/feedpropertiesdialog.cpp
@@ -36,10 +36,10 @@
 #include <QVBoxLayout>
 
 using namespace Akregator;
-FeedPropertiesWidget::FeedPropertiesWidget(QWidget *parent, const char *name)
+FeedPropertiesWidget::FeedPropertiesWidget(QWidget *parent, const QString &name)
     : QWidget(parent)
 {
-    setObjectName(QLatin1String(name));
+    setObjectName(name);
     setupUi(this);
     connect(cb_updateInterval, &QCheckBox::toggled, updateSpinBox, \
                &QSpinBox::setEnabled);
     connect(cb_updateInterval, &QCheckBox::toggled, updateComboBox, \
                &KComboBox::setEnabled);
diff --git a/akregator/src/feed/feedpropertiesdialog.h \
b/akregator/src/feed/feedpropertiesdialog.h index 211d518..242f8fa 100644
--- a/akregator/src/feed/feedpropertiesdialog.h
+++ b/akregator/src/feed/feedpropertiesdialog.h
@@ -39,7 +39,7 @@ class FeedPropertiesWidget : public QWidget, public \
Ui::FeedPropertiesWidgetBase  {
     Q_OBJECT
 public:
-    explicit FeedPropertiesWidget(QWidget *parent = Q_NULLPTR, const char *name = \
Q_NULLPTR); +    explicit FeedPropertiesWidget(QWidget *parent = Q_NULLPTR, const \
QString &name = QString());  ~FeedPropertiesWidget();
 
     enum IntervalStep {
diff --git a/akregator/src/mainwidget.cpp b/akregator/src/mainwidget.cpp
index e96c4e7..bc6ab8b 100644
--- a/akregator/src/mainwidget.cpp
+++ b/akregator/src/mainwidget.cpp
@@ -102,7 +102,7 @@ MainWidget::~MainWidget()
     }
 }
 
-MainWidget::MainWidget(Part *part, QWidget *parent, ActionManagerImpl \
*actionManager, const char *name) +MainWidget::MainWidget(Part *part, QWidget \
*parent, ActionManagerImpl *actionManager, const QString &name)  : QWidget(parent),
       m_feedList(),
       m_viewMode(NormalView),
@@ -110,7 +110,7 @@ MainWidget::MainWidget(Part *part, QWidget *parent, \
ActionManagerImpl *actionMan  m_feedListManagementInterface(new \
FeedListManagementImpl),  m_networkConfigManager(new \
QNetworkConfigurationManager(this))  {
-    setObjectName(QLatin1String(name));
+    setObjectName(name);
 
     FeedListManagementInterface::setInstance(m_feedListManagementInterface);
 
diff --git a/akregator/src/mainwidget.h b/akregator/src/mainwidget.h
index 50a0131..352bbf1 100644
--- a/akregator/src/mainwidget.h
+++ b/akregator/src/mainwidget.h
@@ -76,7 +76,7 @@ public:
     @param parent parent widget
     @param name the name of the widget (@ref QWidget )
     */
-    MainWidget(Akregator::Part *part, QWidget *parent, ActionManagerImpl \
*actionManager, const char *name); +    MainWidget(Akregator::Part *part, QWidget \
*parent, ActionManagerImpl *actionManager, const QString &name);  
     /** destructor.  Note that cleanups should be done in
     slotOnShutdown(), so we don't risk accessing self-deleting objects after \
                deletion. */
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index 0d5917a..fe42188 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -50,16 +50,16 @@
 
 using namespace Akregator;
 
-BrowserInterface::BrowserInterface(MainWindow *shell, const char *name)
+BrowserInterface::BrowserInterface(MainWindow *shell, const QString &name)
     : KParts::BrowserInterface(shell)
 {
-    setObjectName(QLatin1String(name));
+    setObjectName(name);
     m_shell = shell;
 }
 
 MainWindow::MainWindow(QWidget *parent)
     : KParts::MainWindow(parent)
-    , m_browserIface(new BrowserInterface(this, "browser_interface"))
+    , m_browserIface(new BrowserInterface(this, \
QStringLiteral("browser_interface")))  , m_part()
     , m_statusLabel(new KSqueezedTextLabel(this))
 {
diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
index c76760c..56d2e03 100644
--- a/akregator/src/mainwindow.h
+++ b/akregator/src/mainwindow.h
@@ -45,7 +45,7 @@ class BrowserInterface : public KParts::BrowserInterface
     Q_OBJECT
 
 public:
-    BrowserInterface(Akregator::MainWindow *shell, const char *name);
+    explicit BrowserInterface(Akregator::MainWindow *shell, const QString &name);
 
 private:
     Akregator::MainWindow *m_shell;
diff --git a/kaddressbook/src/printing/stylepage.cpp \
b/kaddressbook/src/printing/stylepage.cpp index 6a223cc..3930e8e 100644
--- a/kaddressbook/src/printing/stylepage.cpp
+++ b/kaddressbook/src/printing/stylepage.cpp
@@ -42,10 +42,10 @@ static bool contactFieldsNameLesser(const ContactFields::Field \
                &field,
                                         ContactFields::label(otherField)) < 0);
 }
 
-StylePage::StylePage(QWidget *parent, const char *name)
+StylePage::StylePage(QWidget *parent, const QString &name)
     : QWidget(parent)
 {
-    setObjectName(QLatin1String(name));
+    setObjectName(name);
     initGUI();
 
     initFieldCombo();
diff --git a/kaddressbook/src/printing/stylepage.h \
b/kaddressbook/src/printing/stylepage.h index 62d53cd..1f9a35f 100644
--- a/kaddressbook/src/printing/stylepage.h
+++ b/kaddressbook/src/printing/stylepage.h
@@ -39,7 +39,7 @@ class StylePage : public QWidget
     Q_OBJECT
 
 public:
-    explicit StylePage(QWidget *parent = Q_NULLPTR, const char *name = Q_NULLPTR);
+    explicit StylePage(QWidget *parent = Q_NULLPTR, const QString &name = \
QString());  ~StylePage();
 
     /**


[prev in list] [next in list] [prev in thread] [next in thread]