Ticket #47125: pykde4-macports-adaptations2.diff

File pykde4-macports-adaptations2.diff, 45.2 KB (added by RJVB (René Bertin), 10 years ago)

  • sip/kdeui/kabstractwidgetjobtracker.sip 

    diff --git sip/kdeui/kabstractwidgetjobtracker.sip sip/kdeui/kabstractwidgetjobtracker.sip
index 6952642..b793971 100644
    signals: 
    223223
    224224//  Subclasses of QObject
    225225
     226%If (WS_X11)
    226227%ConvertToSubClassCode
    227228    // CTSCC for subclasses of 'QObject'
    228229    sipType = NULL;
    … … signals: 
    638639    else if (dynamic_cast<Sonnet::ConfigWidget*>(sipCpp))
    639640        sipType = sipType_Sonnet_ConfigWidget;
    640641%End
     642%End
     643%If (!WS_X11)
     644%ConvertToSubClassCode
     645    // CTSCC for subclasses of 'QObject'
     646    sipType = NULL;
     647
     648    if (dynamic_cast<KActionCategory*>(sipCpp))
     649        sipType = sipType_KActionCategory;
     650    else if (dynamic_cast<KActionCollection*>(sipCpp))
     651        sipType = sipType_KActionCollection;
     652    else if (dynamic_cast<KCategoryDrawerV2*>(sipCpp))
     653        {
     654        sipType = sipType_KCategoryDrawerV2;
     655        if (dynamic_cast<KCategoryDrawerV3*>(sipCpp))
     656            sipType = sipType_KCategoryDrawerV3;
     657        }
     658    else if (dynamic_cast<KCompletion*>(sipCpp))
     659        sipType = sipType_KCompletion;
     660    else if (dynamic_cast<KConfigDialogManager*>(sipCpp))
     661        sipType = sipType_KConfigDialogManager;
     662    else if (dynamic_cast<KConfigSkeleton*>(sipCpp))
     663        sipType = sipType_KConfigSkeleton;
     664    else if (dynamic_cast<KFind*>(sipCpp))
     665        {
     666        sipType = sipType_KFind;
     667        if (dynamic_cast<KReplace*>(sipCpp))
     668            sipType = sipType_KReplace;
     669        }
     670    else if (dynamic_cast<KGlobalAccel*>(sipCpp))
     671        sipType = sipType_KGlobalAccel;
     672    else if (dynamic_cast<KGlobalSettings*>(sipCpp))
     673        sipType = sipType_KGlobalSettings;
     674    else if (dynamic_cast<KGlobalShortcutInfo*>(sipCpp))
     675        sipType = sipType_KGlobalShortcutInfo;
     676    else if (dynamic_cast<KHelpMenu*>(sipCpp))
     677        sipType = sipType_KHelpMenu;
     678    else if (dynamic_cast<KIconLoader*>(sipCpp))
     679        sipType = sipType_KIconLoader;
     680    else if (dynamic_cast<KAbstractWidgetJobTracker*>(sipCpp))
     681        {
     682        sipType = sipType_KAbstractWidgetJobTracker;
     683        if (dynamic_cast<KStatusBarJobTracker*>(sipCpp))
     684            sipType = sipType_KStatusBarJobTracker;
     685        else if (dynamic_cast<KWidgetJobTracker*>(sipCpp))
     686            sipType = sipType_KWidgetJobTracker;
     687        }
     688    else if (dynamic_cast<KUiServerJobTracker*>(sipCpp))
     689        sipType = sipType_KUiServerJobTracker;
     690    else if (dynamic_cast<KDialogJobUiDelegate*>(sipCpp))
     691        sipType = sipType_KDialogJobUiDelegate;
     692    else if (dynamic_cast<KMessageBoxMessageHandler*>(sipCpp))
     693        sipType = sipType_KMessageBoxMessageHandler;
     694    else if (dynamic_cast<KModelIndexProxyMapper*>(sipCpp))
     695        sipType = sipType_KModelIndexProxyMapper;
     696    else if (dynamic_cast<KModifierKeyInfo*>(sipCpp))
     697        sipType = sipType_KModifierKeyInfo;
     698    else if (dynamic_cast<KNotification*>(sipCpp))
     699        sipType = sipType_KNotification;
     700    else if (dynamic_cast<KNotificationRestrictions*>(sipCpp))
     701        sipType = sipType_KNotificationRestrictions;
     702    else if (dynamic_cast<KPageWidgetItem*>(sipCpp))
     703        sipType = sipType_KPageWidgetItem;
     704    else if (dynamic_cast<KPassivePopupMessageHandler*>(sipCpp))
     705        sipType = sipType_KPassivePopupMessageHandler;
     706    else if (dynamic_cast<KPixmapSequenceOverlayPainter*>(sipCpp))
     707        sipType = sipType_KPixmapSequenceOverlayPainter;
     708    else if (dynamic_cast<KStartupInfo*>(sipCpp))
     709        sipType = sipType_KStartupInfo;
     710    else if (dynamic_cast<KStatusNotifierItem*>(sipCpp))
     711        sipType = sipType_KStatusNotifierItem;
     712    else if (dynamic_cast<KViewStateMaintainerBase*>(sipCpp))
     713        sipType = sipType_KViewStateMaintainerBase;
     714    else if (dynamic_cast<KViewStateSaver*>(sipCpp))
     715        sipType = sipType_KViewStateSaver;
     716    else if (dynamic_cast<KWallet::Wallet*>(sipCpp))
     717        sipType = sipType_KWallet_Wallet;
     718    else if (dynamic_cast<KXMLGUIFactory*>(sipCpp))
     719        sipType = sipType_KXMLGUIFactory;
     720    else if (dynamic_cast<KWidgetItemDelegate*>(sipCpp))
     721        sipType = sipType_KWidgetItemDelegate;
     722    else if (dynamic_cast<KExtendableItemDelegate*>(sipCpp))
     723        sipType = sipType_KExtendableItemDelegate;
     724    else if (dynamic_cast<KPageModel*>(sipCpp))
     725        {
     726        sipType = sipType_KPageModel;
     727        if (dynamic_cast<KPageWidgetModel*>(sipCpp))
     728            sipType = sipType_KPageWidgetModel;
     729        }
     730    else if (dynamic_cast<KDescendantsProxyModel*>(sipCpp))
     731        sipType = sipType_KDescendantsProxyModel;
     732    else if (dynamic_cast<KIdentityProxyModel*>(sipCpp))
     733        {
     734        sipType = sipType_KIdentityProxyModel;
     735        if (dynamic_cast<KCheckableProxyModel*>(sipCpp))
     736            sipType = sipType_KCheckableProxyModel;
     737        }
     738    else if (dynamic_cast<KSelectionProxyModel*>(sipCpp))
     739        sipType = sipType_KSelectionProxyModel;
     740    else if (dynamic_cast<KCategorizedSortFilterProxyModel*>(sipCpp))
     741        sipType = sipType_KCategorizedSortFilterProxyModel;
     742    else if (dynamic_cast<KRecursiveFilterProxyModel*>(sipCpp))
     743        sipType = sipType_KRecursiveFilterProxyModel;
     744    else if (dynamic_cast<KAction*>(sipCpp))
     745        {
     746        sipType = sipType_KAction;
     747        if (dynamic_cast<KActionMenu*>(sipCpp))
     748            sipType = sipType_KActionMenu;
     749        else if (dynamic_cast<KDualAction*>(sipCpp))
     750            sipType = sipType_KDualAction;
     751        else if (dynamic_cast<KPasteTextAction*>(sipCpp))
     752            sipType = sipType_KPasteTextAction;
     753        else if (dynamic_cast<KSelectAction*>(sipCpp))
     754            {
     755            sipType = sipType_KSelectAction;
     756            if (dynamic_cast<KCodecAction*>(sipCpp))
     757                sipType = sipType_KCodecAction;
     758            else if (dynamic_cast<KFontAction*>(sipCpp))
     759                sipType = sipType_KFontAction;
     760            else if (dynamic_cast<KFontSizeAction*>(sipCpp))
     761                sipType = sipType_KFontSizeAction;
     762            else if (dynamic_cast<KRecentFilesAction*>(sipCpp))
     763                sipType = sipType_KRecentFilesAction;
     764            }
     765        else if (dynamic_cast<KToggleAction*>(sipCpp))
     766            {
     767            sipType = sipType_KToggleAction;
     768            if (dynamic_cast<KToggleFullScreenAction*>(sipCpp))
     769                sipType = sipType_KToggleFullScreenAction;
     770            else if (dynamic_cast<KToggleToolBarAction*>(sipCpp))
     771                sipType = sipType_KToggleToolBarAction;
     772            }
     773        else if (dynamic_cast<KToolBarLabelAction*>(sipCpp))
     774            sipType = sipType_KToolBarLabelAction;
     775        else if (dynamic_cast<KToolBarPopupAction*>(sipCpp))
     776            sipType = sipType_KToolBarPopupAction;
     777        else if (dynamic_cast<KToolBarSpacerAction*>(sipCpp))
     778            sipType = sipType_KToolBarSpacerAction;
     779        }
     780    else if (dynamic_cast<KApplication*>(sipCpp))
     781        {
     782        sipType = sipType_KApplication;
     783        if (dynamic_cast<KUniqueApplication*>(sipCpp))
     784            sipType = sipType_KUniqueApplication;
     785        }
     786    else if (dynamic_cast<KBreadcrumbSelectionModel*>(sipCpp))
     787        sipType = sipType_KBreadcrumbSelectionModel;
     788    else if (dynamic_cast<KLinkItemSelectionModel*>(sipCpp))
     789        sipType = sipType_KLinkItemSelectionModel;
     790    else if (dynamic_cast<KStyle*>(sipCpp))
     791        sipType = sipType_KStyle;
     792    else if (dynamic_cast<KSvgRenderer*>(sipCpp))
     793        sipType = sipType_KSvgRenderer;
     794    else if (dynamic_cast<Sonnet::Highlighter*>(sipCpp))
     795        sipType = sipType_Sonnet_Highlighter;
     796    else if (dynamic_cast<KSystemTrayIcon*>(sipCpp))
     797        sipType = sipType_KSystemTrayIcon;
     798    else if (dynamic_cast<KUndoStack*>(sipCpp))
     799        sipType = sipType_KUndoStack;
     800    else if (dynamic_cast<KDateValidator*>(sipCpp))
     801        sipType = sipType_KDateValidator;
     802    else if (dynamic_cast<KFloatValidator*>(sipCpp))
     803        sipType = sipType_KFloatValidator;
     804    else if (dynamic_cast<KIntValidator*>(sipCpp))
     805        sipType = sipType_KIntValidator;
     806    else if (dynamic_cast<KMimeTypeValidator*>(sipCpp))
     807        sipType = sipType_KMimeTypeValidator;
     808    else if (dynamic_cast<KStringListValidator*>(sipCpp))
     809        sipType = sipType_KStringListValidator;
     810    else if (dynamic_cast<KDoubleValidator*>(sipCpp))
     811        sipType = sipType_KDoubleValidator;
     812    else if (dynamic_cast<KActionSelector*>(sipCpp))
     813        sipType = sipType_KActionSelector;
     814    else if (dynamic_cast<KCModule*>(sipCpp))
     815        sipType = sipType_KCModule;
     816    else if (dynamic_cast<KCapacityBar*>(sipCpp))
     817        sipType = sipType_KCapacityBar;
     818    else if (dynamic_cast<KCharSelect*>(sipCpp))
     819        sipType = sipType_KCharSelect;
     820    else if (dynamic_cast<KDateTable*>(sipCpp))
     821        sipType = sipType_KDateTable;
     822    else if (dynamic_cast<KDateTimeEdit*>(sipCpp))
     823        sipType = sipType_KDateTimeEdit;
     824    else if (dynamic_cast<KDateTimeWidget*>(sipCpp))
     825        sipType = sipType_KDateTimeWidget;
     826    else if (dynamic_cast<KDateWidget*>(sipCpp))
     827        sipType = sipType_KDateWidget;
     828    else if (dynamic_cast<KEditListWidget*>(sipCpp))
     829        sipType = sipType_KEditListWidget;
     830    else if (dynamic_cast<KFadeWidgetEffect*>(sipCpp))
     831        sipType = sipType_KFadeWidgetEffect;
     832    else if (dynamic_cast<KFilterProxySearchLine*>(sipCpp))
     833        sipType = sipType_KFilterProxySearchLine;
     834    else if (dynamic_cast<KFontChooser*>(sipCpp))
     835        sipType = sipType_KFontChooser;
     836    else if (dynamic_cast<KFontRequester*>(sipCpp))
     837        sipType = sipType_KFontRequester;
     838    else if (dynamic_cast<KKeySequenceWidget*>(sipCpp))
     839        sipType = sipType_KKeySequenceWidget;
     840    else if (dynamic_cast<KLanguageButton*>(sipCpp))
     841        sipType = sipType_KLanguageButton;
     842    else if (dynamic_cast<KLed*>(sipCpp))
     843        sipType = sipType_KLed;
     844    else if (dynamic_cast<KMultiTabBar*>(sipCpp))
     845        sipType = sipType_KMultiTabBar;
     846    else if (dynamic_cast<KNumInput*>(sipCpp))
     847        {
     848        sipType = sipType_KNumInput;
     849        if (dynamic_cast<KDoubleNumInput*>(sipCpp))
     850            sipType = sipType_KDoubleNumInput;
     851        else if (dynamic_cast<KIntNumInput*>(sipCpp))
     852            sipType = sipType_KIntNumInput;
     853        }
     854    else if (dynamic_cast<KPageView*>(sipCpp))
     855        {
     856        sipType = sipType_KPageView;
     857        if (dynamic_cast<KPageWidget*>(sipCpp))
     858            sipType = sipType_KPageWidget;
     859        }
     860    else if (dynamic_cast<KPixmapRegionSelectorWidget*>(sipCpp))
     861        sipType = sipType_KPixmapRegionSelectorWidget;
     862    else if (dynamic_cast<KPixmapSequenceWidget*>(sipCpp))
     863        sipType = sipType_KPixmapSequenceWidget;
     864    else if (dynamic_cast<KShortcutWidget*>(sipCpp))
     865        sipType = sipType_KShortcutWidget;
     866    else if (dynamic_cast<KShortcutsEditor*>(sipCpp))
     867        sipType = sipType_KShortcutsEditor;
     868    else if (dynamic_cast<KTitleWidget*>(sipCpp))
     869        sipType = sipType_KTitleWidget;
     870    else if (dynamic_cast<KTreeWidgetSearchLineWidget*>(sipCpp))
     871        sipType = sipType_KTreeWidgetSearchLineWidget;
     872    else if (dynamic_cast<KXYSelector*>(sipCpp))
     873        {
     874        sipType = sipType_KXYSelector;
     875        if (dynamic_cast<KHueSaturationSelector*>(sipCpp))
     876            sipType = sipType_KHueSaturationSelector;
     877        }
     878    else if (dynamic_cast<KArrowButton*>(sipCpp))
     879        sipType = sipType_KArrowButton;
     880    else if (dynamic_cast<KColorButton*>(sipCpp))
     881        sipType = sipType_KColorButton;
     882    else if (dynamic_cast<KMultiTabBarButton*>(sipCpp))
     883        {
     884        sipType = sipType_KMultiTabBarButton;
     885        if (dynamic_cast<KMultiTabBarTab*>(sipCpp))
     886            sipType = sipType_KMultiTabBarTab;
     887        }
     888    else if (dynamic_cast<KPushButton*>(sipCpp))
     889        sipType = sipType_KPushButton;
     890    else if (dynamic_cast<KAnimatedButton*>(sipCpp))
     891        sipType = sipType_KAnimatedButton;
     892    else if (dynamic_cast<KRuler*>(sipCpp))
     893        sipType = sipType_KRuler;
     894    else if (dynamic_cast<KSelector*>(sipCpp))
     895        {
     896        sipType = sipType_KSelector;
     897        if (dynamic_cast<KColorValueSelector*>(sipCpp))
     898            sipType = sipType_KColorValueSelector;
     899        else if (dynamic_cast<KGradientSelector*>(sipCpp))
     900            sipType = sipType_KGradientSelector;
     901        }
     902    else if (dynamic_cast<KIntSpinBox*>(sipCpp))
     903        sipType = sipType_KIntSpinBox;
     904    else if (dynamic_cast<KColorCombo*>(sipCpp))
     905        sipType = sipType_KColorCombo;
     906    else if (dynamic_cast<KComboBox*>(sipCpp))
     907        {
     908        sipType = sipType_KComboBox;
     909        if (dynamic_cast<KDateComboBox*>(sipCpp))
     910            sipType = sipType_KDateComboBox;
     911        else if (dynamic_cast<KFontComboBox*>(sipCpp))
     912            sipType = sipType_KFontComboBox;
     913        else if (dynamic_cast<KHistoryComboBox*>(sipCpp))
     914            sipType = sipType_KHistoryComboBox;
     915        else if (dynamic_cast<KTimeComboBox*>(sipCpp))
     916            sipType = sipType_KTimeComboBox;
     917        else if (dynamic_cast<Sonnet::DictionaryComboBox*>(sipCpp))
     918            sipType = sipType_Sonnet_DictionaryComboBox;
     919        }
     920    else if (dynamic_cast<KDialog*>(sipCpp))
     921        {
     922        sipType = sipType_KDialog;
     923        if (dynamic_cast<KAboutApplicationDialog*>(sipCpp))
     924            sipType = sipType_KAboutApplicationDialog;
     925        else if (dynamic_cast<KBugReport*>(sipCpp))
     926            sipType = sipType_KBugReport;
     927        else if (dynamic_cast<KColorDialog*>(sipCpp))
     928            sipType = sipType_KColorDialog;
     929        else if (dynamic_cast<KEditToolBar*>(sipCpp))
     930            sipType = sipType_KEditToolBar;
     931        else if (dynamic_cast<KFindDialog*>(sipCpp))
     932            {
     933            sipType = sipType_KFindDialog;
     934            if (dynamic_cast<KReplaceDialog*>(sipCpp))
     935                sipType = sipType_KReplaceDialog;
     936            }
     937        else if (dynamic_cast<KFontDialog*>(sipCpp))
     938            sipType = sipType_KFontDialog;
     939        else if (dynamic_cast<KNewPasswordDialog*>(sipCpp))
     940            sipType = sipType_KNewPasswordDialog;
     941        else if (dynamic_cast<KPageDialog*>(sipCpp))
     942            {
     943            sipType = sipType_KPageDialog;
     944            if (dynamic_cast<KAssistantDialog*>(sipCpp))
     945                sipType = sipType_KAssistantDialog;
     946            else if (dynamic_cast<KConfigDialog*>(sipCpp))
     947                sipType = sipType_KConfigDialog;
     948            }
     949        else if (dynamic_cast<KPasswordDialog*>(sipCpp))
     950            sipType = sipType_KPasswordDialog;
     951        else if (dynamic_cast<KPixmapRegionSelectorDialog*>(sipCpp))
     952            sipType = sipType_KPixmapRegionSelectorDialog;
     953        else if (dynamic_cast<KProgressDialog*>(sipCpp))
     954            sipType = sipType_KProgressDialog;
     955        else if (dynamic_cast<KShortcutsDialog*>(sipCpp))
     956            sipType = sipType_KShortcutsDialog;
     957        else if (dynamic_cast<KTipDialog*>(sipCpp))
     958            sipType = sipType_KTipDialog;
     959        else if (dynamic_cast<Sonnet::ConfigDialog*>(sipCpp))
     960            sipType = sipType_Sonnet_ConfigDialog;
     961        else if (dynamic_cast<Sonnet::Dialog*>(sipCpp))
     962            sipType = sipType_Sonnet_Dialog;
     963        }
     964    else if (dynamic_cast<KDialogButtonBox*>(sipCpp))
     965        sipType = sipType_KDialogButtonBox;
     966    else if (dynamic_cast<KColorPatch*>(sipCpp))
     967        sipType = sipType_KColorPatch;
     968    else if (dynamic_cast<KDatePicker*>(sipCpp))
     969        sipType = sipType_KDatePicker;
     970    else if (dynamic_cast<KHBox*>(sipCpp))
     971        {
     972        sipType = sipType_KHBox;
     973        if (dynamic_cast<KVBox*>(sipCpp))
     974            sipType = sipType_KVBox;
     975        }
     976    else if (dynamic_cast<KMessageWidget*>(sipCpp))
     977        sipType = sipType_KMessageWidget;
     978    else if (dynamic_cast<KPassivePopup*>(sipCpp))
     979        sipType = sipType_KPassivePopup;
     980    else if (dynamic_cast<KPlotWidget*>(sipCpp))
     981        sipType = sipType_KPlotWidget;
     982    else if (dynamic_cast<KPopupFrame*>(sipCpp))
     983        sipType = sipType_KPopupFrame;
     984    else if (dynamic_cast<KRatingWidget*>(sipCpp))
     985        sipType = sipType_KRatingWidget;
     986    else if (dynamic_cast<KSeparator*>(sipCpp))
     987        sipType = sipType_KSeparator;
     988    else if (dynamic_cast<KCategorizedView*>(sipCpp))
     989        sipType = sipType_KCategorizedView;
     990    else if (dynamic_cast<KListWidget*>(sipCpp))
     991        {
     992        sipType = sipType_KListWidget;
     993        if (dynamic_cast<KCompletionBox*>(sipCpp))
     994            sipType = sipType_KCompletionBox;
     995        }
     996    else if (dynamic_cast<KColorCells*>(sipCpp))
     997        sipType = sipType_KColorCells;
     998    else if (dynamic_cast<KTimeZoneWidget*>(sipCpp))
     999        sipType = sipType_KTimeZoneWidget;
     1000    else if (dynamic_cast<KTextEdit*>(sipCpp))
     1001        {
     1002        sipType = sipType_KTextEdit;
     1003        if (dynamic_cast<KRichTextEdit*>(sipCpp))
     1004            {
     1005            sipType = sipType_KRichTextEdit;
     1006            if (dynamic_cast<KRichTextWidget*>(sipCpp))
     1007                sipType = sipType_KRichTextWidget;
     1008            }
     1009        }
     1010    else if (dynamic_cast<KTextBrowser*>(sipCpp))
     1011        sipType = sipType_KTextBrowser;
     1012    else if (dynamic_cast<KSqueezedTextLabel*>(sipCpp))
     1013        sipType = sipType_KSqueezedTextLabel;
     1014    else if (dynamic_cast<KUrlLabel*>(sipCpp))
     1015        sipType = sipType_KUrlLabel;
     1016    else if (dynamic_cast<KButtonGroup*>(sipCpp))
     1017        sipType = sipType_KButtonGroup;
     1018    else if (dynamic_cast<KEditListBox*>(sipCpp))
     1019        sipType = sipType_KEditListBox;
     1020    else if (dynamic_cast<KLineEdit*>(sipCpp))
     1021        {
     1022        sipType = sipType_KLineEdit;
     1023        if (dynamic_cast<KListWidgetSearchLine*>(sipCpp))
     1024            sipType = sipType_KListWidgetSearchLine;
     1025        else if (dynamic_cast<KRestrictedLine*>(sipCpp))
     1026            sipType = sipType_KRestrictedLine;
     1027        else if (dynamic_cast<KTreeWidgetSearchLine*>(sipCpp))
     1028            sipType = sipType_KTreeWidgetSearchLine;
     1029        }
     1030    else if (dynamic_cast<KMainWindow*>(sipCpp))
     1031        {
     1032        sipType = sipType_KMainWindow;
     1033        if (dynamic_cast<KXmlGuiWindow*>(sipCpp))
     1034            sipType = sipType_KXmlGuiWindow;
     1035        }
     1036    else if (dynamic_cast<KMenu*>(sipCpp))
     1037        sipType = sipType_KMenu;
     1038    else if (dynamic_cast<KMenuBar*>(sipCpp))
     1039        sipType = sipType_KMenuBar;
     1040    else if (dynamic_cast<KSplashScreen*>(sipCpp))
     1041        sipType = sipType_KSplashScreen;
     1042    else if (dynamic_cast<KStatusBar*>(sipCpp))
     1043        sipType = sipType_KStatusBar;
     1044    else if (dynamic_cast<KTabBar*>(sipCpp))
     1045        sipType = sipType_KTabBar;
     1046    else if (dynamic_cast<KTabWidget*>(sipCpp))
     1047        sipType = sipType_KTabWidget;
     1048    else if (dynamic_cast<KToolBar*>(sipCpp))
     1049        sipType = sipType_KToolBar;
     1050    else if (dynamic_cast<Sonnet::ConfigWidget*>(sipCpp))
     1051        sipType = sipType_Sonnet_ConfigWidget;
     1052%End
     1053%End
    6411054
    6421055public:
    6431056    ~KAbstractWidgetJobTracker ();

  • sip/kdeui/kapplication.sip 

    diff --git sip/kdeui/kapplication.sip sip/kdeui/kapplication.sip
index febcd38..3f95d9a 100644
    static void kdeui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv) 
    9292
    9393public:
    9494    explicit                KApplication (bool GUIenabled = 1);
     95%If (WS_X11)
    9596    explicit                KApplication (Display* display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
    9697//force
    9798                            KApplication (Display* display, SIP_PYLIST list, const QByteArray& rAppName, bool GUIenabled = 1) [(Display*, int&, char**, const QByteArray&, bool = 1)];
    … … public: 
    119120        }
    120121%End
    121122//end
     123%End
    122124//ig                            KApplication (Display* display, int& argc, char** argv, const QByteArray& rAppName, bool GUIenabled = 1);
    123125
    124126    static KApplication*    kApplication ();
    … … public: 
    141143    unsigned long           userTimestamp () const;
    142144    void                    updateRemoteUserTimestamp (const QString& service, int time = 0);
    143145    bool                    notify (QObject* receiver, QEvent* event);
     146%If (WS_X11)
    144147//ig    int                     xErrhandler (Display*, void*);
    145148    int                     xioErrhandler (Display*);
     149%End
    146150//ig    void                    iceIOErrorHandler (_IceConn* conn);
    147151    bool loadedByKdeinit;
    148152    void                    updateUserTimestamp (int time = 0);
    … … signals: 
    154158
    155159protected:
    156160                            KApplication (bool GUIenabled, const KComponentData& cData);
     161%If (WS_X11)
    157162                            KApplication (Display* display, Qt::HANDLE visual, Qt::HANDLE colormap, const KComponentData& cData);
    158163//ig    bool                    x11EventFilter (XEvent*);
     164%End
    159165
    160166private:
    161167                            KApplication (const KApplication&);

  • sip/kdeui/kkeyserver_x11.sip

    old new  
    1919// You should have received a copy of the GNU General Public License
    2020// along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2121
     22%If (WS_X11)
    2223%ModuleHeaderCode
    2324#include <kkeyserver_x11.h>
    2425%End
    … …  
    5051%ModuleHeaderCode
    5152#include <kkeyserver_x11.h>
    5253%End
    53 
     54%End

  • sip/kdeui/kmanagerselection.sip 

    diff --git sip/kdeui/kmanagerselection.sip sip/kdeui/kmanagerselection.sip
index fd13239..e7acfcc 100644
     
    1919// You should have received a copy of the GNU General Public License
    2020// along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2121
    22 
     22%If (WS_X11)
    2323class KSelectionOwner : QObject
    2424{
    2525%TypeHeaderCode
    … … public: 
    7171};
    7272// KSelectionWatcher
    7373
    74 
     74%End

  • sip/kdeui/kratingwidget.sip 

    diff --git sip/kdeui/kratingwidget.sip sip/kdeui/kratingwidget.sip
index d5ced65..f17af8b 100644
    protected: 
    235235
    236236//  Subclasses of QObject
    237237
     238%If (WS_X11)
    238239%ConvertToSubClassCode
    239240    // CTSCC for subclasses of 'QObject'
    240241    sipType = NULL;
    … … protected: 
    650651    else if (dynamic_cast<Sonnet::ConfigWidget*>(sipCpp))
    651652        sipType = sipType_Sonnet_ConfigWidget;
    652653%End
     654%End
     655%If (!WS_X11)
     656%ConvertToSubClassCode
     657    // CTSCC for subclasses of 'QObject'
     658    sipType = NULL;
    653659
     660    if (dynamic_cast<KActionCategory*>(sipCpp))
     661        sipType = sipType_KActionCategory;
     662    else if (dynamic_cast<KActionCollection*>(sipCpp))
     663        sipType = sipType_KActionCollection;
     664    else if (dynamic_cast<KCategoryDrawerV2*>(sipCpp))
     665        {
     666        sipType = sipType_KCategoryDrawerV2;
     667        if (dynamic_cast<KCategoryDrawerV3*>(sipCpp))
     668            sipType = sipType_KCategoryDrawerV3;
     669        }
     670    else if (dynamic_cast<KCompletion*>(sipCpp))
     671        sipType = sipType_KCompletion;
     672    else if (dynamic_cast<KConfigDialogManager*>(sipCpp))
     673        sipType = sipType_KConfigDialogManager;
     674    else if (dynamic_cast<KConfigSkeleton*>(sipCpp))
     675        sipType = sipType_KConfigSkeleton;
     676    else if (dynamic_cast<KFind*>(sipCpp))
     677        {
     678        sipType = sipType_KFind;
     679        if (dynamic_cast<KReplace*>(sipCpp))
     680            sipType = sipType_KReplace;
     681        }
     682    else if (dynamic_cast<KGlobalAccel*>(sipCpp))
     683        sipType = sipType_KGlobalAccel;
     684    else if (dynamic_cast<KGlobalSettings*>(sipCpp))
     685        sipType = sipType_KGlobalSettings;
     686    else if (dynamic_cast<KGlobalShortcutInfo*>(sipCpp))
     687        sipType = sipType_KGlobalShortcutInfo;
     688    else if (dynamic_cast<KHelpMenu*>(sipCpp))
     689        sipType = sipType_KHelpMenu;
     690    else if (dynamic_cast<KIconLoader*>(sipCpp))
     691        sipType = sipType_KIconLoader;
     692    else if (dynamic_cast<KAbstractWidgetJobTracker*>(sipCpp))
     693        {
     694        sipType = sipType_KAbstractWidgetJobTracker;
     695        if (dynamic_cast<KStatusBarJobTracker*>(sipCpp))
     696            sipType = sipType_KStatusBarJobTracker;
     697        else if (dynamic_cast<KWidgetJobTracker*>(sipCpp))
     698            sipType = sipType_KWidgetJobTracker;
     699        }
     700    else if (dynamic_cast<KUiServerJobTracker*>(sipCpp))
     701        sipType = sipType_KUiServerJobTracker;
     702    else if (dynamic_cast<KDialogJobUiDelegate*>(sipCpp))
     703        sipType = sipType_KDialogJobUiDelegate;
     704    else if (dynamic_cast<KMessageBoxMessageHandler*>(sipCpp))
     705        sipType = sipType_KMessageBoxMessageHandler;
     706    else if (dynamic_cast<KModelIndexProxyMapper*>(sipCpp))
     707        sipType = sipType_KModelIndexProxyMapper;
     708    else if (dynamic_cast<KModifierKeyInfo*>(sipCpp))
     709        sipType = sipType_KModifierKeyInfo;
     710    else if (dynamic_cast<KNotification*>(sipCpp))
     711        sipType = sipType_KNotification;
     712    else if (dynamic_cast<KNotificationRestrictions*>(sipCpp))
     713        sipType = sipType_KNotificationRestrictions;
     714    else if (dynamic_cast<KPageWidgetItem*>(sipCpp))
     715        sipType = sipType_KPageWidgetItem;
     716    else if (dynamic_cast<KPassivePopupMessageHandler*>(sipCpp))
     717        sipType = sipType_KPassivePopupMessageHandler;
     718    else if (dynamic_cast<KPixmapSequenceOverlayPainter*>(sipCpp))
     719        sipType = sipType_KPixmapSequenceOverlayPainter;
     720    else if (dynamic_cast<KStartupInfo*>(sipCpp))
     721        sipType = sipType_KStartupInfo;
     722    else if (dynamic_cast<KStatusNotifierItem*>(sipCpp))
     723        sipType = sipType_KStatusNotifierItem;
     724    else if (dynamic_cast<KViewStateMaintainerBase*>(sipCpp))
     725        sipType = sipType_KViewStateMaintainerBase;
     726    else if (dynamic_cast<KViewStateSaver*>(sipCpp))
     727        sipType = sipType_KViewStateSaver;
     728    else if (dynamic_cast<KWallet::Wallet*>(sipCpp))
     729        sipType = sipType_KWallet_Wallet;
     730    else if (dynamic_cast<KXMLGUIFactory*>(sipCpp))
     731        sipType = sipType_KXMLGUIFactory;
     732    else if (dynamic_cast<KWidgetItemDelegate*>(sipCpp))
     733        sipType = sipType_KWidgetItemDelegate;
     734    else if (dynamic_cast<KExtendableItemDelegate*>(sipCpp))
     735        sipType = sipType_KExtendableItemDelegate;
     736    else if (dynamic_cast<KPageModel*>(sipCpp))
     737        {
     738        sipType = sipType_KPageModel;
     739        if (dynamic_cast<KPageWidgetModel*>(sipCpp))
     740            sipType = sipType_KPageWidgetModel;
     741        }
     742    else if (dynamic_cast<KDescendantsProxyModel*>(sipCpp))
     743        sipType = sipType_KDescendantsProxyModel;
     744    else if (dynamic_cast<KIdentityProxyModel*>(sipCpp))
     745        {
     746        sipType = sipType_KIdentityProxyModel;
     747        if (dynamic_cast<KCheckableProxyModel*>(sipCpp))
     748            sipType = sipType_KCheckableProxyModel;
     749        }
     750    else if (dynamic_cast<KSelectionProxyModel*>(sipCpp))
     751        sipType = sipType_KSelectionProxyModel;
     752    else if (dynamic_cast<KCategorizedSortFilterProxyModel*>(sipCpp))
     753        sipType = sipType_KCategorizedSortFilterProxyModel;
     754    else if (dynamic_cast<KRecursiveFilterProxyModel*>(sipCpp))
     755        sipType = sipType_KRecursiveFilterProxyModel;
     756    else if (dynamic_cast<KAction*>(sipCpp))
     757        {
     758        sipType = sipType_KAction;
     759        if (dynamic_cast<KActionMenu*>(sipCpp))
     760            sipType = sipType_KActionMenu;
     761        else if (dynamic_cast<KDualAction*>(sipCpp))
     762            sipType = sipType_KDualAction;
     763        else if (dynamic_cast<KPasteTextAction*>(sipCpp))
     764            sipType = sipType_KPasteTextAction;
     765        else if (dynamic_cast<KSelectAction*>(sipCpp))
     766            {
     767            sipType = sipType_KSelectAction;
     768            if (dynamic_cast<KCodecAction*>(sipCpp))
     769                sipType = sipType_KCodecAction;
     770            else if (dynamic_cast<KFontAction*>(sipCpp))
     771                sipType = sipType_KFontAction;
     772            else if (dynamic_cast<KFontSizeAction*>(sipCpp))
     773                sipType = sipType_KFontSizeAction;
     774            else if (dynamic_cast<KRecentFilesAction*>(sipCpp))
     775                sipType = sipType_KRecentFilesAction;
     776            }
     777        else if (dynamic_cast<KToggleAction*>(sipCpp))
     778            {
     779            sipType = sipType_KToggleAction;
     780            if (dynamic_cast<KToggleFullScreenAction*>(sipCpp))
     781                sipType = sipType_KToggleFullScreenAction;
     782            else if (dynamic_cast<KToggleToolBarAction*>(sipCpp))
     783                sipType = sipType_KToggleToolBarAction;
     784            }
     785        else if (dynamic_cast<KToolBarLabelAction*>(sipCpp))
     786            sipType = sipType_KToolBarLabelAction;
     787        else if (dynamic_cast<KToolBarPopupAction*>(sipCpp))
     788            sipType = sipType_KToolBarPopupAction;
     789        else if (dynamic_cast<KToolBarSpacerAction*>(sipCpp))
     790            sipType = sipType_KToolBarSpacerAction;
     791        }
     792    else if (dynamic_cast<KApplication*>(sipCpp))
     793        {
     794        sipType = sipType_KApplication;
     795        if (dynamic_cast<KUniqueApplication*>(sipCpp))
     796            sipType = sipType_KUniqueApplication;
     797        }
     798    else if (dynamic_cast<KBreadcrumbSelectionModel*>(sipCpp))
     799        sipType = sipType_KBreadcrumbSelectionModel;
     800    else if (dynamic_cast<KLinkItemSelectionModel*>(sipCpp))
     801        sipType = sipType_KLinkItemSelectionModel;
     802    else if (dynamic_cast<KStyle*>(sipCpp))
     803        sipType = sipType_KStyle;
     804    else if (dynamic_cast<KSvgRenderer*>(sipCpp))
     805        sipType = sipType_KSvgRenderer;
     806    else if (dynamic_cast<Sonnet::Highlighter*>(sipCpp))
     807        sipType = sipType_Sonnet_Highlighter;
     808    else if (dynamic_cast<KSystemTrayIcon*>(sipCpp))
     809        sipType = sipType_KSystemTrayIcon;
     810    else if (dynamic_cast<KUndoStack*>(sipCpp))
     811        sipType = sipType_KUndoStack;
     812    else if (dynamic_cast<KDateValidator*>(sipCpp))
     813        sipType = sipType_KDateValidator;
     814    else if (dynamic_cast<KFloatValidator*>(sipCpp))
     815        sipType = sipType_KFloatValidator;
     816    else if (dynamic_cast<KIntValidator*>(sipCpp))
     817        sipType = sipType_KIntValidator;
     818    else if (dynamic_cast<KMimeTypeValidator*>(sipCpp))
     819        sipType = sipType_KMimeTypeValidator;
     820    else if (dynamic_cast<KStringListValidator*>(sipCpp))
     821        sipType = sipType_KStringListValidator;
     822    else if (dynamic_cast<KDoubleValidator*>(sipCpp))
     823        sipType = sipType_KDoubleValidator;
     824    else if (dynamic_cast<KActionSelector*>(sipCpp))
     825        sipType = sipType_KActionSelector;
     826    else if (dynamic_cast<KCModule*>(sipCpp))
     827        sipType = sipType_KCModule;
     828    else if (dynamic_cast<KCapacityBar*>(sipCpp))
     829        sipType = sipType_KCapacityBar;
     830    else if (dynamic_cast<KCharSelect*>(sipCpp))
     831        sipType = sipType_KCharSelect;
     832    else if (dynamic_cast<KDateTable*>(sipCpp))
     833        sipType = sipType_KDateTable;
     834    else if (dynamic_cast<KDateTimeEdit*>(sipCpp))
     835        sipType = sipType_KDateTimeEdit;
     836    else if (dynamic_cast<KDateTimeWidget*>(sipCpp))
     837        sipType = sipType_KDateTimeWidget;
     838    else if (dynamic_cast<KDateWidget*>(sipCpp))
     839        sipType = sipType_KDateWidget;
     840    else if (dynamic_cast<KEditListWidget*>(sipCpp))
     841        sipType = sipType_KEditListWidget;
     842    else if (dynamic_cast<KFadeWidgetEffect*>(sipCpp))
     843        sipType = sipType_KFadeWidgetEffect;
     844    else if (dynamic_cast<KFilterProxySearchLine*>(sipCpp))
     845        sipType = sipType_KFilterProxySearchLine;
     846    else if (dynamic_cast<KFontChooser*>(sipCpp))
     847        sipType = sipType_KFontChooser;
     848    else if (dynamic_cast<KFontRequester*>(sipCpp))
     849        sipType = sipType_KFontRequester;
     850    else if (dynamic_cast<KKeySequenceWidget*>(sipCpp))
     851        sipType = sipType_KKeySequenceWidget;
     852    else if (dynamic_cast<KLanguageButton*>(sipCpp))
     853        sipType = sipType_KLanguageButton;
     854    else if (dynamic_cast<KLed*>(sipCpp))
     855        sipType = sipType_KLed;
     856    else if (dynamic_cast<KMultiTabBar*>(sipCpp))
     857        sipType = sipType_KMultiTabBar;
     858    else if (dynamic_cast<KNumInput*>(sipCpp))
     859        {
     860        sipType = sipType_KNumInput;
     861        if (dynamic_cast<KDoubleNumInput*>(sipCpp))
     862            sipType = sipType_KDoubleNumInput;
     863        else if (dynamic_cast<KIntNumInput*>(sipCpp))
     864            sipType = sipType_KIntNumInput;
     865        }
     866    else if (dynamic_cast<KPageView*>(sipCpp))
     867        {
     868        sipType = sipType_KPageView;
     869        if (dynamic_cast<KPageWidget*>(sipCpp))
     870            sipType = sipType_KPageWidget;
     871        }
     872    else if (dynamic_cast<KPixmapRegionSelectorWidget*>(sipCpp))
     873        sipType = sipType_KPixmapRegionSelectorWidget;
     874    else if (dynamic_cast<KPixmapSequenceWidget*>(sipCpp))
     875        sipType = sipType_KPixmapSequenceWidget;
     876    else if (dynamic_cast<KShortcutWidget*>(sipCpp))
     877        sipType = sipType_KShortcutWidget;
     878    else if (dynamic_cast<KShortcutsEditor*>(sipCpp))
     879        sipType = sipType_KShortcutsEditor;
     880    else if (dynamic_cast<KTitleWidget*>(sipCpp))
     881        sipType = sipType_KTitleWidget;
     882    else if (dynamic_cast<KTreeWidgetSearchLineWidget*>(sipCpp))
     883        sipType = sipType_KTreeWidgetSearchLineWidget;
     884    else if (dynamic_cast<KXYSelector*>(sipCpp))
     885        {
     886        sipType = sipType_KXYSelector;
     887        if (dynamic_cast<KHueSaturationSelector*>(sipCpp))
     888            sipType = sipType_KHueSaturationSelector;
     889        }
     890    else if (dynamic_cast<KArrowButton*>(sipCpp))
     891        sipType = sipType_KArrowButton;
     892    else if (dynamic_cast<KColorButton*>(sipCpp))
     893        sipType = sipType_KColorButton;
     894    else if (dynamic_cast<KMultiTabBarButton*>(sipCpp))
     895        {
     896        sipType = sipType_KMultiTabBarButton;
     897        if (dynamic_cast<KMultiTabBarTab*>(sipCpp))
     898            sipType = sipType_KMultiTabBarTab;
     899        }
     900    else if (dynamic_cast<KPushButton*>(sipCpp))
     901        sipType = sipType_KPushButton;
     902    else if (dynamic_cast<KAnimatedButton*>(sipCpp))
     903        sipType = sipType_KAnimatedButton;
     904    else if (dynamic_cast<KRuler*>(sipCpp))
     905        sipType = sipType_KRuler;
     906    else if (dynamic_cast<KSelector*>(sipCpp))
     907        {
     908        sipType = sipType_KSelector;
     909        if (dynamic_cast<KColorValueSelector*>(sipCpp))
     910            sipType = sipType_KColorValueSelector;
     911        else if (dynamic_cast<KGradientSelector*>(sipCpp))
     912            sipType = sipType_KGradientSelector;
     913        }
     914    else if (dynamic_cast<KIntSpinBox*>(sipCpp))
     915        sipType = sipType_KIntSpinBox;
     916    else if (dynamic_cast<KColorCombo*>(sipCpp))
     917        sipType = sipType_KColorCombo;
     918    else if (dynamic_cast<KComboBox*>(sipCpp))
     919        {
     920        sipType = sipType_KComboBox;
     921        if (dynamic_cast<KDateComboBox*>(sipCpp))
     922            sipType = sipType_KDateComboBox;
     923        else if (dynamic_cast<KFontComboBox*>(sipCpp))
     924            sipType = sipType_KFontComboBox;
     925        else if (dynamic_cast<KHistoryComboBox*>(sipCpp))
     926            sipType = sipType_KHistoryComboBox;
     927        else if (dynamic_cast<KTimeComboBox*>(sipCpp))
     928            sipType = sipType_KTimeComboBox;
     929        else if (dynamic_cast<Sonnet::DictionaryComboBox*>(sipCpp))
     930            sipType = sipType_Sonnet_DictionaryComboBox;
     931        }
     932    else if (dynamic_cast<KDialog*>(sipCpp))
     933        {
     934        sipType = sipType_KDialog;
     935        if (dynamic_cast<KAboutApplicationDialog*>(sipCpp))
     936            sipType = sipType_KAboutApplicationDialog;
     937        else if (dynamic_cast<KBugReport*>(sipCpp))
     938            sipType = sipType_KBugReport;
     939        else if (dynamic_cast<KColorDialog*>(sipCpp))
     940            sipType = sipType_KColorDialog;
     941        else if (dynamic_cast<KEditToolBar*>(sipCpp))
     942            sipType = sipType_KEditToolBar;
     943        else if (dynamic_cast<KFindDialog*>(sipCpp))
     944            {
     945            sipType = sipType_KFindDialog;
     946            if (dynamic_cast<KReplaceDialog*>(sipCpp))
     947                sipType = sipType_KReplaceDialog;
     948            }
     949        else if (dynamic_cast<KFontDialog*>(sipCpp))
     950            sipType = sipType_KFontDialog;
     951        else if (dynamic_cast<KNewPasswordDialog*>(sipCpp))
     952            sipType = sipType_KNewPasswordDialog;
     953        else if (dynamic_cast<KPageDialog*>(sipCpp))
     954            {
     955            sipType = sipType_KPageDialog;
     956            if (dynamic_cast<KAssistantDialog*>(sipCpp))
     957                sipType = sipType_KAssistantDialog;
     958            else if (dynamic_cast<KConfigDialog*>(sipCpp))
     959                sipType = sipType_KConfigDialog;
     960            }
     961        else if (dynamic_cast<KPasswordDialog*>(sipCpp))
     962            sipType = sipType_KPasswordDialog;
     963        else if (dynamic_cast<KPixmapRegionSelectorDialog*>(sipCpp))
     964            sipType = sipType_KPixmapRegionSelectorDialog;
     965        else if (dynamic_cast<KProgressDialog*>(sipCpp))
     966            sipType = sipType_KProgressDialog;
     967        else if (dynamic_cast<KShortcutsDialog*>(sipCpp))
     968            sipType = sipType_KShortcutsDialog;
     969        else if (dynamic_cast<KTipDialog*>(sipCpp))
     970            sipType = sipType_KTipDialog;
     971        else if (dynamic_cast<Sonnet::ConfigDialog*>(sipCpp))
     972            sipType = sipType_Sonnet_ConfigDialog;
     973        else if (dynamic_cast<Sonnet::Dialog*>(sipCpp))
     974            sipType = sipType_Sonnet_Dialog;
     975        }
     976    else if (dynamic_cast<KDialogButtonBox*>(sipCpp))
     977        sipType = sipType_KDialogButtonBox;
     978    else if (dynamic_cast<KColorPatch*>(sipCpp))
     979        sipType = sipType_KColorPatch;
     980    else if (dynamic_cast<KDatePicker*>(sipCpp))
     981        sipType = sipType_KDatePicker;
     982    else if (dynamic_cast<KHBox*>(sipCpp))
     983        {
     984        sipType = sipType_KHBox;
     985        if (dynamic_cast<KVBox*>(sipCpp))
     986            sipType = sipType_KVBox;
     987        }
     988    else if (dynamic_cast<KMessageWidget*>(sipCpp))
     989        sipType = sipType_KMessageWidget;
     990    else if (dynamic_cast<KPassivePopup*>(sipCpp))
     991        sipType = sipType_KPassivePopup;
     992    else if (dynamic_cast<KPlotWidget*>(sipCpp))
     993        sipType = sipType_KPlotWidget;
     994    else if (dynamic_cast<KPopupFrame*>(sipCpp))
     995        sipType = sipType_KPopupFrame;
     996    else if (dynamic_cast<KRatingWidget*>(sipCpp))
     997        sipType = sipType_KRatingWidget;
     998    else if (dynamic_cast<KSeparator*>(sipCpp))
     999        sipType = sipType_KSeparator;
     1000    else if (dynamic_cast<KCategorizedView*>(sipCpp))
     1001        sipType = sipType_KCategorizedView;
     1002    else if (dynamic_cast<KListWidget*>(sipCpp))
     1003        {
     1004        sipType = sipType_KListWidget;
     1005        if (dynamic_cast<KCompletionBox*>(sipCpp))
     1006            sipType = sipType_KCompletionBox;
     1007        }
     1008    else if (dynamic_cast<KColorCells*>(sipCpp))
     1009        sipType = sipType_KColorCells;
     1010    else if (dynamic_cast<KTimeZoneWidget*>(sipCpp))
     1011        sipType = sipType_KTimeZoneWidget;
     1012    else if (dynamic_cast<KTextEdit*>(sipCpp))
     1013        {
     1014        sipType = sipType_KTextEdit;
     1015        if (dynamic_cast<KRichTextEdit*>(sipCpp))
     1016            {
     1017            sipType = sipType_KRichTextEdit;
     1018            if (dynamic_cast<KRichTextWidget*>(sipCpp))
     1019                sipType = sipType_KRichTextWidget;
     1020            }
     1021        }
     1022    else if (dynamic_cast<KTextBrowser*>(sipCpp))
     1023        sipType = sipType_KTextBrowser;
     1024    else if (dynamic_cast<KSqueezedTextLabel*>(sipCpp))
     1025        sipType = sipType_KSqueezedTextLabel;
     1026    else if (dynamic_cast<KUrlLabel*>(sipCpp))
     1027        sipType = sipType_KUrlLabel;
     1028    else if (dynamic_cast<KButtonGroup*>(sipCpp))
     1029        sipType = sipType_KButtonGroup;
     1030    else if (dynamic_cast<KEditListBox*>(sipCpp))
     1031        sipType = sipType_KEditListBox;
     1032    else if (dynamic_cast<KLineEdit*>(sipCpp))
     1033        {
     1034        sipType = sipType_KLineEdit;
     1035        if (dynamic_cast<KListWidgetSearchLine*>(sipCpp))
     1036            sipType = sipType_KListWidgetSearchLine;
     1037        else if (dynamic_cast<KRestrictedLine*>(sipCpp))
     1038            sipType = sipType_KRestrictedLine;
     1039        else if (dynamic_cast<KTreeWidgetSearchLine*>(sipCpp))
     1040            sipType = sipType_KTreeWidgetSearchLine;
     1041        }
     1042    else if (dynamic_cast<KMainWindow*>(sipCpp))
     1043        {
     1044        sipType = sipType_KMainWindow;
     1045        if (dynamic_cast<KXmlGuiWindow*>(sipCpp))
     1046            sipType = sipType_KXmlGuiWindow;
     1047        }
     1048    else if (dynamic_cast<KMenu*>(sipCpp))
     1049        sipType = sipType_KMenu;
     1050    else if (dynamic_cast<KMenuBar*>(sipCpp))
     1051        sipType = sipType_KMenuBar;
     1052    else if (dynamic_cast<KSplashScreen*>(sipCpp))
     1053        sipType = sipType_KSplashScreen;
     1054    else if (dynamic_cast<KStatusBar*>(sipCpp))
     1055        sipType = sipType_KStatusBar;
     1056    else if (dynamic_cast<KTabBar*>(sipCpp))
     1057        sipType = sipType_KTabBar;
     1058    else if (dynamic_cast<KTabWidget*>(sipCpp))
     1059        sipType = sipType_KTabWidget;
     1060    else if (dynamic_cast<KToolBar*>(sipCpp))
     1061        sipType = sipType_KToolBar;
     1062    else if (dynamic_cast<Sonnet::ConfigWidget*>(sipCpp))
     1063        sipType = sipType_Sonnet_ConfigWidget;
     1064%End
     1065%End
    6541066public:
    6551067    ~KRatingWidget ();
    6561068};

  • sip/kdeui/kuniqueapplication.sip 

    diff --git sip/kdeui/kuniqueapplication.sip sip/kdeui/kuniqueapplication.sip
index d9b9ce3..cffc66b 100644
    class KUniqueApplication : KApplication 
    2929
    3030public:
    3131    explicit                KUniqueApplication (bool GUIenabled = 1, bool configUnique = 0);
     32%If (WS_X11)
    3233    explicit                KUniqueApplication (Display* display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, bool configUnique = 0);
     34%End
    3335    static void             addCmdLineOptions ();
    3436
    3537

  • sip/kdeui/kwallet.sip 

    diff --git sip/kdeui/kwallet.sip sip/kdeui/kwallet.sip
index e05454a..11308c4 100644
    protected: 
    106106//ig    virtual void            virtual_hook (int id, void* data);
    107107public:
    108108    ~Wallet ();
     109%If (!WS_MACX)
    109110    static bool             isUsingKSecretsService ();
     111%End
    110112};
    111113// Wallet
    112114

  • sip/kdeui/kwindowinfo.sip 

    diff --git sip/kdeui/kwindowinfo.sip sip/kdeui/kwindowinfo.sip
index 24e060c..498ebca 100644
    public: 
    5050    int                     desktop () const;
    5151    QRect                   geometry () const;
    5252    QRect                   frameGeometry () const;
     53%If (WS_X11)
    5354    WId                     transientFor () const;
    5455    WId                     groupLeader () const;
    5556    QByteArray              windowClassClass () const;
    5657    QByteArray              windowClassName () const;
    5758    QByteArray              windowRole () const;
    5859    QByteArray              clientMachine () const;
     60%End
    5961    bool                    actionSupported (NET::Action action) const;
    6062                            KWindowInfo (const KWindowInfo&);
    6163    ~KWindowInfo ();

  • sip/kdeui/kwindowsystem.sip 

    diff --git sip/kdeui/kwindowsystem.sip sip/kdeui/kwindowsystem.sip
index 161f6c0..955fcc6 100644
    class KWindowSystem : QObject, NET 
    2424{
    2525%TypeHeaderCode
    2626#include <kwindowsystem.h>
     27#include <../../Library/Frameworks/QtGui.framework/Versions/4/Headers/qstyleoption.h>
    2728%End
    2829
    2930
    … … public: 
    4445    static void             setOnAllDesktops (WId win, bool b);
    4546    static void             setOnDesktop (WId win, int desktop);
    4647    static void             setMainWindow (QWidget* subwindow, WId mainwindow);
     48%If (WS_X11)
    4749    static WId              transientFor (WId window);
    4850    static WId              groupLeader (WId window);
     51%End
    4952    static QPixmap          icon (WId win, int width = -1, int height = -1, bool scale = 0);
    5053
    5154    enum IconSource
    … … public: 
    7780    static bool             allowedActionsSupported ();
    7881    static QString          readNameProperty (WId window, unsigned long atom);
    7982    static void             doNotManage (const QString& title);
     83%If (WS_X11)
    8084    static bool             mapViewport ();
    8185    static int              viewportToDesktop (const QPoint& pos);
    8286    static int              viewportWindowToDesktop (const QRect& r);
    8387    static QPoint           desktopToViewport (int desktop, bool absolute);
    8488    static QPoint           constrainViewportRelativePosition (const QPoint& pos);
     89%End
    8590
    8691signals:
    8792    void                    currentDesktopChanged (int desktop);

  • sip/kdeui/kxmessages.sip 

    diff --git sip/kdeui/kxmessages.sip sip/kdeui/kxmessages.sip
index 1b3438c..f69170d 100644
     
    2020// along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2121
    2222
     23%If (WS_X11)
    2324class KXMessages : QWidget
    2425{
    2526%TypeHeaderCode
    … … public: 
    4849    ~KXMessages ();
    4950};
    5051// KXMessages
     52%End
    5153
    5254

  • sip/kdeui/kxutils.sip 

    diff --git sip/kdeui/kxutils.sip sip/kdeui/kxutils.sip
index 9327afd..1f56920 100644
     
    1818// You should have received a copy of the GNU General Public License
    1919// along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2020
     21%If (WS_X11)
    2122%ModuleHeaderCode
    2223#include <kxutils.h>
    2324%End
    … … int timestampCompare (unsigned long time1, unsigned long tim 
    2829int                     timestampDiff (unsigned long time1, unsigned long time2);
    2930};
    3031// KXUtils
    31 
     32%End
    3233

  • sip/kdeui/netwm.sip 

    diff --git sip/kdeui/netwm.sip sip/kdeui/netwm.sip
index 2084144..26de24f 100644
     
    1919// You should have received a copy of the GNU General Public License
    2020// along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2121
     22%If (WS_X11)
    2223%ModuleHeaderCode
    2324#include <netwm.h>
    2425%End
    … … public: 
    286287typedef ulong Time;
    287288
    288289//end
     290%End

  • netwm_def.sip

    old new  
    111111{
    112112%TypeHeaderCode
    113113#include <netwm_def.h>
     114#include <../../../../../../Library/Frameworks/QtGui.framework/Versions/4/Headers/qstyleoption.h>
    114115%End
    115116
    116117
    … …  
    200201        AllTypesMask
    201202    };
    202203
     204%If (WS_X11)
    203205    static bool             typeMatchesMask (NET::WindowType type, unsigned long mask);
     206%End
    204207
    205208    enum State
    206209    {
    … …  
    353356        DesktopLayoutCornerBottomRight
    354357    };
    355358
     359%If (WS_X11)
    356360    static int              timestampCompare (unsigned long time1, unsigned long time2);
    357361    static int              timestampDiff (unsigned long time1, unsigned long time2);
     362%End
    358363};
    359364// NET