diff options
| author | 2014-11-21 14:34:32 +0000 | |
|---|---|---|
| committer | 2014-11-21 14:34:32 +0000 | |
| commit | 43e0468a233a49b1010f34c5ce888204fa4e9416 (patch) | |
| tree | b1f97b1b9fdfc72677b935d34e26c70fa7030feb /src/modules/help | |
| parent | Trivial typo (diff) | |
| download | KVIrc-43e0468a233a49b1010f34c5ce888204fa4e9416.tar.gz KVIrc-43e0468a233a49b1010f34c5ce888204fa4e9416.tar.bz2 KVIrc-43e0468a233a49b1010f34c5ce888204fa4e9416.zip | |
- massive trailing whitespace cleanup (yes, one of these "you can hate me for that" commits)
- apply patch by d00p: show the correct protocol version instead of just "SSLv3/TLSv1", thanks!
- fix compilation on qt 5.4 on windows
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6398 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/help')
| -rw-r--r-- | src/modules/help/HelpIndex.cpp | 6 | ||||
| -rw-r--r-- | src/modules/help/HelpIndex.h | 2 | ||||
| -rw-r--r-- | src/modules/help/HelpWidget.cpp | 4 | ||||
| -rw-r--r-- | src/modules/help/HelpWindow.cpp | 2 | ||||
| -rw-r--r-- | src/modules/help/HelpWindow.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp index b1dd47e34..95d125cfe 100644 --- a/src/modules/help/HelpIndex.cpp +++ b/src/modules/help/HelpIndex.cpp @@ -196,7 +196,7 @@ QString HelpIndex::getCharsetForDocument(QFile *file) meta = meta.toLower(); QRegExp r(QLatin1String("charset=([^\"\\s]+)")); if (r.indexIn(meta) != -1) { - encoding = r.cap(1); + encoding = r.cap(1); } } @@ -284,13 +284,13 @@ void HelpIndex::writeDocumentList() return; QDataStream s( &f ); s << docList; - + QFile f1( docListFile+".titles" ); if ( !f1.open(QFile::WriteOnly ) ) return; QDataStream s1( &f1 ); s1 << titleList; - + } void HelpIndex::readDict() diff --git a/src/modules/help/HelpIndex.h b/src/modules/help/HelpIndex.h index 6eb1cdf6c..effe15f8e 100644 --- a/src/modules/help/HelpIndex.h +++ b/src/modules/help/HelpIndex.h @@ -96,7 +96,7 @@ public: void setDictionaryFile( const QString& ); void setDocListFile( const QString& ); void setDocList( const QStringList & ); - + const QStringList& documentList() { return docList; }; const QStringList& titlesList() { return titleList; }; diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp index 44be162fe..9db49d8a9 100644 --- a/src/modules/help/HelpWidget.cpp +++ b/src/modules/help/HelpWidget.cpp @@ -76,12 +76,12 @@ HelpWidget::HelpWidget(QWidget * par, bool bIsStandalone) m_pTextBrowser->setStyleSheet("QTextBrowser { background-color:white; color:black; }"); m_pLayout->addWidget(m_pTextBrowser); connect(m_pTextBrowser,SIGNAL(loadFinished(bool)),this,SLOT(slotLoadFinished(bool))); - + // lower toolbar m_pToolBarHighlight = new QToolBar(this); m_pLayout->addWidget(m_pToolBarHighlight); m_pToolBarHighlight->hide(); - + QLabel *pHighlightLabel = new QLabel(); pHighlightLabel->setText(__tr2qs("Highlight: ")); m_pToolBarHighlight->addWidget(pHighlightLabel); diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp index 563b7aa93..0ed1f86fd 100644 --- a/src/modules/help/HelpWindow.cpp +++ b/src/modules/help/HelpWindow.cpp @@ -58,7 +58,7 @@ HelpWindow::HelpWindow(const char * name) m_pHelpWidget = new HelpWidget(m_pSplitter); - m_pToolBar=new KviTalVBox(m_pSplitter); + m_pToolBar=new KviTalVBox(m_pSplitter); m_pTabWidget = new QTabWidget(m_pToolBar); m_pBottomLayout = new KviTalHBox(m_pToolBar); diff --git a/src/modules/help/HelpWindow.h b/src/modules/help/HelpWindow.h index 29e6a3dea..c9817f008 100644 --- a/src/modules/help/HelpWindow.h +++ b/src/modules/help/HelpWindow.h @@ -92,7 +92,7 @@ public slots: void startSearch(); void searchSelected ( QListWidgetItem * ); void refreshIndex(); - + void initialSetup(); void indexingStart( int iNum ); void indexingProgress( int iNum ); |
