From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- krdc/krdc.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'krdc/krdc.h') diff --git a/krdc/krdc.h b/krdc/krdc.h index 08409b26..1cd5b739 100644 --- a/krdc/krdc.h +++ b/krdc/krdc.h @@ -52,20 +52,21 @@ enum Protocol { }; // Overloaded TQScrollView, to let mouse move events through to remote widget -class QScrollView2 : public TQScrollView { +class TQScrollView2 : public TQScrollView { public: - QScrollView2(TQWidget *w, const char *name); + TQScrollView2(TQWidget *w, const char *name); protected: virtual void mouseMoveEvent(TQMouseEvent *e); }; -class KRDC : public QWidget +class KRDC : public TQWidget { Q_OBJECT + TQ_OBJECT private: SmartPtr m_progressDialog; // dialog, displayed while connecting - TQVBoxLayout *m_layout; // the layout for autosizing the scrollview + TQVBoxLayout *m_layout; // the tqlayout for autosizing the scrollview TQScrollView *m_scrollView; // scrollview that contains the remote widget KProgress *m_progress; // progress bar for the dialog KRemoteView *m_view; // the remote widget (e.g. KVncView) @@ -120,20 +121,20 @@ private: static const int TOOLBAR_SPEED_DOWN; static const int TOOLBAR_SPEED_UP; void fsToolbarScheduleHidden(); - TQPopupMenu *createPopupMenu(TQWidget *parent) const; + TQPopupMenu *createPopupMenu(TQWidget *tqparent) const; protected: virtual void mouseMoveEvent(TQMouseEvent *e); virtual bool event(TQEvent *e); virtual bool eventFilter(TQObject *watched, TQEvent *e); - virtual TQSize sizeHint(); + virtual TQSize tqsizeHint(); public: KRDC(WindowMode wm = WINDOW_MODE_AUTO, - const TQString &host = TQString::null, - Quality q = QUALITY_UNKNOWN, - const TQString &encodings = TQString::null, - const TQString &password = TQString::null, + const TQString &host = TQString(), + Quality q = TQUALITY_UNKNOWN, + const TQString &encodings = TQString(), + const TQString &password = TQString(), bool scale = false, bool localCursor = false, TQSize initialWindowSize = TQSize()); @@ -144,7 +145,7 @@ public: static void setLastHost(const TQString &host); private slots: - void changeProgress(RemoteViewStatus s); + void changeProgress(RemoteViewtqStatus s); void showingPasswordDialog(bool b); void showProgressTimeout(); -- cgit v1.2.1