generic: prepare for Katie changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kate/part/swapfile/kateswapfile.cpp b/kate/part/swapfile/kateswapfile.cpp
index 3f47365..bd7439d 100644 (file)
--- a/kate/part/swapfile/kateswapfile.cpp
+++ b/kate/part/swapfile/kateswapfile.cpp
@@ -60,9 +60,6 @@ SwapFile::SwapFile(KateDocument *document)
   , m_recovered(false)
   , m_needSync(false)
 {
-  // fixed version of serialisation
-  m_stream.setVersion (QDataStream::Qt_4_6);
-
   // conect the timer
   connect(syncTimer(), SIGNAL(timeout()), this, SLOT(writeFileToDisk()), Qt::DirectConnection);
   

diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 5085791..90b8172 100644 (file)
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -99,22 +99,6 @@ extern "C"
         if (exportKDEColors)
             flags |= KRdbExportColors;
         runRdb( flags );
-
-        // Write some Qt root property.
-#ifdef Q_WS_X11
-        QByteArray properties;
-        QDataStream d(&properties, QIODevice::WriteOnly);
-        d.setVersion(QDataStream::Qt_4_8);
-        d << kapp->palette() << KGlobalSettings::generalFont();
-        Atom a = XInternAtom(QX11Info::display(), "_QT_DESKTOP_PROPERTIES", false);
-
-        // do it for all root windows - multihead support
-        int screen_count = ScreenCount(QX11Info::display());
-        for (int i = 0; i < screen_count; i++)
-            XChangeProperty(QX11Info::display(), RootWindow(QX11Info::display(), i),
-                            a, a, 8, PropModeReplace,
-                            (unsigned char*) properties.data(), properties.size());
-#endif
     }
 }