TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix kalyptus by altering kdelibs

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246968 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent b56a10ae43
commit a46e337285
8 changed files with 86 additions and 36 deletions
Show Stats Download Patch File Download Diff File

5
kdeui/kdockwidget.h
Unescape View File

@ -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

74
kdeui/keditlistbox.h
Unescape View File

@ -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

9
kdeui/kmainwindow.h
Unescape View File

@ -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

4
kdeui/kurllabel.h
Unescape View File

@ -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

2
kio/kfile/kdiroperator.cpp
Unescape View File

@ -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);
}

10
kio/kio/kfilterdev.h
Unescape View File

@ -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

5
kmdi/kmdimainfrm.h
Unescape View File

@ -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;

13
kparts/mainwindow.h
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save