[Uml-devel] KDE/kdesdk/umbrello/umbrello
Christian Ehrlicher
Ch.Ehrlicher at gmx.de
Sun Oct 14 12:06:43 UTC 2007
SVN commit 725056 by chehrlic:
qt3support--
M +1 -1 actor.h
M +1 -1 artifact.h
M +1 -1 category.h
M +1 -1 classifier.h
M +3 -5 codeimport/cppimport.cpp
M +2 -1 codeparameter.cpp
M +1 -1 component.h
M +0 -1 configurable.cpp
M +2 -2 configurable.h
M +2 -1 dialogs/diagramprintpage.cpp
M +4 -2 dialogs/umluniqueconstraintdialog.cpp
M +1 -1 entity.h
M +1 -1 enum.h
M +1 -1 folder.h
M +1 -1 node.h
M +1 -1 package.h
M +1 -1 usecase.h
--- trunk/KDE/kdesdk/umbrello/umbrello/actor.h #725055:725056
@@ -34,7 +34,7 @@
* @param name The name of the Actor.
* @param id The unique id to assign to this Actor.
*/
- explicit UMLActor(const QString & name = "", Uml::IDType id = Uml::id_None);
+ explicit UMLActor(const QString & name = QString(), Uml::IDType id = Uml::id_None);
/**
* Standard deconstructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/artifact.h #725055:725056
@@ -46,7 +46,7 @@
* @param Name The name of the Concept.
* @param id The unique id of the Concept.
*/
- explicit UMLArtifact(const QString & Name = "", Uml::IDType id = Uml::id_None);
+ explicit UMLArtifact(const QString & name = QString(), Uml::IDType id = Uml::id_None);
/**
* Standard deconstructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/category.h #725055:725056
@@ -41,7 +41,7 @@
* @param name The name of the Category.
* @param id The unique id to assign to this Category.
*/
- explicit UMLCategory(const QString & name = "", Uml::IDType id = Uml::id_None);
+ explicit UMLCategory(const QString & name = QString(), Uml::IDType id = Uml::id_None);
/**
* Standard deconstructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/classifier.h #725055:725056
@@ -51,7 +51,7 @@
* @param name The name of the Concept.
* @param id The unique id of the Concept.
*/
- explicit UMLClassifier(const QString & name = "", Uml::IDType id = Uml::id_None);
+ explicit UMLClassifier(const QString & name = QString(), Uml::IDType id = Uml::id_None);
/**
* Standard deconstructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/cppimport.cpp #725055:725056
@@ -12,9 +12,7 @@
// own header
#include "cppimport.h"
// qt/kde includes
-#include <qmap.h>
-#include <qregexp.h>
-#include <kmessagebox.h>
+#include <QMap>
#include <kdebug.h>
// app includes
#include "import_utils.h"
@@ -61,11 +59,11 @@
continue;
QString includeFile = it.key();
if (includeFile.isEmpty()) {
- uError() << fileName << ": " << it.data().first
+ uError() << fileName << ": " << it.value().first
<< " not found" << endl;
continue;
}
- uDebug() << fileName << ": " << includeFile << " => " << it.data().first;
+ uDebug() << fileName << ": " << includeFile << " => " << it.value().first;
if (ms_seenFiles.indexOf(includeFile) == -1)
feedTheModel(includeFile);
}
--- trunk/KDE/kdesdk/umbrello/umbrello/codeparameter.cpp #725055:725056
@@ -34,8 +34,9 @@
//
CodeParameter::CodeParameter ( ClassifierCodeDocument * parentDoc, UMLObject * parentObject )
- : QObject ( (QObject*) parentObject, "ACodeParam")
+ : QObject ( parentObject)
{
+ setObjectName( "ACodeParam" );
initFields( parentDoc, parentObject );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/component.h #725055:725056
@@ -36,7 +36,7 @@
* @param name The name of the Concept.
* @param id The unique id of the Concept.
*/
- explicit UMLComponent(const QString & name = "", Uml::IDType id = Uml::id_None);
+ explicit UMLComponent(const QString & name = QString(), Uml::IDType id = Uml::id_None);
/**
* Empty deconstructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/configurable.cpp #725055:725056
@@ -36,7 +36,6 @@
Configurable::Configurable() :
_plugins()
{
- _plugins.setAutoDelete(false);
}
Configurable::~Configurable()
--- trunk/KDE/kdesdk/umbrello/umbrello/configurable.h #725055:725056
@@ -19,7 +19,7 @@
#ifndef UMBRELLO_CONFIGURABLE_H
#define UMBRELLO_CONFIGURABLE_H
-#include <Q3PtrList>
+#include <QList>
// forward declarations
class KConfig;
@@ -107,7 +107,7 @@
bool unloadPlugins();
private:
- typedef Q3PtrList<Plugin> PluginList;
+ typedef QList<Plugin*> PluginList;
PluginList _plugins; ///< List of loaded plugins
};
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/diagramprintpage.cpp #725055:725056
@@ -124,7 +124,7 @@
int listCount = m_pSelectLB -> count();
int count = 0;
- for(int i=0;i<listCount;i++) {
+ for(int i = 0; i < listCount; i++) {
if(m_pSelectLB -> isSelected(i)) {
if(count==sel) {
UMLView *view = (UMLView *)m_pDoc -> findView(m_nIdList[i]);
@@ -134,6 +134,7 @@
count++;
}
}
+ return QString();
}
bool DiagramPrintPage::isValid( QString& msg ) {
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umluniqueconstraintdialog.cpp #725055:725056
@@ -72,7 +72,8 @@
// layout to hold the name label and line edit
- QHBoxLayout* nameLayout = new QHBoxLayout( mainLayout );
+ QHBoxLayout* nameLayout = new QHBoxLayout();
+ mainLayout->addItem( nameLayout );
// name label
m_pNameL = new QLabel( i18n( "Name" ), this );
@@ -94,7 +95,8 @@
listVBoxLayout->addWidget( m_pAttributeListLB );
// Horizontal Layout to hold attributes CB, the add, and remove buttons
- QHBoxLayout* comboButtonHBoxLayout = new QHBoxLayout( listVBoxLayout );
+ QHBoxLayout* comboButtonHBoxLayout = new QHBoxLayout();
+ listVBoxLayout->addItem( comboButtonHBoxLayout );
// the Combo Box containing the attributes
m_pAttributeCB = new KComboBox( true, m_pAttributeListGB );
--- trunk/KDE/kdesdk/umbrello/umbrello/entity.h #725055:725056
@@ -44,7 +44,7 @@
* @param name The name of the Entity.
* @param id The unique id of the Entity.
*/
- explicit UMLEntity(const QString& name = "", Uml::IDType id = Uml::id_None);
+ explicit UMLEntity(const QString& name = QString(), Uml::IDType id = Uml::id_None);
/**
* Standard deconstructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/enum.h #725055:725056
@@ -35,7 +35,7 @@
* @param name The name of the Enum.
* @param id The unique id of the Enum.
*/
- explicit UMLEnum(const QString& name = "", Uml::IDType id = Uml::id_None);
+ explicit UMLEnum(const QString& name = QString(), Uml::IDType id = Uml::id_None);
/**
* Standard deconstructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/folder.h #725055:725056
@@ -41,7 +41,7 @@
* @param id The unique id of the Folder. A new ID will be generated
* if this argument is left away.
*/
- explicit UMLFolder(const QString & name = "", Uml::IDType id = Uml::id_None);
+ explicit UMLFolder(const QString & name = QString(), Uml::IDType id = Uml::id_None);
/**
* Empty deconstructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/node.h #725055:725056
@@ -34,7 +34,7 @@
* @param name The name of the Concept.
* @param id The unique id of the Concept.
*/
- explicit UMLNode(const QString & name = "", Uml::IDType id = Uml::id_None);
+ explicit UMLNode(const QString & name = QString(), Uml::IDType id = Uml::id_None);
/**
* Empty deconstructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/package.h #725055:725056
@@ -41,7 +41,7 @@
* @param name The name of the Concept.
* @param id The unique id of the Concept.
*/
- explicit UMLPackage(const QString & name = "", Uml::IDType id = Uml::id_None);
+ explicit UMLPackage(const QString & name = QString(), Uml::IDType id = Uml::id_None);
/**
* Empty deconstructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/usecase.h #725055:725056
@@ -31,7 +31,7 @@
* @param name The name of the object.
* @param id The id of the object.
*/
- explicit UMLUseCase(const QString & name = "", Uml::IDType id = Uml::id_None);
+ explicit UMLUseCase(const QString & name = QString(), Uml::IDType id = Uml::id_None);
/**
* Standard deconstructor
More information about the umbrello-devel
mailing list