From 0b810e5444fa9907d47d0897f619d793b22973c2 Mon Sep 17 00:00:00 2001
From: Karol Szwed <gallium@kde.org>
Date: Sun, 22 Apr 2001 13:06:35 +0000
Subject: [PATCH] Modified to remove any global objects - everything global is
 simply a pointer now. Forgot to say "added sticky button" in last commit :)

svn path=/trunk/kdebase/kwin/; revision=93431
---
 clients/quartz/quartz.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/clients/quartz/quartz.cpp b/clients/quartz/quartz.cpp
index cf3d06674c..6fb2631cbd 100644
--- a/clients/quartz/quartz.cpp
+++ b/clients/quartz/quartz.cpp
@@ -81,8 +81,8 @@ static unsigned char pinup_dgray_bits[] = {
 ///////////////////////////////////////////////////////////////////////////
 
 // Titlebar button positions
-QString quartzButtonsLeft;
-QString quartzButtonsRight;
+QString* quartzButtonsLeft;
+QString* quartzButtonsRight;
 bool stickyButtonOnLeft = true;
 
 KPixmap* titleBlocks 	= NULL;
@@ -99,6 +99,9 @@ QuartzHandler* clientHandler;
 
 QuartzHandler::QuartzHandler()
 {
+	quartzButtonsLeft = new QString();
+	quartzButtonsRight = new QString();
+
 	readConfig();
 	createPixmaps();
 	connect( options, SIGNAL(resetClients()), this, SLOT(slotReset()) );
@@ -107,6 +110,9 @@ QuartzHandler::QuartzHandler()
 
 QuartzHandler::~QuartzHandler()
 {
+	delete quartzButtonsLeft;
+	delete quartzButtonsRight;
+
 	freePixmaps();
 }
 
@@ -131,17 +137,17 @@ void QuartzHandler::readConfig()
 	if( conf->readBoolEntry("CustomButtonPositions", false) )
 	{
 		// Read the positions from the config file...
-		quartzButtonsLeft  = conf->readEntry("ButtonsOnLeft", "MS");
-		quartzButtonsRight = conf->readEntry("ButtonsOnRight", "HIAX");
+		*quartzButtonsLeft  = conf->readEntry("ButtonsOnLeft", "MS");
+		*quartzButtonsRight = conf->readEntry("ButtonsOnRight", "HIAX");
 	} else
 		{
 			// Use defaults
-			quartzButtonsLeft = "MS";
-			quartzButtonsRight = "HIAX";
+			*quartzButtonsLeft = "MS";
+			*quartzButtonsRight = "HIAX";
 		}
 
 	// A small hack to make the sticky button look nicer
-	stickyButtonOnLeft = (bool)quartzButtonsLeft.contains( 'S' );
+	stickyButtonOnLeft = (bool)quartzButtonsLeft->contains( 'S' );
 }
 
 
@@ -453,13 +459,13 @@ QuartzClient::QuartzClient( Workspace *ws, WId w, QWidget *parent,
     hb->setResizeMode( QLayout::FreeResize );
     g->addLayout ( hb, 1, 1 );
 
-	addClientButtons( quartzButtonsLeft );
+	addClientButtons( *quartzButtonsLeft );
 
     titlebar = new QSpacerItem( 10, titleHeight, QSizePolicy::Expanding, QSizePolicy::Minimum );
     hb->addItem(titlebar);
     hb->addSpacing(2);
 
-	addClientButtons( quartzButtonsRight, false );
+	addClientButtons( *quartzButtonsRight, false );
 
     hb->addSpacing(2);
 }