summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2013-12-07 18:40:50 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-12-07 18:40:50 +0100
commitb2077814875df6006a8a7b9d02f854d3e69a47f1 (patch)
treec99d44cf823cd85b6815ec5d6ace8cd857318875
parent92310a96cfcf56609e77d1b87a44f8e288a7ba81 (diff)
downloadpytqt-b2077814875df6006a8a7b9d02f854d3e69a47f1.tar.gz
pytqt-b2077814875df6006a8a7b9d02f854d3e69a47f1.zip
Fix FTBFS with sip >= 4.15
-rw-r--r--sip/qt/qlayout.sip4
-rw-r--r--sip/qtnetwork/qftp.sip3
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