From b2077814875df6006a8a7b9d02f854d3e69a47f1 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 7 Dec 2013 18:40:50 +0100 Subject: Fix FTBFS with sip >= 4.15 --- sip/qt/qlayout.sip | 4 ++-- sip/qtnetwork/qftp.sip | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sip/qt/qlayout.sip b/sip/qt/qlayout.sip index ddc0a3d..46db606 100644 --- a/sip/qt/qlayout.sip +++ b/sip/qt/qlayout.sip @@ -328,8 +328,8 @@ public: TQSizePolicy::ExpandData expanding() const; TQSize minimumSize() const; TQSize maximumSize() const; - void setGeometry(const TQRect &) = 0; - TQLayoutIterator iterator() = 0; + virtual void setGeometry(const TQRect &) = 0; + virtual TQLayoutIterator iterator() = 0; bool isEmpty() const; int totalHeightForWidth(int) const; diff --git a/sip/qtnetwork/qftp.sip b/sip/qtnetwork/qftp.sip index f3f053e..e5f46d8 100644 --- a/sip/qtnetwork/qftp.sip +++ b/sip/qtnetwork/qftp.sip @@ -177,6 +177,9 @@ protected: virtual void operationRename(TQNetworkOperation *); virtual void operationGet(TQNetworkOperation *); virtual void operationPut(TQNetworkOperation *); + +private: + virtual bool checkConnection(TQNetworkOperation *); }; %End -- cgit v1.2.1