summaryrefslogtreecommitdiffstats
path: root/tdeio
diff options
context:
space:
mode:
Diffstat (limited to 'tdeio')
-rw-r--r--tdeio/kssl/kopenssl.h18
-rw-r--r--tdeio/kssl/kssl.h2
-rw-r--r--tdeio/kssl/ksslcertchain.h2
-rw-r--r--tdeio/kssl/ksslcertdlg.h2
-rw-r--r--tdeio/kssl/ksslsettings.h6
-rw-r--r--tdeio/tdefile/kpropertiesdialog.h6
-rw-r--r--tdeio/tdefile/tdediroperator.cpp25
-rw-r--r--tdeio/tdefile/tdediroperator.h3
-rw-r--r--tdeio/tdefile/tdefiledialog.h4
-rw-r--r--tdeio/tdeio/global.h2
-rw-r--r--tdeio/tdeio/jobclasses.h2
-rw-r--r--tdeio/tdeio/kdatatool.h4
-rw-r--r--tdeio/tdeio/kfilterdev.h2
-rw-r--r--tdeio/tdeio/kmimetype.h2
-rw-r--r--tdeio/tdeio/kprotocolinfo.h34
-rw-r--r--tdeio/tdeio/kurifilter.h2
-rw-r--r--tdeio/tdeio/netaccess.h22
-rw-r--r--tdeio/tdeio/passdlg.h2
-rw-r--r--tdeio/tdeio/slave.h2
-rw-r--r--tdeio/tdeio/slaveinterface.h4
-rw-r--r--tdeio/tdeio/tcpslavebase.h18
21 files changed, 96 insertions, 68 deletions
diff --git a/tdeio/kssl/kopenssl.h b/tdeio/kssl/kopenssl.h
index 18255034c..d305243e4 100644
--- a/tdeio/kssl/kopenssl.h
+++ b/tdeio/kssl/kopenssl.h
@@ -1063,15 +1063,15 @@ public:
# undef X509_STORE_CTX_set_chain
# undef SSLv23_client_method
#endif
- STACK *sk_dup(const STACK *s) KDE_DEPRECATED;
- void sk_free(STACK *s) KDE_DEPRECATED;
- STACK *sk_new(int (*cmp)()) KDE_DEPRECATED;
- int sk_num(STACK *s) KDE_DEPRECATED;
- char *sk_pop(STACK *s) KDE_DEPRECATED;
- int sk_push(STACK *s, char *d) KDE_DEPRECATED;
- char *sk_value(STACK *s, int n) KDE_DEPRECATED;
- void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) KDE_DEPRECATED;
- SSL_METHOD *SSLv23_client_method() KDE_DEPRECATED;
+ STACK *sk_dup(const STACK *s) TDE_DEPRECATED;
+ void sk_free(STACK *s) TDE_DEPRECATED;
+ STACK *sk_new(int (*cmp)()) TDE_DEPRECATED;
+ int sk_num(STACK *s) TDE_DEPRECATED;
+ char *sk_pop(STACK *s) TDE_DEPRECATED;
+ int sk_push(STACK *s, char *d) TDE_DEPRECATED;
+ char *sk_value(STACK *s, int n) TDE_DEPRECATED;
+ void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) TDE_DEPRECATED;
+ SSL_METHOD *SSLv23_client_method() TDE_DEPRECATED;
#endif
diff --git a/tdeio/kssl/kssl.h b/tdeio/kssl/kssl.h
index 37ee5017b..ec4fb9842 100644
--- a/tdeio/kssl/kssl.h
+++ b/tdeio/kssl/kssl.h
@@ -177,7 +177,7 @@ public:
* @param proxy is the IP or hostname of the proxy server
* @deprecated
*/
- void setProxyUse(bool active, TQString realIP = TQString::null, int realPort = 0, TQString proxy = TQString::null) KDE_DEPRECATED;
+ void setProxyUse(bool active, TQString realIP = TQString::null, int realPort = 0, TQString proxy = TQString::null) TDE_DEPRECATED;
/**
* Set the peer hostname to be used for certificate verification.
diff --git a/tdeio/kssl/ksslcertchain.h b/tdeio/kssl/ksslcertchain.h
index eb6c27d44..bf9c66cc3 100644
--- a/tdeio/kssl/ksslcertchain.h
+++ b/tdeio/kssl/ksslcertchain.h
@@ -95,7 +95,7 @@ public:
* @param chain the certificate chain
* @deprecated
*/
- void setChain(TQStringList chain) KDE_DEPRECATED;
+ void setChain(TQStringList chain) TDE_DEPRECATED;
/**
* Set the certificate chain as a list of base64 encoded X.509
diff --git a/tdeio/kssl/ksslcertdlg.h b/tdeio/kssl/ksslcertdlg.h
index d4ec4412f..73300ec9d 100644
--- a/tdeio/kssl/ksslcertdlg.h
+++ b/tdeio/kssl/ksslcertdlg.h
@@ -65,7 +65,7 @@ public:
* @param sendChecked send the checked item to the remote host
* @deprecated
*/
- void setup(TQStringList certs, bool saveChecked = false, bool sendChecked = true) KDE_DEPRECATED;
+ void setup(TQStringList certs, bool saveChecked = false, bool sendChecked = true) TDE_DEPRECATED;
/**
* Setup the dialog. Call this before you display the dialog.
diff --git a/tdeio/kssl/ksslsettings.h b/tdeio/kssl/ksslsettings.h
index 18b55331f..47b0de345 100644
--- a/tdeio/kssl/ksslsettings.h
+++ b/tdeio/kssl/ksslsettings.h
@@ -120,19 +120,19 @@ public:
* Do not use this
* @deprecated
*/
- bool warnOnSelfSigned() const KDE_DEPRECATED;
+ bool warnOnSelfSigned() const TDE_DEPRECATED;
/**
* Do not use this
* @deprecated
*/
- bool warnOnRevoked() const KDE_DEPRECATED;
+ bool warnOnRevoked() const TDE_DEPRECATED;
/**
* Do not use this
* @deprecated
*/
- bool warnOnExpired() const KDE_DEPRECATED;
+ bool warnOnExpired() const TDE_DEPRECATED;
/**
* Does the user want to use the Entropy Gathering Daemon?
diff --git a/tdeio/tdefile/kpropertiesdialog.h b/tdeio/tdefile/kpropertiesdialog.h
index cc1f75b86..61fc22a6b 100644
--- a/tdeio/tdefile/kpropertiesdialog.h
+++ b/tdeio/tdefile/kpropertiesdialog.h
@@ -129,7 +129,7 @@ public:
* @param autoShow tells the dialog whether it should show itself automatically. */
KPropertiesDialog( const KURL& _url, mode_t _mode,
TQWidget* parent = 0L, const char* name = 0L,
- bool modal = false, bool autoShow = true) KDE_DEPRECATED;
+ bool modal = false, bool autoShow = true) TDE_DEPRECATED;
#endif
/**
@@ -270,12 +270,12 @@ public:
* @return a pointer to the dialog
* @deprecated KPropertiesDialog directly inherits from KDialogBase, so use \a this instead
*/
- KDE_DEPRECATED KDialogBase* dialog() { return this; }
+ TDE_DEPRECATED KDialogBase* dialog() { return this; }
/**
* @return a pointer to the dialog
* @deprecated KPropertiesDialog directly inherits from KDialogBase, so use \a this instead
*/
- KDE_DEPRECATED const KDialogBase* dialog() const { return this; }
+ TDE_DEPRECATED const KDialogBase* dialog() const { return this; }
/**
* If the dialog is being built from a template, this method
diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp
index 9bf947f20..8b133d433 100644
--- a/tdeio/tdefile/tdediroperator.cpp
+++ b/tdeio/tdefile/tdediroperator.cpp
@@ -145,6 +145,8 @@ KDirOperator::KDirOperator(const KURL& _url,
setupMenu();
setFocusPolicy(TQWidget::WheelFocus);
+
+ installEventFilter(this);
}
KDirOperator::~KDirOperator()
@@ -1046,6 +1048,11 @@ void KDirOperator::connectView(KFileView *view)
}
m_fileView = view;
+ m_fileView->widget()->installEventFilter(this);
+ if (m_fileView->widget()->inherits("TQScrollView"))
+ {
+ (static_cast<TQScrollView *>(m_fileView->widget()))->viewport()->installEventFilter(this);
+ }
m_fileView->setDropOptions(d->dropOptions);
viewActionCollection = 0L;
KFileViewSignaler *sig = view->signaler();
@@ -1734,6 +1741,24 @@ TQString KDirOperator::viewConfigGroup() const
return d->configGroup;
}
+bool KDirOperator::eventFilter(TQObject *obj, TQEvent *ev)
+{
+ if (ev->type() == TQEvent::MouseButtonRelease)
+ {
+ TQMouseEvent *mouseEv = static_cast<TQMouseEvent *>(ev);
+ switch (mouseEv->button())
+ {
+ case TQMouseEvent::HistoryBackButton:
+ back();
+ return true;
+ case TQMouseEvent::HistoryForwardButton:
+ forward();
+ return true;
+ }
+ }
+ return false;
+}
+
void KDirOperator::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
diff --git a/tdeio/tdefile/tdediroperator.h b/tdeio/tdefile/tdediroperator.h
index 89b1a1709..50467fc61 100644
--- a/tdeio/tdefile/tdediroperator.h
+++ b/tdeio/tdefile/tdediroperator.h
@@ -936,6 +936,9 @@ private slots:
void insertViewDependentActions();
+public:
+ bool eventFilter(TQObject *obj, TQEvent *ev);
+
private:
static bool isReadable( const KURL& url );
diff --git a/tdeio/tdefile/tdefiledialog.h b/tdeio/tdefile/tdefiledialog.h
index 9807893d0..3782e455f 100644
--- a/tdeio/tdefile/tdefiledialog.h
+++ b/tdeio/tdefile/tdefiledialog.h
@@ -309,7 +309,7 @@ public:
* Do not use in conjunction with setFilter()
* @deprecated
*/
- void setFilterMimeType(const TQString &label, const KMimeType::List &types, const KMimeType::Ptr &defaultType) KDE_DEPRECATED;
+ void setFilterMimeType(const TQString &label, const KMimeType::List &types, const KMimeType::Ptr &defaultType) TDE_DEPRECATED;
/**
* Returns the mimetype for the desired output format.
@@ -364,7 +364,7 @@ public:
* Ownership is transferred to KFileDialog. You need to create the
* preview-widget with "new", i.e. on the heap.
*/
- void setPreviewWidget(const TQWidget *w) KDE_DEPRECATED;
+ void setPreviewWidget(const TQWidget *w) TDE_DEPRECATED;
/**
* Adds a preview widget and enters the preview mode.
diff --git a/tdeio/tdeio/global.h b/tdeio/tdeio/global.h
index c4ba34f95..77e2da77b 100644
--- a/tdeio/tdeio/global.h
+++ b/tdeio/tdeio/global.h
@@ -103,7 +103,7 @@ namespace TDEIO
* @param speed speed in bytes per second
* @return calculated remaining time
*/
- TDEIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) KDE_DEPRECATED;
+ TDEIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) TDE_DEPRECATED;
/**
* Helper for showing information about a set of files and directories
diff --git a/tdeio/tdeio/jobclasses.h b/tdeio/tdeio/jobclasses.h
index d83668f5b..5d04b7f5d 100644
--- a/tdeio/tdeio/jobclasses.h
+++ b/tdeio/tdeio/jobclasses.h
@@ -1285,7 +1285,7 @@ namespace TDEIO {
/**
* @deprecated
*/
- void setSourceSize( off_t size ) KDE_DEPRECATED;
+ void setSourceSize( off_t size ) TDE_DEPRECATED;
/**
* Returns the source URL.
diff --git a/tdeio/tdeio/kdatatool.h b/tdeio/tdeio/kdatatool.h
index d94acdc11..ab5a2ee4b 100644
--- a/tdeio/tdeio/kdatatool.h
+++ b/tdeio/tdeio/kdatatool.h
@@ -97,13 +97,13 @@ public:
* @return a large pixmap for the DataTool.
* @deprecated, use iconName()
*/
- TQPixmap icon() const KDE_DEPRECATED;
+ TQPixmap icon() const TDE_DEPRECATED;
/**
* Returns the mini icon of this data tool.
* @return a mini pixmap for the DataTool.
* @deprecated, use iconName()
*/
- TQPixmap miniIcon() const KDE_DEPRECATED;
+ TQPixmap miniIcon() const TDE_DEPRECATED;
/**
* Returns the icon name for this DataTool.
* @return the name of the icon for the DataTool
diff --git a/tdeio/tdeio/kfilterdev.h b/tdeio/tdeio/kfilterdev.h
index 1783eccdf..c692e3a0b 100644
--- a/tdeio/tdeio/kfilterdev.h
+++ b/tdeio/tdeio/kfilterdev.h
@@ -114,7 +114,7 @@ private:
* @deprecated. Use deviceForFile instead.
* To be removed in KDE 3.0
*/
- static TQIODevice* createFilterDevice(KFilterBase* base, TQFile* file) KDE_DEPRECATED;
+ static TQIODevice* createFilterDevice(KFilterBase* base, TQFile* file) TDE_DEPRECATED;
public:
/**
diff --git a/tdeio/tdeio/kmimetype.h b/tdeio/tdeio/kmimetype.h
index b6ec9267e..5a7dcd345 100644
--- a/tdeio/tdeio/kmimetype.h
+++ b/tdeio/tdeio/kmimetype.h
@@ -580,7 +580,7 @@ public:
* @param service the service to execute
* @deprecated, see the other executeService
*/
- static void executeService( const TQString& path, KDEDesktopMimeType::Service& service ) KDE_DEPRECATED;
+ static void executeService( const TQString& path, KDEDesktopMimeType::Service& service ) TDE_DEPRECATED;
/**
* Execute @p service on the list of @p urls.
diff --git a/tdeio/tdeio/kprotocolinfo.h b/tdeio/tdeio/kprotocolinfo.h
index 3cf142b69..000a88323 100644
--- a/tdeio/tdeio/kprotocolinfo.h
+++ b/tdeio/tdeio/kprotocolinfo.h
@@ -98,7 +98,7 @@ public:
*/
static bool isKnownProtocol( const TQString& protocol )
#ifdef KPROTOCOLINFO_TDECORE
- KDE_WEAK_SYMBOL
+ TDE_WEAK_SYMBOL
#endif
;
@@ -227,7 +227,7 @@ public:
*/
static bool isHelperProtocol( const TQString& protocol )
#ifdef KPROTOCOLINFO_TDECORE
- KDE_WEAK_SYMBOL
+ TDE_WEAK_SYMBOL
#endif
;
@@ -255,7 +255,7 @@ public:
*/
static bool isFilterProtocol( const TQString& protocol )
#ifdef KPROTOCOLINFO_TDECORE
- KDE_WEAK_SYMBOL
+ TDE_WEAK_SYMBOL
#endif
;
@@ -612,38 +612,38 @@ public:
// The following methods are deprecated:
/// @deprecated
- static Type inputType( const TQString& protocol ) KDE_DEPRECATED;
+ static Type inputType( const TQString& protocol ) TDE_DEPRECATED;
/// @deprecated
- static Type outputType( const TQString& protocol ) KDE_DEPRECATED;
+ static Type outputType( const TQString& protocol ) TDE_DEPRECATED;
/**
* @deprecated
* Returns the list of fields this protocol returns when listing
* The current possibilities are
* Name, Type, Size, Date, AccessDate, Access, Owner, Group, Link, URL, MimeType
*/
- static TQStringList listing( const TQString& protocol ) KDE_DEPRECATED;
+ static TQStringList listing( const TQString& protocol ) TDE_DEPRECATED;
/// @deprecated
- static bool isSourceProtocol( const TQString& protocol ) KDE_DEPRECATED;
+ static bool isSourceProtocol( const TQString& protocol ) TDE_DEPRECATED;
/// @deprecated
- static bool supportsListing( const TQString& protocol ) KDE_DEPRECATED;
+ static bool supportsListing( const TQString& protocol ) TDE_DEPRECATED;
/// @deprecated
- static bool supportsReading( const TQString& protocol ) KDE_DEPRECATED;
+ static bool supportsReading( const TQString& protocol ) TDE_DEPRECATED;
/// @deprecated
- static bool supportsWriting( const TQString& protocol ) KDE_DEPRECATED;
+ static bool supportsWriting( const TQString& protocol ) TDE_DEPRECATED;
/// @deprecated
- static bool supportsMakeDir( const TQString& protocol ) KDE_DEPRECATED;
+ static bool supportsMakeDir( const TQString& protocol ) TDE_DEPRECATED;
/// @deprecated
- static bool supportsDeleting( const TQString& protocol ) KDE_DEPRECATED;
+ static bool supportsDeleting( const TQString& protocol ) TDE_DEPRECATED;
/// @deprecated
- static bool supportsLinking( const TQString& protocol ) KDE_DEPRECATED;
+ static bool supportsLinking( const TQString& protocol ) TDE_DEPRECATED;
/// @deprecated
- static bool supportsMoving( const TQString& protocol ) KDE_DEPRECATED;
+ static bool supportsMoving( const TQString& protocol ) TDE_DEPRECATED;
/// @deprecated
- static bool canCopyFromFile( const TQString& protocol ) KDE_DEPRECATED;
+ static bool canCopyFromFile( const TQString& protocol ) TDE_DEPRECATED;
/// @deprecated
- static bool canCopyToFile( const TQString& protocol ) KDE_DEPRECATED;
+ static bool canCopyToFile( const TQString& protocol ) TDE_DEPRECATED;
/// @deprecated
- static TQString defaultMimetype( const TQString& protocol) KDE_DEPRECATED;
+ static TQString defaultMimetype( const TQString& protocol) TDE_DEPRECATED;
//////////////////////// END DEPRECATED ///////////////////////
protected:
diff --git a/tdeio/tdeio/kurifilter.h b/tdeio/tdeio/kurifilter.h
index 3c6861c15..9118f7f89 100644
--- a/tdeio/tdeio/kurifilter.h
+++ b/tdeio/tdeio/kurifilter.h
@@ -142,7 +142,7 @@ public:
*
* @deprecated
*/
- KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+ TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
/**
* Returns the filtered or the original URL.
diff --git a/tdeio/tdeio/netaccess.h b/tdeio/tdeio/netaccess.h
index b5e126086..5a9767515 100644
--- a/tdeio/tdeio/netaccess.h
+++ b/tdeio/tdeio/netaccess.h
@@ -119,7 +119,7 @@ public:
/**
* @deprecated. Use the function above instead.
*/
- static bool download(const KURL& src, TQString & target) KDE_DEPRECATED;
+ static bool download(const KURL& src, TQString & target) TDE_DEPRECATED;
/**
* Removes the specified file if and only if it was created
@@ -158,7 +158,7 @@ public:
/**
* @deprecated. Use the function above instead.
*/
- static bool upload(const TQString& src, const KURL& target) KDE_DEPRECATED;
+ static bool upload(const TQString& src, const KURL& target) TDE_DEPRECATED;
/**
* Alternative to upload for copying over the network.
@@ -184,7 +184,7 @@ public:
/**
* @deprecated. Use the function above instead.
*/
- static bool copy( const KURL& src, const KURL& target ) KDE_DEPRECATED;
+ static bool copy( const KURL& src, const KURL& target ) TDE_DEPRECATED;
// KDE4: merge with above
/**
@@ -226,7 +226,7 @@ public:
/**
* @deprecated. Use the function above instead.
*/
- static bool dircopy( const KURL& src, const KURL& target ) KDE_DEPRECATED; // KDE4: merge
+ static bool dircopy( const KURL& src, const KURL& target ) TDE_DEPRECATED; // KDE4: merge
/**
* Overloaded method, which takes a list of source URLs
@@ -283,17 +283,17 @@ public:
* @deprecated. Use the function above instead.
* @since 3.2
*/
- static bool exists(const KURL& url, TQWidget* window) KDE_DEPRECATED;
+ static bool exists(const KURL& url, TQWidget* window) TDE_DEPRECATED;
/**
* @deprecated. Use the function above instead.
*/
- static bool exists(const KURL& url) KDE_DEPRECATED;
+ static bool exists(const KURL& url) TDE_DEPRECATED;
/**
* @deprecated. Use the function above instead.
*/
- static bool exists(const KURL& url, bool source) KDE_DEPRECATED; // KDE4: merge
+ static bool exists(const KURL& url, bool source) TDE_DEPRECATED; // KDE4: merge
/**
* Tests whether a URL exists and return information on it.
@@ -316,7 +316,7 @@ public:
/**
* @deprecated. Use the function above instead.
*/
- static bool stat(const KURL& url, TDEIO::UDSEntry & entry) KDE_DEPRECATED;
+ static bool stat(const KURL& url, TDEIO::UDSEntry & entry) TDE_DEPRECATED;
/**
* Tries to map a local URL for the given URL.
@@ -358,7 +358,7 @@ public:
* you should try to identify a suitable parent widget
* if at all possible.
*/
- static bool del( const KURL & url ) KDE_DEPRECATED;
+ static bool del( const KURL & url ) TDE_DEPRECATED;
/**
* Creates a directory in a synchronous way.
@@ -383,7 +383,7 @@ public:
* you should try to identify a suitable parent widget
* if at all possible.
*/
- static bool mkdir( const KURL & url, int permissions = -1 ) KDE_DEPRECATED;
+ static bool mkdir( const KURL & url, int permissions = -1 ) TDE_DEPRECATED;
/**
* Executes a remote process via the fish ioslave in a synchronous way.
@@ -472,7 +472,7 @@ public:
* you should try to identify a suitable parent widget
* if at all possible.
*/
- static TQString mimetype( const KURL & url ) KDE_DEPRECATED;
+ static TQString mimetype( const KURL & url ) TDE_DEPRECATED;
/**
* Returns the error string for the last job, in case it failed.
diff --git a/tdeio/tdeio/passdlg.h b/tdeio/tdeio/passdlg.h
index c1e3606b4..b5c56ffba 100644
--- a/tdeio/tdeio/passdlg.h
+++ b/tdeio/tdeio/passdlg.h
@@ -113,7 +113,7 @@ public:
/**
* @deprecated. Use setUserReadOnly(bool).
*/
- KDE_DEPRECATED void setEnableUserField( bool enable, bool=false ) {
+ TDE_DEPRECATED void setEnableUserField( bool enable, bool=false ) {
setUserReadOnly( !enable );
};
diff --git a/tdeio/tdeio/slave.h b/tdeio/tdeio/slave.h
index 2f8138dc9..dafde7842 100644
--- a/tdeio/tdeio/slave.h
+++ b/tdeio/tdeio/slave.h
@@ -204,7 +204,7 @@ namespace TDEIO {
* within TDEIO::Slave instead. Old code directly accessing connection()
* will not be able to access special protocols.
*/
- KDE_DEPRECATED Connection *connection() { return &slaveconn; } // TODO(BIC): remove before KDE 4
+ TDE_DEPRECATED Connection *connection() { return &slaveconn; } // TODO(BIC): remove before KDE 4
void ref() { m_refCount++; }
void deref() { m_refCount--; if (!m_refCount) delete this; }
diff --git a/tdeio/tdeio/slaveinterface.h b/tdeio/tdeio/slaveinterface.h
index 2f9fdbd5a..aca56f09b 100644
--- a/tdeio/tdeio/slaveinterface.h
+++ b/tdeio/tdeio/slaveinterface.h
@@ -210,12 +210,12 @@ protected:
*/
void openPassDlg( const TQString& prompt, const TQString& user,
const TQString& caption, const TQString& comment,
- const TQString& label, bool readOnly ) KDE_DEPRECATED;
+ const TQString& label, bool readOnly ) TDE_DEPRECATED;
/**
* @deprecated. Use openPassDlg( AuthInfo& ) instead.
*/
- void openPassDlg( const TQString& prompt, const TQString& user, bool readOnly ) KDE_DEPRECATED;
+ void openPassDlg( const TQString& prompt, const TQString& user, bool readOnly ) TDE_DEPRECATED;
void messageBox( int type, const TQString &text, const TQString &caption,
const TQString &buttonYes, const TQString &buttonNo );
diff --git a/tdeio/tdeio/tcpslavebase.h b/tdeio/tdeio/tcpslavebase.h
index 4903dd7ac..a0a8620fc 100644
--- a/tdeio/tdeio/tcpslavebase.h
+++ b/tdeio/tdeio/tcpslavebase.h
@@ -60,48 +60,48 @@ protected:
/**
* @deprecated Due to inconsistency with KDE naming convention.
*/
- KDE_DEPRECATED ssize_t Write(const void *data, ssize_t len) { return write( data, len ); }
+ TDE_DEPRECATED ssize_t Write(const void *data, ssize_t len) { return write( data, len ); }
/**
* @deprecated Due to inconsistency with KDE naming convention.
*/
- KDE_DEPRECATED ssize_t Read(void *data, ssize_t len) { return read( data, len ); }
+ TDE_DEPRECATED ssize_t Read(void *data, ssize_t len) { return read( data, len ); }
/**
* @deprecated Due to inconsistency with KDE naming convention.
*/
- KDE_DEPRECATED ssize_t ReadLine(char *data, ssize_t len) { return readLine( data, len ); }
+ TDE_DEPRECATED ssize_t ReadLine(char *data, ssize_t len) { return readLine( data, len ); }
/**
* @deprecated Due to inconsistency with KDE naming convention.
*/
- KDE_DEPRECATED unsigned short int GetPort(unsigned short int p) { return port(p); }
+ TDE_DEPRECATED unsigned short int GetPort(unsigned short int p) { return port(p); }
/**
* @deprecated Due to inconsistency with KDE naming convention.
*/
- KDE_DEPRECATED bool ConnectToHost( const TQString &host, unsigned int port,
+ TDE_DEPRECATED bool ConnectToHost( const TQString &host, unsigned int port,
bool sendError ) { return connectToHost( host, port, sendError ); }
/**
* @deprecated Due to inconsistency with KDE naming convention.
*/
- KDE_DEPRECATED void CloseDescriptor() { closeDescriptor(); }
+ TDE_DEPRECATED void CloseDescriptor() { closeDescriptor(); }
/**
* @deprecated Due to inconsistency with KDE naming convention.
*/
- KDE_DEPRECATED bool AtEOF() { return atEnd(); }
+ TDE_DEPRECATED bool AtEOF() { return atEnd(); }
/**
* @deprecated Due to inconsistency with KDE naming convention.
*/
- KDE_DEPRECATED bool InitializeSSL() { return initializeSSL(); }
+ TDE_DEPRECATED bool InitializeSSL() { return initializeSSL(); }
/**
* @deprecated Due to inconsistency with KDE naming convention.
*/
- KDE_DEPRECATED void CleanSSL() { cleanSSL(); }
+ TDE_DEPRECATED void CleanSSL() { cleanSSL(); }
#endif
/**
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 15:52:54 +0000