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

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint
From:       Laurent Montel <montel () kde ! org>
Date:       2005-11-15 12:46:50
Message-ID: 1132058810.476891.23151.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 480533 by mlaurent:

Q3ValueList--


 M  +1 -1      cups/cupsdconf2/cupsdconf.cpp  
 M  +2 -2      cups/cupsdconf2/cupsdconf.h  
 M  +1 -1      cups/cupsdconf2/cupsddialog.cpp  
 M  +2 -2      management/kminstancepage.cpp  
 M  +1 -1      management/kminstancepage.h  
 M  +4 -4      management/kmjobviewer.cpp  
 M  +6 -6      management/kmmainview.cpp  


--- trunk/KDE/kdelibs/kdeprint/cups/cupsdconf2/cupsdconf.cpp #480532:480533
@@ -448,7 +448,7 @@
 		if (browsing_) t << "BrowseShortNames " << (useshortnames_ ? "Yes" : "No") << \
endl;  
 		t << endl << "# Unknown" << endl;
-		for (Q3ValueList< QPair<QString,QString> >::ConstIterator it=unknown_.begin(); \
it!=unknown_.end(); ++it) +		for (QList< QPair<QString,QString> >::ConstIterator \
it=unknown_.begin(); it!=unknown_.end(); ++it)  t << (*it).first << " " << \
(*it).second << endl;  
 		return true;
--- trunk/KDE/kdelibs/kdeprint/cups/cupsdconf2/cupsdconf.h #480532:480533
@@ -25,7 +25,7 @@
 #include <q3ptrlist.h>
 #include <qtextstream.h>
 #include <qpair.h>
-#include <Q3ValueList>
+#include <QList>
 
 #include "cupsdcomment.h"
 
@@ -139,7 +139,7 @@
 	CupsdComment	comments_;
 	
 	// unrecognized options
-	Q3ValueList< QPair<QString,QString> >	unknown_;
+	QList< QPair<QString,QString> >	unknown_;
 };
 
 struct CupsLocation
--- trunk/KDE/kdelibs/kdeprint/cups/cupsdconf2/cupsddialog.cpp #480532:480533
@@ -178,7 +178,7 @@
 	{
 		// there were some unknown options, warn the user
 		QString	msg;
-		for (Q3ValueList< QPair<QString,QString> >::ConstIterator \
it=conf_->unknown_.begin(); it!=conf_->unknown_.end(); ++it) +		for (QList< \
QPair<QString,QString> >::ConstIterator it=conf_->unknown_.begin(); \
it!=conf_->unknown_.end(); ++it)  msg += ((*it).first + " = " + (*it).second + \
"<br>");  msg.prepend("<p>" + i18n("Some options were not recognized by this \
                configuration tool. "
 		                          "They will be left untouched and you won't be able to \
                change them.") + "</p>");
--- trunk/KDE/kdelibs/kdeprint/management/kminstancepage.cpp #480532:480533
@@ -49,7 +49,7 @@
 	main_->addWidget(m_view);
 	QVBoxLayout	*sub_ = new QVBoxLayout(0, 0, 0);
 	main_->addLayout(sub_);
-	for (Q3ValueList<QPushButton*>::Iterator it=m_buttons.begin(); it!=m_buttons.end(); \
++it) +	for (QList<QPushButton*>::Iterator it=m_buttons.begin(); it!=m_buttons.end(); \
++it)  if (*it)
 			sub_->addWidget(*it);
 		else
@@ -113,7 +113,7 @@
 		m_view->sort();
 	}
 
-	for (Q3ValueList<QPushButton*>::ConstIterator it=m_buttons.begin(); \
it!=m_buttons.end(); ++it) +	for (QList<QPushButton*>::ConstIterator \
it=m_buttons.begin(); it!=m_buttons.end(); ++it)  if (*it)
 			(*it)->setEnabled(ok);
 
--- trunk/KDE/kdelibs/kdeprint/management/kminstancepage.h #480532:480533
@@ -51,7 +51,7 @@
 
 private:
 	KListBox		*m_view;
-	Q3ValueList<QPushButton*>	m_buttons;
+	QList<QPushButton*>	m_buttons;
 	KMPrinter		*m_printer;
 };
 
--- trunk/KDE/kdelibs/kdeprint/management/kmjobviewer.cpp #480532:480533
@@ -595,8 +595,8 @@
 		}
 	}
 
-	Q3ValueList<KAction*>	acts = m_manager->createPluginActions(actionCollection());
-	for (Q3ValueListIterator<KAction*> it=acts.begin(); it!=acts.end(); ++it)
+	QList<KAction*>	acts = m_manager->createPluginActions(actionCollection());
+	for (QList<KAction*>::Iterator it=acts.begin(); it!=acts.end(); ++it)
 	{
 		// connect the action to this
 		connect((*it), SIGNAL(activated(int)), SLOT(pluginActionActivated(int)));
@@ -612,8 +612,8 @@
 
 void KMJobViewer::removePluginActions()
 {
-	Q3ValueList<KAction*>	acts = actionCollection()->actions("plugin");
-	for (Q3ValueListIterator<KAction*> it=acts.begin(); it!=acts.end(); ++it)
+	QList<KAction*>	acts = actionCollection()->actions("plugin");
+	for (QList<KAction*>::Iterator it=acts.begin(); it!=acts.end(); ++it)
 	{
 		(*it)->unplugAll();
 		delete (*it);
--- trunk/KDE/kdelibs/kdeprint/management/kmmainview.cpp #480532:480533
@@ -465,8 +465,8 @@
 		}
 		if (!printer->isSpecial())
 		{
-			Q3ValueList<KAction*>	pactions = m_actions->actions("plugin");
-			for (Q3ValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); \
++it) +			QList<KAction*>	pactions = m_actions->actions("plugin");
+			for (QList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
 				(*it)->plug(m_pop);
 			if (pactions.count() > 0)
 				m_pop->insertSeparator();
@@ -795,11 +795,11 @@
 void KMMainView::loadPluginActions()
 {
 	KMFactory::self()->manager()->createPluginActions(m_actions);
-	Q3ValueList<KAction*>	pactions = m_actions->actions("plugin");
+	QList<KAction*>	pactions = m_actions->actions("plugin");
 	int	index = m_pactionsindex;
 	//QPopupMenu *menu = m_menubar->findItem( m_menubar->idAt( 1 ) )->popup();
 	QMenu *menu = m_menubar->getButton( 1 )->popup();
-	for (Q3ValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
+	for (QList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
 	{
 		(*it)->plug(m_toolbar, index++);
 		( *it )->plug( menu );
@@ -808,8 +808,8 @@
 
 void KMMainView::removePluginActions()
 {
-	Q3ValueList<KAction*>	pactions = m_actions->actions("plugin");
-	for (Q3ValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
+	QList<KAction*>	pactions = m_actions->actions("plugin");
+	for (QList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
 	{
 		(*it)->unplugAll();
 		delete (*it);


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