summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/kapplication.cpp1
-rw-r--r--tdecore/kasyncio.h2
-rw-r--r--tdecore/kbufferedio.h2
-rw-r--r--tdecore/kconfigbase.h2
-rw-r--r--tdecore/kextsock.h2
-rw-r--r--tdecore/kstartupinfo.h2
-rw-r--r--tdecore/network/kbufferedsocket.h2
-rw-r--r--tdecore/network/kclientsocketbase.h2
-rw-r--r--tdecore/network/kdatagramsocket.h2
-rw-r--r--tdecore/network/kresolver.h2
-rw-r--r--tdecore/network/kreverseresolver.h2
-rw-r--r--tdecore/network/kserversocket.h2
-rw-r--r--tdecore/network/ksrvresolverworker_p.h2
-rw-r--r--tdecore/network/kstreamsocket.h2
14 files changed, 14 insertions, 13 deletions
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 3ca23c49f..d2ab865cc 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -195,6 +195,7 @@ static int x11_error(Display *dpy, XErrorEvent *ev) {
x11_composite_error_generated = true;
return 0;
}
+ return 1;
}
#endif
diff --git a/tdecore/kasyncio.h b/tdecore/kasyncio.h
index dbe7cd603..88b904a55 100644
--- a/tdecore/kasyncio.h
+++ b/tdecore/kasyncio.h
@@ -47,7 +47,7 @@ public TQObject,
public TQIODevice
{
Q_OBJECT
- TQ_OBJECT
+
protected:
KAsyncIO() // cannot be accessed externally
{ }
diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h
index 8c53d0676..78bccc9ef 100644
--- a/tdecore/kbufferedio.h
+++ b/tdecore/kbufferedio.h
@@ -56,7 +56,7 @@ class KBufferedIOPrivate;
class TDECORE_EXPORT KBufferedIO: public KAsyncIO
{
Q_OBJECT
- TQ_OBJECT
+
protected:
// no default public constructor
diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h
index 2f41195aa..7c0706e46 100644
--- a/tdecore/kconfigbase.h
+++ b/tdecore/kconfigbase.h
@@ -70,7 +70,7 @@ class KConfigGroup;
class TDECORE_EXPORT KConfigBase : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
friend class KConfigBackEnd;
friend class KConfigINIBackEnd;
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index 57f3dc8e2..080898443 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -95,7 +95,7 @@ class KExtendedSocketPrivate;
class TDECORE_EXPORT KExtendedSocket: public KBufferedIO // public TQObject, public QIODevice
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/tdecore/kstartupinfo.h b/tdecore/kstartupinfo.h
index d384ceeed..70b1f6e09 100644
--- a/tdecore/kstartupinfo.h
+++ b/tdecore/kstartupinfo.h
@@ -68,7 +68,7 @@ class TDECORE_EXPORT KStartupInfo
: public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* By default, the startup notification is ended for the application
diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h
index 2035098df..93bee08f3 100644
--- a/tdecore/network/kbufferedsocket.h
+++ b/tdecore/network/kbufferedsocket.h
@@ -58,7 +58,7 @@ class KBufferedSocketPrivate;
class TDECORE_EXPORT KBufferedSocket: public KStreamSocket
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Default constructor.
diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h
index ceb5cf118..59da43511 100644
--- a/tdecore/network/kclientsocketbase.h
+++ b/tdecore/network/kclientsocketbase.h
@@ -58,7 +58,7 @@ public TQObject,
public KActiveSocketBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/tdecore/network/kdatagramsocket.h b/tdecore/network/kdatagramsocket.h
index e68119276..c51fea1ef 100644
--- a/tdecore/network/kdatagramsocket.h
+++ b/tdecore/network/kdatagramsocket.h
@@ -180,7 +180,7 @@ class KDatagramSocketPrivate;
class TDECORE_EXPORT KDatagramSocket: public KClientSocketBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h
index 6ae6a26c4..5e20e174a 100644
--- a/tdecore/network/kresolver.h
+++ b/tdecore/network/kresolver.h
@@ -295,7 +295,7 @@ class KResolverPrivate;
class TDECORE_EXPORT KResolver: public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/tdecore/network/kreverseresolver.h b/tdecore/network/kreverseresolver.h
index 5c9e95779..21a17b0a5 100644
--- a/tdecore/network/kreverseresolver.h
+++ b/tdecore/network/kreverseresolver.h
@@ -50,7 +50,7 @@ class KReverseResolverPrivate;
class TDECORE_EXPORT KReverseResolver: public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h
index 448fed270..4f1af33b9 100644
--- a/tdecore/network/kserversocket.h
+++ b/tdecore/network/kserversocket.h
@@ -107,7 +107,7 @@ class KServerSocketPrivate;
class TDECORE_EXPORT KServerSocket: public TQObject, public KPassiveSocketBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Default constructor.
diff --git a/tdecore/network/ksrvresolverworker_p.h b/tdecore/network/ksrvresolverworker_p.h
index 293308544..a9aba3d35 100644
--- a/tdecore/network/ksrvresolverworker_p.h
+++ b/tdecore/network/ksrvresolverworker_p.h
@@ -42,7 +42,7 @@ namespace KNetwork
public KNetwork::KResolverWorkerBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
struct Entry
diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h
index 0308eb9ab..ab90e923a 100644
--- a/tdecore/network/kstreamsocket.h
+++ b/tdecore/network/kstreamsocket.h
@@ -97,7 +97,7 @@ class KStreamSocketPrivate;
class TDECORE_EXPORT KStreamSocket: public KClientSocketBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**