From a46e33728580cacf68994d5b5d3780a5bcb58e8b Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 13 Aug 2011 21:51:16 +0000 Subject: Fix kalyptus by altering kdelibs git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246968 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeui/kdockwidget.h | 5 ++++ kdeui/keditlistbox.h | 74 ++++++++++++++++++++++++---------------------- kdeui/kmainwindow.h | 9 ++++++ kdeui/kurllabel.h | 4 +++ kio/kfile/kdiroperator.cpp | 2 +- kio/kio/kfilterdev.h | 10 +++++++ kmdi/kmdimainfrm.h | 5 ++++ kparts/mainwindow.h | 13 ++++++++ 8 files changed, 86 insertions(+), 36 deletions(-) diff --git a/kdeui/kdockwidget.h b/kdeui/kdockwidget.h index d3b030697..019cd9e55 100644 --- a/kdeui/kdockwidget.h +++ b/kdeui/kdockwidget.h @@ -1332,7 +1332,11 @@ public: * @param name internal object name * @param f Qt::WidgetFlags widget flags */ +#ifdef qdoc + KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); +#else KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); +#endif /** * Destructs a dockmainwindow. @@ -1546,3 +1550,4 @@ private: #endif + diff --git a/kdeui/keditlistbox.h b/kdeui/keditlistbox.h index 3a7fc1980..bd8b19a64 100644 --- a/kdeui/keditlistbox.h +++ b/kdeui/keditlistbox.h @@ -51,41 +51,7 @@ class KDEUI_EXPORT KEditListBox : public TQGroupBox TQ_PROPERTY( TQStringList items READ items WRITE setItems ) public: - /** - * Custom editor class - * - * @since 3.1 - **/ - // ### KDE4: add virtual destructor - class CustomEditor - { - public: - KDEUI_EXPORT CustomEditor() - : m_representationWidget( 0L ), - m_lineEdit( 0L ) {} - KDEUI_EXPORT CustomEditor( TQWidget *repWidget, KLineEdit *edit ) - : m_representationWidget( repWidget ), - m_lineEdit( edit ) {} - KDEUI_EXPORT CustomEditor( KComboBox *combo ); - - KDEUI_EXPORT void setRepresentationWidget( TQWidget *repWidget ) { - m_representationWidget = repWidget; - } - KDEUI_EXPORT void setLineEdit( KLineEdit *edit ) { - m_lineEdit = edit; - } - - KDEUI_EXPORT virtual TQWidget *representationWidget() const { - return m_representationWidget; - } - KDEUI_EXPORT virtual KLineEdit *lineEdit() const { - return m_lineEdit; - } - - protected: - TQWidget *m_representationWidget; - KLineEdit *m_lineEdit; - }; + class CustomEditor; public: @@ -270,6 +236,44 @@ public: private: //our lovely private d-pointer KEditListBoxPrivate* const d; + + /** + * Custom editor class + * + * @since 3.1 + **/ + // ### KDE4: add virtual destructor + public: + class CustomEditor + { + public: + KDEUI_EXPORT CustomEditor() + : m_representationWidget( 0L ), + m_lineEdit( 0L ) {} + KDEUI_EXPORT CustomEditor( TQWidget *repWidget, KLineEdit *edit ) + : m_representationWidget( repWidget ), + m_lineEdit( edit ) {} + KDEUI_EXPORT CustomEditor( KComboBox *combo ); + + KDEUI_EXPORT void setRepresentationWidget( TQWidget *repWidget ) { + m_representationWidget = repWidget; + } + KDEUI_EXPORT void setLineEdit( KLineEdit *edit ) { + m_lineEdit = edit; + } + + KDEUI_EXPORT virtual TQWidget *representationWidget() const { + return m_representationWidget; + } + KDEUI_EXPORT virtual KLineEdit *lineEdit() const { + return m_lineEdit; + } + + protected: + TQWidget *m_representationWidget; + KLineEdit *m_lineEdit; + }; }; #endif + diff --git a/kdeui/kmainwindow.h b/kdeui/kmainwindow.h index 43f9845bf..035cdb772 100644 --- a/kdeui/kmainwindow.h +++ b/kdeui/kmainwindow.h @@ -133,7 +133,11 @@ public: * KMainWindow *kmw = new KMainWindow (...); * \endcode **/ +#ifdef qdoc + KMainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose ); +#else KMainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); +#endif /** * Flags that can be passed in an argument to the constructor to @@ -155,7 +159,11 @@ public: * * @since 3.2 */ +#ifdef qdoc + KMainWindow( int cflags, TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose ); +#else KMainWindow( int cflags, TQWidget* parent = 0, const char *name = 0, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); +#endif /** * \brief Destructor. @@ -1065,3 +1073,4 @@ inline void kRestoreMainWindows() { } #endif + diff --git a/kdeui/kurllabel.h b/kdeui/kurllabel.h index 30ef78a39..5563f77ba 100644 --- a/kdeui/kurllabel.h +++ b/kdeui/kurllabel.h @@ -161,7 +161,10 @@ public: /** * Reimplemented for internal reasons, the API is not affected. */ +#ifdef qdoc +#else virtual void setFocusPolicy ( TQ_FocusPolicy policy ); +#endif /** * Reimplemented for internal reasons, the API is not affected. @@ -405,3 +408,4 @@ private: }; #endif // KURLLABEL_H + diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index f84be90ea..753ba1b3a 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -1560,7 +1560,7 @@ void KDirOperator::resizeEvent( TQResizeEvent * ) if (m_fileView) m_fileView->widget()->resize( size() ); - if ( progress->parent() == this ) // might be reparented into a statusbar + if ( TQT_BASE_OBJECT(progress->parent()) == TQT_BASE_OBJECT(this) ) // might be reparented into a statusbar progress->move(2, height() - progress->height() -2); } diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h index 027d1eb4a..e5280542d 100644 --- a/kio/kio/kfilterdev.h +++ b/kio/kio/kfilterdev.h @@ -53,7 +53,10 @@ public: * Open for reading or writing. * If the KFilterBase's device is not opened, it will be opened. */ +#ifdef qdoc +#else virtual bool open( TQ_OpenMode mode ); +#endif /** * Close after reading or writing. * If the KFilterBase's device was opened by open(), it will be closed. @@ -77,11 +80,14 @@ public: void setSkipHeaders(); // Not implemented +#ifdef qdoc +#else #ifdef USE_QT4 virtual qint64 size() const; #else // USE_QT4 virtual TQIODevice::Offset size() const; #endif // USE_QT4 +#endif virtual TQIODevice::Offset at() const; /** @@ -91,8 +97,11 @@ public: virtual bool atEnd() const; +#ifdef qdoc +#else virtual TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ); virtual TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len ); +#endif //int readLine( char *data, uint maxlen ); virtual int getch(); @@ -192,3 +201,4 @@ private: #endif + diff --git a/kmdi/kmdimainfrm.h b/kmdi/kmdimainfrm.h index f6fecbb9c..38cef9f44 100644 --- a/kmdi/kmdimainfrm.h +++ b/kmdi/kmdimainfrm.h @@ -296,7 +296,11 @@ private: // methods public: +#ifdef qdoc + KMdiMainFrm( TQWidget* parentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose ); +#else KMdiMainFrm( TQWidget* parentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = (WFlags)(WType_TopLevel | WDestructiveClose) ); +#endif virtual ~KMdiMainFrm(); /** @@ -877,3 +881,4 @@ signals: #endif //_KMDIMAINFRM_H_ // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; + diff --git a/kparts/mainwindow.h b/kparts/mainwindow.h index 08262c19a..f1c386a6a 100644 --- a/kparts/mainwindow.h +++ b/kparts/mainwindow.h @@ -51,16 +51,28 @@ class KPARTS_EXPORT MainWindow : public KMainWindow, virtual public PartBase /** * Constructor, same signature as KMainWindow. */ +#ifdef qdoc + MainWindow( TQWidget* parent, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); +#else MainWindow( TQWidget* parent, const char *name = 0L, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); +#endif /** * Compatibility Constructor */ +#ifdef qdoc + MainWindow( const char *name = 0L, WFlags f = WDestructiveClose ); +#else MainWindow( const char *name = 0L, WFlags f = (WFlags)WDestructiveClose ); +#endif /** * Constructor with creation flags, see KMainWindow. * @since 3.2 */ +#ifdef qdoc + MainWindow( int cflags, TQWidget* parent, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); +#else MainWindow( int cflags, TQWidget* parent, const char *name = 0L, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); +#endif /** * Destructor. */ @@ -105,3 +117,4 @@ private: } #endif + -- cgit v1.2.1