[prev in list] [next in list] [prev in thread] [next in thread] 

List:       atlantik-devel
Subject:    [atlantik-cvs]
From:       kde () office ! kde ! org
Date:       2003-05-27 21:09:36
[Download RAW message or body]

Update of /home/kde/kdegames/atlantik/client
In directory office:/tmp/cvs-serv32436

Modified Files:
      Tag: KDE_3_1_BRANCH
	monopigator.cpp monopigator.h selectgame_widget.cpp 
	selectserver_widget.cpp 
Log Message:
fix for #54524 by Albert 'TSDgeos' Astals Cid

Index: monopigator.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/monopigator.cpp,v
retrieving revision 1.9.8.2
retrieving revision 1.9.8.3
diff -u -d -r1.9.8.2 -r1.9.8.3
--- monopigator.cpp	13 Jan 2003 17:14:39 -0000	1.9.8.2
+++ monopigator.cpp	27 May 2003 21:09:32 -0000	1.9.8.3
@@ -24,6 +24,11 @@
 	m_downloadData = 0;
 }
 
+Monopigator::~Monopigator()
+{
+	if (m_job != NULL) m_job -> kill();
+}
+
 void Monopigator::loadData(const KURL &url)
 {
 	if (m_downloadData)
@@ -32,11 +37,11 @@
 	m_downloadData->open(IO_WriteOnly);
 	m_downloadData->reset();
 
-	KIO::Job *job = KIO::get(url.url(), true, false);
-	job->addMetaData(QString::fromLatin1("UserAgent"), QString::fromLatin1("Atlantik/" \
ATLANTIK_VERSION_STRING)); +	m_job = KIO::get(url.url(), true, false);
+	m_job->addMetaData(QString::fromLatin1("UserAgent"), \
QString::fromLatin1("Atlantik/" ATLANTIK_VERSION_STRING));  
-	connect(job, SIGNAL(data(KIO::Job *, const QByteArray &)), SLOT(slotData(KIO::Job \
                *, const QByteArray &)));
-	connect(job, SIGNAL(result(KIO::Job *)), SLOT(slotResult(KIO::Job *)));
+	connect(m_job, SIGNAL(data(KIO::Job *, const QByteArray &)), SLOT(slotData(KIO::Job \
*, const QByteArray &))); +	connect(m_job, SIGNAL(result(KIO::Job *)), \
SLOT(slotResult(KIO::Job *)));  }
 
 void Monopigator::slotData(KIO::Job *, const QByteArray &data)
@@ -47,6 +52,7 @@
 void Monopigator::slotResult(KIO::Job *job)
 {
 	processData(m_downloadData->buffer(), !job->error());
+	m_job = NULL;
 }
 
 void Monopigator::processData(const QByteArray &data, bool okSoFar)

Index: monopigator.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/monopigator.h,v
retrieving revision 1.8.8.2
retrieving revision 1.8.8.3
diff -u -d -r1.8.8.2 -r1.8.8.3
--- monopigator.h	13 Jan 2003 17:14:39 -0000	1.8.8.2
+++ monopigator.h	27 May 2003 21:09:32 -0000	1.8.8.3
@@ -29,6 +29,7 @@
 
 public:
 	Monopigator();
+	~Monopigator();
 	void loadData(const KURL &);
 
 signals:
@@ -43,6 +44,7 @@
 	void processData(const QByteArray &, bool = true);
 
 	QBuffer *m_downloadData;
+	KIO::Job *m_job;
 };
 
 #endif

Index: selectgame_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectgame_widget.cpp,v
retrieving revision 1.23.6.1
retrieving revision 1.23.6.2
diff -u -d -r1.23.6.1 -r1.23.6.2
--- selectgame_widget.cpp	21 Jan 2003 00:31:13 -0000	1.23.6.1
+++ selectgame_widget.cpp	27 May 2003 21:09:32 -0000	1.23.6.2
@@ -47,8 +47,7 @@
 	connect(m_gameList, SIGNAL(rightButtonClicked(QListViewItem *, const QPoint &, \
int)), this, SLOT(validateConnectButton()));  connect(m_gameList, \
SIGNAL(selectionChanged(QListViewItem *)), this, SLOT(validateConnectButton()));  
-	QHBoxLayout *buttonBox = new QHBoxLayout(this, 0, KDialog::spacingHint());
-	m_mainLayout->addItem(buttonBox);
+	QHBoxLayout *buttonBox = new QHBoxLayout(m_mainLayout, KDialog::spacingHint());
 
 	KPushButton *backButton = new KPushButton(SmallIcon("back"), i18n("Server List"), \
this);  buttonBox->addWidget(backButton);
@@ -62,7 +61,7 @@
 	buttonBox->addWidget(m_connectButton);
 
 	connect(m_connectButton, SIGNAL(clicked()), this, SLOT(connectClicked()));
-	
+
     // Status indicator
 	m_statusLabel = new QLabel(this);
 	m_statusLabel->setText(i18n("Retrieving game list..."));

Index: selectserver_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectserver_widget.cpp,v
retrieving revision 1.18.6.1
retrieving revision 1.18.6.2
diff -u -d -r1.18.6.1 -r1.18.6.2
--- selectserver_widget.cpp	7 Jan 2003 22:57:46 -0000	1.18.6.1
+++ selectserver_widget.cpp	27 May 2003 21:09:33 -0000	1.18.6.2
@@ -58,9 +58,7 @@
 	connect(m_serverList, SIGNAL(rightButtonClicked(QListViewItem *, const QPoint &, \
int)), this, SLOT(validateConnectButton()));  connect(m_serverList, \
SIGNAL(selectionChanged(QListViewItem *)), this, SLOT(validateConnectButton()));  
-	QHBoxLayout *buttonBox = new QHBoxLayout(this, 0, KDialog::spacingHint());
-	m_mainLayout->addItem(buttonBox); 
-
+ 	QHBoxLayout *buttonBox = new QHBoxLayout(m_mainLayout, KDialog::spacingHint());
 	buttonBox->addItem(new QSpacerItem(20, 20, QSizePolicy::Expanding, \
QSizePolicy::Minimum));  
 	m_refreshButton = new KPushButton(BarIcon("reload", KIcon::SizeSmall), \
i18n("Refresh"), this);

_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-cvs


[prev in list] [next in list] [prev in thread] [next in thread]