rpms/kdebindings/devel kdebindings-4.3.80-pykdeui-trunk.patch, NONE, 1.1 kdebindings-4.3.80-fix-build.patch, 1.3, 1.4 kdebindings.spec, 1.272, 1.273
Kevin Kofler
kkofler at fedoraproject.org
Sat Dec 12 01:19:48 UTC 2009
- Previous message: rpms/ifuse/devel ifuse.spec,1.10,1.11
- Next message: rpms/lxpanel/devel lxpanel-0.5.4-default.patch, NONE, 1.1 lxpanel-0.5.4-fix-ca.po.patch, NONE, 1.1 lxpanel-0.5.4-remove-cpufreq-from-configure.patch, NONE, 1.1 lxpanel.spec, 1.26, 1.27 lxpanel-default.patch, 1.7, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15772/devel
Modified Files:
kdebindings-4.3.80-fix-build.patch kdebindings.spec
Added Files:
kdebindings-4.3.80-pykdeui-trunk.patch
Log Message:
Try upstream backport to fix the PyKDE4 kdeui build.
kdebindings-4.3.80-pykdeui-trunk.patch:
kabstractwidgetjobtracker.sip | 266 +++++++++++++++++-------------------------
kactioncollection.sip | 2
kdescendantsproxymodel.sip | 50 -------
kdeuimod.sip | 2
kiconcache.sip | 12 +
ksortfilterproxymodel.sip | 33 -----
kstatusnotifieritem.sip | 7 -
ktimezonewidget.sip | 5
kwallet.sip | 2
kwindowsystem.sip | 2
netwm.sip | 2
netwm_def.sip | 3
12 files changed, 137 insertions(+), 249 deletions(-)
--- NEW FILE kdebindings-4.3.80-pykdeui-trunk.patch ---
Index: python/pykde4/sip/kdeui/kdescendantsproxymodel.sip
===================================================================
--- python/pykde4/sip/kdeui/kdescendantsproxymodel.sip (revision 1060017)
+++ python/pykde4/sip/kdeui/kdescendantsproxymodel.sip (revision 1060018)
@@ -1,50 +0,0 @@
-// Copyright 2009 Simon Edwards <simon at simonzone.com>
-
-// Generated by twine2
-
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU Library General Public License as
-// published by the Free Software Foundation; either version 2, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details
-
-// You should have received a copy of the GNU Library General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-class KDescendantsProxyModel : QAbstractProxyModel
-{
-%TypeHeaderCode
-#include <kdescendantsproxymodel.h>
-%End
-
-public:
- explicit KDescendantsProxyModel (QObject* parent /TransferThis/ = 0);
- virtual ~KDescendantsProxyModel ();
- virtual void setSourceModel (QAbstractItemModel* model);
- void setRootIndex (const QModelIndex& index);
- void setDisplayAncestorData (bool display);
- bool displayAncestorData () const;
- void setAncestorSeparator (const QString& separator);
- QString ancestorSeparator () const;
-//FIXME not implemented
-//ig int descendantCount (const QModelIndex& index) const;
- QModelIndex mapFromSource (const QModelIndex& sourceIndex) const;
- QModelIndex mapToSource (const QModelIndex& proxyIndex) const;
- virtual Qt::ItemFlags flags (const QModelIndex& index) const;
- QVariant data (const QModelIndex& index, int role = Qt::DisplayRole) const;
- virtual int rowCount (const QModelIndex& parent = QModelIndex()) const;
- virtual QMimeData* mimeData (const QModelIndexList& indexes) const;
- virtual QStringList mimeTypes () const;
- virtual bool hasChildren (const QModelIndex& parent = QModelIndex()) const;
- virtual QModelIndex index (int, int, const QModelIndex& parent = QModelIndex()) const;
- virtual QModelIndex parent (const QModelIndex&) const;
- virtual int columnCount (const QModelIndex& index = QModelIndex()) const;
- virtual Qt::DropActions supportedDropActions () const;
- virtual QModelIndexList match (const QModelIndex& start, int role, const QVariant& value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const;
-};
Index: python/pykde4/sip/kdeui/ksortfilterproxymodel.sip
===================================================================
--- python/pykde4/sip/kdeui/ksortfilterproxymodel.sip (revision 1060017)
+++ python/pykde4/sip/kdeui/ksortfilterproxymodel.sip (revision 1060018)
@@ -1,33 +0,0 @@
-// Copyright 2009 Simon Edwards <simon at simonzone.com>
-
-// Generated by twine2
-
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU Library General Public License as
-// published by the Free Software Foundation; either version 2, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details
-
-// You should have received a copy of the GNU Library General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-class KSortFilterProxyModel : QSortFilterProxyModel
-{
-%TypeHeaderCode
-#include <ksortfilterproxymodel.h>
-%End
-
-public:
- KSortFilterProxyModel (QObject* parent /TransferThis/ = 0);
- ~KSortFilterProxyModel ();
- bool showAllChildren () const;
- void setShowAllChildren (bool showAllChildren);
-protected:
- virtual bool filterAcceptsRow (int source_row, const QModelIndex& source_parent) const;
-};
Index: python/pykde4/sip/kdeui/netwm.sip
===================================================================
--- python/pykde4/sip/kdeui/netwm.sip (revision 1060017)
+++ python/pykde4/sip/kdeui/netwm.sip (revision 1060018)
@@ -267,6 +267,8 @@
//end
//ig NETWinInfo (Display* display, Window window, Window rootWindow, const unsigned long properties [], int properties_size, NET::Role role = NET::Role::Client);
~NETWinInfo ();
+ void setFrameOverlap (NETStrut strut);
+ NETStrut frameOverlap () const;
};
// NETWinInfo
Index: python/pykde4/sip/kdeui/kiconcache.sip
===================================================================
--- python/pykde4/sip/kdeui/kiconcache.sip (revision 1060017)
+++ python/pykde4/sip/kdeui/kiconcache.sip (revision 1060018)
@@ -46,7 +46,19 @@
unsigned int mostRecentMTime (const QSet<QString>& dirNames) const;
public:
~KIconCache ();
+%ConvertToSubClassCode
+ // CTSCC for subclasses of 'KPixmapCache'
+ sipType = NULL;
+
+ if (dynamic_cast<KIconCache*>(sipCpp))
+ sipType = sipType_KIconCache;
+%End
};
// KIconCache
+%ModuleHeaderCode
+//ctscc
+#include <kiconcache.h>
+#include <kpixmapcache.h>
+%End
Index: python/pykde4/sip/kdeui/netwm_def.sip
===================================================================
--- python/pykde4/sip/kdeui/netwm_def.sip (revision 1060017)
+++ python/pykde4/sip/kdeui/netwm_def.sip (revision 1060018)
@@ -316,7 +316,8 @@
WM2Opacity,
WM2DesktopLayout,
WM2FullPlacement,
- WM2FullscreenMonitors
+ WM2FullscreenMonitors,
+ WM2FrameOverlap
};
Index: python/pykde4/sip/kdeui/ktimezonewidget.sip
===================================================================
--- python/pykde4/sip/kdeui/ktimezonewidget.sip (revision 1060017)
+++ python/pykde4/sip/kdeui/ktimezonewidget.sip (revision 1060018)
@@ -33,6 +33,11 @@
void setSelected (const QString& zone, bool selected);
static QString displayName (const KTimeZone& zone);
~KTimeZoneWidget ();
+ void setItemsCheckable (bool enable);
+ bool itemsCheckable () const;
+ void setSelectionMode (QAbstractItemView::SelectionMode mode);
+ QAbstractItemView::SelectionMode selectionMode () const;
+ void clearSelection ();
};
// KTimeZoneWidget
Index: python/pykde4/sip/kdeui/kactioncollection.sip
===================================================================
--- python/pykde4/sip/kdeui/kactioncollection.sip (revision 1060017)
+++ python/pykde4/sip/kdeui/kactioncollection.sip (revision 1060018)
@@ -68,7 +68,9 @@
protected:
//ig virtual void connectNotify (const char* signal);
+//force
virtual void connectNotify (SIP_SIGNAL);
+//end
virtual void slotActionTriggered ();
virtual void slotActionHighlighted ();
Index: python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip
===================================================================
--- python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip (revision 1060017)
+++ python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip (revision 1060018)
@@ -63,7 +63,6 @@
#include <kdatetable.h>
#include <kdatetimewidget.h>
#include <kdatewidget.h>
-#include <kdescendantsproxymodel.h>
#include <kdialog.h>
#include <kdialogbuttonbox.h>
#include <kdialogjobuidelegate.h>
@@ -136,7 +135,6 @@
#include <kshortcutsdialog.h>
#include <kshortcutseditor.h>
#include <kshortcutwidget.h>
-#include <ksortfilterproxymodel.h>
#include <ksplashscreen.h>
#include <ksqueezedtextlabel.h>
#include <kstartupinfo.h>
@@ -226,11 +224,9 @@
else if (dynamic_cast<KConfigSkeleton*>(sipCpp))
sipType = sipType_KConfigSkeleton;
else if (dynamic_cast<KFind*>(sipCpp))
- {
sipType = sipType_KFind;
- if (dynamic_cast<KReplace*>(sipCpp))
- sipType = sipType_KReplace;
- }
+ else if (dynamic_cast<KReplace*>(sipCpp))
+ sipType = sipType_KReplace;
else if (dynamic_cast<KGlobalAccel*>(sipCpp))
sipType = sipType_KGlobalAccel;
else if (dynamic_cast<KGlobalSettings*>(sipCpp))
@@ -241,14 +237,12 @@
sipType = sipType_KHelpMenu;
else if (dynamic_cast<KIconLoader*>(sipCpp))
sipType = sipType_KIconLoader;
+ else if (dynamic_cast<KStatusBarJobTracker*>(sipCpp))
+ sipType = sipType_KStatusBarJobTracker;
+ else if (dynamic_cast<KWidgetJobTracker*>(sipCpp))
+ sipType = sipType_KWidgetJobTracker;
else if (dynamic_cast<KAbstractWidgetJobTracker*>(sipCpp))
- {
sipType = sipType_KAbstractWidgetJobTracker;
- if (dynamic_cast<KStatusBarJobTracker*>(sipCpp))
- sipType = sipType_KStatusBarJobTracker;
- else if (dynamic_cast<KWidgetJobTracker*>(sipCpp))
- sipType = sipType_KWidgetJobTracker;
- }
else if (dynamic_cast<KUiServerJobTracker*>(sipCpp))
sipType = sipType_KUiServerJobTracker;
else if (dynamic_cast<KDialogJobUiDelegate*>(sipCpp))
@@ -284,59 +278,45 @@
else if (dynamic_cast<KExtendableItemDelegate*>(sipCpp))
sipType = sipType_KExtendableItemDelegate;
else if (dynamic_cast<KPageModel*>(sipCpp))
- {
sipType = sipType_KPageModel;
- if (dynamic_cast<KPageWidgetModel*>(sipCpp))
- sipType = sipType_KPageWidgetModel;
- }
- else if (dynamic_cast<KDescendantsProxyModel*>(sipCpp))
- sipType = sipType_KDescendantsProxyModel;
+ else if (dynamic_cast<KPageWidgetModel*>(sipCpp))
+ sipType = sipType_KPageWidgetModel;
else if (dynamic_cast<KSelectionProxyModel*>(sipCpp))
sipType = sipType_KSelectionProxyModel;
else if (dynamic_cast<KCategorizedSortFilterProxyModel*>(sipCpp))
sipType = sipType_KCategorizedSortFilterProxyModel;
- else if (dynamic_cast<KSortFilterProxyModel*>(sipCpp))
- sipType = sipType_KSortFilterProxyModel;
+ else if (dynamic_cast<KActionMenu*>(sipCpp))
+ sipType = sipType_KActionMenu;
+ else if (dynamic_cast<KPasteTextAction*>(sipCpp))
+ sipType = sipType_KPasteTextAction;
+ else if (dynamic_cast<KCodecAction*>(sipCpp))
+ sipType = sipType_KCodecAction;
+ else if (dynamic_cast<KFontAction*>(sipCpp))
+ sipType = sipType_KFontAction;
+ else if (dynamic_cast<KFontSizeAction*>(sipCpp))
+ sipType = sipType_KFontSizeAction;
+ else if (dynamic_cast<KRecentFilesAction*>(sipCpp))
+ sipType = sipType_KRecentFilesAction;
+ else if (dynamic_cast<KSelectAction*>(sipCpp))
+ sipType = sipType_KSelectAction;
+ else if (dynamic_cast<KToggleAction*>(sipCpp))
+ sipType = sipType_KToggleAction;
+ else if (dynamic_cast<KToggleFullScreenAction*>(sipCpp))
+ sipType = sipType_KToggleFullScreenAction;
+ else if (dynamic_cast<KToggleToolBarAction*>(sipCpp))
+ sipType = sipType_KToggleToolBarAction;
+ else if (dynamic_cast<KToolBarLabelAction*>(sipCpp))
+ sipType = sipType_KToolBarLabelAction;
+ else if (dynamic_cast<KToolBarPopupAction*>(sipCpp))
+ sipType = sipType_KToolBarPopupAction;
+ else if (dynamic_cast<KToolBarSpacerAction*>(sipCpp))
+ sipType = sipType_KToolBarSpacerAction;
else if (dynamic_cast<KAction*>(sipCpp))
- {
sipType = sipType_KAction;
- if (dynamic_cast<KActionMenu*>(sipCpp))
- sipType = sipType_KActionMenu;
- else if (dynamic_cast<KPasteTextAction*>(sipCpp))
- sipType = sipType_KPasteTextAction;
- else if (dynamic_cast<KSelectAction*>(sipCpp))
- {
- sipType = sipType_KSelectAction;
- if (dynamic_cast<KCodecAction*>(sipCpp))
- sipType = sipType_KCodecAction;
- else if (dynamic_cast<KFontAction*>(sipCpp))
- sipType = sipType_KFontAction;
- else if (dynamic_cast<KFontSizeAction*>(sipCpp))
- sipType = sipType_KFontSizeAction;
- else if (dynamic_cast<KRecentFilesAction*>(sipCpp))
- sipType = sipType_KRecentFilesAction;
- }
- else if (dynamic_cast<KToggleAction*>(sipCpp))
- {
- sipType = sipType_KToggleAction;
- if (dynamic_cast<KToggleFullScreenAction*>(sipCpp))
- sipType = sipType_KToggleFullScreenAction;
- else if (dynamic_cast<KToggleToolBarAction*>(sipCpp))
- sipType = sipType_KToggleToolBarAction;
- }
- else if (dynamic_cast<KToolBarLabelAction*>(sipCpp))
- sipType = sipType_KToolBarLabelAction;
- else if (dynamic_cast<KToolBarPopupAction*>(sipCpp))
- sipType = sipType_KToolBarPopupAction;
- else if (dynamic_cast<KToolBarSpacerAction*>(sipCpp))
- sipType = sipType_KToolBarSpacerAction;
- }
+ else if (dynamic_cast<KUniqueApplication*>(sipCpp))
+ sipType = sipType_KUniqueApplication;
else if (dynamic_cast<KApplication*>(sipCpp))
- {
sipType = sipType_KApplication;
- if (dynamic_cast<KUniqueApplication*>(sipCpp))
- sipType = sipType_KUniqueApplication;
- }
else if (dynamic_cast<KStyle*>(sipCpp))
sipType = sipType_KStyle;
else if (dynamic_cast<KSvgRenderer*>(sipCpp))
@@ -390,19 +370,15 @@
else if (dynamic_cast<KMultiTabBar*>(sipCpp))
sipType = sipType_KMultiTabBar;
else if (dynamic_cast<KNumInput*>(sipCpp))
- {
sipType = sipType_KNumInput;
- if (dynamic_cast<KDoubleNumInput*>(sipCpp))
- sipType = sipType_KDoubleNumInput;
- else if (dynamic_cast<KIntNumInput*>(sipCpp))
- sipType = sipType_KIntNumInput;
- }
+ else if (dynamic_cast<KDoubleNumInput*>(sipCpp))
+ sipType = sipType_KDoubleNumInput;
+ else if (dynamic_cast<KIntNumInput*>(sipCpp))
+ sipType = sipType_KIntNumInput;
else if (dynamic_cast<KPageView*>(sipCpp))
- {
sipType = sipType_KPageView;
- if (dynamic_cast<KPageWidget*>(sipCpp))
- sipType = sipType_KPageWidget;
- }
+ else if (dynamic_cast<KPageWidget*>(sipCpp))
+ sipType = sipType_KPageWidget;
else if (dynamic_cast<KPixmapRegionSelectorWidget*>(sipCpp))
sipType = sipType_KPixmapRegionSelectorWidget;
else if (dynamic_cast<KPixmapSequenceWidget*>(sipCpp))
@@ -417,94 +393,80 @@
sipType = sipType_KTreeWidgetSearchLineWidget;
else if (dynamic_cast<KXMessages*>(sipCpp))
sipType = sipType_KXMessages;
+ else if (dynamic_cast<KHueSaturationSelector*>(sipCpp))
+ sipType = sipType_KHueSaturationSelector;
else if (dynamic_cast<KXYSelector*>(sipCpp))
- {
sipType = sipType_KXYSelector;
- if (dynamic_cast<KHueSaturationSelector*>(sipCpp))
- sipType = sipType_KHueSaturationSelector;
- }
else if (dynamic_cast<KArrowButton*>(sipCpp))
sipType = sipType_KArrowButton;
else if (dynamic_cast<KColorButton*>(sipCpp))
sipType = sipType_KColorButton;
+ else if (dynamic_cast<KMultiTabBarTab*>(sipCpp))
+ sipType = sipType_KMultiTabBarTab;
else if (dynamic_cast<KMultiTabBarButton*>(sipCpp))
- {
sipType = sipType_KMultiTabBarButton;
- if (dynamic_cast<KMultiTabBarTab*>(sipCpp))
- sipType = sipType_KMultiTabBarTab;
- }
else if (dynamic_cast<KPushButton*>(sipCpp))
sipType = sipType_KPushButton;
else if (dynamic_cast<KAnimatedButton*>(sipCpp))
sipType = sipType_KAnimatedButton;
else if (dynamic_cast<KRuler*>(sipCpp))
sipType = sipType_KRuler;
+ else if (dynamic_cast<KColorValueSelector*>(sipCpp))
+ sipType = sipType_KColorValueSelector;
+ else if (dynamic_cast<KGradientSelector*>(sipCpp))
+ sipType = sipType_KGradientSelector;
else if (dynamic_cast<KSelector*>(sipCpp))
- {
sipType = sipType_KSelector;
- if (dynamic_cast<KColorValueSelector*>(sipCpp))
- sipType = sipType_KColorValueSelector;
- else if (dynamic_cast<KGradientSelector*>(sipCpp))
- sipType = sipType_KGradientSelector;
- }
else if (dynamic_cast<KIntSpinBox*>(sipCpp))
sipType = sipType_KIntSpinBox;
else if (dynamic_cast<KColorCombo*>(sipCpp))
sipType = sipType_KColorCombo;
+ else if (dynamic_cast<KFontComboBox*>(sipCpp))
+ sipType = sipType_KFontComboBox;
+ else if (dynamic_cast<KHistoryComboBox*>(sipCpp))
+ sipType = sipType_KHistoryComboBox;
+ else if (dynamic_cast<Sonnet::DictionaryComboBox*>(sipCpp))
+ sipType = sipType_Sonnet_DictionaryComboBox;
else if (dynamic_cast<KComboBox*>(sipCpp))
- {
sipType = sipType_KComboBox;
- if (dynamic_cast<KFontComboBox*>(sipCpp))
- sipType = sipType_KFontComboBox;
- else if (dynamic_cast<KHistoryComboBox*>(sipCpp))
- sipType = sipType_KHistoryComboBox;
- else if (dynamic_cast<Sonnet::DictionaryComboBox*>(sipCpp))
- sipType = sipType_Sonnet_DictionaryComboBox;
- }
else if (dynamic_cast<KDialog*>(sipCpp))
- {
sipType = sipType_KDialog;
- if (dynamic_cast<KAboutApplicationDialog*>(sipCpp))
- sipType = sipType_KAboutApplicationDialog;
- else if (dynamic_cast<KBugReport*>(sipCpp))
- sipType = sipType_KBugReport;
- else if (dynamic_cast<KColorDialog*>(sipCpp))
- sipType = sipType_KColorDialog;
- else if (dynamic_cast<KEditToolBar*>(sipCpp))
- sipType = sipType_KEditToolBar;
- else if (dynamic_cast<KFindDialog*>(sipCpp))
- {
- sipType = sipType_KFindDialog;
- if (dynamic_cast<KReplaceDialog*>(sipCpp))
- sipType = sipType_KReplaceDialog;
- }
- else if (dynamic_cast<KFontDialog*>(sipCpp))
- sipType = sipType_KFontDialog;
- else if (dynamic_cast<KNewPasswordDialog*>(sipCpp))
- sipType = sipType_KNewPasswordDialog;
- else if (dynamic_cast<KPageDialog*>(sipCpp))
- {
- sipType = sipType_KPageDialog;
- if (dynamic_cast<KAssistantDialog*>(sipCpp))
- sipType = sipType_KAssistantDialog;
- else if (dynamic_cast<KConfigDialog*>(sipCpp))
- sipType = sipType_KConfigDialog;
- }
- else if (dynamic_cast<KPasswordDialog*>(sipCpp))
- sipType = sipType_KPasswordDialog;
- else if (dynamic_cast<KPixmapRegionSelectorDialog*>(sipCpp))
- sipType = sipType_KPixmapRegionSelectorDialog;
- else if (dynamic_cast<KProgressDialog*>(sipCpp))
- sipType = sipType_KProgressDialog;
- else if (dynamic_cast<KShortcutsDialog*>(sipCpp))
- sipType = sipType_KShortcutsDialog;
- else if (dynamic_cast<KTipDialog*>(sipCpp))
- sipType = sipType_KTipDialog;
- else if (dynamic_cast<Sonnet::ConfigDialog*>(sipCpp))
- sipType = sipType_Sonnet_ConfigDialog;
- else if (dynamic_cast<Sonnet::Dialog*>(sipCpp))
- sipType = sipType_Sonnet_Dialog;
- }
+ else if (dynamic_cast<KAboutApplicationDialog*>(sipCpp))
+ sipType = sipType_KAboutApplicationDialog;
+ else if (dynamic_cast<KBugReport*>(sipCpp))
+ sipType = sipType_KBugReport;
+ else if (dynamic_cast<KColorDialog*>(sipCpp))
+ sipType = sipType_KColorDialog;
+ else if (dynamic_cast<KEditToolBar*>(sipCpp))
+ sipType = sipType_KEditToolBar;
+ else if (dynamic_cast<KFindDialog*>(sipCpp))
+ sipType = sipType_KFindDialog;
+ else if (dynamic_cast<KReplaceDialog*>(sipCpp))
+ sipType = sipType_KReplaceDialog;
+ else if (dynamic_cast<KFontDialog*>(sipCpp))
+ sipType = sipType_KFontDialog;
+ else if (dynamic_cast<KNewPasswordDialog*>(sipCpp))
+ sipType = sipType_KNewPasswordDialog;
+ else if (dynamic_cast<KAssistantDialog*>(sipCpp))
+ sipType = sipType_KAssistantDialog;
+ else if (dynamic_cast<KConfigDialog*>(sipCpp))
+ sipType = sipType_KConfigDialog;
+ else if (dynamic_cast<KPageDialog*>(sipCpp))
+ sipType = sipType_KPageDialog;
+ else if (dynamic_cast<KPasswordDialog*>(sipCpp))
+ sipType = sipType_KPasswordDialog;
+ else if (dynamic_cast<KPixmapRegionSelectorDialog*>(sipCpp))
+ sipType = sipType_KPixmapRegionSelectorDialog;
+ else if (dynamic_cast<KProgressDialog*>(sipCpp))
+ sipType = sipType_KProgressDialog;
+ else if (dynamic_cast<KShortcutsDialog*>(sipCpp))
+ sipType = sipType_KShortcutsDialog;
+ else if (dynamic_cast<KTipDialog*>(sipCpp))
+ sipType = sipType_KTipDialog;
+ else if (dynamic_cast<Sonnet::ConfigDialog*>(sipCpp))
+ sipType = sipType_Sonnet_ConfigDialog;
+ else if (dynamic_cast<Sonnet::Dialog*>(sipCpp))
+ sipType = sipType_Sonnet_Dialog;
else if (dynamic_cast<KDialogButtonBox*>(sipCpp))
sipType = sipType_KDialogButtonBox;
else if (dynamic_cast<KColorPatch*>(sipCpp))
@@ -512,11 +474,9 @@
else if (dynamic_cast<KDatePicker*>(sipCpp))
sipType = sipType_KDatePicker;
else if (dynamic_cast<KHBox*>(sipCpp))
- {
sipType = sipType_KHBox;
- if (dynamic_cast<KVBox*>(sipCpp))
- sipType = sipType_KVBox;
- }
+ else if (dynamic_cast<KVBox*>(sipCpp))
+ sipType = sipType_KVBox;
else if (dynamic_cast<KPassivePopup*>(sipCpp))
sipType = sipType_KPassivePopup;
else if (dynamic_cast<KPlotWidget*>(sipCpp))
@@ -528,25 +488,19 @@
else if (dynamic_cast<KCategorizedView*>(sipCpp))
sipType = sipType_KCategorizedView;
else if (dynamic_cast<KListWidget*>(sipCpp))
- {
sipType = sipType_KListWidget;
- if (dynamic_cast<KCompletionBox*>(sipCpp))
- sipType = sipType_KCompletionBox;
- }
+ else if (dynamic_cast<KCompletionBox*>(sipCpp))
+ sipType = sipType_KCompletionBox;
else if (dynamic_cast<KColorCells*>(sipCpp))
sipType = sipType_KColorCells;
else if (dynamic_cast<KTimeZoneWidget*>(sipCpp))
sipType = sipType_KTimeZoneWidget;
+ else if (dynamic_cast<KRichTextWidget*>(sipCpp))
+ sipType = sipType_KRichTextWidget;
+ else if (dynamic_cast<KRichTextEdit*>(sipCpp))
+ sipType = sipType_KRichTextEdit;
else if (dynamic_cast<KTextEdit*>(sipCpp))
- {
sipType = sipType_KTextEdit;
- if (dynamic_cast<KRichTextEdit*>(sipCpp))
- {
- sipType = sipType_KRichTextEdit;
- if (dynamic_cast<KRichTextWidget*>(sipCpp))
- sipType = sipType_KRichTextWidget;
- }
- }
else if (dynamic_cast<KTextBrowser*>(sipCpp))
sipType = sipType_KTextBrowser;
else if (dynamic_cast<KSqueezedTextLabel*>(sipCpp))
@@ -557,22 +511,18 @@
sipType = sipType_KButtonGroup;
else if (dynamic_cast<KEditListBox*>(sipCpp))
sipType = sipType_KEditListBox;
+ else if (dynamic_cast<KListWidgetSearchLine*>(sipCpp))
+ sipType = sipType_KListWidgetSearchLine;
+ else if (dynamic_cast<KRestrictedLine*>(sipCpp))
+ sipType = sipType_KRestrictedLine;
+ else if (dynamic_cast<KTreeWidgetSearchLine*>(sipCpp))
+ sipType = sipType_KTreeWidgetSearchLine;
else if (dynamic_cast<KLineEdit*>(sipCpp))
- {
sipType = sipType_KLineEdit;
- if (dynamic_cast<KListWidgetSearchLine*>(sipCpp))
- sipType = sipType_KListWidgetSearchLine;
- else if (dynamic_cast<KRestrictedLine*>(sipCpp))
- sipType = sipType_KRestrictedLine;
- else if (dynamic_cast<KTreeWidgetSearchLine*>(sipCpp))
- sipType = sipType_KTreeWidgetSearchLine;
- }
+ else if (dynamic_cast<KXmlGuiWindow*>(sipCpp))
+ sipType = sipType_KXmlGuiWindow;
else if (dynamic_cast<KMainWindow*>(sipCpp))
- {
sipType = sipType_KMainWindow;
- if (dynamic_cast<KXmlGuiWindow*>(sipCpp))
- sipType = sipType_KXmlGuiWindow;
- }
else if (dynamic_cast<KMenu*>(sipCpp))
sipType = sipType_KMenu;
else if (dynamic_cast<KMenuBar*>(sipCpp))
Index: python/pykde4/sip/kdeui/kdeuimod.sip
===================================================================
--- python/pykde4/sip/kdeui/kdeuimod.sip (revision 1060017)
+++ python/pykde4/sip/kdeui/kdeuimod.sip (revision 1060018)
@@ -74,7 +74,6 @@
%Include kdatetimewidget.sip
%Include kdatewidget.sip
%Include kdeprintdialog.sip
-%Include kdescendantsproxymodel.sip
%Include kdialog.sip
%Include kdialogbuttonbox.sip
%Include kdialogjobuidelegate.sip
@@ -165,7 +164,6 @@
%Include kshortcutsdialog.sip
%Include kshortcutseditor.sip
%Include kshortcutwidget.sip
-%Include ksortfilterproxymodel.sip
%Include ksplashscreen.sip
%Include ksqueezedtextlabel.sip
%Include kstandardaction.sip
Index: python/pykde4/sip/kdeui/kwallet.sip
===================================================================
--- python/pykde4/sip/kdeui/kwallet.sip (revision 1060017)
+++ python/pykde4/sip/kdeui/kwallet.sip (revision 1060018)
@@ -83,7 +83,7 @@
virtual int readMap (const QString& key, QMap<QString,QString>& value /Out/);
virtual int readPassword (const QString& key, QString& value /Out/);
int readEntryList (const QString& key, QMap<QString,QByteArray>& value /Out/);
-//ig int readMapList (const QString& key, QMap<QString,QMap<QString,QString>>& value /Out/);
+//ig int readMapList (const QString& key, QMap<QString,QMap<QString,QString>>& value /Out/);
int readPasswordList (const QString& key, QMap<QString,QString>& value /Out/);
virtual int writeEntry (const QString& key, const QByteArray& value, KWallet::Wallet::EntryType entryType);
virtual int writeEntry (const QString& key, const QByteArray& value);
Index: python/pykde4/sip/kdeui/kwindowsystem.sip
===================================================================
--- python/pykde4/sip/kdeui/kwindowsystem.sip (revision 1060017)
+++ python/pykde4/sip/kdeui/kwindowsystem.sip (revision 1060018)
@@ -99,7 +99,9 @@
void showingDesktopChanged (bool showing);
protected:
+//force
virtual void connectNotify (SIP_SIGNAL);
+//end
private:
KWindowSystem ();
Index: python/pykde4/sip/kdeui/kstatusnotifieritem.sip
===================================================================
--- python/pykde4/sip/kdeui/kstatusnotifieritem.sip (revision 1060017)
+++ python/pykde4/sip/kdeui/kstatusnotifieritem.sip (revision 1060018)
@@ -60,10 +60,6 @@
QString attentionIconName () const;
void setAttentionIconByPixmap (const QIcon& icon);
QIcon attentionIconPixmap () const;
- void setAttentionMovie (QMovie* movie);
- void setAttentionMovie (const QVector<QPixmap>& movie);
- void setAttentionMovie (const QVector<QImage>& movie);
- QMovie* attentionMovie () const;
void setToolTip (const QString& iconName, const QString& title, const QString& subTitle);
void setToolTip (const QIcon& icon, const QString& title, const QString& subTitle);
void setToolTipIconByName (const QString& name);
@@ -89,4 +85,7 @@
void secondaryActivateRequested (const QPoint& pos);
protected:
bool eventFilter (QObject* watched, QEvent* event);
+public:
+ void setAttentionMovieByName (const QString& name);
+ QString attentionMovieName () const;
};
kdebindings-4.3.80-fix-build.patch:
python/pykde4/sip/akonadi/agentfilterproxymodel.sip | 6 ------
python/pykde4/sip/akonadi/preprocessorbase.sip | 6 ------
smoke/nepomuk/smokeconfig.xml | 1 +
3 files changed, 1 insertion(+), 12 deletions(-)
Index: kdebindings-4.3.80-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.80-fix-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kdebindings-4.3.80-fix-build.patch 12 Dec 2009 00:43:39 -0000 1.3
+++ kdebindings-4.3.80-fix-build.patch 12 Dec 2009 01:19:47 -0000 1.4
@@ -58,40 +58,6 @@ diff -ur kdebindings-4.3.80/python/pykde
else if (dynamic_cast<Akonadi::StatisticsProxyModel*>(sipCpp))
sipClass = sipClass_Akonadi_StatisticsProxyModel;
else if (dynamic_cast<Akonadi::ItemModel*>(sipCpp))
-diff -ur kdebindings-4.3.80/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip
---- kdebindings-4.3.80/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip 2009-11-21 10:43:24.000000000 +0100
-+++ kdebindings-4.3.80-fix-build/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip 2009-12-12 01:40:23.000000000 +0100
-@@ -63,7 +63,6 @@
- #include <kdatetable.h>
- #include <kdatetimewidget.h>
- #include <kdatewidget.h>
--#include <kdescendantsproxymodel.h>
- #include <kdialog.h>
- #include <kdialogbuttonbox.h>
- #include <kdialogjobuidelegate.h>
-@@ -136,7 +135,6 @@
- #include <kshortcutsdialog.h>
- #include <kshortcutseditor.h>
- #include <kshortcutwidget.h>
--#include <ksortfilterproxymodel.h>
- #include <ksplashscreen.h>
- #include <ksqueezedtextlabel.h>
- #include <kstartupinfo.h>
-@@ -289,14 +287,10 @@
- if (dynamic_cast<KPageWidgetModel*>(sipCpp))
- sipType = sipType_KPageWidgetModel;
- }
-- else if (dynamic_cast<KDescendantsProxyModel*>(sipCpp))
-- sipType = sipType_KDescendantsProxyModel;
- else if (dynamic_cast<KSelectionProxyModel*>(sipCpp))
- sipType = sipType_KSelectionProxyModel;
- else if (dynamic_cast<KCategorizedSortFilterProxyModel*>(sipCpp))
- sipType = sipType_KCategorizedSortFilterProxyModel;
-- else if (dynamic_cast<KSortFilterProxyModel*>(sipCpp))
-- sipType = sipType_KSortFilterProxyModel;
- else if (dynamic_cast<KAction*>(sipCpp))
- {
- sipType = sipType_KAction;
diff -ur kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml
--- kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml 2009-11-21 10:43:27.000000000 +0100
+++ kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml 2009-12-12 00:17:57.000000000 +0100
Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- kdebindings.spec 12 Dec 2009 00:43:39 -0000 1.272
+++ kdebindings.spec 12 Dec 2009 01:19:47 -0000 1.273
@@ -70,10 +70,13 @@ Patch0: kdebindings-qyoto-examples.patc
Patch1: kdebindings-4.3.75-no-rpath.patch
# fix the NepomukSmoke build by blacklisting
# Nepomuk::ResourceManager::generateUniqueUri
-# also fix the PyKDE4 Akonadi and kdeui bindings to build
+# also fix the PyKDE4 Akonadi bindings to build
Patch2: kdebindings-4.3.80-fix-build.patch
## upstream patches
+# fix the PyKDE4 kdeui bindings to build
+# http://websvn.kde.org/?view=revision&revision=1060018
+Patch100: kdebindings-4.3.80-pykdeui-trunk.patch
BuildRequires: akonadi-devel >= 1.1.0
@@ -283,6 +286,7 @@ Falcon plugin for the Kross archtecture
%patch2 -p1 -b .fix-build
# upstream patches
+%patch100 -p0 -b .pykdeui-trunk
# do the no-rpath hack last, after the upstream backports (if any)
%patch1 -p1 -b .no-rpath
- Previous message: rpms/ifuse/devel ifuse.spec,1.10,1.11
- Next message: rpms/lxpanel/devel lxpanel-0.5.4-default.patch, NONE, 1.1 lxpanel-0.5.4-fix-ca.po.patch, NONE, 1.1 lxpanel-0.5.4-remove-cpufreq-from-configure.patch, NONE, 1.1 lxpanel.spec, 1.26, 1.27 lxpanel-default.patch, 1.7, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list