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

List:       kde-commits
Subject:    KDE/kdebase/kioslave/media
From:       Laurent Montel <montel () kde ! org>
Date:       2005-12-08 9:19:01
Message-ID: 1134033541.682328.20785.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 486645 by mlaurent:

Q3ValueList->QList


 M  +1 -1      kcmodule/notifiermodule.cpp  
 M  +2 -2      libmediacommon/medium.h  
 M  +17 -17    libmediacommon/notifiersettings.cpp  
 M  +6 -6      libmediacommon/notifiersettings.h  
 M  +1 -1      mediamanager/mediamanager.h  
 M  +1 -1      medianotifier/medianotifier.cpp  
 M  +3 -3      medianotifier/notificationdialog.cpp  


--- trunk/KDE/kdebase/kioslave/media/kcmodule/notifiermodule.cpp #486644:486645
@@ -24,7 +24,7 @@
 #include <qlayout.h>
 //Added by qt3to4:
 #include <QVBoxLayout>
-#include <Q3ValueList>
+#include <QList>
 #include <QBoxLayout>
 #include <kcombobox.h>
 #include <kpushbutton.h>
--- trunk/KDE/kdebase/kioslave/media/libmediacommon/medium.h #486644:486645
@@ -22,13 +22,13 @@
 #include <qstring.h>
 #include <qstringlist.h>
 //Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 #include <kurl.h>
 
 class Medium
 {
 public:
-	typedef Q3ValueList<const Medium> List;
+	typedef QList<Medium> List;
 
 	static const uint ID = 0;
 	static const uint NAME = 1;
--- trunk/KDE/kdebase/kioslave/media/libmediacommon/notifiersettings.cpp #486644:486645
@@ -69,7 +69,7 @@
 	}
 }
 
-Q3ValueList<NotifierAction*> NotifierSettings::actions()
+QList<NotifierAction*> NotifierSettings::actions()
 {
 	return m_actions;
 }
@@ -79,12 +79,12 @@
 	return m_supportedMimetypes;
 }
 
-Q3ValueList<NotifierAction*> NotifierSettings::actionsForMimetype( const QString &mimetype )
+QList<NotifierAction*> NotifierSettings::actionsForMimetype( const QString &mimetype )
 {
-	Q3ValueList<NotifierAction*> result;
+	QList<NotifierAction*> result;
 
-	Q3ValueList<NotifierAction*>::iterator it = m_actions.begin();
-	Q3ValueList<NotifierAction*>::iterator end = m_actions.end();
+	QList<NotifierAction*>::iterator it = m_actions.begin();
+	QList<NotifierAction*>::iterator end = m_actions.end();
 
 	for ( ; it!=end; ++it )
 	{
@@ -199,10 +199,10 @@
 	m_actions.append( open );
 	m_idMap[ open->id() ] = open;
 
-	Q3ValueList<NotifierServiceAction*> services = listServices();
+	QList<NotifierServiceAction*> services = listServices();
 
-	Q3ValueList<NotifierServiceAction*>::iterator serv_it = services.begin();
-	Q3ValueList<NotifierServiceAction*>::iterator serv_end = services.end();
+	QList<NotifierServiceAction*>::iterator serv_it = services.begin();
+	QList<NotifierServiceAction*>::iterator serv_end = services.end();
 	
 	for ( ; serv_it!=serv_end; ++serv_it )
 	{
@@ -237,8 +237,8 @@
 }
 void NotifierSettings::save()
 {
-	Q3ValueList<NotifierAction*>::iterator act_it = m_actions.begin();
-	Q3ValueList<NotifierAction*>::iterator act_end = m_actions.end();
+	QList<NotifierAction*>::iterator act_it = m_actions.begin();
+	QList<NotifierAction*>::iterator act_end = m_actions.end();
 
 	for ( ; act_it!=act_end; ++act_it )
 	{
@@ -277,20 +277,20 @@
 	}
 }
 
-Q3ValueList<NotifierServiceAction*> NotifierSettings::loadActions( KDesktopFile &desktop ) const
+QList<NotifierServiceAction*> NotifierSettings::loadActions( KDesktopFile &desktop ) const
 {
 	desktop.setDesktopGroup();
 
-	Q3ValueList<NotifierServiceAction*> services;
+	QList<NotifierServiceAction*> services;
 	
 	const QString filename = desktop.fileName();
 	const QStringList mimetypes = desktop.readListEntry( "ServiceTypes" );
 
-	Q3ValueList<KDEDesktopMimeType::Service> type_services
+	QList<KDEDesktopMimeType::Service> type_services
 		= KDEDesktopMimeType::userDefinedServices(filename, true);
 
-	Q3ValueList<KDEDesktopMimeType::Service>::iterator service_it = type_services.begin();
-	Q3ValueList<KDEDesktopMimeType::Service>::iterator service_end = type_services.end();
+	QList<KDEDesktopMimeType::Service>::iterator service_it = type_services.begin();
+	QList<KDEDesktopMimeType::Service>::iterator service_end = type_services.end();
 	for (; service_it!=service_end; ++service_it)
 	{
 		NotifierServiceAction *service_action
@@ -345,9 +345,9 @@
 	return false;
 }
 
-Q3ValueList<NotifierServiceAction*> NotifierSettings::listServices( const QString &mimetype ) const
+QList<NotifierServiceAction*> NotifierSettings::listServices( const QString &mimetype ) const
 {
-	Q3ValueList<NotifierServiceAction*> services;
+	QList<NotifierServiceAction*> services;
 	QStringList dirs = KGlobal::dirs()->findDirs("data", "konqueror/servicemenus/");
 	
 	QStringList::ConstIterator dir_it = dirs.begin();
--- trunk/KDE/kdebase/kioslave/media/libmediacommon/notifiersettings.h #486644:486645
@@ -33,8 +33,8 @@
 	NotifierSettings();
 	~NotifierSettings();
 
-	Q3ValueList<NotifierAction*> actions();
-	Q3ValueList<NotifierAction*> actionsForMimetype( const QString &mimetype );
+	QList<NotifierAction*> actions();
+	QList<NotifierAction*> actionsForMimetype( const QString &mimetype );
 	
 	bool addAction( NotifierServiceAction *action );
 	bool deleteAction( NotifierServiceAction *action );
@@ -50,13 +50,13 @@
 	void save();
 	
 private:
-	Q3ValueList<NotifierServiceAction*> listServices( const QString &mimetype = QString() ) const;
+	QList<NotifierServiceAction*> listServices( const QString &mimetype = QString() ) const;
 	bool shouldLoadActions( KDesktopFile &desktop, const QString &mimetype ) const;
-	Q3ValueList<NotifierServiceAction*> loadActions( KDesktopFile &desktop ) const;
+	QList<NotifierServiceAction*> loadActions( KDesktopFile &desktop ) const;
 
 	QStringList m_supportedMimetypes;
-	Q3ValueList<NotifierAction*> m_actions;
-	Q3ValueList<NotifierServiceAction*> m_deletedActions;
+	QList<NotifierAction*> m_actions;
+	QList<NotifierServiceAction*> m_deletedActions;
 	QMap<QString,NotifierAction*> m_idMap;
 	QMap<QString,NotifierAction*> m_autoMimetypesMap;
 };
--- trunk/KDE/kdebase/kioslave/media/mediamanager/mediamanager.h #486644:486645
@@ -69,7 +69,7 @@
 
 private:
 	MediaList m_mediaList;
-	Q3ValueList<BackendBase*> m_backends;
+	QList<BackendBase*> m_backends;
 	RemovableBackend *mp_removableBackend;
 	MediaDirNotify m_dirNotify;
 };
--- trunk/KDE/kdebase/kioslave/media/medianotifier/medianotifier.cpp #486644:486645
@@ -267,7 +267,7 @@
 	
 	if ( settings->autoActionForMimetype( medium.mimetype() )==0L )
 	{
-		QLinkedList<NotifierAction*> actions
+		QList<NotifierAction*> actions
 			= settings->actionsForMimetype( medium.mimetype() );
 		
 		// If only one action remains, it's the "do nothing" action
--- trunk/KDE/kdebase/kioslave/media/medianotifier/notificationdialog.cpp #486644:486645
@@ -83,11 +83,11 @@
 {
 	m_view->actionsList->clear();
 
-	QLinkedList<NotifierAction*> actions
+	QList<NotifierAction*> actions
 		= m_settings->actionsForMimetype( m_medium.mimetype() );
 	
-	QLinkedList<NotifierAction*>::iterator it = actions.begin();
-	QLinkedList<NotifierAction*>::iterator end = actions.end();
+	QList<NotifierAction*>::iterator it = actions.begin();
+	QList<NotifierAction*>::iterator end = actions.end();
 	
 	for ( ; it!=end; ++it )
 	{
[prev in list] [next in list] [prev in thread] [next in thread]