rev 3440 - trunk/packages/kdesdk/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Thu Mar 30 13:46:34 UTC 2006
Author: chrsmrtn
Date: 2006-03-30 13:46:33 +0000 (Thu, 30 Mar 2006)
New Revision: 3440
Added:
trunk/packages/kdesdk/debian/patches/01_kdesdk_branch_r524399.diff
Removed:
trunk/packages/kdesdk/debian/patches/01_kdesdk_branch_r504925.diff
Log:
kdesdk branch updates.
Deleted: trunk/packages/kdesdk/debian/patches/01_kdesdk_branch_r504925.diff
Added: trunk/packages/kdesdk/debian/patches/01_kdesdk_branch_r524399.diff
===================================================================
--- trunk/packages/kdesdk/debian/patches/01_kdesdk_branch_r524399.diff 2006-03-30 03:22:49 UTC (rev 3439)
+++ trunk/packages/kdesdk/debian/patches/01_kdesdk_branch_r524399.diff 2006-03-30 13:46:33 UTC (rev 3440)
@@ -0,0 +1,1155 @@
+#DPATCHLEVEL=0
+--- kbabel/kbabeldict/kbabeldict_module.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kbabel/kbabeldict/kbabeldict_module.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -16,6 +16,7 @@
+ Comment[eu]=Hiztegi modulua KBabelDict-entzat
+ Comment[fi]=Sanakirjamoduli KBabelDict ohjelmalle
+ Comment[fr]=Module de dictionnaire pour KBabelDict
++Comment[ga]=Modúl foclóra le haghaidh KBabelDict
+ Comment[hi]=के-बेबल-डिकà¥à¤¶ के लिठशबà¥à¤¦à¤•à¥‹à¤¶ मॉडà¥à¤¯à¥‚ल
+ Comment[hu]=Szótármodul a KBabelDicthez
+ Comment[is]=Orðabókareining fyrir KBabel
+--- kbabel/kbabeldict/modules/dbsearchengine/dbsearchengine.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kbabel/kbabeldict/modules/dbsearchengine/dbsearchengine.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -15,6 +15,7 @@
+ Name[eu]=Itzulpen datu-basea KBabelDict-entzat
+ Name[fi]=Käännöstietokanta KBabelDict ohjelmalle
+ Name[fr]=Base de données des traductions pour KBabelDict
++Name[ga]=Cuimhne Aistriúcháin le haghaidh KBabelDict
+ Name[hi]=के-बेबल-डिकà¥à¤¶ के लिठअनà¥à¤µà¤¾à¤¦ डाटाबेस
+ Name[hu]=FordÃtási adatbázis a KBabelDicthez
+ Name[is]=Þýðingagagnagrunnur fyrir KBabel orðabókina
+--- kbabel/kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kbabel/kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -15,6 +15,7 @@
+ Name[eu]=v2 itzulpen datu-basea KBabelDict-entzat
+ Name[fi]=Käännöstietokanta v2 KBabelDict ohjelmalle
+ Name[fr]=Base de données des traductions v2 pour KBabelDict
++Name[ga]=Cuimhne Aistriúcháin (v2) le haghaidh KBabelDict
+ Name[hi]=के-बेबल-डिकà¥à¤¶ के लिठअनà¥à¤µà¤¾à¤¦ डाटाबेस वी2
+ Name[hu]=FordÃtási adatbázis (v2) a KBabelDicthez
+ Name[is]=Þýðingagagnagrunnur v2 fyrir KBabel orðabókina
+--- kbabel/datatools/xml/kbabel_xmltool.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kbabel/datatools/xml/kbabel_xmltool.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -13,6 +13,7 @@
+ Name[eu]=XML balidazioa KBabel-entzat
+ Name[fi]=XML-validointi KBabelille
+ Name[fr]=Validation XML pour KBabel
++Name[ga]=BailÃochtú XML le haghaidh KBabel
+ Name[hi]=के-बेबल के लिठà¤à¤•à¥à¤¸à¤à¤®à¤à¤² वेलिडेशन
+ Name[hu]=XML-ellenőrzés a KBabelben
+ Name[is]=XML staðfesting fyrir KBabel
+--- kbabel/datatools/arguments/kbabel_argstool.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kbabel/datatools/arguments/kbabel_argstool.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -13,6 +13,7 @@
+ Name[eu]=Argumentu balidazioa KBabel-entzat
+ Name[fi]=Muuttujien tarkistus KBabelille
+ Name[fr]=Validation d'un argument pour KBabel
++Name[ga]=BailÃochtú Argóintà le haghaidh KBabel
+ Name[hi]=के-बेबल के लिठआरà¥à¤—à¥à¤®à¥‡à¤‚ट वेलिडेशन
+ Name[hu]=Argumentumellenőrző a KBabelhez
+ Name[is]=Viðfangastaðfestir fyrir KBabel
+--- kbabel/datatools/accelerators/kbabel_accelstool.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kbabel/datatools/accelerators/kbabel_accelstool.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -13,6 +13,7 @@
+ Name[eu]=Bizkortzaile balidazioa KBabel-entzat
+ Name[fi]=Pikavalintavalidoija KBabelille
+ Name[fr]=Validation des accélérateurs clavier pour KBabel
++Name[ga]=BailÃochtú na nAicearraà le haghaidh KBabel
+ Name[hi]=के-बेबल के लिठतà¥à¤µà¤°à¤• वेलिडेशन
+ Name[hu]=Gyorsbillentyű-ellenőrző a KBabelhez
+ Name[is]=Flýtilyklastaðfestir fyrir KBabel
+@@ -54,6 +55,7 @@
+ Comment[eu]=Egiaztatu bizkortzaileak
+ Comment[fi]=Tarkista pikavalinnat
+ Comment[fr]=Vérification des accélérateurs clavier
++Comment[ga]=Seiceáil AicearraÃ
+ Comment[he]=בודק ×ž×–× ×§×™×
+ Comment[hi]=तà¥à¤µà¤°à¤• जांच करें
+ Comment[hu]=A gyorsbillentyűk ellenőrzése
+--- kbabel/datatools/equations/kbabel_equationstool.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kbabel/datatools/equations/kbabel_equationstool.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -13,6 +13,7 @@
+ Name[eu]=Ekuazioen balidazioa KBabel-entzat
+ Name[fi]=Yhtälöiden tarkistaja KBabelille
+ Name[fr]=Validateur de similitudes pour KBabel
++Name[ga]=BailÃochtú Cothromóidà le haghaidh KBabel
+ Name[hi]=के-बेबल के लिठसमीकरण वेलिडेशन
+ Name[hu]=Egyenletellenőrző a KBabelhez
+ Name[is]=Jöfnustaðfesting fyrir KBabel
+@@ -52,6 +53,7 @@
+ Comment[eu]=Egiaztatu ekuazioak
+ Comment[fi]=Tarkista yhtälöt
+ Comment[fr]=Vérifier les identités
++Comment[ga]=Seiceáil CothromóidÃ
+ Comment[he]=בודק משוו×ות
+ Comment[hi]=समीकरण जांच करें
+ Comment[hu]=Az egyenletek ellenőrzése
+--- kbabel/datatools/punctuation/kbabel_punctuationtool.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kbabel/datatools/punctuation/kbabel_punctuationtool.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -13,6 +13,7 @@
+ Name[eu]=Puntuazio balidazioa KBabel-entzat
+ Name[fi]=Pilkutuksen tarkistus KBabelille
+ Name[fr]=Validation de ponctuation pour KBabel
++Name[ga]=BailÃochtú na PoncaÃochta le haghaidh KBabel
+ Name[hi]=के-बेबल के लिठविरामचिहà¥à¤¨ वेलिडेशन
+ Name[hu]=ÃrásjelellenÅ‘rzÅ‘ a KBabelhez
+ Name[is]=Staðfesting greinamerkja fyrir KBabel
+--- kbabel/filters/gettext/kbabel_gettext_import.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kbabel/filters/gettext/kbabel_gettext_import.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -15,6 +15,7 @@
+ Name[eu]=KBabel GNU gettext inportazio iragazkia
+ Name[fi]=KBabel GNU Gettext vientisuodin
+ Name[fr]=Filtre d'importation GNU Gettext pour KBabel
++Name[ga]=Scagaire Iompórtála Gettext GNU le haghaidh KBabel
+ Name[hi]=के-बेबल गà¥à¤¨à¥‚ गेट-टेकà¥à¤¸à¥à¤Ÿ आयात फ़िलà¥à¤Ÿà¤°
+ Name[hu]=KBabel GNU Gettext importszűrő
+ Name[is]=KBabel GNU Gettext innflutningssÃa
+--- kbabel/filters/gettext/kbabel_gettext_export.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kbabel/filters/gettext/kbabel_gettext_export.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -15,6 +15,7 @@
+ Name[eu]=KBabel GNU gettext esportazio iragazkia
+ Name[fi]=KBabel GNU Gettext vientisuodin
+ Name[fr]=filtre d'exportation GNU Gettext pour KBabel
++Name[ga]=Scagaire Easpórtála Gettext GNU le haghaidh KBabel
+ Name[hi]=के-बेबल गà¥à¤¨à¥‚ गेट-टेकà¥à¤¸à¥à¤Ÿ निरà¥à¤¯à¤¾à¤¤ फ़िलà¥à¤Ÿà¤°
+ Name[hu]=KBabel GNU Gettext exportszűrő
+ Name[is]=KBabel GNU Gettext útflutningssÃa
+--- umbrello/umbrello/umbrello.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/umbrello.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -22,6 +22,7 @@
+ GenericName[eu]=UML modelatzailea
+ GenericName[fi]=UML-mallintaja
+ GenericName[fr]=Modeleur UML
++GenericName[ga]=Múnlóir UML
+ GenericName[hi]=यूà¤à¤®à¤à¤² मॉडलर
+ GenericName[hu]=UML-modellező
+ GenericName[it]=Modellatore UML
+--- umbrello/umbrello/nativeimportbase.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/nativeimportbase.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -5,7 +5,7 @@
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+- * copyright (C) 2005 *
++ * copyright (C) 2005-2006 *
+ * Umbrello UML Modeller Authors <uml-devel@ uml.sf.net> *
+ ***************************************************************************/
+
+@@ -20,8 +20,6 @@
+ #include <kdebug.h>
+ // app includes
+ #include "import_utils.h"
+-#include "uml.h"
+-#include "umldoc.h"
+
+ NativeImportBase::NativeImportBase(QString singleLineCommentIntro) {
+ m_singleLineCommentIntro = singleLineCommentIntro;
+@@ -179,6 +177,7 @@
+ return;
+ }
+ // Scan the input file into the QStringList m_source.
++ m_source.clear();
+ m_srcIndex = 0;
+ initVars();
+ QTextStream stream(&file);
+@@ -191,7 +190,7 @@
+ m_klass = NULL;
+ m_currentAccess = Uml::Visibility::Public;
+ m_scopeIndex = 0;
+- m_scope[0] = NULL;
++ m_scope[0] = NULL; // index 0 is reserved for global scope
+ const uint srcLength = m_source.count();
+ for (m_srcIndex = 0; m_srcIndex < srcLength; m_srcIndex++) {
+ const QString& firstToken = m_source[m_srcIndex];
+@@ -206,18 +205,7 @@
+ }
+ }
+
+-void NativeImportBase::importFiles(QStringList fileList) {
+- UMLDoc *umldoc = UMLApp::app()->getDocument();
++void NativeImportBase::initialize() {
+ m_parsedFiles.clear();
+- for (QStringList::Iterator fileIT = fileList.begin();
+- fileIT != fileList.end(); ++fileIT) {
+- QString fileName = (*fileIT);
+- umldoc->writeToStatusBar(i18n("Importing file: %1").arg(fileName));
+- m_source.clear();
+- m_srcIndex = 0;
+- m_scope[0] = NULL; // index 0 is reserved for global scope
+- m_scopeIndex = 0;
+- parseFile(fileName);
+- }
+ }
+
+--- umbrello/umbrello/aligntoolbar.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/aligntoolbar.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -19,12 +19,13 @@
+ #include "umlwidget.h"
+ #include "umlwidgetlist.h"
+
++#include <qmainwindow.h>
+ #include <klocale.h>
+ #include <kmessagebox.h>
+ #include <kstandarddirs.h>
+
+-AlignToolBar::AlignToolBar(QMainWindow* parentWindow, const char* name)
+- : KToolBar(parentWindow,Qt::DockRight,false,name)
++AlignToolBar::AlignToolBar(QMainWindow* parentWindow, const char* )
++ : KToolBar(parentWindow,Qt::DockRight,false)
+ {
+ // load images for the buttons
+ loadPixmaps();
+--- umbrello/umbrello/model_utils.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/model_utils.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -139,6 +139,14 @@
+ // Remember packages that we've seen - for avoiding cycles.
+ UMLPackageList seenPkgs;
+ for (; pkg; pkg = currentObj->getUMLPackage()) {
++ if (nameWithoutFirstPrefix.isEmpty()) {
++ if (caseSensitive) {
++ if (pkg->getName() == name)
++ return pkg;
++ } else if (pkg->getName().lower() == name.lower()) {
++ return pkg;
++ }
++ }
+ if (seenPkgs.findRef(pkg) != -1) {
+ kdError() << "findUMLObject(" << name << "): "
+ << "breaking out of cycle involving "
+--- umbrello/umbrello/associationwidget.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/associationwidget.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -43,6 +43,7 @@
+ #include "widget_utils.h"
+ #include "dialogs/assocpropdlg.h"
+ #include "inputdialog.h"
++#include "optionstate.h"
+
+ using namespace Uml;
+
+@@ -2499,7 +2500,7 @@
+ int size = m_LinePath.count();
+ if( size <= 2 )
+ return;
+- //check all points except the end points to se if we clicked on one of them
++ //check all points except the end points to see if we clicked on one of them
+ QPoint tempPoint;
+ int x, y;
+ const int BOUNDARY = 4; // check for pixels around the point
+@@ -2870,7 +2871,6 @@
+ void AssociationWidget::updateRegionLineCount(int index, int totalCount,
+ AssociationWidget::Region region,
+ Role_Type role) {
+- ///@todo remove parameter totalCount (no longer needed)
+ if( region == Error )
+ return;
+ // If the association is to self and the line ends are on the same region then
+@@ -2926,56 +2926,61 @@
+ robj.m_OldCorner.setY(y);
+ int ww = pWidget->getWidth();
+ int wh = pWidget->getHeight();
+-// int ch = wh * index / totalCount;
+-// int cw = ww * index / totalCount;
+- uint nind = role == A ? 1: m_LinePath.count() - 2;
+- QPoint neighbour = m_LinePath.getPoint(nind);
++ const bool angular = UMLApp::app()->getOptionState().generalState.angularlines;
+ int ch = 0;
+ int cw = 0;
+- if (neighbour.x() < x)
+- cw = 0;
+- else if (neighbour.x() > x + ww)
+- cw = 0 + ww;
+- else
+- cw = neighbour.x() - x;
++ if (angular) {
++ uint nind = (role == A ? 1 : m_LinePath.count() - 2);
++ QPoint neighbour = m_LinePath.getPoint(nind);
++ if (neighbour.x() < x)
++ cw = 0;
++ else if (neighbour.x() > x + ww)
++ cw = 0 + ww;
++ else
++ cw = neighbour.x() - x;
++ if (neighbour.y() < y)
++ ch = 0;
++ else if (neighbour.y() > y + wh)
++ ch = 0 + wh;
++ else
++ ch = neighbour.y() - y;
++ } else {
++ ch = wh * index / totalCount;
++ cw = ww * index / totalCount;
++ }
+
+- if (neighbour.y() < y)
+- ch = 0;
+- else if (neighbour.y() > y + wh)
+- ch = 0 + wh;
+- else
+- ch = neighbour.y() - y;
+-
+ int snapX = m_pView->snappedX(x + cw);
+ int snapY = m_pView->snappedY(y + ch);
+
+- QPoint pt(snapX, snapY);
+-
+-/* switch(region) {
+- default:
+-// case West:
+- pt.setX(snapX);
+- pt.setY(snapY);
+- break;
+- case North:
+- pt.setX(snapX);
+- pt.setY(y);
+- break;
+- case East:
+- pt.setX(x + ww);
+- pt.setY(snapY);
+- break;
+- case South:
+- pt.setX(snapX);
+- pt.setY(y + wh);
+- break;
+- case Center:
+- pt.setX(x + ww / 2);
+- pt.setY(y + wh / 2);
+- break;
+-// default:
+- break;
+- }*/
++ QPoint pt;
++ if (angular) {
++ pt = QPoint(snapX, snapY);
++ } else {
++ switch(region) {
++ case West:
++ pt.setX(x);
++ pt.setY(snapY);
++ break;
++ case North:
++ pt.setX(snapX);
++ pt.setY(y);
++ break;
++ case East:
++ pt.setX(x + ww);
++ pt.setY(snapY);
++ break;
++ case South:
++ pt.setX(snapX);
++ pt.setY(y + wh);
++ break;
++ case Center:
++ pt.setX(x + ww / 2);
++ pt.setY(y + wh / 2);
++ break;
++ default:
++ break;
++ }
++ }
+ if (role == A)
+ m_LinePath.setPoint( 0, pt );
+ else {
+--- umbrello/umbrello/classimport.h (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/classimport.h (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -5,7 +5,7 @@
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+- * copyright (C) 2005 *
++ * copyright (C) 2005-2006 *
+ * Umbrello UML Modeller Authors <uml-devel@ uml.sf.net> *
+ ***************************************************************************/
+
+@@ -29,18 +29,33 @@
+
+ /**
+ * Import files.
+- * To be provided by the programming language specific code import
+- * implementation class.
+ *
+ * @param files List of files to import.
+ */
+- virtual void importFiles(QStringList files) = 0;
++ void importFiles(QStringList files);
+
+ /**
+ * Factory method.
+ */
+ static ClassImport *createImporterByFileExt(QString filename);
+
++protected:
++ /**
++ * Initialize the importer.
++ * This is called by importFiles() once, before entering
++ * the loop for importing one or more files.
++ * To be implemented by inheriting classes.
++ */
++ virtual void initialize() = 0;
++
++ /**
++ * Import a single file.
++ * To be implemented by inheriting classes.
++ *
++ * @param filename The file to import.
++ */
++ virtual void parseFile(QString filename) = 0;
++
+ };
+
+ #endif
+--- umbrello/umbrello/uml.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/uml.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -1,8 +1,3 @@
+-/*
+- * copyright (C) 2002-2004
+- * Umbrello UML Modeller Authors <uml-devel@ uml.sf.net>
+- */
+-
+ /***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+@@ -10,6 +5,8 @@
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
++ * copyright (C) 2002-2006 *
++ * Umbrello UML Modeller Authors <uml-devel@ uml.sf.net> *
+ ***************************************************************************/
+
+ // own header
+@@ -503,6 +500,7 @@
+ m_config->writeEntry( "undo", m_optionState.generalState.undo );
+ m_config->writeEntry( "tabdiagrams", m_optionState.generalState.tabdiagrams );
+ m_config->writeEntry( "newcodegen", m_optionState.generalState.newcodegen );
++ m_config->writeEntry( "angularlines", m_optionState.generalState.angularlines );
+ m_config->writeEntry( "autosave", m_optionState.generalState.autosave );
+ m_config->writeEntry( "time", m_optionState.generalState.time );
+ m_config->writeEntry( "autosavetime", m_optionState.generalState.autosavetime );
+@@ -1087,6 +1085,7 @@
+ #endif
+ );
+ m_optionState.generalState.newcodegen = m_config -> readBoolEntry( "newcodegen", true );
++ m_optionState.generalState.angularlines = m_config->readBoolEntry("angularlines", false);
+ m_optionState.generalState.autosave = m_config -> readBoolEntry( "autosave", true );
+ m_optionState.generalState.time = m_config -> readNumEntry( "time", 0 ); //old autosavetime value kept for compatibility
+ m_optionState.generalState.autosavetime = m_config -> readNumEntry( "autosavetime", 0 );
+@@ -1427,6 +1426,11 @@
+ classImporter->importFiles(fileList);
+ delete classImporter;
+ m_doc->setLoading(false);
++ //Modification is set after the import is made, because the file was modified when adding the classes
++ //Allowing undo of the whole class importing. I think it eats a lot of memory
++ //m_doc->setModified(true);
++ //Setting the modification, but without allowing undo
++ m_doc->setModified(true, false);
+ }
+
+ void UMLApp::slotClassWizard() {
+--- umbrello/umbrello/cppimport.h (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/cppimport.h (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -5,7 +5,7 @@
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+- * copyright (C) 2005 *
++ * copyright (C) 2005-2006 *
+ * Umbrello UML Modeller Authors <uml-devel@ uml.sf.net> *
+ ***************************************************************************/
+
+@@ -28,11 +28,19 @@
+ CppImport();
+ virtual ~CppImport();
+
++protected:
+ /**
+ * Implement abstract operation from ClassImport for C++.
+ */
+- void importFiles(QStringList headerFiles);
++ void initialize();
+
++ /**
++ * Import a single file.
++ *
++ * @param filename The file to import.
++ */
++ void parseFile(QString filename);
++
+ private:
+ /**
+ * Auxiliary method for recursively traversing the #include dependencies
+--- umbrello/umbrello/umldoc.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/umldoc.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -2392,7 +2392,9 @@
+ if( tempURL.fileName() == i18n("Untitled") ) {
+ tempURL.setPath( QDir::homeDirPath() + i18n("/autosave%1").arg(".xmi") );
+ saveDocument( tempURL );
++ m_doc_url.setFileName( i18n("Untitled") );
+ m_modified = true;
++ UMLApp::app()->setModified( m_modified );
+ } else {
+ // 2004-05-17 Achim Spangler
+ KURL orgDocUrl = m_doc_url;
+@@ -2408,8 +2410,10 @@
+ // 2004-05-17 Achim Spangler
+ // re-activate m_modified if autosave is writing to other file
+ // than the main project file -> autosave-suffix != ".xmi"
+- if ( ".xmi" != optionState.generalState.autosavesuffix )
+- setModified( true );
++ if ( ".xmi" != optionState.generalState.autosavesuffix ) {
++ m_modified = true;
++ UMLApp::app()->setModified( m_modified );
++ }
+ // restore original file name -
+ // UMLDoc::saveDocument() sets doc_url to filename which is given as autosave-filename
+ setURL( orgDocUrl );
+--- umbrello/umbrello/codegenerators/javawriter.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/codegenerators/javawriter.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -738,8 +738,8 @@
+
+ str = ""; // reset for next method
+ str += ((op->getAbstract() || isInterface) ? "abstract ":"");
+- str += (op->getStatic() ? "static":"");
+ str += scopeToJavaDecl(op->getVisibility()) + " ";
++ str += (op->getStatic() ? "static ":"");
+ str += methodReturnType + " " +cleanName(op->getName()) + "( ";
+
+ atl = op->getParmList();
+--- umbrello/umbrello/codegenerators/javacodeoperation.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/codegenerators/javacodeoperation.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -66,9 +66,11 @@
+ if (paramNum != nrofParam )
+ paramStr += ", ";
+ }
++ QString maybeStatic;
++ if (o->getStatic())
++ maybeStatic = "static ";
++ QString startText = strVis + " " + maybeStatic + returnType + methodName + " (" + paramStr + ")";
+
+- QString startText = strVis + " "+ returnType + methodName + " ( "+paramStr+")";
+-
+ // IF the parent is an interface, our operations look different
+ // e.g. they have no body
+ if(isInterface) {
+--- umbrello/umbrello/codegenerators/javacodegenerator.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/codegenerators/javacodegenerator.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -142,6 +142,8 @@
+ // Same thing again for "bool" to "boolean"
+ QString JavaCodeGenerator::fixTypeName(QString string)
+ {
++ if (string.isEmpty() || string.contains(QRegExp("^\\s+$")))
++ return "void";
+ string.replace(QRegExp("^string$"),"String");
+ string.replace(QRegExp("^bool$"),"boolean");
+ return cleanName(string);
+--- umbrello/umbrello/dialogs/umlentityattributedialog.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/dialogs/umlentityattributedialog.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -134,6 +134,7 @@
+ }
+
+ m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
++ m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+
+ // Add the data types.
+ UMLDatatypeList dataTypes = pDoc->getDatatypes();
+--- umbrello/umbrello/dialogs/settingsdlg.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/dialogs/settingsdlg.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -1,8 +1,3 @@
+-/*
+- * copyright (C) 2002-2004
+- * Umbrello UML Modeller Authors <uml-devel@ uml.sf.net>
+- */
+-
+ /***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+@@ -10,6 +5,8 @@
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
++ * copyright (C) 2002-2006 *
++ * Umbrello UML Modeller Authors <uml-devel@ uml.sf.net> *
+ ***************************************************************************/
+
+ // own header
+@@ -17,6 +14,7 @@
+
+ // qt includes
+ #include <qlayout.h>
++#include <qtooltip.h>
+ #include <qvbox.h>
+ // kde includes
+ #include <kdebug.h>
+@@ -120,6 +118,10 @@
+ m_GeneralWidgets.newcodegenCB -> setChecked( m_pOptionState->generalState.newcodegen );
+ miscLayout -> addWidget( m_GeneralWidgets.newcodegenCB, 1, 0 );
+
++ m_GeneralWidgets.angularLinesCB = new QCheckBox( i18n("Use angular association lines"), m_GeneralWidgets.miscGB );
++ m_GeneralWidgets.angularLinesCB -> setChecked( m_pOptionState->generalState.angularlines );
++ miscLayout -> addWidget( m_GeneralWidgets.angularLinesCB, 1, 1 );
++
+ //setup autosave settings
+
+ m_GeneralWidgets.autosaveGB = new QGroupBox( i18n("Autosave"), page );
+@@ -144,6 +146,14 @@
+ Dialog_Utils::makeLabeledEditField( m_GeneralWidgets.autosaveGB, autosaveLayout, 2,
+ m_GeneralWidgets.autosaveSuffixL, i18n("Set autosave suffix:"),
+ m_GeneralWidgets.autosaveSuffixT, m_pOptionState->generalState.autosavesuffix );
++ QString autoSaveSuffixToolTip = i18n( "<qt><p>The autosave file will be saved to ~/autosave.xmi if the autosaving occurs "
++ "before you have manually saved the file.</p>"
++ "<p>If you've already saved it, the autosave file will be saved in the same folder as the file "
++ "and will be named like the file's name, followed by the suffix specified.</p>"
++ "<p>If the suffix is equal to the suffix of the file you've saved, "
++ "the autosave will overwrite your file automatically.</p></qt>" );
++ QToolTip::add( m_GeneralWidgets.autosaveSuffixL, autoSaveSuffixToolTip );
++ QToolTip::add( m_GeneralWidgets.autosaveSuffixT, autoSaveSuffixToolTip );
+
+ //setup startup settings
+ m_GeneralWidgets.startupGB = new QGroupBox( i18n("Startup"), page );
+@@ -341,6 +351,7 @@
+ m_pOptionState->generalState.undo = m_GeneralWidgets.undoCB -> isChecked();
+ m_pOptionState->generalState.tabdiagrams = m_GeneralWidgets.tabdiagramsCB->isChecked();
+ m_pOptionState->generalState.newcodegen = m_GeneralWidgets.newcodegenCB->isChecked();
++ m_pOptionState->generalState.angularlines = m_GeneralWidgets.angularLinesCB->isChecked();
+ m_pOptionState->generalState.autosave = m_GeneralWidgets.autosaveCB -> isChecked();
+ m_pOptionState->generalState.autosavetime = m_GeneralWidgets.timeISB -> value();
+ // 2004-05-17 Achim Spangler: retrieve Suffix setting from dialog entry
+--- umbrello/umbrello/dialogs/umlattributedialog.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/dialogs/umlattributedialog.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -114,6 +114,7 @@
+ m_pImplementationRB -> setChecked( true );
+
+ m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
++ m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+
+ //now add the Concepts
+ UMLClassifierList namesList( pDoc->getConcepts() );
+--- umbrello/umbrello/dialogs/umltemplatedialog.h (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/dialogs/umltemplatedialog.h (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -19,7 +19,7 @@
+
+ class QButtonGroup;
+ class QCheckBox;
+-class QComboBox;
++class KComboBox;
+ class QGroupBox;
+ class QLineEdit;
+ class QRadioButton;
+@@ -59,7 +59,7 @@
+ QGroupBox* m_pTemplateGB;
+ QGroupBox* m_pValuesGB;
+ QLabel *m_pTypeL, *m_pNameL, *m_pStereoTypeL;
+- QComboBox* m_pTypeCB;
++ KComboBox* m_pTypeCB;
+ QLineEdit *m_pNameLE, *m_pStereoTypeLE;
+
+ public slots:
+--- umbrello/umbrello/dialogs/parmpropdlg.h (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/dialogs/parmpropdlg.h (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -16,6 +16,7 @@
+ #define PARMPROPDLG_H
+
+ #include <kdialogbase.h>
++#include <kcombobox.h>
+ #include <qgroupbox.h>
+ #include <qlabel.h>
+ #include <qlayout.h>
+@@ -27,6 +28,7 @@
+ #include "../attribute.h"
+
+ class UMLDoc;
++
+ /**
+ * Displays a dialog box that displays properties of a paramater.
+ * You need to make sure that @ref UMLDoc is made to be the
+@@ -103,7 +105,7 @@
+ QButtonGroup *m_pKind;
+ QRadioButton * m_pIn, * m_pOut, *m_pInOut;
+ QLabel * m_pTypeL, * m_pNameL, * m_pInitialL, * m_pStereoTypeL;
+- QComboBox * m_pTypeCB;
++ KComboBox * m_pTypeCB;
+ QLineEdit * m_pNameLE, * m_pInitialLE, * m_pStereoTypeLE;
+ QMultiLineEdit * m_pDoc;
+ UMLDoc * m_pUmldoc;
+--- umbrello/umbrello/dialogs/classgenpage.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/dialogs/classgenpage.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -214,6 +214,7 @@
+
+ // manage stereotypes
+ m_pStereoTypeCB -> setDuplicatesEnabled(false);//only allow one of each type in box
++ m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+ insertStereotype (QString("")); // an empty stereotype is the default
+ int defaultStereotype=0;
+ bool foundDefaultStereotype = false;
+--- umbrello/umbrello/dialogs/umloperationdialog.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/dialogs/umloperationdialog.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -158,6 +158,7 @@
+ insertType( "void" );
+
+ m_pRtypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
++ m_pRtypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+
+ // add template parameters
+ UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->parent());
+@@ -210,6 +211,7 @@
+
+ // manage stereotypes
+ m_pStereoTypeCB -> setDuplicatesEnabled(false);//only allow one of each type in box
++ m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+ insertStereotype (QString("")); // an empty stereotype is the default
+ int defaultStereotype=0;
+ bool foundDefaultStereotype = false;
+--- umbrello/umbrello/dialogs/umltemplatedialog.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/dialogs/umltemplatedialog.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -23,6 +23,7 @@
+ #include <qlineedit.h>
+
+ // kde includes
++#include <kcombobox.h>
+ #include <klocale.h>
+ #include <kmessagebox.h>
+ #include <kdebug.h>
+@@ -55,7 +56,7 @@
+ m_pTypeL = new QLabel(i18n("&Type:"), m_pValuesGB);
+ valuesLayout->addWidget(m_pTypeL, 0, 0);
+
+- m_pTypeCB = new QComboBox(m_pValuesGB);
++ m_pTypeCB = new KComboBox(m_pValuesGB);
+ valuesLayout->addWidget(m_pTypeCB, 0, 1);
+ m_pTypeL->setBuddy(m_pTypeCB);
+
+@@ -81,7 +82,8 @@
+
+ m_pTypeCB->setEditable(true);
+ m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
+- m_pTypeCB->setAutoCompletion(true);
++ m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
++// m_pTypeCB->setAutoCompletion(true);
+
+ //work out which one to select
+ int typeBoxCount = 0;
+--- umbrello/umbrello/dialogs/parmpropdlg.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/dialogs/parmpropdlg.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -62,7 +62,7 @@
+ m_pTypeL = new QLabel(i18n("&Type:"), m_pParmGB);
+ propLayout -> addWidget(m_pTypeL, 0, 0);
+
+- m_pTypeCB = new QComboBox(m_pParmGB);
++ m_pTypeCB = new KComboBox(m_pParmGB);
+ propLayout -> addWidget(m_pTypeCB, 0, 1);
+ m_pTypeL->setBuddy(m_pTypeCB);
+
+@@ -122,7 +122,8 @@
+
+ m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
+ m_pTypeCB->setEditable(true);
+- m_pTypeCB->setAutoCompletion(false);
++ m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
++// m_pTypeCB->setAutoCompletion(false);
+
+ //add template parameters
+ UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() );
+--- umbrello/umbrello/dialogs/settingsdlg.h (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/dialogs/settingsdlg.h (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -1,8 +1,3 @@
+-/*
+- * copyright (C) 2002-2004
+- * Umbrello UML Modeller Authors <uml-devel@ uml.sf.net>
+- */
+-
+ /***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+@@ -10,6 +5,8 @@
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
++ * copyright (C) 2002-2006 *
++ * Umbrello UML Modeller Authors <uml-devel@ uml.sf.net> *
+ ***************************************************************************/
+
+
+@@ -93,6 +90,7 @@
+ QCheckBox * undoCB;
+ QCheckBox * tabdiagramsCB;
+ QCheckBox * newcodegenCB;
++ QCheckBox * angularLinesCB;
+ QCheckBox * autosaveCB;
+ QCheckBox * logoCB;
+ QCheckBox * tipCB;
+--- umbrello/umbrello/cppimport.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/cppimport.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -5,6 +5,8 @@
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
++ * copyright (C) 2005-2006 *
++ * Umbrello UML Modeller Authors <uml-devel@ uml.sf.net> *
+ ***************************************************************************/
+
+ // own header
+@@ -15,11 +17,8 @@
+ #include <kapplication.h>
+ #include <kmessagebox.h>
+ #include <kdebug.h>
+-#include <klocale.h>
+ // app includes
+ #include "import_utils.h"
+-#include "uml.h"
+-#include "umldoc.h"
+ #include "umlobject.h"
+ #include "docwindow.h"
+ #include "package.h"
+@@ -80,12 +79,10 @@
+ return;
+ }
+ CppTree2Uml modelFeeder( fileName );
+- UMLDoc *umldoc = UMLApp::app()->getDocument();
+- umldoc->writeToStatusBar(i18n("Importing file: %1").arg(fileName));
+ modelFeeder.parseTranslationUnit( ast );
+ }
+
+-void CppImport::importFiles(QStringList headerFileList) {
++void CppImport::initialize() {
+ // Reset the driver
+ ms_driver->reset();
+ // The driver shall attempt to parse included files.
+@@ -104,22 +101,12 @@
+
+ }
+ ms_seenFiles.clear();
+- UMLDoc *umldoc = UMLApp::app()->getDocument();
+- for (QStringList::Iterator fileIT = headerFileList.begin();
+- fileIT != headerFileList.end(); ++fileIT) {
+- QString fileName = (*fileIT);
+- umldoc->writeToStatusBar(i18n("Importing file: %1").arg(fileName));
++}
+
+- /// kapp->processEvents();
+- // Invoking kapp->processEvents() improves responsiveness when importing
+- // many large header files but slows down import because the list view is
+- // intermittently updated.
+-
+- if (ms_seenFiles.find(fileName) != ms_seenFiles.end())
+- continue;
+- ms_driver->parseFile( fileName );
+- feedTheModel(fileName);
+- }
+- umldoc->writeToStatusBar("Ready.");
++void CppImport::parseFile(QString fileName) {
++ if (ms_seenFiles.find(fileName) != ms_seenFiles.end())
++ return;
++ ms_driver->parseFile( fileName );
++ feedTheModel(fileName);
+ }
+
+--- umbrello/umbrello/aligntoolbar.h (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/aligntoolbar.h (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -15,10 +15,12 @@
+ #ifndef ALIGNTOOLBAR_H
+ #define ALIGNTOOLBAR_H
+
++#include <qpixmap.h>
+ #include <ktoolbar.h>
+ #include "umlnamespace.h"
+ #include "umlwidgetlist.h"
+
++class QMainWindow;
+
+ /**
+ * This toolbar provides tools for alignment. Widgets can only be aligned, when
+--- umbrello/umbrello/x-umbrello.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/x-umbrello.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -19,6 +19,7 @@
+ Comment[eu]=Umbrello UML modelatzaile fitxategia
+ Comment[fi]=Umbrello UML-mallinnustiedosto
+ Comment[fr]=Fichier du modeleur UML Umbrello
++Comment[ga]=Comhad le haghaidh an Mhúnlóra UML Umbrello
+ Comment[hi]=अमà¥à¤¬à¤°à¥ˆà¤²à¥‹ यूà¤à¤®à¤à¤² मॉडलर फ़ाइल
+ Comment[hu]=Umbrello UML-fájl
+ Comment[is]=Umbrello UML Modeller Skrá
+--- umbrello/umbrello/nativeimportbase.h (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/nativeimportbase.h (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -8,7 +8,7 @@
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+- * copyright (C) 2005 *
++ * copyright (C) 2005-2006 *
+ * Umbrello UML Modeller Authors <uml-devel@ uml.sf.net> *
+ ***************************************************************************/
+
+@@ -50,10 +50,11 @@
+ NativeImportBase(QString singleLineCommentIntro);
+ virtual ~NativeImportBase();
+
++protected:
+ /**
+ * Implement abstract operation from ClassImport.
+ */
+- void importFiles(QStringList files);
++ void initialize();
+
+ /**
+ * Import a single file.
+@@ -64,7 +65,6 @@
+ */
+ virtual void parseFile(QString filename);
+
+-protected:
+ /**
+ * Initialize auxiliary variables.
+ * This is called by the default implementation of parseFile()
+--- umbrello/umbrello/classimport.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/classimport.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -13,13 +13,31 @@
+ #include "classimport.h"
+ // qt/kde includes
+ #include <qregexp.h>
++#include <klocale.h>
+ // app includes
++#include "umldoc.h"
++#include "uml.h"
+ #include "idlimport.h"
+ #include "pythonimport.h"
+ #include "javaimport.h"
+ #include "adaimport.h"
+ #include "cppimport.h"
+
++void ClassImport::importFiles(QStringList fileList) {
++ initialize();
++ UMLDoc *umldoc = UMLApp::app()->getDocument();
++ uint processedFilesCount = 0;
++ for (QStringList::Iterator fileIT = fileList.begin();
++ fileIT != fileList.end(); ++fileIT) {
++ QString fileName = (*fileIT);
++ umldoc->writeToStatusBar(i18n("Importing file: %1 Progress: %2/%3").
++ arg(fileName).arg(processedFilesCount).arg(fileList.size()));
++ parseFile(fileName);
++ processedFilesCount++;
++ }
++ umldoc->writeToStatusBar(i18n("Ready."));
++}
++
+ ClassImport *ClassImport::createImporterByFileExt(QString filename) {
+ ClassImport *classImporter;
+ if (filename.endsWith(".idl"))
+--- umbrello/umbrello/optionstate.h (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/optionstate.h (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -45,6 +45,7 @@
+ bool undo;
+ bool tabdiagrams;
+ bool newcodegen;
++ bool angularlines;
+ bool autosave;
+ int time; //old autosave time, kept for compatibility
+ int autosavetime;
+--- umbrello/umbrello/umlview.cpp (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/umbrello/umlview.cpp (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -2158,6 +2158,9 @@
+ }
+ }
+ m_pDoc->setModified();
++ // go back to arrow tool
++ UMLApp::app()->getWorkToolBar()->setDefaultTool();
++ setCursor( KCursor::arrowCursor() );
+ } else {
+ KMessageBox::error(0, i18n("Incorrect use of associations."), i18n("Association Error"));
+ }
+--- umbrello/VERSION (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/VERSION (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -1 +1 @@
+-1.5.2
++1.5.3
+--- umbrello/ChangeLog (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/ChangeLog (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -1,3 +1,12 @@
++Version 1.5.3
++
++* Switch to arrow after object creation (http://bugs.debian.org/353344)
++* Bugs/wishes from http://bugs.kde.org:
++* Static variables in java code are not marked static (59190)
++* Save autosave file to a more obvious place (72019)
++* Usability and responsiveness improvements to code import (93296)
++* Memory problem when importing classes from c++ sources (122668)
++
+ Version 1.5.2
+
+ * fixed problem reordering methods in classes/interfaces
+@@ -24,7 +33,6 @@
+ * Crash when importing Python files (121952)
+ * "void" is imported as class and not datatypes (122184)
+ * Crash when creating a datatype with the same name as a class (122188)
+-* Memory problem when importing classes from c++ sources (122668)
+ * Crash when refusing to rename a class on importing typedef (122914)
+ * Java import fails at abstract methods or interfaces (123661)
+
+--- umbrello/THANKS (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ umbrello/THANKS (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -63,9 +63,10 @@
+ Jonathan Riddell <jr @jriddell.org>
+ Peeter Russak <pezz @tkwcy.ee>
+ Paulo Roberto Rodriguez Sehn <paulo.sehn @gmail.com>
+-Achim Spangler <Achim.Spangler @mnet-online.de>
++Daniel Calviño Sánchez <danxuliu @gmail.com>
+ Leo Savernik <l.savernik @aon.at>
+ Peter Soetens <peter.soetens @mech.kuleuven.ac.be>
++Achim Spangler <Achim.Spangler @mnet-online.de>
+ Sebastian Stein <seb.stein @gmx.de>
+ Andrew Sutton <asutton @cs.kent.edu>
+ Tanuj <tagrawal @hss.hns.com>
+--- scripts/kdesvn-build (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ scripts/kdesvn-build (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -3438,9 +3438,9 @@
+ # Also remove more than one colon.
+ for ($path, $libdir)
+ {
++ s/:+/:/;
+ s/^:*//;
+ s/:*$//;
+- s/:+/:/;
+ }
+
+ # Everyone loves unsermake. It's a pity that not every module will compile with it.
+--- scripts/create_svnignore (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ scripts/create_svnignore (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -33,7 +33,7 @@
+ addignore Makefile
+ addignore Makefile.in
+
+- bins=`perl -p -e 's/\\\s*\n/ /g' Makefile.am | grep _PROGRAMS | sed -e 's/.*=\s*//;s/#.*//;s/\$([^)]*)//'`
++ bins=`perl -p -e 's/\\\s*\n/ /g' Makefile.am | egrep '_PROGRAMS|_LTLIBRARIES|_LIBRARIES' | sed -e 's/.*=\s*//;s/#.*//;s/\$([^)]*)//'`
+ if test -n "$bins"; then
+ addignore ".libs"
+ addignore ".deps"
+@@ -46,6 +46,13 @@
+ fgrep -q .skel Makefile.am && addignore "*.kidl"
+ fgrep -q .skel Makefile.am && addignore "*_skel.c*"
+ fgrep -q .stub Makefile.am && addignore "*_stub.cpp"
++ if fgrep -q .ui Makefile.am; then
++ uis=`ls -1 *.ui 2>/dev/null`
++ for ui in $uis; do
++ addignore ${ui/.ui/.h}
++ addignore ${ui/.ui/.cpp}
++ done
++ fi
+
+ grep -q "^include.*/Doxyfile.am$" Makefile.am && addignore "Doxyfile"
+
+--- scripts/kde-devel-gdb (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ scripts/kde-devel-gdb (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -258,9 +258,15 @@
+ # Needs to be refined, i.e. figuring out the right void* pointers casts.
+ # Simon says: each Node contains the d pointer of the QString.
+ define printq4stringlist
+- set $list = $arg0
+- set $stringdata = QtPrivate::QStringList_join( &paths, "\n" ).d
+- printq4stringdata $stringdata
++ # This is ugly, but we need to avoid conflicts with printq4string's own vars...
++ set $q4sl_i = 0
++ set $q4sl_d = & $arg0
++ set $q4sl_sz = $q4sl_d->size()
++ while $q4sl_i < $q4sl_sz
++ output $q4sl_i
++ printf " "
++ printq4string $q4sl_d->at($q4sl_i++)
++ end
+ end
+ document printq4stringlist
+ Prints the contents of a Qt4 QStringList.
+--- kcachegrind/kcachegrind/kcachegrind.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kcachegrind/kcachegrind/kcachegrind.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -24,6 +24,7 @@
+ GenericName[eu]=Profilatzailearen interfazea
+ GenericName[fi]=Profiloijan käyttöliittymä
+ GenericName[fr]=Interface de profilage
++GenericName[ga]=Comhéadan ar PhróifÃleoir
+ GenericName[hi]=पà¥à¤°à¥‹à¤«à¤¼à¤¾à¤‡à¤²à¤° फà¥à¤°à¤¨à¥à¤Ÿà¤à¤£à¥à¤¡
+ GenericName[hu]=Profilozó
+ GenericName[is]=Myndrænt viðmót á afkastakönnuð
+--- cervisia/cervisia.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ cervisia/cervisia.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -16,6 +16,7 @@
+ GenericName[eu]=CVS interfazea
+ GenericName[fi]=Käyttöliittymä CVS:lle
+ GenericName[fr]=Interface graphique pour CVS
++GenericName[ga]=Comhéadan ar CVS
+ GenericName[he]=ממשק CVS
+ GenericName[hi]=सीवीà¤à¤¸ फà¥à¤°à¤¨à¥à¤Ÿà¤à¤£à¥à¤¡
+ GenericName[hr]=CVS suÄelje
+--- kfile-plugins/ts/kfile_ts.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kfile-plugins/ts/kfile_ts.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -15,6 +15,7 @@
+ Name[eu]=Qt Linguist fitxategi informazioa
+ Name[fi]=Qt Linquist tiedoston tiedot
+ Name[fr]=Fichier d'informations Qt Linguist
++Name[ga]=Eolas faoi Chomhad Qt Linguist
+ Name[hi]=कà¥à¤¯à¥‚टी लिंगà¥à¤µà¤¿à¤¸à¥à¤Ÿ फ़ाइल जानकारी
+ Name[hu]=Qt Linguist fájljellemzők
+ Name[is]=Qt Linguist skráarupplýsingar
+--- kfile-plugins/c++/kfile_cpp.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kfile-plugins/c++/kfile_cpp.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -18,6 +18,7 @@
+ Name[fi]=C++ tiedot
+ Name[fo]=C++-upplýsingar
+ Name[fr]=Informations C++
++Name[ga]=Eolas C++
+ Name[he]=מידע ++C
+ Name[hi]=C++ जानकारी
+ Name[hr]=C++ informacije
+--- kuiviewer/designerthumbnail.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kuiviewer/designerthumbnail.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -16,6 +16,7 @@
+ Name[eu]=Qt Designer fitxategiak
+ Name[fi]=Qt Designer -tiedostot
+ Name[fr]=Fichiers Qt Designer
++Name[ga]=Comhaid Qt Designer
+ Name[hi]=कà¥à¤¯à¥‚-टी डिजाइनर फ़ाइलें
+ Name[hu]=Qt Designer fájlok
+ Name[is]=Qt Designer skrár
+--- kioslave/svn/svnhelper/subversion.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kioslave/svn/svnhelper/subversion.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -56,6 +56,7 @@
+ Name[et]=Hoidlast kustutamine
+ Name[eu]=Ezabatu biltegitik
+ Name[fr]=Supprimer du référentiel
++Name[ga]=Scrios ón Stór
+ Name[he]=מחק ממ×גר
+ Name[hu]=Törlés az adattárból
+ Name[is]=Eyða frá geymslu
+@@ -217,6 +218,7 @@
+ Name[et]=Hoidla import
+ Name[eu]=Inportatu biltegia
+ Name[fr]=Importer dans un référentiel
++Name[ga]=Iompórtáil Stór
+ Name[hu]=Adattár importálása
+ Name[is]=Flytja inn geymslu
+ Name[it]=Importa deposito
+@@ -523,6 +525,7 @@
+ Name[et]=Paiga loomine...
+ Name[eu]=Sortu adabakia...
+ Name[fr]=Créer un correctif...
++Name[ga]=Cruthaigh Paiste...
+ Name[he]=צור טל××™...
+ Name[hu]=Folt készÃtése...
+ Name[is]=Búa til plástur...
+--- kioslave/svn/svnhelper/apply_patch.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kioslave/svn/svnhelper/apply_patch.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -49,6 +49,7 @@
+ Comment[et]=Paiga rakendamine teisele kataloogile/failile
+ Comment[eu]=Aplikatu adabakia beste karpeta/fitxategi bati
+ Comment[fr]=Appliquer le correctif sur un autre dossier / fichier
++Comment[ga]=Cuir an paiste i bhfeidhm ar fhillteán/chomhad eile
+ Comment[hu]=A folt alkalmazása másik könyvtárra vagy fájlra
+ Comment[is]=Virkja plásturinn á aðra möppu/skrá
+ Comment[it]=Applica la correzione a un'altra cartella o file
+--- kbugbuster/kbugbuster.desktop (.../tags/KDE/3.5.2/kdesdk) (revision 524399)
++++ kbugbuster/kbugbuster.desktop (.../branches/KDE/3.5/kdesdk) (revision 524399)
+@@ -23,6 +23,7 @@
+ GenericName[fi]=KDE Bugienhallinta
+ GenericName[fo]=KDE-villuhandfaring
+ GenericName[fr]=Outil de gestion de bogues pour KDE
++GenericName[ga]=Bainisteoireacht Fabhtanna KDE
+ GenericName[he]=× ×™×”×•×œ של ב××’×™× ×‘-KDE
+ GenericName[hi]=केडीई बग पà¥à¤°à¤¬à¤‚धक
+ GenericName[hr]=KDE upravljanje bugovima
More information about the pkg-kde-commits
mailing list