summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tdecore/ksock.cpp7
-rw-r--r--tdecore/ksock.h6
-rw-r--r--tdeui/kguiitem.cpp4
-rw-r--r--tdeui/kguiitem.h2
-rw-r--r--tdeui/tdemainwindow.cpp11
-rw-r--r--tdeui/tdemainwindow.h3
6 files changed, 24 insertions, 9 deletions
diff --git a/tdecore/ksock.cpp b/tdecore/ksock.cpp
index 57bfc26d1..3f4886b8a 100644
--- a/tdecore/ksock.cpp
+++ b/tdecore/ksock.cpp
@@ -20,8 +20,6 @@
* Boston, MA 02110-1301, USA.
**/
-#define KSOCK_INTERNAL_C_COMPILATION 1
-
#include <config.h>
#include <sys/types.h>
@@ -42,7 +40,12 @@ extern "C" {
#define KSOCK_NO_BROKEN
#include "kdebug.h"
+// FIXME
+// FOR BINARY COMPATIBILITY ONLY
+// REMOVE WHEN PRACTICAL!
+#define TDESOCKET_BINARY_COMPAT_HACK 1
#include "ksock.h"
+#undef TDESOCKET_BINARY_COMPAT_HACK
#include "kextsock.h"
#include "ksockaddr.h"
diff --git a/tdecore/ksock.h b/tdecore/ksock.h
index 422e69b9b..31ca099e6 100644
--- a/tdecore/ksock.h
+++ b/tdecore/ksock.h
@@ -342,10 +342,10 @@ protected:
int sock;
private:
- // DEPRECATED
-#ifdef KSOCK_INTERNAL_C_COMPILATION
+ // HACK
+#ifdef TDESOCKET_BINARY_COMPAT_HACK
KDE_EXPORT bool bindAndListen();
-#endif // KSOCK_INTERNAL_C_COMPILATION
+#endif // TDESOCKET_BINARY_COMPAT_HACK
TDEServerSocket(const TDEServerSocket&);
TDEServerSocket& operator=(const TDEServerSocket&);
diff --git a/tdeui/kguiitem.cpp b/tdeui/kguiitem.cpp
index dd30e1fe8..9d623bb39 100644
--- a/tdeui/kguiitem.cpp
+++ b/tdeui/kguiitem.cpp
@@ -155,7 +155,7 @@ TQIconSet KGuiItem::iconSet( TDEIcon::Group group, int size, TDEInstance* instan
{
if( !d->m_iconName.isEmpty())
{
-// some caching here would(?) come handy
+ // some caching here would(?) come handy
return instance->iconLoader()->loadIconSet( d->m_iconName, group, size, true, false );
}
else
@@ -164,7 +164,9 @@ TQIconSet KGuiItem::iconSet( TDEIcon::Group group, int size, TDEInstance* instan
}
}
else
+ {
return TQIconSet();
+ }
}
TQString KGuiItem::iconName() const
diff --git a/tdeui/kguiitem.h b/tdeui/kguiitem.h
index 538275f3d..c2ab86746 100644
--- a/tdeui/kguiitem.h
+++ b/tdeui/kguiitem.h
@@ -46,7 +46,7 @@ public:
// It gives the wrong impression that you just change the text.
KGuiItem( const TQString &text,
const TQString &iconName = TQString::null,
- const TQString &toolTip = TQString::null,
+ const TQString &toolTip = TQString::null,
const TQString &whatsThis = TQString::null );
KGuiItem( const TQString &text, const TQIconSet &iconSet,
diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index 51d873bd0..225b910e4 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -66,6 +66,7 @@ public:
bool autoSaveWindowSize:1;
bool care_about_geometry:1;
bool shuttingDown:1;
+ bool newStyleRefCounting:1;
TQString autoSaveGroup;
TDEAccel * tdeaccel;
TDEMainWindowInterface *m_interface;
@@ -245,7 +246,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
d->shuttingDown = false;
if ((d->care_about_geometry = being_first)) {
being_first = false;
- if ( kapp->geometryArgument().isNull() ) // if there is no geometry, it doesn't mater
+ if ( kapp->geometryArgument().isNull() ) // if there is no geometry, it doesn't matter
d->care_about_geometry = false;
else
parseGeometry(false);
@@ -257,6 +258,14 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
else
d->m_interface = new TDEMainWindowInterface(this);
+ if ( cflags & NewRefCountMode ) {
+ d->newStyleRefCounting = true;
+ kapp->ref();
+ }
+ else {
+ d->newStyleRefCounting = false;
+ }
+
if (!kapp->authorize("movable_toolbars"))
setDockWindowsMovable(false);
}
diff --git a/tdeui/tdemainwindow.h b/tdeui/tdemainwindow.h
index f2898ab06..856590ab9 100644
--- a/tdeui/tdemainwindow.h
+++ b/tdeui/tdemainwindow.h
@@ -151,7 +151,8 @@ public:
*/
enum CreationFlags
{
- NoDCOPObject = 1
+ NoDCOPObject = 1,
+ NewRefCountMode = 2
};
/**