[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.3/kdelibs/kfile
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2009-06-30 20:18:32
Message-ID: 1246393112.482362.15445.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 989745 by apaku:

Backport:
Revert r981652 and r981593.
Apparently I missed that the setView( KFile::DefaultView ) actually uses the
defaults from the config file.
BUG:198081


 M  +0 -5      kdiroperator.cpp  
 M  +0 -8      kdiroperator.h  
 M  +1 -1      kfilewidget.cpp  


--- branches/KDE/4.3/kdelibs/kfile/kdiroperator.cpp #989744:989745
@@ -2627,11 +2627,6 @@
     d->actionCollection->action("decorationAtTop")->setChecked(!decorationAtLeft);
 }
 
-KFile::FileView KDirOperator::viewKind() const
-{
-    return static_cast<KFile::FileView>(d->viewKind);
-}
-
 // ### temporary code
 #include <dirent.h>
 bool KDirOperator::Private::isReadable(const KUrl& url)
--- branches/KDE/4.3/kdelibs/kfile/kdiroperator.h #989744:989745
@@ -852,14 +852,6 @@
      */
     void currentIconSizeChanged(int size);
 
-public:
-    /**
-     * @returns the currently used view kind
-     * @see setView
-     * @since 4.3
-     */
-    KFile::FileView viewKind() const;
-
 private:
     class Private;
     Private* const d;
--- branches/KDE/4.3/kdelibs/kfile/kfilewidget.cpp #989744:989745
@@ -1712,7 +1712,7 @@
     if ( !d->hasView ) { // delayed view-creation
         Q_ASSERT( d );
         Q_ASSERT( d->ops );
-        d->ops->setView( d->ops->viewKind() );
+        d->ops->setView( KFile::Default );
         d->ops->view()->setSizePolicy( QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Maximum ) );
         d->hasView = true;
 
[prev in list] [next in list] [prev in thread] [next in thread]