diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:26 -0600 |
| commit | 392b293dfeaa3e4241e50b833126d0c2d598761d (patch) | |
| tree | 2e113362b942a9339c055661efd21cdb626e5e1d /src/kvpnc.h | |
| parent | 1d9c18c8a07f4833695c6a2ab978698ae1cc90e7 (diff) | |
| download | kvpnc-392b293dfeaa3e4241e50b833126d0c2d598761d.tar.gz kvpnc-392b293dfeaa3e4241e50b833126d0c2d598761d.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 1d9c18c8a07f4833695c6a2ab978698ae1cc90e7.
Diffstat (limited to 'src/kvpnc.h')
| -rw-r--r-- | src/kvpnc.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kvpnc.h b/src/kvpnc.h index 5ec0d8a..e1827cc 100644 --- a/src/kvpnc.h +++ b/src/kvpnc.h @@ -32,7 +32,7 @@ #include <tqdatetime.h> #include <tqptrlist.h> #include <tqlabel.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqpixmap.h> #include <tqpoint.h> #include <tqsize.h> @@ -111,7 +111,7 @@ protected: * sets the gui status * @param status The status that will be set */ - void setGuiStatus( int status ); + void setGuitqStatus( int status ); /** * terminates the connection @@ -142,7 +142,7 @@ public: private: // FIXME also declared at kvpncconfig -> made it only in one place - enum ConnectionStatus {disconnected=0, connecting=1, connected=2}; + enum ConnectiontqStatus {disconnected=0, connecting=1, connected=2}; enum LogType {info=0, remote=1, error=2, success=3, debug=4}; KApplication *parent; @@ -191,7 +191,7 @@ private: int RacoonctlConnectCounter; //<< counter for waiting of adminsock int sec, min, hour; int racoon_tunnel_state; // 0 => no tunnel, 1 => first tunnel, 2 => second tunnel - int prevConnectionState; //< needed for setGuiStatus(), holds previous state before disconnect (connected, connecting) + int prevConnectionState; //< needed for setGuitqStatus(), holds previous state before disconnect (connected, connecting) bool cancelClicked; bool deviceaddrstr2addr; @@ -468,7 +468,7 @@ private slots: void vpncStarted(); void ipsecStarted(); void ipsecPhase2Established(); - void checkIpsecWhackStatus(); + void checkIpsecWhacktqStatus(); void addIpsecConnection(); void racoonStarted(); void pppdStarted(); @@ -501,7 +501,7 @@ private slots: void sendFeedbackMail(); void feedbackMailSent(); void start_l2tpd(); - bool checkCiscoVpncStatus(); + bool checkCiscoVpnctqStatus(); void startCiscoVpnc(); void startStopIpsec(bool stop=false, bool silent=false); void startStopOpenl2tp(bool stop=false, bool silent=false); @@ -524,7 +524,7 @@ k_dcop: void doConnect(); void doDisconnect(); uint getConnectedTime(); - TQString getStatus(); + TQString gettqStatus(); TQString getCurrentProfile(); void setProfile(TQString profilename); void createNewProfile(); |