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

List:       kde-commits
Subject:    KDE
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2009-11-30 9:55:36
Message-ID: 1259574936.186575.21108.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1056459 by skelly:

Move/copy the KSortFilterPrxoyModel into kdebase.

It will be replaced in 4.5




 M  +1 -0      kdebase/apps/konqueror/src/CMakeLists.txt  
 M  +1 -1      kdebase/apps/konqueror/src/konqhistoryproxymodel.h  
 AM            kdebase/apps/konqueror/src/ksortfilterproxymodel.cpp   \
kdelibs/kdeui/itemviews/ksortfilterproxymodel.cpp#1054140 [License: LGPL (v2+)]  AM   \
kdebase/apps/konqueror/src/ksortfilterproxymodel.h   \
kdelibs/kdeui/itemviews/ksortfilterproxymodel.h#1054140 [License: LGPL (v2+)]  M  +1 \
-1      kdebase/workspace/ksysguard/gui/SensorBrowser.h    AM            \
kdebase/workspace/ksysguard/gui/ksortfilterproxymodel.cpp   \
kdelibs/kdeui/itemviews/ksortfilterproxymodel.cpp#1054140 [License: LGPL (v2+)]  AM   \
kdebase/workspace/ksysguard/gui/ksortfilterproxymodel.h   \
kdelibs/kdeui/itemviews/ksortfilterproxymodel.h#1054140 [License: LGPL (v2+)]  M  +0 \
-2      kdelibs/kdeui/CMakeLists.txt    D             \
kdelibs/kdeui/itemviews/ksortfilterproxymodel.cpp    D             \
kdelibs/kdeui/itemviews/ksortfilterproxymodel.h  


--- trunk/KDE/kdebase/apps/konqueror/src/CMakeLists.txt #1056458:1056459
@@ -23,6 +23,7 @@
 
    # for the sidebar history module
    konqhistorymodel.cpp
+   ksortfilterproxymodel.cpp
    konqhistoryproxymodel.cpp
    konqhistoryview.cpp
    konqhistorysettings.cpp
--- trunk/KDE/kdebase/apps/konqueror/src/konqhistoryproxymodel.h #1056458:1056459
@@ -20,7 +20,7 @@
 #ifndef KONQ_HISTORYPROXYMODEL_H
 #define KONQ_HISTORYPROXYMODEL_H
 
-#include <ksortfilterproxymodel.h>
+#include "ksortfilterproxymodel.h"
 
 class KonqHistorySettings;
 
** trunk/KDE/kdebase/apps/konqueror/src/ksortfilterproxymodel.cpp #property \
svn:mergeinfo  + 
** trunk/KDE/kdebase/apps/konqueror/src/ksortfilterproxymodel.h #property \
svn:mergeinfo  + 
--- trunk/KDE/kdebase/workspace/ksysguard/gui/SensorBrowser.h #1056458:1056459
@@ -27,7 +27,7 @@
 #include <QMap>
 #include <QHash>
 #include <ksgrd/SensorClient.h>
-#include <ksortfilterproxymodel.h>
+#include "ksortfilterproxymodel.h"
 
 class QMouseEvent;
 
** trunk/KDE/kdebase/workspace/ksysguard/gui/ksortfilterproxymodel.cpp #property \
svn:mergeinfo  + 
** trunk/KDE/kdebase/workspace/ksysguard/gui/ksortfilterproxymodel.h #property \
svn:mergeinfo  + 
--- trunk/KDE/kdelibs/kdeui/CMakeLists.txt #1056458:1056459
@@ -118,7 +118,6 @@
  # This requires patches which are not yet in Qt. Disabled for now.
 #  itemviews/kreparentingproxymodel.cpp
  itemviews/kselectionproxymodel.cpp
- itemviews/ksortfilterproxymodel.cpp
  jobs/kdialogjobuidelegate.cpp
  jobs/kabstractwidgetjobtracker.cpp
  jobs/kwidgetjobtracker.cpp
@@ -479,7 +478,6 @@
  itemviews/kwidgetitemdelegate.h
 #  itemviews/kreparentingproxymodel.h
  itemviews/kselectionproxymodel.h
- itemviews/ksortfilterproxymodel.h
  jobs/kdialogjobuidelegate.h
  jobs/kabstractwidgetjobtracker.h
  jobs/kwidgetjobtracker.h


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