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

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint/cups
From:       Laurent Montel <montel () kde ! org>
Date:       2006-02-09 12:54:07
Message-ID: 1139489647.054237.27996.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 507518 by mlaurent:

Port to qt4


 M  +21 -17    kptagspage.cpp  
 M  +2 -2      kptagspage.h  


--- trunk/KDE/kdelibs/kdeprint/cups/kptagspage.cpp #507517:507518
@@ -19,8 +19,9 @@
 
 #include "kptagspage.h"
 
-#include <q3table.h>
-#include <q3header.h>
+#include <QTableWidget>
+#include <QTableWidgetItem>
+#include <QHeaderView>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qregexp.h>
@@ -76,11 +77,14 @@
 	setTitle(i18n("Additional Tags"));
 	setOnlyRealPrinters(true);
 
-	m_tags = new Q3Table(10, 2, this);
-	m_tags->horizontalHeader()->setStretchEnabled(true);
-	m_tags->horizontalHeader()->setLabel(0, i18n("Name"));
-	m_tags->horizontalHeader()->setLabel(1, i18n("Value"));
-	m_tags->setReadOnly(ro);
+	QStringList lst;
+	lst << i18n("Name")<<i18n("Value");
+	m_tags = new QTableWidget(10, 2, this);
+	m_tags->horizontalHeader()->resizeSections ( QHeaderView::Stretch );
+	m_tags->setVerticalHeaderLabels(lst);
+
+#warning "kde4: port m_tags->setReadOnly(ro);!!!!!\n";
+	//m_tags->setReadOnly(ro);
 	m_tags->setWhatsThis(whatsThisAdditionalTagsTable);
 
 	QVBoxLayout	*l0 = new QVBoxLayout(this, 0, 5);
@@ -104,9 +108,9 @@
 bool KPTagsPage::isValid(QString& msg)
 {
 	QRegExp	re("\\s");
-	for (int r=0; r<m_tags->numCols(); r++)
+	for (int r=0; r<m_tags->columnCount(); r++)
 	{
-		QString	tag(m_tags->text(r, 0));
+		QString	tag(m_tags->itemAt( 0, r)->text());
 		if (tag.isEmpty())
 			continue;
 		else if (tag.find(re) != -1)
@@ -122,28 +126,28 @@
 {
 	int	r(0);
 	QRegExp	re("^\"|\"$");
-	for (QMap<QString,QString>::ConstIterator it=opts.begin(); it!=opts.end() && \
r<m_tags->numRows(); ++it) +	for (QMap<QString,QString>::ConstIterator \
it=opts.begin(); it!=opts.end() && r<m_tags->rowCount (); ++it)  {
 		if (it.key().startsWith("KDEPrint-"))
 		{
-			m_tags->setText(r, 0, it.key().mid(9));
+			m_tags->itemAt( 0, r)->setText(it.key().mid(9));
 			QString	data = it.data();
-			m_tags->setText(r, 1, data.replace(re, ""));
+			m_tags->itemAt(1, r )-> setText(data.replace(re, ""));
 			r++;
 		}
 	}
-	for (; r<m_tags->numRows(); r++)
+	for (; r<m_tags->rowCount(); r++)
 	{
-		m_tags->setText(r, 0, QString());
-		m_tags->setText(r, 1, QString());
+		m_tags->itemAt(0,r)->setText(QString());
+		m_tags->itemAt(1,r)->setText(QString());
 	}
 }
 
 void KPTagsPage::getOptions(QMap<QString,QString>& opts, bool)
 {
-	for (int r=0; r<m_tags->numRows(); r++)
+	for (int r=0; r<m_tags->rowCount(); r++)
 	{
-		QString	tag(m_tags->text(r, 0)), val(m_tags->text(r, 1));
+		QString	tag(m_tags->itemAt(0,r)->text()), val(m_tags->itemAt(1,r)->text());
 		if (!tag.isEmpty())
 		{
 			tag.prepend("KDEPrint-");
--- trunk/KDE/kdelibs/kdeprint/cups/kptagspage.h #507517:507518
@@ -22,7 +22,7 @@
 
 #include <kprintdialogpage.h>
 
-class Q3Table;
+class QTableWidget;
 
 class KPTagsPage : public KPrintDialogPage
 {
@@ -38,7 +38,7 @@
 	QSize minimumSizeHint() const;
 
 private:
-	Q3Table	*m_tags;
+	QTableWidget 	*m_tags;
 };
 
 #endif


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