[atlantik-cvs] CVS: kdegames/atlantik/libatlantikui estatedetails.cpp, 1.31, 1.32

Update of /home/kde/kdegames/atlantik/libatlantikui
In directory office:/tmp/cvs-serv20455

Modified Files:
	estatedetails.cpp 
Log Message:
New-patches: [email protected]/atlantik--mainline--0.8--patch-2
Summary: Fix (hopefully) awkward EstateDetails column text

For some reason the text becomes "1" when using QString::null, so use
QString::empty instead.

New-patches: [email protected]/atlantik--mainline--0.8--patch-3
Summary: Fix patch-2 regression

Apparently there's no QString::empty so we'll do it with QString("").


Index: estatedetails.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/estatedetails.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- estatedetails.cpp	14 Apr 2004 16:27:24 -0000	1.31
+++ estatedetails.cpp	24 Jun 2004 11:53:26 -0000	1.32
@@ -57,7 +57,7 @@
 	m_mainLayout->addItem(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint()+50, QSizePolicy::Fixed, QSizePolicy::Minimum));
 
 	m_infoListView = new KListView(this, "infoListView");
-	m_infoListView->addColumn(m_estate ? m_estate->name() : QString::null);
+	m_infoListView->addColumn(m_estate ? m_estate->name() : QString("") );
 	m_infoListView->setSorting(-1);
 	m_mainLayout->addWidget(m_infoListView);
 
@@ -278,7 +278,7 @@
 	{
 		m_estate = estate;
 
-		m_infoListView->setColumnText( 0, m_estate ? m_estate->name() : QString::null );
+		m_infoListView->setColumnText( 0, m_estate ? m_estate->name() : QString("") );
 
 		b_recreate = true;
 		update();