SVN_SILENT: removed trailing spaces

svn path=/trunk/KDE/kdebase/apps/; revision=895978

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index 27774cd33f968460b2571bbaabece5c2f159ce73..5918eaf928e2b458c31cd98d2f5e64598494f295 100644 (file)
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.cpp
@@ -49,16 +49,16 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
 
     setSpacing(spacing);
     setMargin(margin);
 
     setSpacing(spacing);
     setMargin(margin);

-    
+

     // Create "Icon" properties
     m_iconSizeGroupBox = new IconSizeGroupBox(this);
     m_iconSizeGroupBox->setSizePolicy(sizePolicy);
     // Create "Icon" properties
     m_iconSizeGroupBox = new IconSizeGroupBox(this);
     m_iconSizeGroupBox->setSizePolicy(sizePolicy);

-    
+

     const int min = ZoomLevelInfo::minimumLevel();
     const int max = ZoomLevelInfo::maximumLevel();
     m_iconSizeGroupBox->setDefaultSizeRange(min, max);
     m_iconSizeGroupBox->setPreviewSizeRange(min, max);
     const int min = ZoomLevelInfo::minimumLevel();
     const int max = ZoomLevelInfo::maximumLevel();
     m_iconSizeGroupBox->setDefaultSizeRange(min, max);
     m_iconSizeGroupBox->setPreviewSizeRange(min, max);

-    
+

     connect(m_iconSizeGroupBox, SIGNAL(defaultSizeChanged(int)),
             this, SIGNAL(changed()));
     connect(m_iconSizeGroupBox, SIGNAL(previewSizeChanged(int)),
     connect(m_iconSizeGroupBox, SIGNAL(defaultSizeChanged(int)),
             this, SIGNAL(changed()));
     connect(m_iconSizeGroupBox, SIGNAL(previewSizeChanged(int)),


@@ -132,7 +132,7 @@ void ColumnViewSettingsPage::loadSettings()
     const QSize iconSize(settings->iconSize(), settings->iconSize());
     const int iconSizeValue = ZoomLevelInfo::zoomLevelForIconSize(iconSize);
     m_iconSizeGroupBox->setDefaultSizeValue(iconSizeValue);
     const QSize iconSize(settings->iconSize(), settings->iconSize());
     const int iconSizeValue = ZoomLevelInfo::zoomLevelForIconSize(iconSize);
     m_iconSizeGroupBox->setDefaultSizeValue(iconSizeValue);

-    
+

     const QSize previewSize(settings->previewSize(), settings->previewSize());
     const int previewSizeValue = ZoomLevelInfo::zoomLevelForIconSize(previewSize);
     m_iconSizeGroupBox->setPreviewSizeValue(previewSizeValue);
     const QSize previewSize(settings->previewSize(), settings->previewSize());
     const int previewSizeValue = ZoomLevelInfo::zoomLevelForIconSize(previewSize);
     m_iconSizeGroupBox->setPreviewSizeValue(previewSizeValue);

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index 8d67287c79868665f5039f9d490cbe25c5677f48..4a439ab1d7c1d610cf783f684d1355b68ab98bd4 100644 (file)
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -53,12 +53,12 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget* parent) :
     // Create "Icon" properties
     m_iconSizeGroupBox = new IconSizeGroupBox(this);
     m_iconSizeGroupBox->setSizePolicy(sizePolicy);
     // Create "Icon" properties
     m_iconSizeGroupBox = new IconSizeGroupBox(this);
     m_iconSizeGroupBox->setSizePolicy(sizePolicy);

-    
+

     const int min = ZoomLevelInfo::minimumLevel();
     const int max = ZoomLevelInfo::maximumLevel();
     m_iconSizeGroupBox->setDefaultSizeRange(min, max);
     m_iconSizeGroupBox->setPreviewSizeRange(min, max);
     const int min = ZoomLevelInfo::minimumLevel();
     const int max = ZoomLevelInfo::maximumLevel();
     m_iconSizeGroupBox->setDefaultSizeRange(min, max);
     m_iconSizeGroupBox->setPreviewSizeRange(min, max);

-    
+

     connect(m_iconSizeGroupBox, SIGNAL(defaultSizeChanged(int)),
             this, SIGNAL(changed()));
     connect(m_iconSizeGroupBox, SIGNAL(previewSizeChanged(int)),
     connect(m_iconSizeGroupBox, SIGNAL(defaultSizeChanged(int)),
             this, SIGNAL(changed()));
     connect(m_iconSizeGroupBox, SIGNAL(previewSizeChanged(int)),


@@ -67,7 +67,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget* parent) :
     // create "Text" properties
     QWidget* textGroup = new QGroupBox(i18nc("@title:group", "Text"), this);
     textGroup->setSizePolicy(sizePolicy);
     // create "Text" properties
     QWidget* textGroup = new QGroupBox(i18nc("@title:group", "Text"), this);
     textGroup->setSizePolicy(sizePolicy);

-    
+

     QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textGroup);
     m_fontRequester = new DolphinFontRequester(textGroup);
     connect(m_fontRequester, SIGNAL(changed()), this, SIGNAL(changed()));
     QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textGroup);
     m_fontRequester = new DolphinFontRequester(textGroup);
     connect(m_fontRequester, SIGNAL(changed()), this, SIGNAL(changed()));


@@ -75,7 +75,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget* parent) :
     QHBoxLayout* textLayout = new QHBoxLayout(textGroup);
     textLayout->addWidget(fontLabel, 0, Qt::AlignRight);
     textLayout->addWidget(m_fontRequester);
     QHBoxLayout* textLayout = new QHBoxLayout(textGroup);
     textLayout->addWidget(fontLabel, 0, Qt::AlignRight);
     textLayout->addWidget(m_fontRequester);

-    
+

     // create "Expandable Folders" checkbox
     m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable folders"), this);
     connect(m_expandableFolders, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
     // create "Expandable Folders" checkbox
     m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable folders"), this);
     connect(m_expandableFolders, SIGNAL(toggled(bool)), this, SIGNAL(changed()));


@@ -125,11 +125,11 @@ void DetailsViewSettingsPage::loadSettings()
     const QSize iconSize(settings->iconSize(), settings->iconSize());
     const int iconSizeValue = ZoomLevelInfo::zoomLevelForIconSize(iconSize);
     m_iconSizeGroupBox->setDefaultSizeValue(iconSizeValue);
     const QSize iconSize(settings->iconSize(), settings->iconSize());
     const int iconSizeValue = ZoomLevelInfo::zoomLevelForIconSize(iconSize);
     m_iconSizeGroupBox->setDefaultSizeValue(iconSizeValue);

-    
+

     const QSize previewSize(settings->previewSize(), settings->previewSize());
     const int previewSizeValue = ZoomLevelInfo::zoomLevelForIconSize(previewSize);
     m_iconSizeGroupBox->setPreviewSizeValue(previewSizeValue);
     const QSize previewSize(settings->previewSize(), settings->previewSize());
     const int previewSizeValue = ZoomLevelInfo::zoomLevelForIconSize(previewSize);
     m_iconSizeGroupBox->setPreviewSizeValue(previewSizeValue);

-    
+

     if (settings->useSystemFont()) {
         m_fontRequester->setMode(DolphinFontRequester::SystemFont);
     } else {
     if (settings->useSystemFont()) {
         m_fontRequester->setMode(DolphinFontRequester::SystemFont);
     } else {

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index c5c1969e55961d9ae04a92c543f926ec707c9245..d9dc0728ef2feb893cd22b97b9e89dee4702cd5d 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -70,7 +70,6 @@ void DolphinApplication::refreshMainWindows()
     }
 }
 
     }
 }
 

-

 int DolphinApplication::newInstance()
 {
     KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());
 int DolphinApplication::newInstance()
 {
     KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 24d61872004f31d5376611fb01f4066d44990407..05c33d7dd1339b3c8d02ed83b02491901a20a84f 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -376,14 +376,14 @@ void DolphinColumnView::setZoomLevel(int level)
 {
     const int size = ZoomLevelInfo::iconSizeForZoomLevel(level);
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 {
     const int size = ZoomLevelInfo::iconSizeForZoomLevel(level);
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();

-    
+

     const bool showPreview = m_controller->dolphinView()->showPreview();
     if (showPreview) {
         settings->setPreviewSize(size);
     } else {
         settings->setIconSize(size);
     }
     const bool showPreview = m_controller->dolphinView()->showPreview();
     if (showPreview) {
         settings->setPreviewSize(size);
     } else {
         settings->setIconSize(size);
     }

-    
+

     updateDecorationSize(showPreview);
 }
 
     updateDecorationSize(showPreview);
 }
 


@@ -596,7 +596,7 @@ void DolphinColumnView::deleteColumn(DolphinColumnWidget* column)
         }
         column->disconnect();
         column->deleteLater();
         }
         column->disconnect();
         column->deleteLater();

-    }   
+    }

 }
 
 #include "dolphincolumnview.moc"
 }
 
 #include "dolphincolumnview.moc"

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index c552d70e120da56d1208fcc0e1d8826f2d48eb16..804ef8a325b2800f0369c371bfa97bc1c2bb92cf 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -77,7 +77,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
 
     setVerticalScrollMode(QListView::ScrollPerPixel);
     setHorizontalScrollMode(QListView::ScrollPerPixel);
 
     setVerticalScrollMode(QListView::ScrollPerPixel);
     setHorizontalScrollMode(QListView::ScrollPerPixel);

-    
+

     new DolphinViewAutoScroller(this);
 
     // apply the column mode settings to the widget
     new DolphinViewAutoScroller(this);
 
     // apply the column mode settings to the widget


@@ -146,7 +146,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
 
     connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
             this, SLOT(updateFont()));
 
     connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
             this, SLOT(updateFont()));

-     
+

     FolderExpander* folderExpander = new FolderExpander(this, m_proxyModel);
     folderExpander->setEnabled(DolphinSettings::instance().generalSettings()->autoExpandFolders());
     connect (folderExpander, SIGNAL(enterDir(const QModelIndex&)),
     FolderExpander* folderExpander = new FolderExpander(this, m_proxyModel);
     folderExpander->setEnabled(DolphinSettings::instance().generalSettings()->autoExpandFolders());
     connect (folderExpander, SIGNAL(enterDir(const QModelIndex&)),


@@ -421,7 +421,7 @@ void DolphinColumnWidget::wheelEvent(QWheelEvent* event)
         event->ignore();
         return;
     }
         event->ignore();
         return;
     }

-    
+

     const int height = m_decorationSize.height();
     const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2;
     verticalScrollBar()->setSingleStep(step);
     const int height = m_decorationSize.height();
     const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2;
     verticalScrollBar()->setSingleStep(step);

diff --git a/src/dolphincolumnwidget.h b/src/dolphincolumnwidget.h
index b3cd741fc0c87de2b4d5b3e3d59a2ecc15ea0e60..825de4ff184033115e1be226765b7c2ccfd08436 100644 (file)
--- a/src/dolphincolumnwidget.h
+++ b/src/dolphincolumnwidget.h
@@ -111,7 +111,7 @@ public:
     KFileItem itemAt(const QPoint& pos) const;
 
     KFileItemList selectedItems() const;
     KFileItem itemAt(const QPoint& pos) const;
 
     KFileItemList selectedItems() const;

-    
+

     /**
      * Returns the MIME data for the selected items.
      */
     /**
      * Returns the MIME data for the selected items.
      */

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 107c2b24ac9db54f39764b5b1bb6c2703f03d5b4..455b978ebacdccc2c599bd297e371f1be5f34140 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -179,13 +179,13 @@ void DolphinContextMenu::openItemContextMenu()
         newMenu->slotCheckUpToDate();
         newMenu->setPopupFiles(m_fileInfo.url());
         newMenu->setEnabled(capabilities().supportsWriting());
         newMenu->slotCheckUpToDate();
         newMenu->setPopupFiles(m_fileInfo.url());
         newMenu->setEnabled(capabilities().supportsWriting());

-        
+

         KMenu* menu = newMenu->menu();
         menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
         menu->setIcon(KIcon("document-new"));
         popup->addMenu(newMenu->menu());
         popup->addSeparator();
         KMenu* menu = newMenu->menu();
         menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
         menu->setIcon(KIcon("document-new"));
         popup->addMenu(newMenu->menu());
         popup->addSeparator();

-    
+

         // insert 'Open in new window' and 'Open in new tab' entries
         popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
         popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
         // insert 'Open in new window' and 'Open in new tab' entries
         popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
         popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));


@@ -283,7 +283,7 @@ void DolphinContextMenu::openViewportContextMenu()
     QAction* action = popup->exec(QCursor::pos());
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
     QAction* action = popup->exec(QCursor::pos());
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();

-                
+

         KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
         KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();


@@ -322,7 +322,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
     KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
     KConfigGroup configGroup(globalConfig, "KDE");
     bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
     KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
     KConfigGroup configGroup(globalConfig, "KDE");
     bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);

-    
+

     const KUrl& url = m_mainWindow->activeViewContainer()->url();
     if (url.isLocalFile()) {
         QAction* moveToTrashAction = collection->action("move_to_trash");
     const KUrl& url = m_mainWindow->activeViewContainer()->url();
     if (url.isLocalFile()) {
         QAction* moveToTrashAction = collection->action("move_to_trash");

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index ffa245f4ec4f8ddcd2361050e5ea36f1a8097dc9..2f267560a4a203b895b55b7a2cac14a97d24229c 100644 (file)
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -59,7 +59,7 @@ void DolphinController::setItemView(QAbstractItemView* view)
 
     if (m_itemView != 0) {
         m_zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_itemView->iconSize());
 
     if (m_itemView != 0) {
         m_zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_itemView->iconSize());

-        
+

         // TODO: this is a workaround until  Qt-issue 176832 has been fixed
         connect(m_itemView, SIGNAL(pressed(const QModelIndex&)),
                 this, SLOT(updateMouseButtonState()));
         // TODO: this is a workaround until  Qt-issue 176832 has been fixed
         connect(m_itemView, SIGNAL(pressed(const QModelIndex&)),
                 this, SLOT(updateMouseButtonState()));

diff --git a/src/dolphincontroller.h b/src/dolphincontroller.h
index 1ad12ecb5cb59cb27a733a5a6e53a25ed8633230..542f21b3b3b4bcfaf6026ccd6993664ddaf131a6 100644 (file)
--- a/src/dolphincontroller.h
+++ b/src/dolphincontroller.h
@@ -179,14 +179,14 @@ public:
 
     /**
      * Sets the zoom level to \a level and emits the signal zoomLevelChanged().
 
     /**
      * Sets the zoom level to \a level and emits the signal zoomLevelChanged().

-     * It must be assured that the used level is inside the range 
+     * It must be assured that the used level is inside the range

      * DolphinController::zoomLevelMinimum() and
      * DolphinController::zoomLevelMaximum().
      * Is invoked by the abstract Dolphin view.
      */
     void setZoomLevel(int level);
     int zoomLevel() const;
      * DolphinController::zoomLevelMinimum() and
      * DolphinController::zoomLevelMaximum().
      * Is invoked by the abstract Dolphin view.
      */
     void setZoomLevel(int level);
     int zoomLevel() const;

-    
+

     /**
      * Tells the view implementation to zoom out by emitting the signal zoomOut()
      * and is invoked by the abstract Dolphin view.
     /**
      * Tells the view implementation to zoom out by emitting the signal zoomOut()
      * and is invoked by the abstract Dolphin view.


@@ -206,7 +206,7 @@ public:
      * nothing will be done.
      */
     void replaceUrlByClipboard();
      * nothing will be done.
      */
     void replaceUrlByClipboard();

-    
+

     /** Emits the signal hideToolTip(). */
     void emitHideToolTip();
 
     /** Emits the signal hideToolTip(). */
     void emitHideToolTip();
 


@@ -224,7 +224,7 @@ public slots:
      * user has triggered an item.
      */
     void triggerItem(const QModelIndex& index);
      * user has triggered an item.
      */
     void triggerItem(const QModelIndex& index);

-    
+

     /**
      * Emits the signal tabRequested(), if the file item for the index \a index
      * represents a directory and when the middle mouse button has been pressed.
     /**
      * Emits the signal tabRequested(), if the file item for the index \a index
      * represents a directory and when the middle mouse button has been pressed.


@@ -348,7 +348,7 @@ signals:
      * must connect to this signal if it supports zooming.
      */
     void zoomLevelChanged(int level);
      * must connect to this signal if it supports zooming.
      */
     void zoomLevelChanged(int level);

-    
+

     /**
      * Is emitted if the abstract view should hide an open tooltip.
      */
     /**
      * Is emitted if the abstract view should hide an open tooltip.
      */

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index c81ec089c9d7d87335d44a42b5aa9b0cc2c497ab..f4b8cd162855c34767dc873ea686ffd8274ccdc7 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -138,7 +138,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
 
     setVerticalScrollMode(QTreeView::ScrollPerPixel);
     setHorizontalScrollMode(QTreeView::ScrollPerPixel);
 
     setVerticalScrollMode(QTreeView::ScrollPerPixel);
     setHorizontalScrollMode(QTreeView::ScrollPerPixel);

-    
+

     const DolphinView* view = controller->dolphinView();
     connect(view, SIGNAL(showPreviewChanged()),
             this, SLOT(slotShowPreviewChanged()));
     const DolphinView* view = controller->dolphinView();
     connect(view, SIGNAL(showPreviewChanged()),
             this, SLOT(slotShowPreviewChanged()));


@@ -150,7 +150,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
 
     connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
             this, SLOT(updateFont()));
 
     connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
             this, SLOT(updateFont()));

-            
+

     m_useDefaultIndexAt = false;
 }
 
     m_useDefaultIndexAt = false;
 }
 


@@ -242,7 +242,7 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
             m_band.destination = m_band.origin;
             m_band.originalSelection = selectionModel()->selection();
         }
             m_band.destination = m_band.origin;
             m_band.originalSelection = selectionModel()->selection();
         }

-    } 
+    }

 }
 
 void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
 }
 
 void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)


@@ -414,7 +414,7 @@ void DolphinDetailsView::wheelEvent(QWheelEvent* event)
         event->ignore();
         return;
     }
         event->ignore();
         return;
     }

-    
+

     const int height = m_decorationSize.height();
     const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2;
     verticalScrollBar()->setSingleStep(step);
     const int height = m_decorationSize.height();
     const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2;
     verticalScrollBar()->setSingleStep(step);


@@ -509,7 +509,7 @@ void DolphinDetailsView::slotEntered(const QModelIndex& index)
 void DolphinDetailsView::updateElasticBand()
 {
     if (m_band.show) {
 void DolphinDetailsView::updateElasticBand()
 {
     if (m_band.show) {

-        QRect dirtyRegion(elasticBandRect());        
+        QRect dirtyRegion(elasticBandRect());

         const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
         m_band.destination = viewport()->mapFromGlobal(QCursor::pos()) + scrollPos;
         // Going above the (logical) top-left of the view causes complications during selection;
         const QPoint scrollPos(horizontalScrollBar()->value(), verticalScrollBar()->value());
         m_band.destination = viewport()->mapFromGlobal(QCursor::pos()) + scrollPos;
         // Going above the (logical) top-left of the view causes complications during selection;


@@ -518,7 +518,7 @@ void DolphinDetailsView::updateElasticBand()
             m_band.destination.setY(0);
         if (m_band.destination.x() < 0)
             m_band.destination.setX(0);
             m_band.destination.setY(0);
         if (m_band.destination.x() < 0)
             m_band.destination.setX(0);

-            
+

         dirtyRegion = dirtyRegion.united(elasticBandRect());
         setDirtyRegion(dirtyRegion);
     }
         dirtyRegion = dirtyRegion.united(elasticBandRect());
         setDirtyRegion(dirtyRegion);
     }


@@ -538,14 +538,14 @@ void DolphinDetailsView::setZoomLevel(int level)
 {
     const int size = ZoomLevelInfo::iconSizeForZoomLevel(level);
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
 {
     const int size = ZoomLevelInfo::iconSizeForZoomLevel(level);
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();

-    
+

     const bool showPreview = m_controller->dolphinView()->showPreview();
     if (showPreview) {
         settings->setPreviewSize(size);
     } else {
         settings->setIconSize(size);
     }
     const bool showPreview = m_controller->dolphinView()->showPreview();
     if (showPreview) {
         settings->setPreviewSize(size);
     } else {
         settings->setIconSize(size);
     }

-    
+

     updateDecorationSize(showPreview);
 }
 
     updateDecorationSize(showPreview);
 }
 


@@ -677,7 +677,7 @@ void DolphinDetailsView::updateElasticBandSelection()
         // Do some quick checks to see if we can rule out the need to
         // update the selection.
         Q_ASSERT(uniformRowHeights());
         // Do some quick checks to see if we can rule out the need to
         // update the selection.
         Q_ASSERT(uniformRowHeights());

-        QModelIndex dummyIndex = model()->index(0, 0);        
+        QModelIndex dummyIndex = model()->index(0, 0);

         if (!dummyIndex.isValid()) {
             // No items in the model presumably.
             return;
         if (!dummyIndex.isValid()) {
             // No items in the model presumably.
             return;


@@ -690,12 +690,12 @@ void DolphinDetailsView::updateElasticBandSelection()
             (selRect.top()    / rowHeight == oldSelRect.top()    / rowHeight) &&
             (selRect.bottom() / rowHeight == oldSelRect.bottom() / rowHeight);
         if (coveringSameRows) {
             (selRect.top()    / rowHeight == oldSelRect.top()    / rowHeight) &&
             (selRect.bottom() / rowHeight == oldSelRect.bottom() / rowHeight);
         if (coveringSameRows) {

-            // Covering the same rows, but have we moved far enough horizontally 
+            // Covering the same rows, but have we moved far enough horizontally

             // that we might have (de)selected some other items?
             const bool itemSelectionChanged =
                 ((selRect.left() > oldSelRect.left()) &&
                  (selRect.left() > m_band.insideNearestLeftEdge)) ||
             // that we might have (de)selected some other items?
             const bool itemSelectionChanged =
                 ((selRect.left() > oldSelRect.left()) &&
                  (selRect.left() > m_band.insideNearestLeftEdge)) ||

-                ((selRect.left() < oldSelRect.left()) &&                
+                ((selRect.left() < oldSelRect.left()) &&

                  (selRect.left() <= m_band.outsideNearestLeftEdge)) ||
                 ((selRect.right() < oldSelRect.right()) &&
                  (selRect.left() >= m_band.insideNearestRightEdge)) ||
                  (selRect.left() <= m_band.outsideNearestLeftEdge)) ||
                 ((selRect.right() < oldSelRect.right()) &&
                  (selRect.left() >= m_band.insideNearestRightEdge)) ||


@@ -744,16 +744,16 @@ void DolphinDetailsView::updateElasticBandSelection()
 
    // Go through all indexes between the top and bottom of boundingRect, and
    // update the selection.
 
    // Go through all indexes between the top and bottom of boundingRect, and
    // update the selection.

-   const int verticalCutoff = boundingRect.bottom();   
+   const int verticalCutoff = boundingRect.bottom();

    QModelIndex currIndex = startIndex;
    QModelIndex lastIndex;
    bool allItemsInBoundDone = false;
 
    QModelIndex currIndex = startIndex;
    QModelIndex lastIndex;
    bool allItemsInBoundDone = false;
 

-   // Calling selectionModel()->select(...) for each item that needs to be 
+   // Calling selectionModel()->select(...) for each item that needs to be

    // toggled is slow as each call emits selectionChanged(...) so store them
    // and do the selection toggle in one batch.
    QItemSelection itemsToToggle;
    // toggled is slow as each call emits selectionChanged(...) so store them
    // and do the selection toggle in one batch.
    QItemSelection itemsToToggle;

-   // QItemSelection's deal with continuous ranges of indexes better than 
+   // QItemSelection's deal with continuous ranges of indexes better than

    // single indexes, so try to portion items that need to be toggled into ranges.
    bool formingToggleIndexRange = false;
    QModelIndex toggleIndexRangeBegin = QModelIndex();
    // single indexes, so try to portion items that need to be toggled into ranges.
    bool formingToggleIndexRange = false;
    QModelIndex toggleIndexRangeBegin = QModelIndex();


@@ -766,7 +766,7 @@ void DolphinDetailsView::updateElasticBandSelection()
        const int cl = currIndexRect.left();
        const int sl = selRect.left();
        const int sr = selRect.right();
        const int cl = currIndexRect.left();
        const int sl = selRect.left();
        const int sr = selRect.right();

-       // "The right edge of the name is outside of the rect but nearer than m_outsideNearestLeft", etc      
+       // "The right edge of the name is outside of the rect but nearer than m_outsideNearestLeft", etc

        if ((cr < sl && cr > m_band.outsideNearestLeftEdge)) {
            m_band.outsideNearestLeftEdge = cr;
        }
        if ((cr < sl && cr > m_band.outsideNearestLeftEdge)) {
            m_band.outsideNearestLeftEdge = cr;
        }


@@ -802,7 +802,7 @@ void DolphinDetailsView::updateElasticBandSelection()
            formingToggleIndexRange = false;
             // If this is the last item in the bounds and it is also the beginning of a range,
             // don't toggle lastIndex - it will already have been dealt with.
            formingToggleIndexRange = false;
             // If this is the last item in the bounds and it is also the beginning of a range,
             // don't toggle lastIndex - it will already have been dealt with.

-           if (!allItemsInBoundDone || toggleIndexRangeBegin != currIndex) { 
+           if (!allItemsInBoundDone || toggleIndexRangeBegin != currIndex) {

                itemsToToggle.select(toggleIndexRangeBegin, lastIndex);
            }
             // Need to start a new range immediately with currIndex?
                itemsToToggle.select(toggleIndexRangeBegin, lastIndex);
            }
             // Need to start a new range immediately with currIndex?

diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h
index 0f99db5195bc3c9410da992cf468b1f4cffc0e3f..1c7e0e9cafb53073be4d2adb9ac30c009c8a5c7c 100644 (file)
--- a/src/dolphindetailsview.h
+++ b/src/dolphindetailsview.h
@@ -111,7 +111,7 @@ private slots:
     QRect elasticBandRect() const;
 
     void setZoomLevel(int level);
     QRect elasticBandRect() const;
 
     void setZoomLevel(int level);

-    
+

     void slotShowPreviewChanged();
 
     /**
     void slotShowPreviewChanged();
 
     /**


@@ -127,7 +127,7 @@ private slots:
      * with the mouse.
      */
     void slotHeaderSectionResized(int logicalIndex, int oldSize, int newSize);
      * with the mouse.
      */
     void slotHeaderSectionResized(int logicalIndex, int oldSize, int newSize);

-    
+

     /**
      * Changes the alternating row colors setting depending from
      * the activation state \a active.
     /**
      * Changes the alternating row colors setting depending from
      * the activation state \a active.


@@ -145,8 +145,8 @@ private slots:
     void updateFont();
 
     /**
     void updateFont();
 
     /**

-     * If the elastic band is currently shown, update the elastic band based on 
-     * the current mouse position and ensure that the selection is the set of items 
+     * If the elastic band is currently shown, update the elastic band based on
+     * the current mouse position and ensure that the selection is the set of items

      * intersecting it.
      */
     void updateElasticBandSelection();
      * intersecting it.
      */
     void updateElasticBandSelection();


@@ -190,7 +190,7 @@ private:
     struct ElasticBand
     {
         ElasticBand();
     struct ElasticBand
     {
         ElasticBand();

-        
+

         // Elastic band origin and destination coordinates are relative to t
         // he origin of the view, not the viewport.
         bool show;
         // Elastic band origin and destination coordinates are relative to t
         // he origin of the view, not the viewport.
         bool show;


@@ -202,10 +202,10 @@ private:
         // on the last elastic band shape.
         QPoint lastSelectionOrigin;
         QPoint lastSelectionDestination;
         // on the last elastic band shape.
         QPoint lastSelectionOrigin;
         QPoint lastSelectionDestination;

-        
+

         // If true, compute the set of selected elements from scratch (slower)
         bool ignoreOldInfo;
         // If true, compute the set of selected elements from scratch (slower)
         bool ignoreOldInfo;

-        
+

         // Edges of the filenames that are closest to the edges of oldSelectionRect.
         // Used to decide whether horizontal changes in the elastic band are likely
         // to require us to re-check which items are selected.
         // Edges of the filenames that are closest to the edges of oldSelectionRect.
         // Used to decide whether horizontal changes in the elastic band are likely
         // to require us to re-check which items are selected.

diff --git a/src/dolphinfileitemdelegate.cpp b/src/dolphinfileitemdelegate.cpp
index 9889feef8ef32d1e93cc7838bc5191d9235c40ed..a66e051ba27a9031bd7adc62cb83b53964d932e0 100644 (file)
--- a/src/dolphinfileitemdelegate.cpp
+++ b/src/dolphinfileitemdelegate.cpp
@@ -42,7 +42,7 @@ void DolphinFileItemDelegate::paint(QPainter* painter,
 {
     if (m_hasMinimizedNameColumn && (index.column() == KDirModel::Name)) {
         QStyleOptionViewItemV4 opt(option);
 {
     if (m_hasMinimizedNameColumn && (index.column() == KDirModel::Name)) {
         QStyleOptionViewItemV4 opt(option);

-        
+

         const QAbstractProxyModel* proxyModel = static_cast<const QAbstractProxyModel*>(index.model());
         const KDirModel* dirModel = static_cast<const KDirModel*>(proxyModel->sourceModel());
         const QModelIndex dirIndex = proxyModel->mapToSource(index);
         const QAbstractProxyModel* proxyModel = static_cast<const QAbstractProxyModel*>(index.model());
         const KDirModel* dirModel = static_cast<const KDirModel*>(proxyModel->sourceModel());
         const QModelIndex dirIndex = proxyModel->mapToSource(index);


@@ -61,7 +61,7 @@ int DolphinFileItemDelegate::nameColumnWidth(const QString& name, const QStyleOp
 {
     QFontMetrics fontMetrics(option.font);
     int width = option.decorationSize.width() + fontMetrics.width(name) + 16;
 {
     QFontMetrics fontMetrics(option.font);
     int width = option.decorationSize.width() + fontMetrics.width(name) + 16;

-    
+

     const int defaultWidth = option.rect.width();
     if ((defaultWidth > 0) && (defaultWidth < width)) {
         width = defaultWidth;
     const int defaultWidth = option.rect.width();
     if ((defaultWidth > 0) && (defaultWidth < width)) {
         width = defaultWidth;

diff --git a/src/dolphinfileitemdelegate.h b/src/dolphinfileitemdelegate.h
index 589ba7178b9be74a3f3be871b18ed035fe4ea3fb..cdc28013a244d421d4b0df878f4fba60ca823135 100644 (file)
--- a/src/dolphinfileitemdelegate.h
+++ b/src/dolphinfileitemdelegate.h
@@ -46,17 +46,17 @@ public:
      */
     void setMinimizedNameColumn(bool minimized);
     bool hasMinimizedNameColumn() const;
      */
     void setMinimizedNameColumn(bool minimized);
     bool hasMinimizedNameColumn() const;

-    
+

     virtual void paint(QPainter* painter,
                        const QStyleOptionViewItem& option,
                        const QModelIndex& index) const;
     virtual void paint(QPainter* painter,
                        const QStyleOptionViewItem& option,
                        const QModelIndex& index) const;

-                       
+

     /**
      * Returns the minimized width of the name column for the name \a name. This method
      * is also used in DolphinDetailsView to handle the selection of items correctly.
      */
     static int nameColumnWidth(const QString& name, const QStyleOptionViewItem& option);
     /**
      * Returns the minimized width of the name column for the name \a name. This method
      * is also used in DolphinDetailsView to handle the selection of items correctly.
      */
     static int nameColumnWidth(const QString& name, const QStyleOptionViewItem& option);

-    
+

 private:
     bool m_hasMinimizedNameColumn;
 };
 private:
     bool m_hasMinimizedNameColumn;
 };

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index b95de351a8c6abf6812ac375d0651bc7508bf60a..e1ae04adfeb0e8db4975281a04ffbdecc537833f 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -277,10 +277,10 @@ void DolphinIconsView::wheelEvent(QWheelEvent* event)
         event->ignore();
         return;
     }
         event->ignore();
         return;
     }

-    
+

     horizontalScrollBar()->setSingleStep(m_itemSize.width() / 10);
     verticalScrollBar()->setSingleStep(m_itemSize.height() / 10);
     horizontalScrollBar()->setSingleStep(m_itemSize.width() / 10);
     verticalScrollBar()->setSingleStep(m_itemSize.height() / 10);

-    
+

     KCategorizedView::wheelEvent(event);
     // if the icons are aligned left to right, the vertical wheel event should
     // be applied to the horizontal scrollbar
     KCategorizedView::wheelEvent(event);
     // if the icons are aligned left to right, the vertical wheel event should
     // be applied to the horizontal scrollbar

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index ebb11ba5b5a06e6e0eb9864a8c6d01076553b81b..23bec1173486e8f54683cdea49b5cca5f534ae4c 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -207,7 +207,7 @@ void DolphinMainWindow::changeUrl(const KUrl& url)
         // shown due to DolphinViewContainer::restoreView().
         return;
     }
         // shown due to DolphinViewContainer::restoreView().
         return;
     }

-    
+

     DolphinViewContainer* view = activeViewContainer();
     if (view != 0) {
         view->setUrl(url);
     DolphinViewContainer* view = activeViewContainer();
     if (view != 0) {
         view->setUrl(url);


@@ -297,7 +297,7 @@ void DolphinMainWindow::openNewTab()
 {
     openNewTab(m_activeViewContainer->url());
     m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
 {
     openNewTab(m_activeViewContainer->url());
     m_tabBar->setCurrentIndex(m_viewTab.count() - 1);

-    
+

     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
     if (navigator->isUrlEditable()) {
         // if a new tab is opened and the URL is editable, assure that
     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
     if (navigator->isUrlEditable()) {
         // if a new tab is opened and the URL is editable, assure that


@@ -1093,7 +1093,7 @@ void DolphinMainWindow::setupActions()
     openInNewTab->setText(i18nc("@action:inmenu", "Open in New Tab"));
     openInNewTab->setIcon(KIcon("tab-new"));
     connect(openInNewTab, SIGNAL(triggered()), this, SLOT(openInNewTab()));
     openInNewTab->setText(i18nc("@action:inmenu", "Open in New Tab"));
     openInNewTab->setIcon(KIcon("tab-new"));
     connect(openInNewTab, SIGNAL(triggered()), this, SLOT(openInNewTab()));

-    
+

     KAction* openInNewWindow = actionCollection()->addAction("open_in_new_window");
     openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window"));
     openInNewWindow->setIcon(KIcon("window-new"));
     KAction* openInNewWindow = actionCollection()->addAction("open_in_new_window");
     openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window"));
     openInNewWindow->setIcon(KIcon("window-new"));

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 46408369623c2919fc8bf62811fa30bc26599d8c..e09b005087ac2524e8b5e298bbf1798fc877653a 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -352,9 +352,9 @@ private slots:
      * view is replaced by \a url.
      */
     void handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons);
      * view is replaced by \a url.
      */
     void handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons);

-    
+

     /**
     /**

-     * Is connected to the KTabBar signal testCanDecode() and adjusts 
+     * Is connected to the KTabBar signal testCanDecode() and adjusts

      * the output parameter \a accept.
      */
     void slotTestCanDecode(const QDragMoveEvent* event, bool& accept);
      * the output parameter \a accept.
      */
     void slotTestCanDecode(const QDragMoveEvent* event, bool& accept);

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index 821c2998d4814dc7548f5bd08f259fd966dd32c9..597756d63f95cb82acb17c430feb943c7efab892 100644 (file)
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -59,43 +59,43 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
     // initialize message label
     m_messageLabel = new StatusBarMessageLabel(this);
     m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     // initialize message label
     m_messageLabel = new StatusBarMessageLabel(this);
     m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);

-    
+

     // initialize zoom slider
     m_zoomWidget = new QWidget(this);
 
     m_zoomOut = new QToolButton(m_zoomWidget);
     m_zoomOut->setIcon(KIcon("zoom-out"));
     m_zoomOut->setAutoRaise(true);
     // initialize zoom slider
     m_zoomWidget = new QWidget(this);
 
     m_zoomOut = new QToolButton(m_zoomWidget);
     m_zoomOut->setIcon(KIcon("zoom-out"));
     m_zoomOut->setAutoRaise(true);

-    
+

     m_zoomSlider = new QSlider(Qt::Horizontal, m_zoomWidget);
     m_zoomSlider->setPageStep(1);
     m_zoomSlider = new QSlider(Qt::Horizontal, m_zoomWidget);
     m_zoomSlider->setPageStep(1);

-    
+

     const int min = ZoomLevelInfo::minimumLevel();
     const int max = ZoomLevelInfo::maximumLevel();
     m_zoomSlider->setRange(min, max);
     m_zoomSlider->setValue(view->zoomLevel());
     const int min = ZoomLevelInfo::minimumLevel();
     const int max = ZoomLevelInfo::maximumLevel();
     m_zoomSlider->setRange(min, max);
     m_zoomSlider->setValue(view->zoomLevel());

-    
+

     m_zoomIn = new QToolButton(m_zoomWidget);
     m_zoomIn->setIcon(KIcon("zoom-in"));
     m_zoomIn->setAutoRaise(true);
     m_zoomIn = new QToolButton(m_zoomWidget);
     m_zoomIn->setIcon(KIcon("zoom-in"));
     m_zoomIn->setAutoRaise(true);

-        
+

     QHBoxLayout* zoomWidgetLayout = new QHBoxLayout(m_zoomWidget);
     zoomWidgetLayout->setSpacing(0);
     zoomWidgetLayout->setMargin(0);
     zoomWidgetLayout->addWidget(m_zoomOut);
     zoomWidgetLayout->addWidget(m_zoomSlider);
     zoomWidgetLayout->addWidget(m_zoomIn);
     QHBoxLayout* zoomWidgetLayout = new QHBoxLayout(m_zoomWidget);
     zoomWidgetLayout->setSpacing(0);
     zoomWidgetLayout->setMargin(0);
     zoomWidgetLayout->addWidget(m_zoomOut);
     zoomWidgetLayout->addWidget(m_zoomSlider);
     zoomWidgetLayout->addWidget(m_zoomIn);

-    
+

     connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoomLevel(int)));
     connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int)));
     connect(m_view, SIGNAL(zoomLevelChanged(int)), m_zoomSlider, SLOT(setValue(int)));
     connect(m_zoomOut, SIGNAL(clicked()), this, SLOT(zoomOut()));
     connect(m_zoomIn, SIGNAL(clicked()), this, SLOT(zoomIn()));
     connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoomLevel(int)));
     connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int)));
     connect(m_view, SIGNAL(zoomLevelChanged(int)), m_zoomSlider, SLOT(setValue(int)));
     connect(m_zoomOut, SIGNAL(clicked()), this, SLOT(zoomOut()));
     connect(m_zoomIn, SIGNAL(clicked()), this, SLOT(zoomIn()));

-    
+

     // initialize space information
     m_spaceInfo = new StatusBarSpaceInfo(this);
     m_spaceInfo->setUrl(m_view->url());
     // initialize space information
     m_spaceInfo = new StatusBarSpaceInfo(this);
     m_spaceInfo->setUrl(m_view->url());

-        
+

     // initialize progress information
     m_progressText = new QLabel(this);
     m_progressText->hide();
     // initialize progress information
     m_progressText = new QLabel(this);
     m_progressText->hide();


@@ -112,7 +112,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
     m_spaceInfo->setFixedHeight(contentHeight);
     m_progressBar->setFixedSize(200, contentHeight);
     m_zoomWidget->setFixedSize(150, contentHeight);
     m_spaceInfo->setFixedHeight(contentHeight);
     m_progressBar->setFixedSize(200, contentHeight);
     m_zoomWidget->setFixedSize(150, contentHeight);

-    
+

     setExtensionsVisible(true);
 }
 
     setExtensionsVisible(true);
 }
 


@@ -126,7 +126,7 @@ void DolphinStatusBar::setMessage(const QString& msg,
     if ((msg == m_messageLabel->text()) && (type == m_messageLabel->type())) {
         return;
     }
     if ((msg == m_messageLabel->text()) && (type == m_messageLabel->type())) {
         return;
     }

-    
+

     m_messageLabel->setMessage(msg, type);
 
     const int widthGap = m_messageLabel->widthGap();
     m_messageLabel->setMessage(msg, type);
 
     const int widthGap = m_messageLabel->widthGap();


@@ -258,7 +258,7 @@ void DolphinStatusBar::assureVisibleText()
         const int spaceInfoWidth  = settings->showSpaceInfo()  ? m_spaceInfo->minimumWidth()  : 0;
         const int zoomWidgetWidth = settings->showZoomSlider() ? m_zoomWidget->minimumWidth() : 0;
         const int widgetsWidth = spaceInfoWidth + zoomWidgetWidth;
         const int spaceInfoWidth  = settings->showSpaceInfo()  ? m_spaceInfo->minimumWidth()  : 0;
         const int zoomWidgetWidth = settings->showZoomSlider() ? m_zoomWidget->minimumWidth() : 0;
         const int widgetsWidth = spaceInfoWidth + zoomWidgetWidth;

-        
+

         if (widthGap + widgetsWidth <= 0) {
             setExtensionsVisible(true);
         }
         if (widthGap + widgetsWidth <= 0) {
             setExtensionsVisible(true);
         }


@@ -284,7 +284,7 @@ void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel)
     QPoint global = m_zoomSlider->rect().topLeft();
     global.ry() += m_zoomSlider->height() / 2;
     QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), m_zoomSlider->mapToGlobal(global));
     QPoint global = m_zoomSlider->rect().topLeft();
     global.ry() += m_zoomSlider->height() / 2;
     QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), m_zoomSlider->mapToGlobal(global));

-    QApplication::sendEvent(m_zoomSlider, &toolTipEvent);   
+    QApplication::sendEvent(m_zoomSlider, &toolTipEvent);

 }
 
 void DolphinStatusBar::setExtensionsVisible(bool visible)
 }
 
 void DolphinStatusBar::setExtensionsVisible(bool visible)


@@ -296,7 +296,7 @@ void DolphinStatusBar::setExtensionsVisible(bool visible)
         spaceInfoVisible = settings->showSpaceInfo();
         zoomSliderVisible = settings->showZoomSlider();
     }
         spaceInfoVisible = settings->showSpaceInfo();
         zoomSliderVisible = settings->showZoomSlider();
     }

-    
+

     m_spaceInfo->setVisible(spaceInfoVisible);
     m_zoomWidget->setVisible(zoomSliderVisible);
 }
     m_spaceInfo->setVisible(spaceInfoVisible);
     m_zoomWidget->setVisible(zoomSliderVisible);
 }

diff --git a/src/dolphintooltip.cpp b/src/dolphintooltip.cpp
index 84eb2ed702937647a92c0f3d638bd7469523141e..f0960a1bd2f457997e6375bff903cbf1f09c3e5a 100644 (file)
--- a/src/dolphintooltip.cpp
+++ b/src/dolphintooltip.cpp
@@ -16,7 +16,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/

- 
+

 #include "dolphintooltip.h"
 
 #include <kicon.h>
 #include "dolphintooltip.h"
 
 #include <kicon.h>


@@ -46,7 +46,7 @@ QSize DolphinBalloonTooltipDelegate::sizeHint(const KStyleOptionToolTip* option,
 }
 
 void DolphinBalloonTooltipDelegate::paint(QPainter* painter, const KStyleOptionToolTip* option, const KToolTipItem* item) const
 }
 
 void DolphinBalloonTooltipDelegate::paint(QPainter* painter, const KStyleOptionToolTip* option, const KToolTipItem* item) const

-{    
+{

     KStyleOptionToolTip updatedStyleOption = *option;
     updatedStyleOption.decorationSize = QSize(PREVIEW_WIDTH, PREVIEW_HEIGHT);
     return KFormattedBalloonTipDelegate::paint(painter, &updatedStyleOption, item);
     KStyleOptionToolTip updatedStyleOption = *option;
     updatedStyleOption.decorationSize = QSize(PREVIEW_WIDTH, PREVIEW_HEIGHT);
     return KFormattedBalloonTipDelegate::paint(painter, &updatedStyleOption, item);

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 72c06512e17ce2b4b68f57a53d04bcd4e9ace7dd..969da773dcd4e677444daa0f52851a16464df8b0 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -233,7 +233,7 @@ void DolphinView::setMode(Mode mode)
     }
 
     emit modeChanged();
     }
 
     emit modeChanged();

-    
+

     updateZoomLevel(oldZoomLevel);
     if (m_showPreview) {
         loadDirectory(viewPropsUrl);
     updateZoomLevel(oldZoomLevel);
     if (m_showPreview) {
         loadDirectory(viewPropsUrl);


@@ -550,7 +550,7 @@ QString DolphinView::statusBarText() const
             const QString name = list.first().name();
             text = (folderCount == 1) ? i18nc("@info:status", "<filename>%1</filename> selected", name) :
                                         i18nc("@info:status", "<filename>%1</filename> selected (%2)",
             const QString name = list.first().name();
             text = (folderCount == 1) ? i18nc("@info:status", "<filename>%1</filename> selected", name) :
                                         i18nc("@info:status", "<filename>%1</filename> selected (%2)",

-                                              name, KIO::convertSize(totalFileSize));                                            
+                                              name, KIO::convertSize(totalFileSize));

         } else {
             // at least 2 items are selected
             const QString foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
         } else {
             // at least 2 items are selected
             const QString foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);


@@ -626,7 +626,7 @@ void DolphinView::renameSelectedItems()
             // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations
             // as one operation instead of n rename operations like it is done now...
             Q_ASSERT(newName.contains('#'));
             // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations
             // as one operation instead of n rename operations like it is done now...
             Q_ASSERT(newName.contains('#'));

-            
+

             // currently the items are sorted by the selection order, resort
             // them by the file name
             qSort(items.begin(), items.end(), lessThan);
             // currently the items are sorted by the selection order, resort
             // them by the file name
             qSort(items.begin(), items.end(), lessThan);


@@ -1323,7 +1323,7 @@ void DolphinView::deleteView()
         disconnect(view);
         m_controller->disconnect(view);
         view->disconnect();
         disconnect(view);
         m_controller->disconnect(view);
         view->disconnect();

-        
+

         bool deleteView = true;
         foreach (const QAbstractItemView* expandedView, m_expandedViews) {
             if (view == expandedView) {
         bool deleteView = true;
         foreach (const QAbstractItemView* expandedView, m_expandedViews) {
             if (view == expandedView) {

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 7d8d06bf2503fead4e7bb49803f5a4a4d5b59dbf..1852e784a3cb162d9367128f1cc777964cbf505d 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -85,7 +85,7 @@ public:
     {
         /**
          * The directory items are shown as icons including an
     {
         /**
          * The directory items are shown as icons including an

-         * icon name. 
+         * icon name.

          */
         IconsView = 0,
 
          */
         IconsView = 0,
 


@@ -242,7 +242,7 @@ public:
      */
     void setZoomLevel(int level);
     int zoomLevel() const;
      */
     void setZoomLevel(int level);
     int zoomLevel() const;

-    
+

     /**
      * Returns true, if zooming in is possible. If false is returned,
      * the maximum zooming level has been reached.
     /**
      * Returns true, if zooming in is possible. If false is returned,
      * the maximum zooming level has been reached.


@@ -308,7 +308,7 @@ public:
      * filtering and hierarchical previews into account.
      */
     void calculateItemCount(int& fileCount, int& folderCount, KIO::filesize_t& totalFileSize) const;
      * filtering and hierarchical previews into account.
      */
     void calculateItemCount(int& fileCount, int& folderCount, KIO::filesize_t& totalFileSize) const;

-    
+

     /**
      * Returns a textual representation of the state of the current
      * folder or selected items, suitable for use in the status bar.
     /**
      * Returns a textual representation of the state of the current
      * folder or selected items, suitable for use in the status bar.


@@ -476,7 +476,7 @@ signals:
 
     /** Is emitted if the additional information shown for this view has been changed. */
     void additionalInfoChanged();
 
     /** Is emitted if the additional information shown for this view has been changed. */
     void additionalInfoChanged();

-    
+

     /** Is emitted if the zoom level has been changed by zooming in or out. */
     void zoomLevelChanged(int level);
 
     /** Is emitted if the zoom level has been changed by zooming in or out. */
     void zoomLevelChanged(int level);
 


@@ -626,7 +626,7 @@ private slots:
      * to m_currentItemUrl.
      */
     void restoreCurrentItem();
      * to m_currentItemUrl.
      */
     void restoreCurrentItem();

-    
+

     /**
      * Is connected to the enterDir() signal from the FolderExpander
      * and triggers the entering of the directory indicated by \a index.
     /**
      * Is connected to the enterDir() signal from the FolderExpander
      * and triggers the entering of the directory indicated by \a index.


@@ -676,7 +676,7 @@ private:
      * Pastes the clipboard data into the URL \a url.
      */
     void pasteToUrl(const KUrl& url);
      * Pastes the clipboard data into the URL \a url.
      */
     void pasteToUrl(const KUrl& url);

-    
+

     /**
      * Checks whether the current item view has the same zoom level
      * as \a oldZoomLevel. If this is not the case, the zoom level
     /**
      * Checks whether the current item view has the same zoom level
      * as \a oldZoomLevel. If this is not the case, the zoom level


@@ -684,7 +684,7 @@ private:
      * is emitted.
      */
     void updateZoomLevel(int oldZoomLevel);
      * is emitted.
      */
     void updateZoomLevel(int oldZoomLevel);

-    
+

     /**
      * Returns a list of URLs for all selected items. The list is
      * simplified, so that when the URLs are part of different tree
     /**
      * Returns a list of URLs for all selected items. The list is
      * simplified, so that when the URLs are part of different tree


@@ -698,13 +698,13 @@ private:
      * this method has been introduced for convenience.
      */
     bool isColumnViewActive() const;
      * this method has been introduced for convenience.
      */
     bool isColumnViewActive() const;

-    
+

     /**
      * Deletes all views from m_expandedViews except if the view
      * is currently shown.
      */
     void deleteExpandedViews();
     /**
      * Deletes all views from m_expandedViews except if the view
      * is currently shown.
      */
     void deleteExpandedViews();

-    
+

     /**
      * Returns the MIME data for all selected items.
      */
     /**
      * Returns the MIME data for all selected items.
      */


@@ -739,7 +739,7 @@ private:
 
     KUrl m_rootUrl;
     KUrl m_currentItemUrl;
 
     KUrl m_rootUrl;
     KUrl m_currentItemUrl;

-    
+

     QList<QAbstractItemView*> m_expandedViews;
 };
 
     QList<QAbstractItemView*> m_expandedViews;
 };
 

diff --git a/src/dolphinviewactionhandler.h b/src/dolphinviewactionhandler.h
index 5084d06fe1d0e070970e5901fae7fe0722fa6b3e..ad56518c4e0614b1d78590c93b1e941b5f5680fa 100644 (file)
--- a/src/dolphinviewactionhandler.h
+++ b/src/dolphinviewactionhandler.h
@@ -130,10 +130,10 @@ private Q_SLOTS:
      * Updates the state of the 'Sort by' actions.
      */
     void slotSortingChanged(DolphinView::Sorting sorting);
      * Updates the state of the 'Sort by' actions.
      */
     void slotSortingChanged(DolphinView::Sorting sorting);

-    
+

     /**
      * Updates the state of the 'Zoom In' and 'Zoom Out' actions.
     /**
      * Updates the state of the 'Zoom In' and 'Zoom Out' actions.

-     */    
+     */

     void slotZoomLevelChanged(int level);
 
     /**
     void slotZoomLevelChanged(int level);
 
     /**

diff --git a/src/dolphinviewautoscroller.cpp b/src/dolphinviewautoscroller.cpp
index fbce803b8ab5f7fc1d98638cc790c89b75350779..b99bbc74954857b91050315f64195f4b1ac11c7f 100644 (file)
--- a/src/dolphinviewautoscroller.cpp
+++ b/src/dolphinviewautoscroller.cpp
@@ -37,7 +37,7 @@ DolphinViewAutoScroller::DolphinViewAutoScroller(QAbstractItemView* parent) :
     m_itemView->setAutoScroll(false);
     m_itemView->viewport()->installEventFilter(this);
     m_itemView->installEventFilter(this);
     m_itemView->setAutoScroll(false);
     m_itemView->viewport()->installEventFilter(this);
     m_itemView->installEventFilter(this);

-    
+

     m_timer = new QTimer(this);
     m_timer->setSingleShot(false);
     m_timer->setInterval(1000 / 25); // 25 frames per second
     m_timer = new QTimer(this);
     m_timer->setSingleShot(false);
     m_timer->setInterval(1000 / 25); // 25 frames per second


@@ -57,30 +57,30 @@ bool DolphinViewAutoScroller::eventFilter(QObject* watched, QEvent* event)
                 m_rubberBandSelection = true;
             }
             break;
                 m_rubberBandSelection = true;
             }
             break;

-            
+

         case QEvent::MouseMove:
             if (m_rubberBandSelection) {
                 triggerAutoScroll();
             }
             break;
         case QEvent::MouseMove:
             if (m_rubberBandSelection) {
                 triggerAutoScroll();
             }
             break;

-            
+

         case QEvent::MouseButtonRelease:
             m_rubberBandSelection = false;
             stopAutoScroll();
             break;
         case QEvent::MouseButtonRelease:
             m_rubberBandSelection = false;
             stopAutoScroll();
             break;

-            
+

         case QEvent::DragEnter:
         case QEvent::DragMove:
             m_rubberBandSelection = false;
             triggerAutoScroll();
             break;
         case QEvent::DragEnter:
         case QEvent::DragMove:
             m_rubberBandSelection = false;
             triggerAutoScroll();
             break;

-            
+

         case QEvent::Drop:
         case QEvent::DragLeave:
             m_rubberBandSelection = false;
             stopAutoScroll();
             break;
         case QEvent::Drop:
         case QEvent::DragLeave:
             m_rubberBandSelection = false;
             stopAutoScroll();
             break;

-            
+

         default:
             break;
         }
         default:
             break;
         }


@@ -99,8 +99,8 @@ bool DolphinViewAutoScroller::eventFilter(QObject* watched, QEvent* event)
         default:
             break;
         }
         default:
             break;
         }

-    } 
-    
+    }
+

 
     return QObject::eventFilter(watched, event);
 }
 
     return QObject::eventFilter(watched, event);
 }


@@ -111,15 +111,15 @@ void DolphinViewAutoScroller::scrollViewport()
     if (verticalScrollBar != 0) {
         const int value = verticalScrollBar->value();
         verticalScrollBar->setValue(value + m_scrollInc);
     if (verticalScrollBar != 0) {
         const int value = verticalScrollBar->value();
         verticalScrollBar->setValue(value + m_scrollInc);

-        
+

     }
     QScrollBar* horizontalScrollBar = m_itemView->horizontalScrollBar();
     if (horizontalScrollBar != 0) {
         const int value = horizontalScrollBar->value();
         horizontalScrollBar->setValue(value + m_scrollInc);
     }
     QScrollBar* horizontalScrollBar = m_itemView->horizontalScrollBar();
     if (horizontalScrollBar != 0) {
         const int value = horizontalScrollBar->value();
         horizontalScrollBar->setValue(value + m_scrollInc);

-        
+

     }
     }

-    
+

     if (m_rubberBandSelection) {
         // The scrolling does not lead to an update of the rubberband
         // selection. Fake a mouse move event to let the QAbstractItemView
     if (m_rubberBandSelection) {
         // The scrolling does not lead to an update of the rubberband
         // selection. Fake a mouse move event to let the QAbstractItemView


@@ -147,7 +147,7 @@ void DolphinViewAutoScroller::triggerAutoScroll()
         // no scrollbars are shown at all, so no autoscrolling is necessary
         return;
     }
         // no scrollbars are shown at all, so no autoscrolling is necessary
         return;
     }

-    
+

     QWidget* viewport = m_itemView->viewport();
     const QPoint pos = viewport->mapFromGlobal(QCursor::pos());
     if (verticalScrolling) {
     QWidget* viewport = m_itemView->viewport();
     const QPoint pos = viewport->mapFromGlobal(QCursor::pos());
     if (verticalScrolling) {


@@ -156,7 +156,7 @@ void DolphinViewAutoScroller::triggerAutoScroll()
     if (horizontalScrolling) {
         calculateScrollIncrement(pos.x(), viewport->width());
     }
     if (horizontalScrolling) {
         calculateScrollIncrement(pos.x(), viewport->width());
     }

-    
+

     if (m_timer->isActive()) {
         if (m_scrollInc == 0) {
             m_timer->stop();
     if (m_timer->isActive()) {
         if (m_scrollInc == 0) {
             m_timer->stop();


@@ -178,7 +178,7 @@ void DolphinViewAutoScroller::calculateScrollIncrement(int cursorPos, int rangeS
     const int maxSpeed = 32;
     const int speedLimiter = 8;
     const int autoScrollBorder = 32;
     const int maxSpeed = 32;
     const int speedLimiter = 8;
     const int autoScrollBorder = 32;

-    
+

     if (cursorPos < autoScrollBorder) {
         m_scrollInc = -minSpeed + (cursorPos - autoScrollBorder) / speedLimiter;
         if (m_scrollInc < -maxSpeed) {
     if (cursorPos < autoScrollBorder) {
         m_scrollInc = -minSpeed + (cursorPos - autoScrollBorder) / speedLimiter;
         if (m_scrollInc < -maxSpeed) {

diff --git a/src/dolphinviewautoscroller.h b/src/dolphinviewautoscroller.h
index 177c6ee0f4cde03aa001d94a058cec58d451aec2..dd84963a76d31ecc216a855a58d2acdc087638f6 100644 (file)
--- a/src/dolphinviewautoscroller.h
+++ b/src/dolphinviewautoscroller.h
@@ -38,24 +38,24 @@ class DolphinViewAutoScroller : public QObject
 public:
     DolphinViewAutoScroller(QAbstractItemView* parent);
     virtual ~DolphinViewAutoScroller();
 public:
     DolphinViewAutoScroller(QAbstractItemView* parent);
     virtual ~DolphinViewAutoScroller();

-    
+

 protected:
     virtual bool eventFilter(QObject* watched, QEvent* event);
 
 private slots:
     void scrollViewport();
     void scrollToCurrentIndex();
 protected:
     virtual bool eventFilter(QObject* watched, QEvent* event);
 
 private slots:
     void scrollViewport();
     void scrollToCurrentIndex();

-    
+

 private:
     void triggerAutoScroll();
     void stopAutoScroll();
 private:
     void triggerAutoScroll();
     void stopAutoScroll();

-    
+

     /**
      * Calculates the scroll increment m_scrollInc dependent from
      * the cursor position \a cursorPos and the range 0 - \a rangeSize - 1.
      */
     void calculateScrollIncrement(int cursorPos, int rangeSize);
     /**
      * Calculates the scroll increment m_scrollInc dependent from
      * the cursor position \a cursorPos and the range 0 - \a rangeSize - 1.
      */
     void calculateScrollIncrement(int cursorPos, int rangeSize);

-    
+

 private:
     bool m_rubberBandSelection;
     int m_scrollInc;
 private:
     bool m_rubberBandSelection;
     int m_scrollInc;

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 6e5385f5e4dd748bd9a890c79e0fa49b87ea4c8a..2ef6209bcf16b5a01f2c7f6fb731936d9030c69f 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -367,7 +367,7 @@ void DolphinViewContainer::restoreView(const KUrl& url)
             }
         } else {
             showErrorMessage(i18nc("@info:status",
             }
         } else {
             showErrorMessage(i18nc("@info:status",

-                                   "Protocol not supported by Dolphin, Konqueror has been launched"));        
+                                   "Protocol not supported by Dolphin, Konqueror has been launched"));

         }
         const QString command = app + ' ' + url.pathOrUrl();
         KRun::runCommand(command, app, app, this);
         }
         const QString command = app + ' ' + url.pathOrUrl();
         KRun::runCommand(command, app, app, this);

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 1c6f8a6bcbcb8d436ffe95b17ad836907ca715b3..15a0ae6a896b8153a30a95b7b0c418b68e0319aa 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -104,7 +104,7 @@ public:
 
     const DolphinView* view() const;
     DolphinView* view();
 
     const DolphinView* view() const;
     DolphinView* view();

-    
+

     /**
      * Refreshes the view container to get synchronized with the (updated) Dolphin settings.
      */
     /**
      * Refreshes the view container to get synchronized with the (updated) Dolphin settings.
      */


@@ -206,13 +206,13 @@ private slots:
      * into the URL navigator.
      */
     void saveRootUrl(const KUrl& url);
      * into the URL navigator.
      */
     void saveRootUrl(const KUrl& url);

-    
+

     /**
      * Is connected with the URL navigator and drops the URLs
      * above the destination \a destination.
      */
     void dropUrls(const KUrl& destination, QDropEvent* event);
     /**
      * Is connected with the URL navigator and drops the URLs
      * above the destination \a destination.
      */
     void dropUrls(const KUrl& destination, QDropEvent* event);

-    
+

     /**
      * Is invoked when a redirection is done and changes the
      * URL of the URL navigator to \a newUrl without triggering
     /**
      * Is invoked when a redirection is done and changes the
      * URL of the URL navigator to \a newUrl without triggering

diff --git a/src/draganddrophelper.cpp b/src/draganddrophelper.cpp
index 387448deb73290397f17c54255ce63e8d1072a4d..00e4bd728c0b71086ce43fecea51bbd548d3d453 100644 (file)
--- a/src/draganddrophelper.cpp
+++ b/src/draganddrophelper.cpp
@@ -61,7 +61,7 @@ void DragAndDropHelper::startDrag(QAbstractItemView* itemView,
         if (data == 0) {
             return;
         }
         if (data == 0) {
             return;
         }

-        
+

         if (controller != 0) {
             controller->emitHideToolTip();
         }
         if (controller != 0) {
             controller->emitHideToolTip();
         }


@@ -91,7 +91,7 @@ void DragAndDropHelper::dropUrls(const KFileItem& destItem,
 {
     const bool dropToItem = !destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile());
     const KUrl destination = dropToItem ? destItem.url() : destPath;
 {
     const bool dropToItem = !destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile());
     const KUrl destination = dropToItem ? destItem.url() : destPath;

-    
+

     const QMimeData* mimeData = event->mimeData();
     if (mimeData->hasFormat("application/x-kde-dndextract")) {
         QString remoteDBusClient = mimeData->data("application/x-kde-dndextract");
     const QMimeData* mimeData = event->mimeData();
     if (mimeData->hasFormat("application/x-kde-dndextract")) {
         QString remoteDBusClient = mimeData->data("application/x-kde-dndextract");


@@ -99,7 +99,7 @@ void DragAndDropHelper::dropUrls(const KFileItem& destItem,
                                                               "org.kde.DndExtract", "extractFilesTo");
         message.setArguments(QVariantList() << destination.path());
         QDBusConnection::sessionBus().call(message);
                                                               "org.kde.DndExtract", "extractFilesTo");
         message.setArguments(QVariantList() << destination.path());
         QDBusConnection::sessionBus().call(message);

-    } else {                                
+    } else {

         const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
         if ((urls.count() == 1) && (urls.first() == destination)) {
             emit errorMessage(i18nc("@info:status", "A folder cannot be dropped into itself"));
         const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
         if ((urls.count() == 1) && (urls.first() == destination)) {
             emit errorMessage(i18nc("@info:status", "A folder cannot be dropped into itself"));

diff --git a/src/draganddrophelper.h b/src/draganddrophelper.h
index e62897208839ce902b72e72612c15aea02c136ff..bf8c0b79da9829758cafda67de9e6e25e80da518 100644 (file)
--- a/src/draganddrophelper.h
+++ b/src/draganddrophelper.h
@@ -47,20 +47,20 @@ class LIBDOLPHINPRIVATE_EXPORT DragAndDropHelper : public QObject
 
 public:
     static DragAndDropHelper& instance();
 
 public:
     static DragAndDropHelper& instance();

-    
+

     /**
      * Returns true, if Dolphin supports the dragging of
      * the given mime data.
      */
     bool isMimeDataSupported(const QMimeData* mimeData) const;
     /**
      * Returns true, if Dolphin supports the dragging of
      * the given mime data.
      */
     bool isMimeDataSupported(const QMimeData* mimeData) const;

-    
+

     /**
      * Creates a drag object for the view \a itemView for all selected items.
      */
     void startDrag(QAbstractItemView* itemView,
                    Qt::DropActions supportedActions,
                    DolphinController* controller = 0);
     /**
      * Creates a drag object for the view \a itemView for all selected items.
      */
     void startDrag(QAbstractItemView* itemView,
                    Qt::DropActions supportedActions,
                    DolphinController* controller = 0);

-                          
+

     /**
      * Handles the dropping of URLs to the given
      * destination. A context menu with the options
     /**
      * Handles the dropping of URLs to the given
      * destination. A context menu with the options


@@ -77,10 +77,10 @@ public:
                   QWidget* widget);
 signals:
     void errorMessage(const QString& msg);
                   QWidget* widget);
 signals:
     void errorMessage(const QString& msg);

-    
+

 private:
     DragAndDropHelper();
 private:
     DragAndDropHelper();

-    
+

     friend class DragAndDropHelperSingleton;
 };
 
     friend class DragAndDropHelperSingleton;
 };
 

diff --git a/src/folderexpander.cpp b/src/folderexpander.cpp
index e742972d3db512eb0f508c086f802310585d7047..574f0a3045090e03b2e57a50423e4dd2e474cdfb 100644 (file)
--- a/src/folderexpander.cpp
+++ b/src/folderexpander.cpp
@@ -53,7 +53,7 @@ FolderExpander::FolderExpander(QAbstractItemView *view, QSortFilterProxyModel *p
         kWarning() << "Need a proxyModel!";
         return; // Not valid.
     }
         kWarning() << "Need a proxyModel!";
         return; // Not valid.
     }

-    KDirModel *m_dirModel = qobject_cast< KDirModel* >( m_proxyModel->sourceModel() );  
+    KDirModel *m_dirModel = qobject_cast< KDirModel* >( m_proxyModel->sourceModel() );

     if (m_dirModel == 0) {
         kWarning() << "Expected m_proxyModel's sourceModel() to be a KDirModel!";
         return; // Not valid.
     if (m_dirModel == 0) {
         kWarning() << "Expected m_proxyModel's sourceModel() to be a KDirModel!";
         return; // Not valid.


@@ -62,7 +62,7 @@ FolderExpander::FolderExpander(QAbstractItemView *view, QSortFilterProxyModel *p
     // Initialise auto-expand timer.
     m_autoExpandTriggerTimer = new QTimer(this);
     m_autoExpandTriggerTimer->setSingleShot(true);
     // Initialise auto-expand timer.
     m_autoExpandTriggerTimer = new QTimer(this);
     m_autoExpandTriggerTimer->setSingleShot(true);

-    connect(m_autoExpandTriggerTimer, SIGNAL(timeout()), 
+    connect(m_autoExpandTriggerTimer, SIGNAL(timeout()),

             this, SLOT(autoExpandTimeout()));
 
     // The view scrolling complicates matters, so we want to
             this, SLOT(autoExpandTimeout()));
 
     // The view scrolling complicates matters, so we want to


@@ -108,7 +108,7 @@ void FolderExpander::autoExpandTimeout()
     // needing to pass in m_proxyModel that has a KDirModel as its sourceModel() ... ?
     QModelIndex proxyIndexToExpand = m_view->indexAt(m_autoExpandPos);
     QModelIndex indexToExpand = m_proxyModel->mapToSource(proxyIndexToExpand);
     // needing to pass in m_proxyModel that has a KDirModel as its sourceModel() ... ?
     QModelIndex proxyIndexToExpand = m_view->indexAt(m_autoExpandPos);
     QModelIndex indexToExpand = m_proxyModel->mapToSource(proxyIndexToExpand);

-    KDirModel* m_dirModel = qobject_cast< KDirModel* >(m_proxyModel->sourceModel()); 
+    KDirModel* m_dirModel = qobject_cast< KDirModel* >(m_proxyModel->sourceModel());

     Q_ASSERT(m_dirModel != 0);
     KFileItem itemToExpand = m_dirModel->itemForIndex(indexToExpand );
 
     Q_ASSERT(m_dirModel != 0);
     KFileItem itemToExpand = m_dirModel->itemForIndex(indexToExpand );
 

diff --git a/src/folderexpander.h b/src/folderexpander.h
index b3ae78da3e24f9ca769c866376a6d621b378a957..d8da29f17d972e006a62dbb8ed97ae64e6a53394 100644 (file)
--- a/src/folderexpander.h
+++ b/src/folderexpander.h
@@ -49,14 +49,14 @@ class KDirModel;
 class LIBDOLPHINPRIVATE_EXPORT FolderExpander : public QObject
 {
     Q_OBJECT
 class LIBDOLPHINPRIVATE_EXPORT FolderExpander : public QObject
 {
     Q_OBJECT

-    
+

 public:
     FolderExpander(QAbstractItemView* view, QSortFilterProxyModel* proxyModel);
     virtual ~FolderExpander();
 public:
     FolderExpander(QAbstractItemView* view, QSortFilterProxyModel* proxyModel);
     virtual ~FolderExpander();

-  
+

     void setEnabled(bool enabled);
     bool enabled() const;
     void setEnabled(bool enabled);
     bool enabled() const;

-  
+

 signals:
     /**
      * Is emitted if the directory \a dirModelIndex should be entered. The
 signals:
     /**
      * Is emitted if the directory \a dirModelIndex should be entered. The


@@ -64,15 +64,15 @@ signals:
      * the directory is already provided by expanding the tree node.
      */
     void enterDir(const QModelIndex& dirModelIndex, QAbstractItemView* view);
      * the directory is already provided by expanding the tree node.
      */
     void enterDir(const QModelIndex& dirModelIndex, QAbstractItemView* view);

-    
-    
+
+

 private slots:
     void viewScrolled();
     void autoExpandTimeout();
 
 private slots:
     void viewScrolled();
     void autoExpandTimeout();
 

-private: 
+private:

     bool m_enabled;
     bool m_enabled;

-    
+

     QAbstractItemView* m_view;
     QSortFilterProxyModel* m_proxyModel;
 
     QAbstractItemView* m_view;
     QSortFilterProxyModel* m_proxyModel;
 

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index a6775df19e65e21747d0e0a108383a94e579bbbb..68193b4e41b73d8733bb61fe35c51803c9b5621d 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -78,9 +78,9 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     QVBoxLayout* contextMenuBoxLayout = new QVBoxLayout(contextMenuBox);
     contextMenuBoxLayout->addWidget(m_showDeleteCommand);
     contextMenuBoxLayout->addWidget(m_showCopyMoveMenu);
     QVBoxLayout* contextMenuBoxLayout = new QVBoxLayout(contextMenuBox);
     contextMenuBoxLayout->addWidget(m_showDeleteCommand);
     contextMenuBoxLayout->addWidget(m_showCopyMoveMenu);

-    
+

     QGroupBox* statusBarBox = new QGroupBox(i18nc("@title:group", "Status Bar"), vBox);
     QGroupBox* statusBarBox = new QGroupBox(i18nc("@title:group", "Status Bar"), vBox);

-    
+

     m_showZoomSlider = new QCheckBox(i18nc("@option:check", "Show zoom slider"), statusBarBox);
     connect(m_showZoomSlider, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     m_showZoomSlider = new QCheckBox(i18nc("@option:check", "Show zoom slider"), statusBarBox);
     connect(m_showZoomSlider, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 


@@ -96,7 +96,7 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
 
     m_renameInline = new QCheckBox(i18nc("@option:check", "Rename inline"), vBox);
     connect(m_renameInline, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     m_renameInline = new QCheckBox(i18nc("@option:check", "Rename inline"), vBox);
     connect(m_renameInline, SIGNAL(toggled(bool)), this, SIGNAL(changed()));

-    
+

     m_autoExpandFolders = new QCheckBox(i18nc("option:check", "Open folders during drag operations"), vBox);
     connect(m_autoExpandFolders, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     m_autoExpandFolders = new QCheckBox(i18nc("option:check", "Open folders during drag operations"), vBox);
     connect(m_autoExpandFolders, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 


@@ -157,7 +157,7 @@ void GeneralSettingsPage::loadSettings()
     KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
     KConfigGroup configGroup(globalConfig, "KDE");
     m_showDeleteCommand->setChecked(configGroup.readEntry("ShowDeleteCommand", false));
     KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
     KConfigGroup configGroup(globalConfig, "KDE");
     m_showDeleteCommand->setChecked(configGroup.readEntry("ShowDeleteCommand", false));

-    
+

     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_showCopyMoveMenu->setChecked(settings->showCopyMoveMenu());
     m_showZoomSlider->setChecked(settings->showZoomSlider());
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_showCopyMoveMenu->setChecked(settings->showCopyMoveMenu());
     m_showZoomSlider->setChecked(settings->showZoomSlider());

diff --git a/src/generalsettingspage.h b/src/generalsettingspage.h
index 9af3774891494e201f92f817ef1b66d2805038a3..da7e72f0f2056236dab7c6411bf0e0fa7f5a0662 100644 (file)
--- a/src/generalsettingspage.h
+++ b/src/generalsettingspage.h
@@ -52,10 +52,10 @@ private:
 
     QCheckBox* m_showDeleteCommand;
     QCheckBox* m_showCopyMoveMenu;
 
     QCheckBox* m_showDeleteCommand;
     QCheckBox* m_showCopyMoveMenu;

-    
+

     QCheckBox* m_showZoomSlider;
     QCheckBox* m_showSpaceInfo;
     QCheckBox* m_showZoomSlider;
     QCheckBox* m_showSpaceInfo;

-    
+

     QCheckBox* m_browseThroughArchives;
     QCheckBox* m_renameInline;
     QCheckBox* m_autoExpandFolders;
     QCheckBox* m_browseThroughArchives;
     QCheckBox* m_renameInline;
     QCheckBox* m_autoExpandFolders;

diff --git a/src/iconsizegroupbox.cpp b/src/iconsizegroupbox.cpp
index 8e075ed8f19baea93e67eb166a4ebd0f9b11eef9..82698e7b74064b83f06613eb64722e0295ad8ce5 100644 (file)
--- a/src/iconsizegroupbox.cpp
+++ b/src/iconsizegroupbox.cpp
@@ -42,14 +42,14 @@ IconSizeGroupBox::IconSizeGroupBox(QWidget* parent) :
     m_defaultSizeSlider->setTickPosition(QSlider::TicksBelow);
     connect(m_defaultSizeSlider, SIGNAL(sliderMoved(int)),
             this, SLOT(slotDefaultSliderMoved(int)));
     m_defaultSizeSlider->setTickPosition(QSlider::TicksBelow);
     connect(m_defaultSizeSlider, SIGNAL(sliderMoved(int)),
             this, SLOT(slotDefaultSliderMoved(int)));

-    
+

     QLabel* previewLabel = new QLabel(i18nc("@label:listbox", "Preview:"), this);
     m_previewSizeSlider = new QSlider(Qt::Horizontal, this);
     m_previewSizeSlider->setPageStep(1);
     m_previewSizeSlider->setTickPosition(QSlider::TicksBelow);
     connect(m_previewSizeSlider, SIGNAL(sliderMoved(int)),
             this, SLOT(slotPreviewSliderMoved(int)));
     QLabel* previewLabel = new QLabel(i18nc("@label:listbox", "Preview:"), this);
     m_previewSizeSlider = new QSlider(Qt::Horizontal, this);
     m_previewSizeSlider->setPageStep(1);
     m_previewSizeSlider->setTickPosition(QSlider::TicksBelow);
     connect(m_previewSizeSlider, SIGNAL(sliderMoved(int)),
             this, SLOT(slotPreviewSliderMoved(int)));

-    
+

     QGridLayout* layout = new QGridLayout(this);
     layout->addWidget(defaultLabel, 0, 0, Qt::AlignRight);
     layout->addWidget(m_defaultSizeSlider, 0, 1);
     QGridLayout* layout = new QGridLayout(this);
     layout->addWidget(defaultLabel, 0, 0, Qt::AlignRight);
     layout->addWidget(m_defaultSizeSlider, 0, 1);


@@ -110,7 +110,7 @@ void IconSizeGroupBox::showToolTip(QSlider* slider, int value)
     QPoint global = slider->rect().topLeft();
     global.ry() += slider->height() / 2;
     QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), slider->mapToGlobal(global));
     QPoint global = slider->rect().topLeft();
     global.ry() += slider->height() / 2;
     QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), slider->mapToGlobal(global));

-    QApplication::sendEvent(slider, &toolTipEvent);    
+    QApplication::sendEvent(slider, &toolTipEvent);

 }
 
 #include "iconsizegroupbox.moc"
 }
 
 #include "iconsizegroupbox.moc"

diff --git a/src/iconsizegroupbox.h b/src/iconsizegroupbox.h
index c93fd8fc2e2aedcb388f66a8c5c3a966779ee072..3ec51c3a57b54e3d91d4aa0d4f847b9137d39faf 100644 (file)
--- a/src/iconsizegroupbox.h
+++ b/src/iconsizegroupbox.h
@@ -37,27 +37,27 @@ class IconSizeGroupBox : public QGroupBox
 public:
     explicit IconSizeGroupBox(QWidget* parent);
     virtual ~IconSizeGroupBox();
 public:
     explicit IconSizeGroupBox(QWidget* parent);
     virtual ~IconSizeGroupBox();

-    
+

     void setDefaultSizeRange(int min, int max);
     void setPreviewSizeRange(int min, int max);
     void setDefaultSizeRange(int min, int max);
     void setPreviewSizeRange(int min, int max);

-    
+

     void setDefaultSizeValue(int value);
     int defaultSizeValue() const;
     void setDefaultSizeValue(int value);
     int defaultSizeValue() const;

-    
+

     void setPreviewSizeValue(int value);
     int previewSizeValue() const;
     void setPreviewSizeValue(int value);
     int previewSizeValue() const;

-    
+

 signals:
     void defaultSizeChanged(int value);
     void previewSizeChanged(int value);
 signals:
     void defaultSizeChanged(int value);
     void previewSizeChanged(int value);

-    
+

 private slots:
     void slotDefaultSliderMoved(int value);
     void slotPreviewSliderMoved(int value);
 private slots:
     void slotDefaultSliderMoved(int value);
     void slotPreviewSliderMoved(int value);

-    
+

 private:
     void showToolTip(QSlider* slider, int value);
 private:
     void showToolTip(QSlider* slider, int value);

-    
+

 private:
     QSlider* m_defaultSizeSlider;
     QSlider* m_previewSizeSlider;
 private:
     QSlider* m_defaultSizeSlider;
     QSlider* m_previewSizeSlider;

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 8273234eb4250d69cd319253505c81666059bc7d..ca43841b8def068531120ca4dde9c7ef5c0cd13c 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -60,17 +60,17 @@ IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :
     // Create "Icon" properties
     m_iconSizeGroupBox = new IconSizeGroupBox(this);
     m_iconSizeGroupBox->setSizePolicy(sizePolicy);
     // Create "Icon" properties
     m_iconSizeGroupBox = new IconSizeGroupBox(this);
     m_iconSizeGroupBox->setSizePolicy(sizePolicy);

-    
+

     const int min = ZoomLevelInfo::minimumLevel();
     const int max = ZoomLevelInfo::maximumLevel();
     m_iconSizeGroupBox->setDefaultSizeRange(min, max);
     m_iconSizeGroupBox->setPreviewSizeRange(min, max);
     const int min = ZoomLevelInfo::minimumLevel();
     const int max = ZoomLevelInfo::maximumLevel();
     m_iconSizeGroupBox->setDefaultSizeRange(min, max);
     m_iconSizeGroupBox->setPreviewSizeRange(min, max);

-    
+

     connect(m_iconSizeGroupBox, SIGNAL(defaultSizeChanged(int)),
             this, SIGNAL(changed()));
     connect(m_iconSizeGroupBox, SIGNAL(previewSizeChanged(int)),
             this, SIGNAL(changed()));
     connect(m_iconSizeGroupBox, SIGNAL(defaultSizeChanged(int)),
             this, SIGNAL(changed()));
     connect(m_iconSizeGroupBox, SIGNAL(previewSizeChanged(int)),
             this, SIGNAL(changed()));

-    
+

     // create 'Text' group for selecting the font, the number of lines
     // and the text width
     QGroupBox* textGroup = new QGroupBox(i18nc("@title:group", "Text"), this);
     // create 'Text' group for selecting the font, the number of lines
     // and the text width
     QGroupBox* textGroup = new QGroupBox(i18nc("@title:group", "Text"), this);


@@ -202,7 +202,7 @@ void IconsViewSettingsPage::loadSettings()
     const QSize iconSize(settings->iconSize(), settings->iconSize());
     const int iconSizeValue = ZoomLevelInfo::zoomLevelForIconSize(iconSize);
     m_iconSizeGroupBox->setDefaultSizeValue(iconSizeValue);
     const QSize iconSize(settings->iconSize(), settings->iconSize());
     const int iconSizeValue = ZoomLevelInfo::zoomLevelForIconSize(iconSize);
     m_iconSizeGroupBox->setDefaultSizeValue(iconSizeValue);

-    
+

     const QSize previewSize(settings->previewSize(), settings->previewSize());
     const int previewSizeValue = ZoomLevelInfo::zoomLevelForIconSize(previewSize);
     m_iconSizeGroupBox->setPreviewSizeValue(previewSizeValue);
     const QSize previewSize(settings->previewSize(), settings->previewSize());
     const int previewSizeValue = ZoomLevelInfo::zoomLevelForIconSize(previewSize);
     m_iconSizeGroupBox->setPreviewSizeValue(previewSizeValue);


@@ -234,7 +234,7 @@ void IconsViewSettingsPage::loadSettings()
 
     m_textWidthBox->setCurrentIndex(textWidthIndex);
     m_arrangementBox->setCurrentIndex(leftToRightArrangement ? 0 : 1);
 
     m_textWidthBox->setCurrentIndex(textWidthIndex);
     m_arrangementBox->setCurrentIndex(leftToRightArrangement ? 0 : 1);

-    
+

     const int spacing = settings->gridSpacing();
     const int index = (spacing <= 0) ? 0 : 1 + (spacing - GridSpacingBase) / GridSpacingInc;
     m_gridSpacingBox->setCurrentIndex(index);
     const int spacing = settings->gridSpacing();
     const int index = (spacing <= 0) ? 0 : 1 + (spacing - GridSpacingBase) / GridSpacingInc;
     m_gridSpacingBox->setCurrentIndex(index);

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 64d5d44c25757d246d169ff8d3cc4f94f6d8673b..fc34bac7dfb26cbe1e1dfa17b97653faa2d66f5b 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -144,7 +144,7 @@ void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item)
             m_urlCandidate = item.url();
             m_fileItem = item;
             m_infoTimer->start();
             m_urlCandidate = item.url();
             m_fileItem = item;
             m_infoTimer->start();

-        }    
+        }

     }
 }
 
     }
 }
 


@@ -488,26 +488,26 @@ void InfoSidebarPage::setNameLabelText(const QString& text)
 {
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 {
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);

-    
+

     QTextLayout textLayout(text);
     textLayout.setFont(m_nameLabel->font());
     textLayout.setTextOption(textOption);
     QTextLayout textLayout(text);
     textLayout.setFont(m_nameLabel->font());
     textLayout.setTextOption(textOption);

-    
+

     QString wrappedText;
     wrappedText.reserve(text.length());
     QString wrappedText;
     wrappedText.reserve(text.length());

-    
+

     // wrap the text to fit into the width of m_nameLabel
     textLayout.beginLayout();
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_nameLabel->width());
         wrappedText += text.mid(line.textStart(), line.textLength());
     // wrap the text to fit into the width of m_nameLabel
     textLayout.beginLayout();
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_nameLabel->width());
         wrappedText += text.mid(line.textStart(), line.textLength());

-        
+

         line = textLayout.createLine();
         if (line.isValid()) {
             wrappedText += QChar::LineSeparator;
         }
         line = textLayout.createLine();
         if (line.isValid()) {
             wrappedText += QChar::LineSeparator;
         }

-    }    
+    }

     textLayout.endLayout();
 
     m_nameLabel->setText(wrappedText);
     textLayout.endLayout();
 
     m_nameLabel->setText(wrappedText);

diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h
index 4ff637fd568abd37a16e84805522f7c2dba71e1c..e6f5117149ca73a12bb8cdbcd16021f7c6b6615d 100644 (file)
--- a/src/infosidebarpage.h
+++ b/src/infosidebarpage.h
@@ -159,12 +159,12 @@ private:
      * InfosidebarPage::fileUrl();
      */
     bool showMultipleSelectionInfo() const;
      * InfosidebarPage::fileUrl();
      */
     bool showMultipleSelectionInfo() const;

-    
+

     /**
      * Returns true, if \a url is equal to the shown URL m_shownUrl.
      */
     bool isEqualToShownUrl(const KUrl& url) const;
     /**
      * Returns true, if \a url is equal to the shown URL m_shownUrl.
      */
     bool isEqualToShownUrl(const KUrl& url) const;

-    
+

     /**
      * Sets the text for the label \a m_nameLabel and assures that the
      * text is split in a way that it can be wrapped within the
     /**
      * Sets the text for the label \a m_nameLabel and assures that the
      * text is split in a way that it can be wrapped within the

diff --git a/src/kformattedballoontipdelegate.cpp b/src/kformattedballoontipdelegate.cpp
index 99fd4dfc17a5fd9c9c1f3f609da1e6f3167daab3..140c90ef40e15f593dfbccf9e7bfefcb8cc7518d 100644 (file)
--- a/src/kformattedballoontipdelegate.cpp
+++ b/src/kformattedballoontipdelegate.cpp
@@ -37,11 +37,11 @@ QSize KFormattedBalloonTipDelegate::sizeHint(const KStyleOptionToolTip *option,
     QTextDocument doc;
     doc.setHtml(item->text());
     const QIcon icon = item->icon();
     QTextDocument doc;
     doc.setHtml(item->text());
     const QIcon icon = item->icon();

-        
+

     const QSize iconSize = icon.isNull() ? QSize(0, 0) : icon.actualSize(option->decorationSize);
     const QSize docSize = doc.size().toSize();
     QSize contentSize = iconSize + docSize;
     const QSize iconSize = icon.isNull() ? QSize(0, 0) : icon.actualSize(option->decorationSize);
     const QSize docSize = doc.size().toSize();
     QSize contentSize = iconSize + docSize;

-    
+

     // assure that the content height is large enough for the icon and the document
     contentSize.setHeight(iconSize.height() > doc.size().height() ? iconSize.height() : doc.size().height());
     return contentSize + QSize(Border * 3, Border * 2);
     // assure that the content height is large enough for the icon and the document
     contentSize.setHeight(iconSize.height() > doc.size().height() ? iconSize.height() : doc.size().height());
     return contentSize + QSize(Border * 3, Border * 2);


@@ -59,7 +59,7 @@ void KFormattedBalloonTipDelegate::paint(QPainter *painter,
 
     const QColor toColor = option->palette.brush(QPalette::ToolTipBase).color();
     const QColor fromColor = KColorScheme::shade(toColor, KColorScheme::LightShade, 0.2);
 
     const QColor toColor = option->palette.brush(QPalette::ToolTipBase).color();
     const QColor fromColor = KColorScheme::shade(toColor, KColorScheme::LightShade, 0.2);

-    
+

     QLinearGradient gradient(option->rect.topLeft(), option->rect.bottomLeft());
     gradient.setColorAt(0.0, fromColor);
     gradient.setColorAt(1.0, toColor);
     QLinearGradient gradient(option->rect.topLeft(), option->rect.bottomLeft());
     gradient.setColorAt(0.0, fromColor);
     gradient.setColorAt(1.0, toColor);


@@ -84,7 +84,7 @@ void KFormattedBalloonTipDelegate::paint(QPainter *painter,
     bitmap.fill(Qt::transparent);
     QPainter p(&bitmap);
     doc.drawContents(&p);
     bitmap.fill(Qt::transparent);
     QPainter p(&bitmap);
     doc.drawContents(&p);

- 
+

     const QRect docRect(QPoint(x, y), doc.size().toSize());
     painter->drawPixmap(docRect, bitmap);
 }
     const QRect docRect(QPoint(x, y), doc.size().toSize());
     painter->drawPixmap(docRect, bitmap);
 }

diff --git a/src/kformattedballoontipdelegate.h b/src/kformattedballoontipdelegate.h
index 64f823a41372244b2b1f3e166f43b4b94689f9b7..452b38a692d26fbc56975635dc864919a358923c 100644 (file)
--- a/src/kformattedballoontipdelegate.h
+++ b/src/kformattedballoontipdelegate.h
@@ -37,7 +37,7 @@ public:
 
 private:
     QPainterPath createPath(const KStyleOptionToolTip& option) const;
 
 private:
     QPainterPath createPath(const KStyleOptionToolTip& option) const;

-    
+

 private:
     enum { Border = 8 };
 };
 private:
     enum { Border = 8 };
 };

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index adcd23d7573923612b43165cd3401bb85fe6b91c..33017f02bc1b853873b144408e9be7f9708258dc 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -72,7 +72,7 @@ void StatusBarSpaceInfo::refresh()
     if (!isVisible()) {
         return;
     }
     if (!isVisible()) {
         return;
     }

-    
+

     // KDiskFreeSpace is for local paths only
     if (!m_url.isLocalFile()) {
         setText(i18nc("@info:status", "Unknown size"));
     // KDiskFreeSpace is for local paths only
     if (!m_url.isLocalFile()) {
         setText(i18nc("@info:status", "Unknown size"));


@@ -101,7 +101,7 @@ void StatusBarSpaceInfo::refresh()
     if (valuesChanged) {
         setText(i18nc("@info:status Free disk space", "%1 free",
                 KIO::convertSize(job.available())));
     if (valuesChanged) {
         setText(i18nc("@info:status Free disk space", "%1 free",
                 KIO::convertSize(job.available())));

-        
+

         setUpdatesEnabled(false);
         m_kBSize = kBSize;
         setValue(kBSize > 0 ? (kBUsed * 100) / kBSize : 0);
         setUpdatesEnabled(false);
         m_kBSize = kBSize;
         setValue(kBSize > 0 ? (kBUsed * 100) / kBSize : 0);

diff --git a/src/statusbarspaceinfo.h b/src/statusbarspaceinfo.h
index 7a9fae36d002a6166ba3d4ace8ea6c8ce23a2b99..06d0605381681f08b3c840d41d840588711d59f1 100644 (file)
--- a/src/statusbarspaceinfo.h
+++ b/src/statusbarspaceinfo.h
@@ -50,7 +50,7 @@ public:
 protected:
     void showEvent(QShowEvent* event);
     void hideEvent(QHideEvent* event);
 protected:
     void showEvent(QShowEvent* event);
     void hideEvent(QHideEvent* event);

-    
+

 private slots:
     /** Refreshes the space information for the current set URL. */
     void refresh();
 private slots:
     /** Refreshes the space information for the current set URL. */
     void refresh();

diff --git a/src/tooltipmanager.cpp b/src/tooltipmanager.cpp
index eb1e52ec11bdd3b2188250534758ec07181840ce..a3faa6923e1114f8b892be2a1e0d68efe38a3c0b 100644 (file)
--- a/src/tooltipmanager.cpp
+++ b/src/tooltipmanager.cpp
@@ -163,7 +163,7 @@ void ToolTipManager::prepareToolTip()
             m_emptyRenderedKToolTipItem = toolTip; // make toolTip accessible everywhere
             showToolTip(toolTip);
         }
             m_emptyRenderedKToolTipItem = toolTip; // make toolTip accessible everywhere
             showToolTip(toolTip);
         }

-        
+

         ++m_previewPass;
         m_waitOnPreviewTimer->start(250);
     } else {
         ++m_previewPass;
         m_waitOnPreviewTimer->start(250);
     } else {


@@ -201,7 +201,7 @@ void ToolTipManager::showToolTip(KToolTipItem* tip)
         m_emptyRenderedKToolTipItem = 0;
         return;
     }
         m_emptyRenderedKToolTipItem = 0;
         return;
     }

-    
+

     KStyleOptionToolTip option;
     // TODO: get option content from KToolTip or add KToolTip::sizeHint() method
     option.direction      = QApplication::layoutDirection();
     KStyleOptionToolTip option;
     // TODO: get option content from KToolTip or add KToolTip::sizeHint() method
     option.direction      = QApplication::layoutDirection();


@@ -234,14 +234,14 @@ void ToolTipManager::showToolTip(KToolTipItem* tip)
     const bool hasRoomToLeft  = (m_itemRect.left()   - size.width()  >= desktop.left());
     const bool hasRoomToRight = (m_itemRect.right()  + size.width()  <= desktop.right());
     const bool hasRoomAbove   = (m_itemRect.top()    - size.height() >= desktop.top());
     const bool hasRoomToLeft  = (m_itemRect.left()   - size.width()  >= desktop.left());
     const bool hasRoomToRight = (m_itemRect.right()  + size.width()  <= desktop.right());
     const bool hasRoomAbove   = (m_itemRect.top()    - size.height() >= desktop.top());

-    const bool hasRoomBelow   = (m_itemRect.bottom() + size.height() <= desktop.bottom());    
+    const bool hasRoomBelow   = (m_itemRect.bottom() + size.height() <= desktop.bottom());

     if (!hasRoomAbove && !hasRoomBelow && !hasRoomToLeft && !hasRoomToRight) {
         delete tip;
         tip = 0;
         return;
     }
 
     if (!hasRoomAbove && !hasRoomBelow && !hasRoomToLeft && !hasRoomToRight) {
         delete tip;
         tip = 0;
         return;
     }
 

-    int x = 0;   
+    int x = 0;

     int y = 0;
     if (hasRoomBelow || hasRoomAbove) {
         x = QCursor::pos().x() + 16; // TODO: use mouse pointer width instead of the magic value of 16
     int y = 0;
     if (hasRoomBelow || hasRoomAbove) {
         x = QCursor::pos().x() + 16; // TODO: use mouse pointer width instead of the magic value of 16


@@ -252,7 +252,7 @@ void ToolTipManager::showToolTip(KToolTipItem* tip)
     } else {
         Q_ASSERT(hasRoomToLeft || hasRoomToRight);
         x = hasRoomToRight ? m_itemRect.right() : m_itemRect.left() - size.width();
     } else {
         Q_ASSERT(hasRoomToLeft || hasRoomToRight);
         x = hasRoomToRight ? m_itemRect.right() : m_itemRect.left() - size.width();

-        
+

         // Put the tooltip at the bottom of the screen. The x-coordinate has already
         // been adjusted, so that no overlapping with m_itemRect occurs.
         y = desktop.bottom() - size.height();
         // Put the tooltip at the bottom of the screen. The x-coordinate has already
         // been adjusted, so that no overlapping with m_itemRect occurs.
         y = desktop.bottom() - size.height();


@@ -285,7 +285,7 @@ void ToolTipManager::setPreviewPix(const KFileItem& item,
         m_generatingPreview = false;
         return;
     }
         m_generatingPreview = false;
         return;
     }

-    
+

     if (m_previewIsLate) {
         // always use the maximal width
         QPixmap paddedImage(QSize(PREVIEW_WIDTH, pixmap.height()));
     if (m_previewIsLate) {
         // always use the maximal width
         QPixmap paddedImage(QSize(PREVIEW_WIDTH, pixmap.height()));

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 2c3e4adaaef6b478194b174cab340a428c724f34..f6b3349d2ea11acca68a7dd2e967ae916d1de580 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -156,7 +156,7 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
         m_treeView->setModel(m_proxyModel);
         m_proxyModel->setSorting(DolphinView::SortByName);
         m_proxyModel->setSortOrder(Qt::AscendingOrder);
         m_treeView->setModel(m_proxyModel);
         m_proxyModel->setSorting(DolphinView::SortByName);
         m_proxyModel->setSortOrder(Qt::AscendingOrder);

-        
+

         new FolderExpander(m_treeView, m_proxyModel);
 
         connect(m_treeView, SIGNAL(clicked(const QModelIndex&)),
         new FolderExpander(m_treeView, m_proxyModel);
 
         connect(m_treeView, SIGNAL(clicked(const QModelIndex&)),

diff --git a/src/treeviewsidebarpage.h b/src/treeviewsidebarpage.h
index 3a37c888229aa287b34a1403ef5a9167289d350a..84a9386ec23f118916f10dc577207aaa11f89693 100644 (file)
--- a/src/treeviewsidebarpage.h
+++ b/src/treeviewsidebarpage.h
@@ -93,7 +93,7 @@ private slots:
      * to the index \a index.
      */
     void dropUrls(const QModelIndex& index, QDropEvent* event);
      * to the index \a index.
      */
     void dropUrls(const QModelIndex& index, QDropEvent* event);

-    
+

     /**
      * Expands the treeview to show the directory
      * specified by \a index.
     /**
      * Expands the treeview to show the directory
      * specified by \a index.

diff --git a/src/zoomlevelinfo.cpp b/src/zoomlevelinfo.cpp
index 50c656b33a1ddec013a751f4a389b8edd7515b38..08e95e3cafdac0c0a56a4b9fa4075452095e177d 100644 (file)
--- a/src/zoomlevelinfo.cpp
+++ b/src/zoomlevelinfo.cpp
@@ -35,7 +35,7 @@ int ZoomLevelInfo::iconSizeForZoomLevel(int level)
 {
     int size = KIconLoader::SizeMedium;
     switch (level) {
 {
     int size = KIconLoader::SizeMedium;
     switch (level) {

-    case 0:  size = KIconLoader::SizeSmall; break; 
+    case 0:  size = KIconLoader::SizeSmall; break;

     case 1:  size = KIconLoader::SizeSmallMedium; break;
     case 2:  size = KIconLoader::SizeMedium; break;
     case 3:  size = KIconLoader::SizeLarge; break;
     case 1:  size = KIconLoader::SizeSmallMedium; break;
     case 2:  size = KIconLoader::SizeMedium; break;
     case 3:  size = KIconLoader::SizeLarge; break;