|
46 | 46 | #include <qpushbutton.h>
|
47 | 47 | #include <utility>
|
48 | 48 |
|
| 49 | +#include "containers.h" |
49 | 50 | #include "dispatch_to.h"
|
50 | 51 | #include "highlightersdialog.h"
|
51 | 52 | #include "highlighterset.h"
|
@@ -206,15 +207,15 @@ void HighlightersDialog::exportHighlighters()
|
206 | 207 |
|
207 | 208 | void HighlightersDialog::importHighlighters()
|
208 | 209 | {
|
209 |
| - QStringList files = QFileDialog::getOpenFileNames( |
| 210 | + const QStringList files = QFileDialog::getOpenFileNames( |
210 | 211 | this, tr( "Select one or more files to open" ), "", tr( "Highlighters (*.conf)" ) );
|
211 | 212 |
|
212 |
| - for ( const auto& file : qAsConst( files ) ) { |
| 213 | + for ( const auto& file : files ) { |
213 | 214 | LOG_DEBUG << "Loading highlighters from " << file;
|
214 | 215 | QSettings settings{ file, QSettings::IniFormat };
|
215 | 216 | HighlighterSetCollection collection;
|
216 | 217 | collection.retrieveFromStorage( settings );
|
217 |
| - for ( const auto& set : qAsConst( collection.highlighters_ ) ) { |
| 218 | + for ( const auto& set : klogg::as_const( collection.highlighters_ ) ) { |
218 | 219 | if ( highlighterSetCollection_.hasSet( set.id() ) ) {
|
219 | 220 | continue;
|
220 | 221 | }
|
@@ -382,7 +383,7 @@ void HighlightersDialog::populateHighlighterList()
|
382 | 383 | {
|
383 | 384 | highlighterListWidget->clear();
|
384 | 385 | for ( const HighlighterSet& highlighterSet :
|
385 |
| - qAsConst( highlighterSetCollection_.highlighters_ ) ) { |
| 386 | + klogg::as_const( highlighterSetCollection_.highlighters_ ) ) { |
386 | 387 | auto* new_item = new QListWidgetItem( highlighterSet.name() );
|
387 | 388 | // new_item->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled );
|
388 | 389 | highlighterListWidget->addItem( new_item );
|
|
0 commit comments