[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegraphics/kpovmodeler
From: Andreas Zehender <az () azweb ! de>
Date: 2006-10-02 20:50:34
Message-ID: 1159822234.394991.17909.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 591610 by azehende:
qt3support porting
fixed layouts in view layout settings page
M +1 -1 pmcontrolpoint.h
M +8 -40 pmerrordialog.cpp
M +2 -6 pmerrordialog.h
M +6 -7 pmlathe.cpp
M +2 -3 pmlayoutsettings.cpp
M +3 -2 pmmesh.cpp
M +1 -1 pmmessage.cpp
M +1 -1 pmmessage.h
M +7 -7 pmpluginmanager.cpp
M +5 -5 pmpluginmanager.h
M +5 -5 pmpluginsettings.cpp
M +0 -1 pmprism.cpp
M +0 -7 pmserializer.h
M +0 -1 pmspheresweep.cpp
--- trunk/KDE/kdegraphics/kpovmodeler/pmcontrolpoint.h #591609:591610
@@ -3,7 +3,7 @@
**************************************************************************
description
--------------------
- copyright : (C) 2000-2001 by Andreas Zehender
+ copyright : (C) 2000-2006 by Andreas Zehender
email : zehender@kde.org
**************************************************************************
--- trunk/KDE/kdegraphics/kpovmodeler/pmerrordialog.cpp #591609:591610
@@ -2,7 +2,7 @@
**************************************************************************
description
--------------------
- copyright : (C) 2000-2001 by Andreas Zehender
+ copyright : (C) 2000-2006 by Andreas Zehender
email : zehender@kde.org
**************************************************************************
@@ -23,9 +23,7 @@
#include <kstdguiitem.h>
#include <qlabel.h>
#include <QTextEdit>
-//Added by qt3to4:
#include <QResizeEvent>
-#include <Q3PtrList>
#include <kconfig.h>
#include <kdialog.h>
@@ -38,9 +36,9 @@
: KDialog( parent)
{
setObjectName( name );
- setCaption( i18n( "Messages" ) );
- setButtons( Ok | Cancel );
- setDefaultButton( Ok );
+ setCaption( i18n( "Messages" ) );
+ setButtons( Ok | Cancel );
+ setDefaultButton( Ok );
KVBox* page = new KVBox( this );
setMainWidget( page );
QLabel* text = new QLabel( QString( "" ), ( QWidget* )page );
@@ -49,37 +47,7 @@
m_pTextView = new QTextEdit( ( QWidget* )page );
m_pTextView->setReadOnly( true );
- m_messageDict.setAutoDelete( true );
- m_messages.setAutoDelete( true );
-
- PMMessageList::ConstIterator it;
- for( it = messages.begin( ); it != messages.end( ); ++it )
- m_messages.append( new PMMessage( *it ) );
-
- Q3PtrListIterator<PMMessage> pit( m_messages );
- for( ; pit.current( ); ++pit )
- {
- PMObject* obj = pit.current( )->linkedObject( );
- for( ; obj; obj = obj->parent( ) )
- {
- Q3PtrList<PMMessage>* pList = m_messageDict.find( obj );
- if( !pList )
- {
- pList = new Q3PtrList<PMMessage>;
- m_messageDict.insert( obj, pList );
- }
- pList->append( pit.current( ) );
- if( !obj->parent( ) )
- {
- if( obj->type( ) != "scene" )
- {
- kError( PMArea ) << "A message contains an object that is not \
inserted in the scene" << endl;
- pit.current( )->setLinkedObject( 0 );
- }
- }
- }
- }
-
+ m_messages = messages;
displayMessages( );
if( errorFlags & PMEWarning )
@@ -111,13 +79,13 @@
void PMErrorDialog::displayMessages( )
{
- Q3PtrListIterator<PMMessage> pit( m_messages );
+ PMMessageList::ConstIterator it;
QString text;
text = "<qt>\n";
- for( ; pit.current( ); ++pit )
- text += "<p>" + pit.current( )->text( ) + "</p>\n";
+ for(it = m_messages.begin( ); it != m_messages.end( ); ++it )
+ text += "<p>" + (*it).text( ) + "</p>\n";
text += "</qt>";
--- trunk/KDE/kdegraphics/kpovmodeler/pmerrordialog.h #591609:591610
@@ -3,7 +3,7 @@
**************************************************************************
description
--------------------
- copyright : (C) 2000-2003 by Andreas Zehender
+ copyright : (C) 2000-2006 by Andreas Zehender
email : zehender@kde.org
**************************************************************************
@@ -26,9 +26,6 @@
#include <kdialog.h>
#include <QList>
-#include <q3ptrdict.h>
-#include <q3ptrlist.h>
-//Added by qt3to4:
#include <QResizeEvent>
class KConfig;
@@ -68,8 +65,7 @@
static QSize s_size;
QTextEdit* m_pTextView;
- Q3PtrDict< Q3PtrList<PMMessage> > m_messageDict;
- Q3PtrList<PMMessage> m_messages;
+ PMMessageList m_messages;
};
#endif
--- trunk/KDE/kdegraphics/kpovmodeler/pmlathe.cpp #591609:591610
@@ -2,7 +2,7 @@
**************************************************************************
description
--------------------
- copyright : (C) 2002 by Andreas Zehender
+ copyright : (C) 2002-2006 by Andreas Zehender
email : zehender@kde.org
**************************************************************************
@@ -31,7 +31,6 @@
#include <klocale.h>
#include <QList>
-#include <Q3PtrList>
const int defaultNumberOfPoints = 4;
const PMVector defaultPoint[defaultNumberOfPoints] =
@@ -536,7 +535,7 @@
int i, d;
PM2DControlPoint* cp = 0;
- Q3PtrList<PM2DControlPoint> tmp[2];
+ QList<PM2DControlPoint*> tmp[2];
for( d = 0; d < 2; ++d )
{
@@ -601,16 +600,16 @@
}
}
- Q3PtrListIterator<PM2DControlPoint> cit1( tmp[0] ), cit2( tmp[1] );
+ QList<PM2DControlPoint*>::iterator cit1, cit2;
- for( ; cit1.current( ) && cit2.current( ); ++cit1, ++cit2 )
+ for( cit1 = tmp[0].begin( ), cit2 = tmp[1].begin( ); cit1 != tmp[0].begin( ) && \
cit2 != tmp[1].begin( ); ++cit1, ++cit2 ) {
( *cit1 )->setLatheLink( *cit2 );
( *cit2 )->setLatheLink( *cit1 );
}
- for( cit1.toFirst( ); cit1.current( ); ++cit1 )
+ for( cit1 = tmp[0].begin( ); cit1 != tmp[0].begin( ); ++cit1 )
list.append( *cit1 );
- for( cit2.toFirst( ); cit2.current( ); ++cit2 )
+ for( cit2 = tmp[1].begin( ); cit2 != tmp[1].begin( ); ++cit2 )
list.append( *cit2 );
}
--- trunk/KDE/kdegraphics/kpovmodeler/pmlayoutsettings.cpp #591609:591610
@@ -2,7 +2,7 @@
**************************************************************************
description
--------------------
- copyright : (C) 2003 by Andreas Zehender
+ copyright : (C) 2003-2006 by Andreas Zehender
email : zehender@kde.org
**************************************************************************
@@ -30,7 +30,6 @@
#include <q3groupbox.h>
//Added by qt3to4:
#include <QGridLayout>
-#include <Q3PtrList>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <klocale.h>
@@ -123,7 +122,7 @@
QHBoxLayout* ghl = new QHBoxLayout( );
gvle->addLayout( ghl );
grid = new QGridLayout( );
- ghl->addLayout( gvle );
+ ghl->addLayout( grid );
grid->addWidget( new QLabel( i18n( "Type:" ), gbe ), 0, 0 );
grid->addWidget( new QLabel( i18n( "Dock position:" ), gbe ), 2, 0 );
m_pColumnWidthLabel = new QLabel( i18n( "Column width:" ), gbe );
--- trunk/KDE/kdegraphics/kpovmodeler/pmmesh.cpp #591609:591610
@@ -2,8 +2,10 @@
**************************************************************************
description
--------------------
- copyright : (C) 2003 by Leon Pennington
+ copyright : (C) 2003-2005 by Leon Pennington
email : leon@leonscape.co.uk
+ copyright : (C) 2006 by Andreas Zehender
+ email : zehender@kde.org
**************************************************************************
**************************************************************************
@@ -26,7 +28,6 @@
#include "pm3dcontrolpoint.h"
#include "pmvectorcontrolpoint.h"
#include <QList>
-#include <Q3PtrList>
#include <Q3MemArray>
const PMVector insideVectorDefault = PMVector( 0.0, 0.0, 0.0 );
--- trunk/KDE/kdegraphics/kpovmodeler/pmmessage.cpp #591609:591610
@@ -2,7 +2,7 @@
**************************************************************************
description
--------------------
- copyright : (C) 2003 by Andreas Zehender
+ copyright : (C) 2003-2006 by Andreas Zehender
email : zehender@kde.org
**************************************************************************
--- trunk/KDE/kdegraphics/kpovmodeler/pmmessage.h #591609:591610
@@ -3,7 +3,7 @@
**************************************************************************
description
--------------------
- copyright : (C) 2003 by Andreas Zehender
+ copyright : (C) 2003-2006 by Andreas Zehender
email : zehender@kde.org
**************************************************************************
--- trunk/KDE/kdegraphics/kpovmodeler/pmpluginmanager.cpp #591609:591610
@@ -69,7 +69,7 @@
PMPluginManager::~PMPluginManager( )
{
- m_plugins.setAutoDelete( true );
+ foreach(PMPluginInfo* info, m_plugins) delete info;
m_plugins.clear( );
}
@@ -82,7 +82,7 @@
void PMPluginManager::registerPart( PMPart* p )
{
- if( !m_parts.containsRef( p ) )
+ if( !m_parts.contains( p ) )
{
m_parts.append( p );
Plugin::loadPlugins( p, p, PMFactory::instance( ), false );
@@ -91,21 +91,21 @@
void PMPluginManager::removePart( PMPart* p )
{
- m_parts.removeRef( p );
+ m_parts.removeAll( p );
}
void PMPluginManager::updatePlugins( )
{
KConfigGroup cfgGroup( PMFactory::instance( )->config( ),
"KParts Plugins" );
- Q3PtrListIterator<PMPluginInfo> pit( m_plugins );
- for( ; *pit; ++pit )
+ QList<PMPluginInfo*>::iterator pit;
+ for( pit = m_plugins.begin( ); pit != m_plugins.end( ); ++pit )
cfgGroup.writeEntry( ( *pit )->name( ) + "Enabled",
( *pit )->enabled( ) );
cfgGroup.sync( );
- Q3PtrListIterator<PMPart> it( m_parts );
- for( ; *it; ++it )
+ QList<PMPart*>::iterator it;
+ for( it = m_parts.begin( ); it != m_parts.end( ); ++it )
{
Plugin::loadPlugins( *it, *it, PMFactory::instance( ), false );
PMShell* shell = ( *it )->shell( );
--- trunk/KDE/kdegraphics/kpovmodeler/pmpluginmanager.h #591609:591610
@@ -20,8 +20,8 @@
#include <kstaticdeleter.h>
-#include <qstring.h>
-#include <q3ptrlist.h>
+#include <QString>
+#include <QList>
class PMPart;
@@ -91,7 +91,7 @@
/**
* Returns a list of available plugins
*/
- Q3PtrList<PMPluginInfo> plugins( ) const { return m_plugins; }
+ QList<PMPluginInfo*> plugins( ) const { return m_plugins; }
/**
* Loads and unloads plugins for all parts when plugins were activated or
* deactivated
@@ -103,8 +103,8 @@
*/
PMPluginManager( );
- Q3PtrList<PMPluginInfo> m_plugins;
- Q3PtrList<PMPart> m_parts;
+ QList<PMPluginInfo*> m_plugins;
+ QList<PMPart*> m_parts;
static PMPluginManager* s_pInstance;
static KStaticDeleter<PMPluginManager> s_staticDeleter;
--- trunk/KDE/kdegraphics/kpovmodeler/pmpluginsettings.cpp #591609:591610
@@ -2,7 +2,7 @@
**************************************************************************
description
--------------------
- copyright : (C) 2003 by Andreas Zehender
+ copyright : (C) 2003-2006 by Andreas Zehender
email : zehender@kde.org
**************************************************************************
@@ -26,7 +26,7 @@
//Added by qt3to4:
#include <QVBoxLayout>
#include <QHBoxLayout>
-#include <Q3PtrList>
+#include <QList>
#include <klocale.h>
class PMPluginListViewItem : public Q3ListViewItem
@@ -91,11 +91,11 @@
void PMPluginSettings::displaySettings( )
{
- Q3PtrList<PMPluginInfo> plugins = PMPluginManager::theManager( )->plugins( );
- Q3PtrListIterator<PMPluginInfo> it( plugins );
+ QList<PMPluginInfo*> plugins = PMPluginManager::theManager( )->plugins( );
+ QList<PMPluginInfo*>::const_iterator it;
m_pPluginsList->clear( );
- for( ; *it; ++it )
+ for(it = plugins.begin( ); it != plugins.end( ); ++it )
new PMPluginListViewItem( m_pPluginsList, *it );
}
--- trunk/KDE/kdegraphics/kpovmodeler/pmprism.cpp #591609:591610
@@ -32,7 +32,6 @@
#include <klocale.h>
#include <QList>
-#include <Q3PtrList>
const int defaultNumberOfPoints = 6;
const PMVector defaultPoint[defaultNumberOfPoints] =
--- trunk/KDE/kdegraphics/kpovmodeler/pmserializer.h #591609:591610
@@ -30,9 +30,6 @@
#include "pmobject.h"
#include "pmerrordialog.h"
-#include <q3dict.h>
-
-
/**
* Class to serialize an object or a list of objects.
*
@@ -152,10 +149,6 @@
*/
PMMessageList m_messages;
/**
- * A dictionary object -> message
- */
- Q3PtrDict< Q3PtrList<PMMessage> > m_messageDict;
- /**
* Number of warnings during parsing
*/
unsigned int m_warnings;
--- trunk/KDE/kdegraphics/kpovmodeler/pmspheresweep.cpp #591609:591610
@@ -33,7 +33,6 @@
#include <klocale.h>
#include <QList>
-#include <Q3PtrList>
const int defaultNumberOfPoints = 2;
const PMVector defaultPoint[defaultNumberOfPoints] =
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic