diff --git a/src/CharacterColor.h b/src/CharacterColor.h index 44f03ab25..bbacff261 100644 --- a/src/CharacterColor.h +++ b/src/CharacterColor.h @@ -95,7 +95,6 @@ public: * color and font weight. */ friend bool operator != (const ColorEntry& a, const ColorEntry& b); - }; inline bool operator == (const ColorEntry& a, const ColorEntry& b) diff --git a/src/ColorSchemeEditor.cpp b/src/ColorSchemeEditor.cpp index e57c31013..690e6e4d5 100644 --- a/src/ColorSchemeEditor.cpp +++ b/src/ColorSchemeEditor.cpp @@ -84,7 +84,7 @@ ColorSchemeEditor::ColorSchemeEditor(QWidget* aParent) dirModel->setFilter(QDir::AllEntries); dirModel->setRootPath(QString('/')); QCompleter *completer = new QCompleter(this); - completer->setModel(dirModel); + completer->setModel(dirModel); _ui->wallpaperPath->setCompleter(completer); _ui->wallpaperPath->setClearButtonEnabled(true); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 16d3acd93..ee09d39a5 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -79,7 +79,7 @@ MainWindow::MainWindow() QMapIterator i(configEntries); while (i.hasNext()) { i.next(); - if (i.key().startsWith(QLatin1String("Width")) + if (i.key().startsWith(QLatin1String("Width")) || i.key().startsWith(QLatin1String("Height"))) { group.deleteEntry(i.key()); } diff --git a/src/TerminalCharacterDecoder.cpp b/src/TerminalCharacterDecoder.cpp index d606dc2dc..3af6be611 100644 --- a/src/TerminalCharacterDecoder.cpp +++ b/src/TerminalCharacterDecoder.cpp @@ -262,7 +262,7 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP } else { // HTML truncates multiple spaces, so use a space marker instead // Use   instead of   so xmllint will work. - text.append(" "); + text.append(" "); } } diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index 26228716a..79c57f33f 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -2919,7 +2919,6 @@ void TerminalDisplay::outputSuspended(bool suspended) _gridLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding), 1, 0); - } // Remove message after a few seconds if (suspended) {