From 3a34ab6a1044f5b6965278343470f857a4bd9bf6 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Sun, 25 Sep 2005 14:51:13 +0000
Subject: [PATCH] Byebye q3cstring

svn path=/trunk/KDE/kdebase/workspace/; revision=463842
---
 kcmkwin/kwinrules/detectwidget.cpp |  8 ++++----
 kcmkwin/kwinrules/detectwidget.h   | 18 +++++++++---------
 kcmkwin/kwinrules/main.cpp         | 10 +++++-----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/kcmkwin/kwinrules/detectwidget.cpp b/kcmkwin/kwinrules/detectwidget.cpp
index 79657bb5e3..15ec7c6481 100644
--- a/kcmkwin/kwinrules/detectwidget.cpp
+++ b/kcmkwin/kwinrules/detectwidget.cpp
@@ -29,7 +29,7 @@
 //Added by qt3to4:
 #include <QMouseEvent>
 #include <QEvent>
-#include <Q3CString>
+#include <QByteArray>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -118,7 +118,7 @@ void DetectDialog::executeDialog()
     emit detectionDone( exec() == QDialog::Accepted );
     }
 
-Q3CString DetectDialog::selectedClass() const
+QByteArray DetectDialog::selectedClass() const
     {
     if( widget->use_class->isChecked() || widget->use_role->isChecked())
         return wmclass_class;
@@ -130,7 +130,7 @@ bool DetectDialog::selectedWholeClass() const
     return widget->use_whole_class->isChecked();
     }
 
-Q3CString DetectDialog::selectedRole() const
+QByteArray DetectDialog::selectedRole() const
     {
     if( widget->use_role->isChecked())
         return role;
@@ -157,7 +157,7 @@ NET::WindowType DetectDialog::selectedType() const
     return type;
     }
 
-Q3CString DetectDialog::selectedMachine() const
+QByteArray DetectDialog::selectedMachine() const
     {
     return machine;
     }
diff --git a/kcmkwin/kwinrules/detectwidget.h b/kcmkwin/kwinrules/detectwidget.h
index 34bcf12e28..fcd9f57b50 100644
--- a/kcmkwin/kwinrules/detectwidget.h
+++ b/kcmkwin/kwinrules/detectwidget.h
@@ -29,7 +29,7 @@
 #include "../../rules.h"
 //Added by qt3to4:
 #include <QEvent>
-#include <Q3CString>
+#include <QByteArray>
 
 namespace KWinInternal
 {
@@ -49,14 +49,14 @@ class DetectDialog
     public:
         DetectDialog( QWidget* parent = NULL, const char* name = NULL );
         void detect( WId window );
-        Q3CString selectedClass() const;
+        QByteArray selectedClass() const;
         bool selectedWholeClass() const;
-        Q3CString selectedRole() const;
+        QByteArray selectedRole() const;
         bool selectedWholeApp() const;
         NET::WindowType selectedType() const;
         QString selectedTitle() const;
         Rules::StringMatch titleMatch() const;
-        Q3CString selectedMachine() const;
+        QByteArray selectedMachine() const;
         const KWin::WindowInfo& windowInfo() const;
     signals:
         void detectionDone( bool );
@@ -67,13 +67,13 @@ class DetectDialog
         void readWindow( WId window );
         void executeDialog();
         WId findWindow();
-        Q3CString wmclass_class;
-        Q3CString wmclass_name;
-        Q3CString role;
+        QByteArray wmclass_class;
+        QByteArray wmclass_name;
+        QByteArray role;
         NET::WindowType type;
         QString title;
-        Q3CString extrarole;
-        Q3CString machine;
+        QByteArray extrarole;
+        QByteArray machine;
         DetectWidget* widget;
         QDialog* grabber;
         KWin::WindowInfo info;
diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp
index 64500c2d0d..44a18c9d39 100644
--- a/kcmkwin/kwinrules/main.cpp
+++ b/kcmkwin/kwinrules/main.cpp
@@ -28,7 +28,7 @@
 
 #include "ruleswidget.h"
 #include "../../rules.h"
-#include <Q3CString>
+#include <QByteArray>
 
 namespace KWinInternal
 {
@@ -71,15 +71,15 @@ static Rules* findRule( const QList< Rules* >& rules, Window wid, bool whole_app
         NET::WM2WindowClass | NET::WM2WindowRole | NET::WM2ClientMachine );
     if( !info.valid()) // shouldn't really happen
         return NULL;
-    Q3CString wmclass_class = info.windowClassClass().lower();
-    Q3CString wmclass_name = info.windowClassName().lower();
-    Q3CString role = info.windowRole().lower();
+    QByteArray wmclass_class = info.windowClassClass().lower();
+    QByteArray wmclass_name = info.windowClassName().lower();
+    QByteArray role = info.windowRole().lower();
     NET::WindowType type = info.windowType( NET::NormalMask | NET::DesktopMask | NET::DockMask
         | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask | NET::TopMenuMask
         | NET::UtilityMask | NET::SplashMask );
     QString title = info.name();
 //    QCString extrarole = ""; // TODO
-    Q3CString machine = info.clientMachine().lower();
+    QByteArray machine = info.clientMachine().lower();
     Rules* best_match = NULL;
     int match_quality = 0;
     for( QList< Rules* >::ConstIterator it = rules.begin();