From: Frank Reininghaus Date: Thu, 14 Apr 2011 11:27:33 +0000 (+0200) Subject: SVN_SILENT Remove trailing white space. X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c7ef72de5563ae33e9342526cb33d67498de0759 SVN_SILENT Remove trailing white space. --- diff --git a/src/panels/search/searchpanel.cpp b/src/panels/search/searchpanel.cpp index 4fb78c581..38c78aacb 100644 --- a/src/panels/search/searchpanel.cpp +++ b/src/panels/search/searchpanel.cpp @@ -83,7 +83,7 @@ bool SearchPanel::urlChanged() m_startedFromDir = url(); } - if (isVisible() && DolphinSearchInformation::instance().isIndexingEnabled()) { + if (isVisible() && DolphinSearchInformation::instance().isIndexingEnabled()) { const Nepomuk::Query::FileQuery query(m_unfacetedRestQuery && m_facetWidget->queryTerm()); if (query.toSearchUrl() == url()) { // The new URL has been triggered by the SearchPanel itself in diff --git a/src/tests/dolphintreeviewtest.cpp b/src/tests/dolphintreeviewtest.cpp index afcd34d2b..149570d1a 100644 --- a/src/tests/dolphintreeviewtest.cpp +++ b/src/tests/dolphintreeviewtest.cpp @@ -222,7 +222,7 @@ void DolphinTreeViewTest::testKeyboardNavigationSelectionUpdate() { /** * Starting a drag&drop operation should not clear the selection, see - * + * * https://bugs.kde.org/show_bug.cgi?id=158649 */ diff --git a/src/tests/dolphinviewtest_allviewmodes.cpp b/src/tests/dolphinviewtest_allviewmodes.cpp index 79c3ed478..b50d4b5df 100644 --- a/src/tests/dolphinviewtest_allviewmodes.cpp +++ b/src/tests/dolphinviewtest_allviewmodes.cpp @@ -57,7 +57,7 @@ DolphinViewTest_AllViewModes::DolphinViewTest_AllViewModes() { Q_DECLARE_METATYPE(KFileItemList) void DolphinViewTest_AllViewModes::testSelection() { - TestDir dir; + TestDir dir; const int totalItems = 50; for (int i = 0; i < totalItems; i++) { dir.createFile(QString("%1").arg(i)); diff --git a/src/views/dolphincategorydrawer.h b/src/views/dolphincategorydrawer.h index d9849727e..94c9e69ef 100644 --- a/src/views/dolphincategorydrawer.h +++ b/src/views/dolphincategorydrawer.h @@ -44,7 +44,7 @@ public: virtual ~DolphinCategoryDrawer(); bool allCategorySelected(const QString &category) const; - + bool someCategorySelected(const QString &category) const; virtual void drawCategory(const QModelIndex &index, int sortRole, diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index 475769e91..8644f5cc2 100644 --- a/src/views/dolphinremoteencoding.cpp +++ b/src/views/dolphinremoteencoding.cpp @@ -16,13 +16,13 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ - + /* * This code is largely based on the kremoteencodingplugin * Copyright (c) 2003 Thiago Macieira * Distributed under the same terms. */ - + #include "dolphinremoteencoding.h" #include "dolphinviewactionhandler.h" @@ -48,7 +48,7 @@ DolphinRemoteEncoding::DolphinRemoteEncoding(QObject* parent, DolphinViewActionH :QObject(parent), m_actionHandler(actionHandler), m_loaded(false), - m_idDefault(0) + m_idDefault(0) { m_menu = new KActionMenu(KIcon("character-set"), i18n("Select Remote Charset"), this); m_actionHandler->actionCollection()->addAction("change_remote_encoding", m_menu); @@ -86,7 +86,7 @@ void DolphinRemoteEncoding::slotAboutToOpenUrl() // everything whose type is T_FILESYSTEM except for local files if (!m_currentURL.isLocalFile() && KProtocolManager::outputType(m_currentURL) == KProtocolInfo::T_FILESYSTEM) { - + m_menu->setEnabled(true); loadSettings(); } else { @@ -105,7 +105,7 @@ void DolphinRemoteEncoding::fillMenu() KMenu* menu = m_menu->menu(); menu->clear(); - + for (int i = 0; i < m_encodingDescriptions.size();i++) { QAction* action = new QAction(m_encodingDescriptions.at(i), this); action->setCheckable(true); @@ -117,7 +117,7 @@ void DolphinRemoteEncoding::fillMenu() menu->addAction(i18n("Reload"), this, SLOT(slotReload()), 0); menu->addAction(i18n("Default"), this, SLOT(slotDefault()), 0)->setCheckable(true); m_idDefault = m_encodingDescriptions.size() + 2; - + connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(slotItemSelected(QAction*))); } @@ -126,12 +126,12 @@ void DolphinRemoteEncoding::updateMenu() if (!m_loaded) { loadSettings(); } - + // uncheck everything for (int i = 0; i < m_menu->menu()->actions().count(); i++) { m_menu->menu()->actions().at(i)->setChecked(false); } - + QString charset = KIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(), DATA_KEY); @@ -145,7 +145,7 @@ void DolphinRemoteEncoding::updateMenu() break; } } - + kDebug() << "URL=" << m_currentURL << " charset=" << charset; if (!isFound) { @@ -156,7 +156,7 @@ void DolphinRemoteEncoding::updateMenu() } else { m_menu->menu()->actions().at(m_idDefault)->setChecked(true); } - + } void DolphinRemoteEncoding::slotAboutToShow() @@ -171,7 +171,7 @@ void DolphinRemoteEncoding::slotItemSelected(QAction* action) { if (action) { int id = action->data().toInt(); - + KConfig config(("kio_" + m_currentURL.protocol() + "rc").toLatin1()); QString host = m_currentURL.host(); if (m_menu->menu()->actions().at(id)->isChecked()) { diff --git a/src/views/dolphinremoteencoding.h b/src/views/dolphinremoteencoding.h index 559bc66ad..b317cc1df 100644 --- a/src/views/dolphinremoteencoding.h +++ b/src/views/dolphinremoteencoding.h @@ -47,10 +47,10 @@ public Q_SLOTS: void slotItemSelected(QAction* action); void slotReload(); void slotDefault(); - + private Q_SLOTS: void slotAboutToShow(); - + private: void updateView(); void loadSettings(); diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h index c971462ec..214c072cd 100644 --- a/src/views/versioncontrol/versioncontrolobserver.h +++ b/src/views/versioncontrol/versioncontrolobserver.h @@ -56,7 +56,7 @@ public: QList contextMenuActions(const KFileItemList& items) const; QList contextMenuActions(const QString& directory) const; - + signals: /** * Is emitted if an information message with the content \a msg @@ -75,7 +75,7 @@ signals: * should be shown. */ void operationCompletedMessage(const QString& msg); - + private slots: /** * Invokes verifyDirectory() with a small delay. If delayedDirectoryVerification() @@ -90,7 +90,7 @@ private slots: * delayedDirectoryVerification() it and assures that the verification of * the directory is done silently without information messages. */ - void silentDirectoryVerification(); + void silentDirectoryVerification(); void verifyDirectory(); @@ -99,7 +99,7 @@ private slots: * and applys the item states. */ void slotThreadFinished(); - + private: struct ItemState { @@ -132,11 +132,11 @@ private: bool m_versionedDirectory; bool m_silentUpdate; // if true, no messages will be send during the update // of version states - + QAbstractItemView* m_view; KDirLister* m_dirLister; DolphinModel* m_dolphinModel; - + QTimer* m_dirVerificationTimer; KVersionControlPlugin* m_plugin; diff --git a/src/views/viewextensionsfactory.h b/src/views/viewextensionsfactory.h index 1f72edac5..134868bce 100644 --- a/src/views/viewextensionsfactory.h +++ b/src/views/viewextensionsfactory.h @@ -96,7 +96,7 @@ private: KFilePreviewGenerator* m_previewGenerator; SelectionManager* m_selectionManager; DolphinViewAutoScroller* m_autoScroller; - DolphinFileItemDelegate* m_fileItemDelegate; + DolphinFileItemDelegate* m_fileItemDelegate; VersionControlObserver* m_versionControlObserver; FolderExpander* m_folderExpander; }; diff --git a/src/views/zoomlevelinfo.h b/src/views/zoomlevelinfo.h index 60bece5e4..4a26f754b 100644 --- a/src/views/zoomlevelinfo.h +++ b/src/views/zoomlevelinfo.h @@ -30,7 +30,7 @@ class ZoomLevelInfo { public: static int minimumLevel(); static int maximumLevel(); - + /** * Helper method for the view implementation to get * the icon size for the zoom level \a level that @@ -38,7 +38,7 @@ public: * ZoomLevelInfo::maximumLevel(). */ static int iconSizeForZoomLevel(int level); - + /** * Helper method for the view implementation to get * the zoom level for the icon size \a size that