Use const variables where possible

It helps the compiler in the optimization process. It helps the programmer understanding the code.
lxqt · Jan 5, 2017 · d785898 · d785898
1 parent 6319ed6
commit d785898
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 27 deletions.
diff --git a/lxqtapplication.cpp b/lxqtapplication.cpp
@@ -128,7 +128,7 @@ Application::Application(int &argc, char** argv, bool handleQuitSignals)
 
 void Application::updateTheme()
 {
-    QString styleSheetKey = QFileInfo(applicationFilePath()).fileName();
+    const QString styleSheetKey = QFileInfo(applicationFilePath()).fileName();
     setStyleSheet(lxqtTheme.qss(styleSheetKey));
     emit themeChanged();
 }
@@ -140,7 +140,7 @@ namespace
     public:
         static void signalHandler(int signo)
         {
-            int ret = write(instance->mSignalSock[0], &signo, sizeof (int));
+            const int ret = write(instance->mSignalSock[0], &signo, sizeof (int));
             if (sizeof (int) != ret)
                 qCritical() << QStringLiteral("unable to write into socketpair, %1").arg(strerror(errno));
         } 

diff --git a/lxqtautostartentry.cpp b/lxqtautostartentry.cpp
@@ -40,7 +40,7 @@ AutostartEntry::AutostartEntry(const QString& name):
 {
     foreach (const QString& dir, XdgDirs::autostartDirs())
     {
-        QString path = QString("%1/%2").arg(dir, name);
+        const QString path = QString("%1/%2").arg(dir, name);
         if (QFile(path).exists())
         {
             mSystemFile.load(path);
@@ -49,7 +49,7 @@ AutostartEntry::AutostartEntry(const QString& name):
         }
     }
 
-    QString path = QString("%1/%2").arg(XdgDirs::autostartHome(), name);
+    const QString path = QString("%1/%2").arg(XdgDirs::autostartHome(), name);
     if (QFile(path).exists())
     {
         mLocalFile.load(path);
@@ -59,7 +59,7 @@ AutostartEntry::AutostartEntry(const QString& name):
 
 void AutostartEntry::setFile(const XdgDesktopFile& file)
 {
-    bool local = isLocal();
+    const bool local = isLocal();
     if (mSystem && local && file == mSystemFile)
     {
         removeLocal();

diff --git a/lxqthtmldelegate.cpp b/lxqthtmldelegate.cpp
@@ -65,7 +65,7 @@ void HtmlDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option,
     options.icon = QIcon();
 
     // icon size
-    QSize iconSize = icon.actualSize(mIconSize);
+    const QSize iconSize = icon.actualSize(mIconSize);
     QRect iconRect = QRect(8, 8, iconSize.width(), iconSize.height());
     if (is_right_to_left)
     {
@@ -86,7 +86,7 @@ void HtmlDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option,
         // shift text right to make icon visible
         painter->translate(iconRect.right() + 8, 0);
     }
-    QRect clip(0, 0, options.rect.width() - iconRect.width() - 8, options.rect.height());
+    const QRect clip(0, 0, options.rect.width() - iconRect.width() - 8, options.rect.height());
     painter->setClipRect(clip);
 
     // set text color to red for selected item
@@ -112,8 +112,8 @@ QSize HtmlDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelInd
     QStyleOptionViewItem options = option;
     initStyleOption(&options, index);
 
-    QSize iconSize = options.icon.actualSize(mIconSize);
-    QRect iconRect = QRect(8, 8, iconSize.width(), iconSize.height());
+    const QSize iconSize = options.icon.actualSize(mIconSize);
+    const QRect iconRect = QRect(8, 8, iconSize.width(), iconSize.height());
 
     QTextDocument doc;
     doc.setHtml(options.text);

diff --git a/lxqtplugininfo.cpp b/lxqtplugininfo.cpp
@@ -72,12 +72,11 @@ bool PluginInfo::isValid() const
  ************************************************/
 QLibrary* PluginInfo::loadLibrary(const QString& libDir) const
 {
-    QString baseName, path;
-    QFileInfo fi = QFileInfo(fileName());
-    path = fi.canonicalPath();
-    baseName = value("X-LXQt-Library", fi.completeBaseName()).toString();
+    const QFileInfo fi = QFileInfo(fileName());
+    const QString path = fi.canonicalPath();
+    const QString baseName = value("X-LXQt-Library", fi.completeBaseName()).toString();
 
-    QString soPath = QDir(libDir).filePath(QString("lib%2.so").arg(baseName));
+    const QString soPath = QDir(libDir).filePath(QString("lib%2.so").arg(baseName));
     QLibrary* library = new QLibrary(soPath);
 
     if (!library->load())
@@ -87,7 +86,7 @@ QLibrary* PluginInfo::loadLibrary(const QString& libDir) const
         return 0;
     }
 
-    QString locale = QLocale::system().name();
+    const QString locale = QLocale::system().name();
     QTranslator* translator = new QTranslator(library);
 
     translator->load(QString("%1/%2/%2_%3.qm").arg(path, baseName, locale));
@@ -107,8 +106,8 @@ PluginInfoList PluginInfo::search(const QStringList& desktopFilesDirs, const QSt
 
     foreach (const QString &desktopFilesDir, desktopFilesDirs)
     {
-        QDir dir(desktopFilesDir);
-        QFileInfoList files = dir.entryInfoList(QStringList(nameFilter), QDir::Files | QDir::Readable);
+        const QDir dir(desktopFilesDir);
+        const QFileInfoList files = dir.entryInfoList(QStringList(nameFilter), QDir::Files | QDir::Readable);
         foreach (const QFileInfo &file, files)
         {
             if (processed.contains(file.fileName()))

diff --git a/lxqtpowermanager.cpp b/lxqtpowermanager.cpp
@@ -48,7 +48,7 @@ class LXQT_API MessageBox: public QMessageBox
 
     static QWidget *parentWidget()
     {
-        QWidgetList widgets = QApplication::topLevelWidgets();
+        const QWidgetList widgets = QApplication::topLevelWidgets();
 
         if (widgets.count())
             return widgets.at(0);
@@ -76,7 +76,7 @@ class LXQT_API MessageBox: public QMessageBox
 protected:
     virtual void resizeEvent(QResizeEvent* event)
     {
-        QRect screen = QApplication::desktop()->screenGeometry();
+        const QRect screen = QApplication::desktop()->screenGeometry();
         move((screen.width()  - this->width()) / 2,
              (screen.height() - this->height()) / 2);
 

diff --git a/lxqtprogramfinder.cpp b/lxqtprogramfinder.cpp
@@ -31,17 +31,17 @@ using namespace LXQt;
 
 LXQT_API bool ProgramFinder::programExists(const QString& command)
 {
-    QString program = programName(command);
+    const QString program = programName(command);
     if (program[0] == QChar('/'))
     {
         QFileInfo fi(program);
         return fi.isExecutable() && fi.isFile();
     }
 
-    QString path = qgetenv("PATH");
+    const QString path = qgetenv("PATH");
     foreach (const QString& dirName, path.split(":", QString::SkipEmptyParts))
     {
-        QFileInfo fi(QDir(dirName), program);
+        const QFileInfo fi(QDir(dirName), program);
         if (fi.isExecutable() && fi.isFile())
             return true;
     }

diff --git a/lxqtrotatedwidget.cpp b/lxqtrotatedwidget.cpp
@@ -90,7 +90,7 @@ void RotatedWidget::adjustContentSize()
 {
     mContent->adjustSize();
 
-    QSize before = size();
+    const QSize before = size();
 
     adjustSize();
 
@@ -147,7 +147,7 @@ void RotatedWidget::paintEvent(QPaintEvent */*event*/)
     if (mOrigin == Qt::TopLeftCorner)
         return;
 
-    QSize sz = mContent->size();
+    const QSize sz = mContent->size();
 
     QPainter painter(this);
 

diff --git a/lxqttranslator.cpp b/lxqttranslator.cpp
@@ -85,7 +85,7 @@ void Translator::setTranslationSearchPaths(const QStringList &paths)
  ************************************************/
 bool translate(const QString &name, const QString &owner)
 {
-    QString locale = QLocale::system().name();
+    const QString locale = QLocale::system().name();
     QTranslator *appTranslator = new QTranslator(qApp);
 
     QStringList *paths = getSearchPaths();
@@ -132,7 +132,7 @@ bool translate(const QString &name, const QString &owner)
  ************************************************/
 bool Translator::translateApplication(const QString &applicationName)
 {
-    QString locale = QLocale::system().name();
+    const QString locale = QLocale::system().name();
     QTranslator *qtTranslator = new QTranslator(qApp);
 
     if (qtTranslator->load("qt_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
@@ -170,7 +170,7 @@ bool Translator::translatePlugin(const QString &pluginName, const QString& type)
 {
     static QSet<QString> loadedPlugins;
 
-    QString fullName = type % QChar('/') % pluginName;
+    const QString fullName = type % QChar('/') % pluginName;
     if (loadedPlugins.contains(fullName))
         return true;