[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [khelpcenter] /: Use QStringLiteral and co. + Add missing i18n
From: Laurent Montel <null () kde ! org>
Date: 2018-08-29 7:03:55
Message-ID: E1fuuWB-00010Q-Nw () code ! kde ! org
[Download RAW message or body]
Git commit 937cb97a511c19f277779bae54d47a94084829f6 by Laurent Montel.
Committed on 29/08/2018 at 07:03.
Pushed by mlaurent into branch 'master'.
Use QStringLiteral and co. + Add missing i18n
M +8 -0 CMakeLists.txt
M +11 -11 application.cpp
M +1 -1 application.h
M +3 -3 docentry.cpp
M +4 -4 docmetainfo.cpp
M +5 -5 glossary.cpp
M +18 -18 grantleeformatter.cpp
M +2 -2 history.cpp
M +6 -6 infotree.cpp
M +10 -10 mainwindow.cpp
M +27 -27 navigator.cpp
M +2 -2 navigatorappgroupitem.cpp
M +7 -7 plugintraverser.cpp
M +20 -20 scrollkeepertreebuilder.cpp
M +6 -6 searchengine.cpp
M +1 -1 searchengine.h
M +4 -4 searchhandler.cpp
M +1 -1 searchhandler.h
M +2 -2 searchwidget.cpp
M +13 -19 toc.cpp
M +9 -9 view.cpp
https://commits.kde.org/khelpcenter/937cb97a511c19f277779bae54d47a94084829f6
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7e7590..acc9533 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,14 @@ set_package_properties(LibXml2 PROPERTIES
TYPE REQUIRED)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+#add_definitions(
+# -DQT_USE_QSTRINGBUILDER
+# -DQT_NO_CAST_TO_ASCII
+# -DQT_NO_CAST_FROM_ASCII
+# -DQT_NO_URL_CAST_FROM_STRING
+# -DQT_NO_CAST_FROM_BYTEARRAY
+# -DQT_NO_SIGNALS_SLOTS_KEYWORDS
+#)
add_subdirectory( plugins )
add_subdirectory( searchhandlers )
diff --git a/application.cpp b/application.cpp
index fddd96f..fde2535 100644
--- a/application.cpp
+++ b/application.cpp
@@ -40,7 +40,7 @@ Application::Application(int& argc, char** argv)
{
setAttribute(Qt::AA_UseHighDpiPixmaps);
- mCmdParser.addPositionalArgument( "url", i18n( "Documentation to open" ) );
+ mCmdParser.addPositionalArgument( QStringLiteral("url"), i18n( "Documentation to open" ) );
mCmdParser.addHelpOption();
mCmdParser.addVersionOption();
@@ -89,20 +89,20 @@ extern "C" int Q_DECL_EXPORT kdemain( int argc, char **argv )
{
KHC::Application app(argc, argv);
KLocalizedString::setApplicationDomain("khelpcenter5");
- KAboutData aboutData( "khelpcenter", i18n("Help Center"),
- PROJECT_VERSION,
+ KAboutData aboutData( QStringLiteral("khelpcenter"), i18n("Help Center"),
+ QLatin1String(PROJECT_VERSION),
i18n("Help Center"),
KAboutLicense::GPL,
i18n("(c) 1999-2018, The KHelpCenter developers") );
- aboutData.addAuthor( "Luigi Toscano", QString("Current maintainer"), \
"luigi.toscano@tiscali.it" );
- aboutData.addAuthor( "Pino Toscano", QString("Xapian-based search, lot of bugfixes"), \
"pino@kde.org" );
- aboutData.addAuthor( "Cornelius Schumacher", QString("Former maintainer"), \
"schumacher@kde.org" );
- aboutData.addAuthor( "Frerich Raabe", QString(), "raabe@kde.org" );
- aboutData.addAuthor( "Matthias Elter", i18n("Original Author"), "me@kde.org" );
- aboutData.addAuthor( "Wojciech Smigaj", i18n("Info page support"), "achu@klub.chip.pl" );
- app.setWindowIcon( QIcon::fromTheme("help-browser") );
- aboutData.setDesktopFileName ( "org.kde.Help" );
+ aboutData.addAuthor( QStringLiteral("Luigi Toscano"), i18n("Current maintainer"), \
QStringLiteral("luigi.toscano@tiscali.it") ); + aboutData.addAuthor( QStringLiteral("Pino \
Toscano"), i18n("Xapian-based search, lot of bugfixes"), QStringLiteral("pino@kde.org") ); + \
aboutData.addAuthor( QStringLiteral("Cornelius Schumacher"), i18n("Former maintainer"), \
QStringLiteral("schumacher@kde.org") ); + aboutData.addAuthor( QStringLiteral("Frerich \
Raabe"), QString(), QStringLiteral("raabe@kde.org") ); + aboutData.addAuthor( \
QStringLiteral("Matthias Elter"), i18n("Original Author"), QStringLiteral("me@kde.org") ); + \
aboutData.addAuthor( QStringLiteral("Wojciech Smigaj"), i18n("Info page support"), \
QStringLiteral("achu@klub.chip.pl") ); + app.setWindowIcon( \
QIcon::fromTheme(QStringLiteral("help-browser")) ); + aboutData.setDesktopFileName ( \
QStringLiteral("org.kde.Help") ); KAboutData::setApplicationData(aboutData);
QCommandLineParser *cmd = app.cmdParser();
diff --git a/application.h b/application.h
index 6bdf29a..610e5da 100644
--- a/application.h
+++ b/application.h
@@ -38,7 +38,7 @@ namespace KHC {
QCommandLineParser *cmdParser();
- public slots:
+ public Q_SLOTS:
void activate(const QStringList& args, const QString &workingDirectory);
private:
diff --git a/docentry.cpp b/docentry.cpp
index a1e132b..0cd09d4 100644
--- a/docentry.cpp
+++ b/docentry.cpp
@@ -66,7 +66,7 @@ QString DocEntry::icon() const
if ( !docExists() ) return QLatin1String("unknown");
if ( isDirectory() ) return QLatin1String("help-contents");
- else return "text-plain";
+ else return QStringLiteral("text-plain");
}
void DocEntry::setUrl( const QString &url )
@@ -79,7 +79,7 @@ QString DocEntry::url() const
if ( !mUrl.isEmpty() ) return mUrl;
if ( identifier().isEmpty() ) return QString();
- return "khelpcenter:" + identifier();
+ return QStringLiteral("khelpcenter:") + identifier();
}
void DocEntry::setInfo( const QString &info )
@@ -219,7 +219,7 @@ bool DocEntry::readFromFile( const QFileInfo &fileInfo )
mIdentifier = fileInfo.completeBaseName();
}
mIndexer = desktopGroup.readEntry( "X-DOC-Indexer" );
- mIndexer.replace( "%f", fileInfo.absoluteFilePath() );
+ mIndexer.replace( QStringLiteral("%f"), fileInfo.absoluteFilePath() );
mIndexTestFile = desktopGroup.readEntry( "X-DOC-IndexTestFile" );
mSearchEnabledDefault = desktopGroup.readEntry( "X-DOC-SearchEnabledDefault",
false );
diff --git a/docmetainfo.cpp b/docmetainfo.cpp
index 7f9bbb2..99dbef3 100644
--- a/docmetainfo.cpp
+++ b/docmetainfo.cpp
@@ -70,7 +70,7 @@ DocEntry *DocMetaInfo::addDocEntry( const QFileInfo &fi )
if ( !fi.exists() ) return nullptr;
QString extension = fi.completeSuffix();
- QStringList extensions = extension.split( '.');
+ QStringList extensions = extension.split( QLatin1Char('.'));
QString lang;
if ( extensions.count() >= 2 )
{
@@ -100,7 +100,7 @@ DocEntry *DocMetaInfo::addDocEntry( const QFileInfo &fi )
*it ) );
}
QString indexer = entry->indexer();
- indexer.replace( "%f", fi.absoluteFilePath() );
+ indexer.replace( QStringLiteral("%f"), fi.absoluteFilePath() );
entry->setIndexer( indexer );
addDocEntry( entry );
return entry;
@@ -130,7 +130,7 @@ DocEntry::List DocMetaInfo::searchEntries() const
QString DocMetaInfo::languageName( const QString &langcode )
{
- if ( langcode == "en" )
+ if ( langcode == QLatin1String("en") )
return i18nc("Describes documentation entries that are in English", "English");
QString cfgfile = QStandardPaths::locate( QStandardPaths::GenericDataLocation, \
QStringLiteral( "locale/%1/kf5_entry.desktop" ).arg( langcode ) ); @@ -156,7 +156,7 @@ void \
DocMetaInfo::scanMetaInfo( bool force )
if ( metaInfos.isEmpty() )
{
- metaInfos = QStandardPaths::locateAll(QStandardPaths::DataLocation, "plugins", \
QStandardPaths::LocateDirectory); + metaInfos = \
QStandardPaths::locateAll(QStandardPaths::DataLocation, QStringLiteral("plugins"), \
QStandardPaths::LocateDirectory); }
for( it = metaInfos.constBegin(); it != metaInfos.constEnd(); ++it)
{
diff --git a/glossary.cpp b/glossary.cpp
index 0bbe946..13fd429 100644
--- a/glossary.cpp
+++ b/glossary.cpp
@@ -49,7 +49,7 @@ class SectionItem : public QTreeWidgetItem
: QTreeWidgetItem( parent )
{
setText(0,text);
- setIcon(0,QIcon::fromTheme( "help-contents" ));
+ setIcon(0,QIcon::fromTheme( QStringLiteral("help-contents") ));
}
};
@@ -84,16 +84,16 @@ Glossary::Glossary( QWidget *parent ) : QTreeWidget( parent )
m_byTopicItem = new QTreeWidgetItem( this );
m_byTopicItem->setText( 0, i18n( "By Topic" ) );
- m_byTopicItem->setIcon( 0, QIcon::fromTheme( "help-contents" ) );
+ m_byTopicItem->setIcon( 0, QIcon::fromTheme( QStringLiteral("help-contents") ) );
m_alphabItem = new QTreeWidgetItem( this );
m_alphabItem->setText( 0, i18n( "Alphabetically" ) );
- m_alphabItem->setIcon( 0, QIcon::fromTheme( "character-set" ) );
+ m_alphabItem->setIcon( 0, QIcon::fromTheme( QStringLiteral("character-set") ) );
- m_cacheFile = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + \
QLatin1Char('/') + "help/glossary.xml" ; + m_cacheFile = \
QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1Char('/') + \
QStringLiteral("help/glossary.xml"); QDir().mkpath( QFileInfo( m_cacheFile ).absolutePath() );
- m_sourceFile = View::langLookup( QLatin1String( "khelpcenter/glossary/index.docbook" ) );
+ m_sourceFile = View::langLookup( QStringLiteral( "khelpcenter/glossary/index.docbook" ) );
}
diff --git a/grantleeformatter.cpp b/grantleeformatter.cpp
index c17a082..155263b 100644
--- a/grantleeformatter.cpp
+++ b/grantleeformatter.cpp
@@ -80,7 +80,7 @@ GrantleeFormatter::GrantleeFormatter()
: d( new Private )
{
QSharedPointer< Grantlee::FileSystemTemplateLoader > loader( new \
Grantlee::FileSystemTemplateLoader );
- loader->setTemplateDirs( QStandardPaths::locateAll( QStandardPaths::DataLocation, \
"templates", QStandardPaths::LocateDirectory ) ); + loader->setTemplateDirs( \
QStandardPaths::locateAll( QStandardPaths::DataLocation, QStringLiteral("templates"), \
QStandardPaths::LocateDirectory ) ); d->engine.addTemplateLoader( loader );
}
@@ -91,19 +91,19 @@ GrantleeFormatter::~GrantleeFormatter()
QString GrantleeFormatter::formatOverview( const QString& title, const QString& name, const \
QString& content ) {
- Grantlee::Template t = d->engine.loadByName( "index.html" );
+ Grantlee::Template t = d->engine.loadByName( QStringLiteral("index.html") );
Grantlee::Context ctx;
- ctx.insert( "title", title );
- ctx.insert( "name", name );
- ctx.insert( "content", content );
+ ctx.insert( QStringLiteral("title"), title );
+ ctx.insert( QStringLiteral("name"), name );
+ ctx.insert( QStringLiteral("content"), content );
return d->format( t, &ctx );
}
QString GrantleeFormatter::formatGlossaryEntry( const GlossaryEntry& entry )
{
- Grantlee::Template t = d->engine.loadByName( "glossary.html" );
+ Grantlee::Template t = d->engine.loadByName( QStringLiteral("glossary.html") );
const GlossaryEntryXRef::List entrySeeAlso = entry.seeAlso();
QStringList seeAlso;
@@ -114,19 +114,19 @@ QString GrantleeFormatter::formatGlossaryEntry( const GlossaryEntry& \
entry ) }
Grantlee::Context ctx;
- ctx.insert( "htmltitle", i18nc( "%1 is a glossary term", "KDE Glossary: %1", entry.term() ) \
);
- ctx.insert( "title", i18n( "KDE Glossary" ) );
- ctx.insert( "term", entry.term() );
- ctx.insert( "definition", entry.definition() );
- ctx.insert( "seeAlsoCount", seeAlso.count() );
- ctx.insert( "seeAlso", i18n( "See also: %1", seeAlso.join( ", " ) ) );
+ ctx.insert( QStringLiteral("htmltitle"), i18nc( "%1 is a glossary term", "KDE Glossary: %1", \
entry.term() ) ); + ctx.insert( QStringLiteral("title"), i18n( "KDE Glossary" ) );
+ ctx.insert( QStringLiteral("term"), entry.term() );
+ ctx.insert( QStringLiteral("definition"), entry.definition() );
+ ctx.insert( QStringLiteral("seeAlsoCount"), seeAlso.count() );
+ ctx.insert( QStringLiteral("seeAlso"), i18n( "See also: %1", seeAlso.join( QStringLiteral(", \
") ) ) );
return d->format( t, &ctx );
}
QString GrantleeFormatter::formatSearchResults( const QString& words, const \
QList<QPair<DocEntry *, QString> >& results ) {
- Grantlee::Template t = d->engine.loadByName( "search.html" );
+ Grantlee::Template t = d->engine.loadByName( QStringLiteral("search.html") );
typedef QPair<DocEntry *, QString> Iter;
QVariantList list;
@@ -134,15 +134,15 @@ QString GrantleeFormatter::formatSearchResults( const QString& words, \
const QLis foreach ( const Iter& it, results )
{
QVariantHash h;
- h.insert( "title", it.first->name() );
- h.insert( "content", it.second );
+ h.insert( QStringLiteral("title"), it.first->name() );
+ h.insert( QStringLiteral("content"), it.second );
list += h;
}
Grantlee::Context ctx;
- ctx.insert( "htmltitle", i18n( "Search Results" ) );
- ctx.insert( "title", i18n( "Search Results for '%1':", words.toHtmlEscaped() ) );
- ctx.insert( "results", list );
+ ctx.insert( QStringLiteral("htmltitle"), i18n( "Search Results" ) );
+ ctx.insert( QStringLiteral("title"), i18n( "Search Results for '%1':", words.toHtmlEscaped() \
) ); + ctx.insert( QStringLiteral("results"), list );
return d->format( t, &ctx );
}
diff --git a/history.cpp b/history.cpp
index 5488bc4..1866525 100644
--- a/history.cpp
+++ b/history.cpp
@@ -65,7 +65,7 @@ void History::setupActions( KActionCollection *coll )
QPair<KGuiItem, KGuiItem> backForward = KStandardGuiItem::backAndForward();
m_backAction = new KToolBarPopupAction( QIcon::fromTheme( backForward.first.iconName() ), \
backForward.first.text(), this );
- coll->addAction( "back", m_backAction );
+ coll->addAction( QStringLiteral("back"), m_backAction );
coll->setDefaultShortcuts(m_backAction, KStandardShortcut::back());
connect(m_backAction, &KToolBarPopupAction::triggered, this, &History::back);
@@ -345,7 +345,7 @@ void History::fillHistoryPopup( QMenu *popup, bool onlyBack, bool \
onlyForward, b {
QString text = (*it)->title;
text = KStringHandler::csqueeze(text, 50); //CT: squeeze
- text.replace( '&', "&&" );
+ text.replace( QLatin1Char('&'), QStringLiteral("&&") );
QAction *action = popup->addAction( text );
action->setData( i );
if ( checkCurrentItem && *it == current )
diff --git a/infotree.cpp b/infotree.cpp
index 2ec3aeb..3edb3dd 100644
--- a/infotree.cpp
+++ b/infotree.cpp
@@ -53,7 +53,7 @@ InfoCategoryItem::InfoCategoryItem( NavigatorItem *parent, const QString \
&text ) {
setAutoDeleteDocEntry( true );
setExpanded( false );
- setIcon( 0, QIcon::fromTheme( "help-contents" ) );
+ setIcon( 0, QIcon::fromTheme( QStringLiteral("help-contents") ) );
// qCDebug(KHC_LOG) << "Got category: " << text;
}
@@ -61,9 +61,9 @@ void InfoCategoryItem::itemExpanded( bool open )
{
NavigatorItem::itemExpanded( open );
- if ( open && childCount() > 0 ) setIcon( 0, QIcon::fromTheme( "help-contents" ) );
+ if ( open && childCount() > 0 ) setIcon( 0, QIcon::fromTheme( \
QStringLiteral("help-contents") ) ); // TODO: was contents2 -> needs to be changed to \
help-contents-alternate or similar
- else setIcon( 0, QIcon::fromTheme( "help-contents" ) );
+ else setIcon( 0, QIcon::fromTheme( QStringLiteral("help-contents") ) );
}
InfoNodeItem::InfoNodeItem( InfoCategoryItem *parent, const QString &text )
@@ -96,12 +96,12 @@ void InfoTree::build( NavigatorItem *parent )
const QString infoPath = QFile::decodeName( qgetenv( "INFOPATH" ) );
if ( !infoPath.isEmpty() )
- infoDirFiles += infoPath.split( ':');
+ infoDirFiles += infoPath.split( QLatin1Char(':'));
QStringList::ConstIterator it = infoDirFiles.constBegin();
QStringList::ConstIterator end = infoDirFiles.constEnd();
for ( ; it != end; ++it ) {
- QString infoDirFileName = *it + "/dir";
+ QString infoDirFileName = *it + QStringLiteral("/dir");
if ( QFile::exists( infoDirFileName ) )
parseInfoDirFile( infoDirFileName );
}
@@ -142,7 +142,7 @@ void InfoTree::parseInfoDirFile( const QString &infoDirFileName )
const int dot = s.indexOf( QLatin1Char( '.' ), closeBrace );
QString appName = s.mid( 2, colon - 2 );
- QString url = "info:/" + s.mid( openBrace + 1, closeBrace - openBrace - 1 );
+ QString url = QStringLiteral("info:/") + s.mid( openBrace + 1, closeBrace - openBrace \
- 1 ); if ( dot - closeBrace > 1 )
url += QLatin1Char('/') + s.mid( closeBrace + 1, dot - closeBrace - 1 );
else
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 051fdca..721f7d1 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -68,7 +68,7 @@ using namespace KHC;
class LogDialog : public QDialog
{
public:
- LogDialog( QWidget *parent = 0 )
+ explicit LogDialog( QWidget *parent = nullptr )
: QDialog( parent )
{
setWindowTitle( i18n("Search Error Log") );
@@ -111,7 +111,7 @@ MainWindow::MainWindow()
{
setObjectName( QLatin1String( "MainWindow" ) );
- QDBusConnection::sessionBus().registerObject("/KHelpCenter", this, \
QDBusConnection::ExportScriptableSlots); + \
QDBusConnection::sessionBus().registerObject(QStringLiteral("/KHelpCenter"), this, \
QDBusConnection::ExportScriptableSlots); mSplitter = new QSplitter( this );
mDoc = new View( mSplitter, this, KHTMLPart::DefaultGUI, actionCollection() );
@@ -140,7 +140,7 @@ MainWindow::MainWindow()
const KParts::OpenUrlArguments &, const \
KParts::BrowserArguments & ) ) );
mNavigator = new Navigator( mDoc, mSplitter );
- mNavigator->setObjectName( "nav" );
+ mNavigator->setObjectName( QStringLiteral("nav") );
connect( mNavigator, SIGNAL( itemSelected( const QString & ) ),
SLOT( viewUrl( const QString & ) ) );
connect( mNavigator, SIGNAL( glossSelected( const GlossaryEntry & ) ),
@@ -157,7 +157,7 @@ MainWindow::MainWindow()
{
if ( Prefs::useKonqSettings() ) {
- KConfig konqCfg( "konquerorrc" );
+ KConfig konqCfg( QStringLiteral("konquerorrc") );
const_cast<KHTMLSettings *>( mDoc->settings() )->init( &konqCfg );
}
const int fontScaleFactor = Prefs::fontzoomfactor();
@@ -231,13 +231,13 @@ void MainWindow::setupActions()
actionCollection()->addAction( KStandardAction::Quit, this, SLOT( close() ) );
actionCollection()->addAction( KStandardAction::Print, this, SLOT( print() ) );
- QAction *prevPage = actionCollection()->addAction( "prevPage" );
+ QAction *prevPage = actionCollection()->addAction( QStringLiteral("prevPage") );
prevPage->setText( i18n( "Previous Page" ) );
actionCollection()->setDefaultShortcut(prevPage, Qt::CTRL+Qt::Key_PageUp );
prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) );
connect( prevPage, SIGNAL( triggered() ), mDoc, SLOT( prevPage() ) );
- QAction *nextPage = actionCollection()->addAction( "nextPage" );
+ QAction *nextPage = actionCollection()->addAction( QStringLiteral("nextPage") );
nextPage->setText( i18n( "Next Page" ) );
actionCollection()->setDefaultShortcut(nextPage, Qt::CTRL + Qt::Key_PageDown );
nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) );
@@ -250,7 +250,7 @@ void MainWindow::setupActions()
home->setWhatsThis(i18n("Go back to the table of contents"));
mCopyText = KStandardAction::copy( this, SLOT(slotCopySelectedText()), this );
- actionCollection()->addAction( "copy_text", mCopyText );
+ actionCollection()->addAction( QStringLiteral("copy_text"), mCopyText );
mLastSearchAction = actionCollection()->addAction( QLatin1String("lastsearch") );
mLastSearchAction->setText( i18n("&Last Search Result") );
@@ -347,7 +347,7 @@ void MainWindow::viewUrl( const QUrl &url, const KParts::OpenUrlArguments \
&args,
QString proto = url.scheme().toLower();
- if ( proto == "khelpcenter" ) {
+ if ( proto == QLatin1String("khelpcenter") ) {
History::self().createEntry();
mNavigator->openInternalUrl( url );
return;
@@ -366,7 +366,7 @@ void MainWindow::viewUrl( const QUrl &url, const KParts::OpenUrlArguments \
&args, else if ( url.isLocalFile() ) {
QMimeDatabase db;
QMimeType mime = db.mimeTypeForUrl( url );
- if ( mime.inherits("text/html") )
+ if ( mime.inherits(QStringLiteral("text/html")) )
own = true;
}
@@ -436,7 +436,7 @@ void MainWindow::slotGlossSelected(const GlossaryEntry &entry)
{
stop();
History::self().createEntry();
- mDoc->begin( QUrl( "glossentry:" + entry.id() ) );
+ mDoc->begin( QUrl( QStringLiteral("glossentry:") + entry.id() ) );
mDoc->write( mDoc->grantleeFormatter()->formatGlossaryEntry( entry ) );
mDoc->end();
}
diff --git a/navigator.cpp b/navigator.cpp
index f1695ed..6f73d6e 100644
--- a/navigator.cpp
+++ b/navigator.cpp
@@ -189,17 +189,17 @@ void Navigator::insertParentAppDocs( const QString &name, NavigatorItem \
*topItem void Navigator::insertKCMDocs( const QString &name, NavigatorItem *topItem, const \
QString &type ) {
qCDebug(KHC_LOG) << "Requested KCM documents for ID" << name;
- QString systemsettingskontrolconstraint = "[X-KDE-System-Settings-Parent-Category] != ''";
- QString konquerorcontrolconstraint = "[X-KDE-PluginKeyword] == 'khtml_general'\
+ QString systemsettingskontrolconstraint = \
QStringLiteral("[X-KDE-System-Settings-Parent-Category] != ''"); + QString \
konquerorcontrolconstraint = QStringLiteral("[X-KDE-PluginKeyword] == \
'khtml_general'\
or [X-KDE-PluginKeyword] == 'performance'\
- or [X-KDE-PluginKeyword] == 'bookmarks'";
- QString filemanagercontrolconstraint = "[X-KDE-PluginKeyword] == 'behavior'\
+ or [X-KDE-PluginKeyword] == 'bookmarks'");
+ QString filemanagercontrolconstraint = QStringLiteral("[X-KDE-PluginKeyword] == 'behavior'\
or [X-KDE-PluginKeyword] == 'dolphinviewmodes'\
or [X-KDE-PluginKeyword] == 'dolphinnavigation'\
or [X-KDE-PluginKeyword] == 'dolphinservices'\
or [X-KDE-PluginKeyword] == 'dolphingeneral'\
- or [X-KDE-PluginKeyword] == 'trash'";
- QString browsercontrolconstraint = "[X-KDE-PluginKeyword] == 'khtml_behavior'\
+ or [X-KDE-PluginKeyword] == 'trash'");
+ QString browsercontrolconstraint = QStringLiteral("[X-KDE-PluginKeyword] == \
'khtml_behavior'\ or [X-KDE-PluginKeyword] == 'proxy'\
or [X-KDE-PluginKeyword] == 'khtml_appearance'\
or [X-KDE-PluginKeyword] == 'khtml_filter'\
@@ -207,26 +207,26 @@ void Navigator::insertKCMDocs( const QString &name, NavigatorItem \
*topItem, cons or [X-KDE-PluginKeyword] == 'cookie'\
or [X-KDE-PluginKeyword] == 'useragent'\
or [X-KDE-PluginKeyword] == 'khtml_java_js'\
- or [X-KDE-PluginKeyword] == 'khtml_plugins'";
+ or [X-KDE-PluginKeyword] == 'khtml_plugins'");
/* missing in browsercontrolconstraint
History no X-KDE-PluginKeyword in kcmhistory.desktop
*/
- QString othercontrolconstraint = "[X-KDE-PluginKeyword] == 'cgi'";
+ QString othercontrolconstraint = QStringLiteral("[X-KDE-PluginKeyword] == 'cgi'");
KService::List list;
- if ( type == QString("kcontrol") ) {
- list = KServiceTypeTrader::self()->query( "KCModule", systemsettingskontrolconstraint );
- } else if ( type == QString("konquerorcontrol") ) {
- list = KServiceTypeTrader::self()->query( "KCModule", konquerorcontrolconstraint );
- } else if ( type == QString("browsercontrol") ) {
- list = KServiceTypeTrader::self()->query( "KCModule", browsercontrolconstraint );
- } else if ( type == QString("filemanagercontrol") ) {
- list = KServiceTypeTrader::self()->query( "KCModule", filemanagercontrolconstraint );
- } else if ( type == QString("othercontrol") ) {
- list = KServiceTypeTrader::self()->query( "KCModule", othercontrolconstraint );
- } else if ( type == QString("kinfocenter") ) {
- list = KServiceTypeTrader::self()->query( "KCModule", "[X-KDE-ParentApp] == 'kinfocenter'" \
); + if ( type == QLatin1String("kcontrol") ) {
+ list = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), \
systemsettingskontrolconstraint ); + } else if ( type == QLatin1String("konquerorcontrol") ) {
+ list = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), \
konquerorcontrolconstraint ); + } else if ( type == QLatin1String("browsercontrol") ) {
+ list = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), \
browsercontrolconstraint ); + } else if ( type == QLatin1String("filemanagercontrol") ) {
+ list = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), \
filemanagercontrolconstraint ); + } else if ( type == QLatin1String("othercontrol") ) {
+ list = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), \
othercontrolconstraint ); + } else if ( type == QLatin1String("kinfocenter") ) {
+ list = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), \
QStringLiteral("[X-KDE-ParentApp] == 'kinfocenter'") ); }
for ( KService::List::const_iterator it = list.constBegin(); it != list.constEnd(); ++it )
@@ -254,7 +254,7 @@ void Navigator::insertIOSlaveDocs( const QString &name, NavigatorItem \
*topItem ) // First parameter is ignored if second is an absolute path
QUrl url(QStringLiteral("help:/") + docPath);
QString icon = KProtocolInfo::icon(*it);
- if ( icon.isEmpty() ) icon = "text-plain";
+ if ( icon.isEmpty() ) icon = QStringLiteral("text-plain");
DocEntry *entry = new DocEntry( *it, url.url(), icon );
NavigatorItem *item = new NavigatorAppItem( entry, topItem, prevItem );
prevItem = item;
@@ -272,7 +272,7 @@ void Navigator::createItemFromDesktopFile( NavigatorItem *topItem,
// First parameter is ignored if second is an absolute path
QUrl url(QStringLiteral("help:/") + docPath);
QString icon = desktopFile.readIcon();
- if ( icon.isEmpty() ) icon = "text-plain";
+ if ( icon.isEmpty() ) icon = QStringLiteral("text-plain");
DocEntry *entry = new DocEntry( desktopFile.readName(), url.url(), icon );
NavigatorItem *item = new NavigatorAppItem( entry, topItem );
item->setAutoDeleteDocEntry( true );
@@ -295,7 +295,7 @@ void Navigator::selectItem( const QUrl &url )
{
qCDebug(KHC_LOG) << "Navigator::selectItem(): " << url.url();
- if ( url.url() == "khelpcenter:home" ) {
+ if ( url.url() == QLatin1String("khelpcenter:home") ) {
clearSelection();
return;
}
@@ -306,7 +306,7 @@ void Navigator::selectItem( const QUrl &url )
QUrl alternativeURL = url;
if (url.hasFragment())
{
- alternativeURL.setQuery("anchor="+url.fragment());
+ alternativeURL.setQuery(QStringLiteral("anchor=")+url.fragment());
alternativeURL.setFragment(QString());
}
@@ -375,7 +375,7 @@ void Navigator::slotItemSelected( QTreeWidgetItem *currentItem )
- if ( url.scheme() == "khelpcenter" ) {
+ if ( url.scheme() == QLatin1String("khelpcenter") ) {
mView->closeUrl();
History::self().updateCurrentEntry( mView );
History::self().createEntry();
@@ -400,7 +400,7 @@ void Navigator::slotItemCollapsed( QTreeWidgetItem *item )
void Navigator::openInternalUrl( const QUrl &url )
{
- if ( url.url() == "khelpcenter:home" ) {
+ if ( url.url() == QLatin1String("khelpcenter:home") ) {
clearSelection();
showOverview( nullptr, url );
return;
@@ -523,7 +523,7 @@ void Navigator::slotSearch()
void Navigator::slotShowSearchResult( const QString &url )
{
QString u = url;
- u.replace( "%k", mSearchEdit->text() );
+ u.replace( QStringLiteral("%k"), mSearchEdit->text() );
emit itemSelected( u );
}
diff --git a/navigatorappgroupitem.cpp b/navigatorappgroupitem.cpp
index 622f11f..df7a4e7 100644
--- a/navigatorappgroupitem.cpp
+++ b/navigatorappgroupitem.cpp
@@ -112,9 +112,9 @@ void NavigatorAppGroupItem::populate( bool recursive )
case KST_KServiceGroup:
{
const KServiceGroup::Ptr g(static_cast<KServiceGroup*>(e.data()));
- if ( ( g->childCount() == 0 ) || g->name().startsWith( '.' ) )
+ if ( ( g->childCount() == 0 ) || g->name().startsWith( QLatin1Char('.') ) )
continue;
- DocEntry *entry = new DocEntry( g->caption(), "", g->icon() );
+ DocEntry *entry = new DocEntry( g->caption(), QString(), g->icon() );
NavigatorAppGroupItem *appItem;
appItem = new NavigatorAppGroupItem( entry, this, g->relPath() );
appItem->setAutoDeleteDocEntry( true );
diff --git a/plugintraverser.cpp b/plugintraverser.cpp
index fab5b60..ccfac9f 100644
--- a/plugintraverser.cpp
+++ b/plugintraverser.cpp
@@ -69,7 +69,7 @@ void PluginTraverser::process( DocEntry *entry )
mCurrentItem = new NavigatorAppItem( entry, mParentItem, mCurrentItem );
} else if ( entry->khelpcenterSpecial() == QLatin1String("apps") ) {
NavigatorAppGroupItem *appItem;
- entry->setIcon( "kde" );
+ entry->setIcon( QStringLiteral("kde") );
if ( mListView )
appItem = new NavigatorAppGroupItem( entry, mListView, mCurrentItem );
else
@@ -85,17 +85,17 @@ void PluginTraverser::process( DocEntry *entry )
if ( entry->khelpcenterSpecial() == QLatin1String("konqueror") ) {
mNavigator->insertParentAppDocs( entry->khelpcenterSpecial(), mCurrentItem );
} else if ( entry->khelpcenterSpecial() == QLatin1String("kcontrol") ) {
- mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), mCurrentItem, \
QString("kcontrol") ); + mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), \
mCurrentItem, QStringLiteral("kcontrol") );
} else if ( entry->khelpcenterSpecial() == QLatin1String("konquerorcontrol") ) {
- mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), mCurrentItem, \
QString("konquerorcontrol") ); + mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), \
mCurrentItem, QStringLiteral("konquerorcontrol") );
} else if ( entry->khelpcenterSpecial() == QLatin1String("filemanagercontrol") ) {
- mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), mCurrentItem, \
QString("filemanagercontrol") ); + mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), \
mCurrentItem, QStringLiteral("filemanagercontrol") );
} else if ( entry->khelpcenterSpecial() == QLatin1String("browsercontrol") ) {
- mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), mCurrentItem, \
QString("browsercontrol") ); + mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), \
mCurrentItem, QStringLiteral("browsercontrol") );
} else if ( entry->khelpcenterSpecial() == QLatin1String("othercontrol") ) {
- mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), mCurrentItem, \
QString("othercontrol") ); + mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), \
mCurrentItem, QStringLiteral("othercontrol") );
} else if ( entry->khelpcenterSpecial() == QLatin1String("kinfocenter") ) {
- mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), mCurrentItem, \
QString("kinfocenter") ); + mNavigator->insertKCMDocs( entry->khelpcenterSpecial(), \
mCurrentItem, QStringLiteral("kinfocenter") );
} else if ( entry->khelpcenterSpecial() == QLatin1String("kioslave") ) {
mNavigator->insertIOSlaveDocs( entry->khelpcenterSpecial(), mCurrentItem );
} else if ( entry->khelpcenterSpecial() == QLatin1String("info") ) {
diff --git a/scrollkeepertreebuilder.cpp b/scrollkeepertreebuilder.cpp
index 87eda88..8651879 100644
--- a/scrollkeepertreebuilder.cpp
+++ b/scrollkeepertreebuilder.cpp
@@ -67,7 +67,7 @@ void ScrollKeeperTreeBuilder::build( NavigatorItem *parent )
qCWarning(KHC_LOG) << "Could not execute scrollkeeper-get-content-list";
return;
}
- mContentsList = proc.readAllStandardOutput().trimmed();
+ mContentsList =QString::fromUtf8( proc.readAllStandardOutput().trimmed());
if (!QFile::exists(mContentsList)) {
qCWarning(KHC_LOG) << "Scrollkeeper contents file" << mContentsList
@@ -75,7 +75,7 @@ void ScrollKeeperTreeBuilder::build( NavigatorItem *parent )
return;
}
- QDomDocument doc("ScrollKeeperContentsList");
+ QDomDocument doc(QStringLiteral("ScrollKeeperContentsList"));
QFile f(mContentsList);
if ( !f.open( QIODevice::ReadOnly ) )
return;
@@ -94,7 +94,7 @@ void ScrollKeeperTreeBuilder::build( NavigatorItem *parent )
while( !n.isNull() ) {
QDomElement e = n.toElement();
if( !e.isNull() ) {
- if (e.tagName() == "sect") {
+ if (e.tagName() == QLatin1String("sect")) {
NavigatorItem *createdItem;
insertSection( parent, e, createdItem );
}
@@ -108,7 +108,7 @@ int ScrollKeeperTreeBuilder::insertSection( NavigatorItem *parent,
NavigatorItem *§Item )
{
// TODO: was contents2 -> needs to be changed to help-contents-alternate or similar
- DocEntry *entry = new DocEntry( "", "", "help-contents" );
+ DocEntry *entry = new DocEntry( QString(), QString(), QLatin1String("help-contents") );
sectItem = new NavigatorItem( entry, parent );
sectItem->setAutoDeleteDocEntry( true );
mItems.append( sectItem );
@@ -119,13 +119,13 @@ int ScrollKeeperTreeBuilder::insertSection( NavigatorItem *parent,
while( !n.isNull() ) {
QDomElement e = n.toElement();
if( !e.isNull() ) {
- if ( e.tagName() == "title" ) {
+ if ( e.tagName() == QLatin1String("title") ) {
entry->setName( e.text() );
sectItem->updateItem();
- } else if (e.tagName() == "sect") {
+ } else if (e.tagName() == QLatin1String("sect")) {
NavigatorItem *created;
numDocs += insertSection( sectItem, e, created );
- } else if (e.tagName() == "doc") {
+ } else if (e.tagName() == QLatin1String("doc")) {
insertDoc(sectItem,e);
++numDocs;
}
@@ -145,7 +145,7 @@ int ScrollKeeperTreeBuilder::insertSection( NavigatorItem *parent,
void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent,
const QDomNode &docNode )
{
- DocEntry *entry = new DocEntry( "", "", "text-plain" );
+ DocEntry *entry = new DocEntry( QString(), QString(), QLatin1String("text-plain") );
NavigatorItem *docItem = new NavigatorItem( entry, parent );
docItem->setAutoDeleteDocEntry( true );
mItems.append( docItem );
@@ -156,27 +156,27 @@ void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent,
while( !n.isNull() ) {
QDomElement e = n.toElement();
if( !e.isNull() ) {
- if ( e.tagName() == "doctitle" ) {
+ if ( e.tagName() == QLatin1String("doctitle") ) {
entry->setName( e.text() );
docItem->updateItem();
- } else if ( e.tagName() == "docsource" ) {
+ } else if ( e.tagName() == QLatin1String("docsource") ) {
url.append( e.text() );
- } else if ( e.tagName() == "docformat" ) {
+ } else if ( e.tagName() == QLatin1String("docformat") ) {
QString mimeType = e.text();
- if ( mimeType == "text/html") {
+ if ( mimeType == QLatin1String("text/html")) {
// Let the HTML part figure out how to get the doc
- } else if ( mimeType == "application/xml"
- || mimeType == "text/xml" /*deprecated name*/ ) {
- if ( url.left( 5 ) == "file:" ) url = url.mid( 5 );
- url.prepend( "ghelp:" );
+ } else if ( mimeType == QLatin1String("application/xml")
+ || mimeType == QLatin1String("text/xml") /*deprecated name*/ ) {
+ if ( url.left( 5 ) == QLatin1String("file:") ) url = url.mid( 5 );
+ url.prepend( QLatin1String("ghelp:") );
#if 0
url.replace( QRegExp( ".xml$" ), ".html" );
#endif
- } else if ( mimeType == "text/sgml" ) {
+ } else if ( mimeType == QLatin1String("text/sgml") ) {
// GNOME docs use this type. We don't have a real viewer for this.
- url.prepend( "file:" );
- } else if ( mimeType.left(5) == "text/" ) {
- url.prepend( "file:" );
+ url.prepend( QStringLiteral("file:") );
+ } else if ( mimeType.left(5) == QLatin1String("text/") ) {
+ url.prepend( QStringLiteral("file:") );
}
}
}
diff --git a/searchengine.cpp b/searchengine.cpp
index 4d666a1..339077e 100644
--- a/searchengine.cpp
+++ b/searchengine.cpp
@@ -192,11 +192,11 @@ SearchEngine::~SearchEngine()
bool SearchEngine::initSearchHandlers()
{
- const QStringList resourceDirs = QStandardPaths::locateAll(QStandardPaths::DataLocation, \
"searchhandlers/", QStandardPaths::LocateDirectory ); + const QStringList resourceDirs = \
QStandardPaths::locateAll(QStandardPaths::DataLocation, QStringLiteral("searchhandlers/"), \
QStandardPaths::LocateDirectory ); QStringList resources;
foreach(const QString& dir, resourceDirs) {
QDir d(dir);
- foreach ( const QString& entry, d.entryList( QStringList( "*.desktop" ), QDir::Files ) ) {
+ foreach ( const QString& entry, d.entryList( QStringList( QStringLiteral("*.desktop") ), \
QDir::Files ) ) { resources += dir + entry;
}
}
@@ -245,9 +245,9 @@ bool SearchEngine::search( const QString & words, const QString & method, \
int ma mScope = scope;
// Saner variables to store search parameters:
- mWordList = words.split(' ');
+ mWordList = words.split(QLatin1Char(' '));
mMaxResults = matches;
- if ( method == "or" ) mOperation = Or;
+ if ( method == QLatin1String("or") ) mOperation = Or;
else mOperation = And;
if ( !mView ) {
@@ -256,7 +256,7 @@ bool SearchEngine::search( const QString & words, const QString & method, \
int ma
QString txt = i18n("Search Results for '%1':", words.toHtmlEscaped() );
- mStderr = "<b>" + txt + "</b>\n";
+ mStderr = QStringLiteral("<b>") + txt + QStringLiteral("</b>\n");
if ( mRootTraverser ) {
qCDebug(KHC_LOG) << "SearchEngine::search(): mRootTraverser not null.";
@@ -275,7 +275,7 @@ QString SearchEngine::substituteSearchQuery( const QString &query,
{
QString result = query;
result.replace( QLatin1String("%i"), identifier );
- result.replace( QLatin1String("%w"), words.join( "+" ) );
+ result.replace( QLatin1String("%w"), words.join( QLatin1Char('+') ) );
result.replace( QLatin1String("%m"), QString::number( maxResults ) );
QString o = QLatin1String(operation == Or ? "or" : "and");
result.replace( QLatin1String("%o"), o );
diff --git a/searchengine.h b/searchengine.h
index 5928b56..d5c4b2d 100644
--- a/searchengine.h
+++ b/searchengine.h
@@ -73,7 +73,7 @@ class SearchEngine : public QObject
bool initSearchHandlers();
- bool search( const QString & words, const QString & method = "and", int matches = 5,
+ bool search( const QString & words, const QString & method = QStringLiteral("and"), int \
matches = 5, const QStringList & scope = QStringList() );
GrantleeFormatter *grantleeFormatter() const;
diff --git a/searchhandler.cpp b/searchhandler.cpp
index 6b19e2d..e8af47e 100644
--- a/searchhandler.cpp
+++ b/searchhandler.cpp
@@ -149,9 +149,9 @@ ExternalProcessSearchHandler::ExternalProcessSearchHandler( const \
KConfigGroup & QString ExternalProcessSearchHandler::indexCommand( const QString &identifier ) \
const {
QString cmd = mIndexCommand;
- cmd.replace( "%i", identifier );
- cmd.replace( "%d", Prefs::indexDirectory() );
- cmd.replace( "%l", mLang );
+ cmd.replace( QStringLiteral("%i"), identifier );
+ cmd.replace( QStringLiteral("%d"), Prefs::indexDirectory() );
+ cmd.replace( QStringLiteral("%l"), mLang );
return cmd;
}
@@ -179,7 +179,7 @@ bool ExternalProcessSearchHandler::checkBinary( const QString &cmd ) const
{
QString binary;
- int pos = cmd.indexOf( ' ' );
+ int pos = cmd.indexOf( QLatin1Char(' ') );
if ( pos < 0 ) binary = cmd;
else binary = cmd.left( pos );
diff --git a/searchhandler.h b/searchhandler.h
index 2db098e..4ca3842 100644
--- a/searchhandler.h
+++ b/searchhandler.h
@@ -110,7 +110,7 @@ namespace KHC {
private:
bool checkBinary( const QString &cmd ) const;
- private slots:
+ private Q_SLOTS:
void slotSearchFinished( SearchJob *, DocEntry *, const QString & );
void slotSearchError( SearchJob *, DocEntry *, const QString & );
diff --git a/searchwidget.cpp b/searchwidget.cpp
index daffc26..70e9d99 100644
--- a/searchwidget.cpp
+++ b/searchwidget.cpp
@@ -208,9 +208,9 @@ void SearchWidget::scopeSelectionChanged( int id )
QString SearchWidget::method() const
{
- QString m = "and";
+ QString m = QStringLiteral("and");
if ( mMethodCombo->currentIndex() == 1)
- m = "or";
+ m = QStringLiteral("or");
return m;
}
diff --git a/toc.cpp b/toc.cpp
index 647e179..8c82902 100644
--- a/toc.cpp
+++ b/toc.cpp
@@ -26,9 +26,7 @@
#include <KProcess>
#include <KXmlGuiWindow>
#include <kcoreaddons_version.h>
-#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5, 36, 0)
#include <docbookxslt.h>
-#endif
#include <QStatusBar>
@@ -88,11 +86,7 @@ void TOC::build( const QString &file )
{
QFileInfo fileInfo( file );
QString fileName = fileInfo.absoluteFilePath();
-#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5, 36, 0)
const QStringList resourceDirs = KDocTools::documentationDirs();
-#else
- const QStringList resourceDirs = \
QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", \
QStandardPaths::LocateDirectory);
-#endif
QStringList::ConstIterator it = resourceDirs.begin();
QStringList::ConstIterator end = resourceDirs.end();
for ( ; it != end; ++it ) {
@@ -102,11 +96,11 @@ void TOC::build( const QString &file )
}
}
- QString cacheFile = fileName.replace( '/', "__" );
+ QString cacheFile = fileName.replace( QLatin1Char('/'), QStringLiteral("__") );
#ifdef Q_WS_WIN
- cacheFile = cacheFile.replace( ':', "_" );
+ cacheFile = cacheFile.replace( QLatin1Char(':'), QStringLiteral("_") );
#endif
- m_cacheFile = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/help/" + \
cacheFile ; + m_cacheFile = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) \
+ QStringLiteral("/help/") + cacheFile ; m_sourceFile = file;
if ( cacheStatus() == NeedRebuild )
@@ -155,9 +149,9 @@ void TOC::buildCache()
connect( meinproc, SIGNAL( finished( int, QProcess::ExitStatus) ),
this, SLOT( meinprocExited( int, QProcess::ExitStatus) ) );
- *meinproc << QStandardPaths::findExecutable("meinproc5");
- *meinproc << "--stylesheet" << QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"khelpcenter/table-of-contents.xslt" );
- *meinproc << "--output" << m_cacheFile;
+ *meinproc << QStandardPaths::findExecutable(QStringLiteral("meinproc5"));
+ *meinproc << QStringLiteral("--stylesheet") << \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QStringLiteral("khelpcenter/table-of-contents.xslt") ); + *meinproc << \
QStringLiteral("--output") << m_cacheFile;
*meinproc << m_sourceFile;
meinproc->setOutputChannelMode(KProcess::OnlyStderrChannel);
@@ -233,8 +227,8 @@ void TOC::fillTree()
if ( !doc.setContent( &f ) )
return;
- TOCChapterItem *chapItem = 0;
- QDomNodeList chapters = doc.documentElement().elementsByTagName( "chapter" );
+ TOCChapterItem *chapItem = nullptr;
+ QDomNodeList chapters = doc.documentElement().elementsByTagName( QStringLiteral("chapter") \
);
for ( int chapterCount = 0; chapterCount < chapters.count(); chapterCount++ ) {
QDomElement chapElem = chapters.item( chapterCount ).toElement();
QDomElement chapTitleElem = childElement( chapElem, QLatin1String( "title" ) );
@@ -244,8 +238,8 @@ void TOC::fillTree()
chapItem = new TOCChapterItem( this, m_parentItem, chapItem, chapTitle, chapRef );
- TOCSectionItem *sectItem = 0;
- QDomNodeList sections = chapElem.elementsByTagName( "section" );
+ TOCSectionItem *sectItem = nullptr;
+ QDomNodeList sections = chapElem.elementsByTagName( QStringLiteral("section") );
for ( int sectCount = 0; sectCount < sections.count(); sectCount++ ) {
QDomElement sectElem = sections.item( sectCount ).toElement();
QDomElement sectTitleElem = childElement( sectElem, QLatin1String( "title" ) );
@@ -303,16 +297,16 @@ TOCSectionItem::TOCSectionItem( TOC *toc, TOCChapterItem *parent, \
QTreeWidgetIte : TOCItem( toc, parent, after, title ),
m_name( name )
{
- setIcon( 0, QIcon::fromTheme( "text-plain" ) );
+ setIcon( 0, QIcon::fromTheme( QStringLiteral("text-plain") ) );
entry()->setUrl(url());
}
QString TOCSectionItem::url()
{
if ( static_cast<TOCSectionItem *>( parent()->child(0) ) == this )
- return static_cast<TOCChapterItem *>( parent() )->url() + '#' + m_name;
+ return static_cast<TOCChapterItem *>( parent() )->url() + QLatin1Char('#') + m_name;
- return "help:" + toc()->application() + '/' + m_name + ".html";
+ return QStringLiteral("help:") + toc()->application() + QLatin1Char('/') + m_name + \
QStringLiteral(".html"); }
diff --git a/view.cpp b/view.cpp
index 05fb2be..50de3d8 100644
--- a/view.cpp
+++ b/view.cpp
@@ -46,7 +46,7 @@ View::View( QWidget *parentWidget, QObject *parent, KHTMLPart::GUIProfile \
prof, connect( this, SIGNAL( popupMenu( const QString &, const QPoint& ) ),
this, SLOT( showMenu( const QString &, const QPoint& ) ) );
- QString css = langLookup("kdoctools5-common/kde-default.css");
+ QString css = langLookup(QStringLiteral("kdoctools5-common/kde-default.css"));
if (!css.isEmpty())
{
QFile css_file(css);
@@ -54,7 +54,7 @@ View::View( QWidget *parentWidget, QObject *parent, KHTMLPart::GUIProfile \
prof, {
QTextStream s(&css_file);
QString stylesheet = s.readAll();
- preloadStyleSheet("help:/kdoctools5-common/kde-default.css", stylesheet);
+ preloadStyleSheet(QStringLiteral("help:/kdoctools5-common/kde-default.css"), \
stylesheet); }
}
@@ -126,7 +126,7 @@ QString View::langLookup( const QString &fname )
return *it;
}
- QString file = (*it).left((*it).lastIndexOf('/')) + "/index.docbook";
+ QString file = (*it).left((*it).lastIndexOf(QLatin1Char('/'))) + \
QStringLiteral("/index.docbook"); info.setFile(file);
if (info.exists() && info.isFile() && info.isReadable()) {
return *it;
@@ -146,7 +146,7 @@ void View::beginSearchResult()
mState = Search;
begin( QUrl( QLatin1Literal( "khelpcenter:search/result" ) ) );
- mSearchResult = "";
+ mSearchResult = QString();
}
void View::writeSearchResult( const QString &str )
@@ -200,14 +200,14 @@ void View::showMenu( const QString& url, const QPoint& pos)
if (url.isEmpty())
{
QAction *action;
- action = mActionCollection->action("go_home");
+ action = mActionCollection->action(QStringLiteral("go_home"));
if (action) pop.addAction( action );
pop.addSeparator();
- action = mActionCollection->action("prevPage");
+ action = mActionCollection->action(QStringLiteral("prevPage"));
if (action) pop.addAction( action );
- action = mActionCollection->action("nextPage");
+ action = mActionCollection->action(QStringLiteral("nextPage"));
if (action) pop.addAction( action);
pop.addSeparator();
@@ -302,7 +302,7 @@ bool View::eventFilter( QObject *o, QEvent *e )
case QEvent::WhatsThis: {
QHelpEvent *he = static_cast<QHelpEvent *>( e );
const QString text = i18n( "<p>Read the topic documentation in this window.<br /><br \
/>Press <b>Space</b>/<b>Shift+Space</b> to scroll, <b>%1</b> to find something, \
<b>Tab</b>/<b>Shift+Tab</b> to jump, and <b>Enter</b> to follow.</p>",
- actionCollection()->action( "find" )->shortcut().toString( \
QKeySequence::NativeText ) ); + actionCollection()->action( \
QStringLiteral("find") )->shortcut().toString( QKeySequence::NativeText ) );
QWhatsThis::showText( he->globalPos(), text, qobject_cast<QWidget *>( o ) );
e->accept();
return true;
@@ -329,7 +329,7 @@ QUrl View::urlFromLinkNode( const DOM::HTMLLinkElement &link ) const
if ( !domHrefUrl.isRelative() )
return domHrefUrl;
- return QUrl(baseURL().toString() +'/'+ domHref.string());
+ return QUrl(baseURL().toString() +QLatin1Char('/')+ domHref.string());
}
void View::slotReload( const QUrl &url )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic