Lima antinno

gbuild.sh

@@ -93,7 +93,7 @@ source_dir=$PWD
 if [[ $version = "rev" ]]; then
 release="$current_timestamp-$current_revision"
 else
-release="2"
+release="0"
 fi
 
 if [[ $parallel = "true" ]]; then

lima_annoqt/src/annoqt.cpp

@@ -405,7 +405,7 @@ bool Annoqt::saveFile( const QString &fileName )
 
 // std::cerr<<m_textEdit->document()->toHtml("utf-8").toUtf8().data() << std::endl;
 
-  foreach (SpecificEntity* entity, m_entities)
+  Q_FOREACH (SpecificEntity* entity, m_entities)
   {
     QString string = entity->string();
     QRegExp rxamp("&(?!amp;)");
@@ -463,7 +463,7 @@ Annoqt::~Annoqt()
 
 {
   qDebug() << "Annoqt::~Annoqt";
-  foreach (SpecificEntity* se, m_entities)
+  Q_FOREACH (SpecificEntity* se, m_entities)
   {
     delete se;
   }
@@ -801,7 +801,7 @@ void Annoqt::computeEntitiesMap()
 {
   qDebug() << "Annoqt::computeEntitiesMap";
   m_entitiesMap.clear();
-  foreach (SpecificEntity* entity, m_entities)
+  Q_FOREACH (SpecificEntity* entity, m_entities)
   {
     for (quint32 i = entity->position(); i < entity->position()+entity->length(); i++)
     {

lima_annoqt/src/kcolorbutton.cpp

@@ -106,7 +106,7 @@ void KColorButton::setColor( const QColor &c )
   if ( d->col != c ) {
     d->col = c;
     repaint();
-    emit changed( d->col );
+    Q_EMIT changed( d->col );
   }
 }
 

lima_annoqt/src/kcolorcollection.cpp

@@ -152,7 +152,7 @@ KColorCollection::save()
 
    str << "KDE RGB Palette\n";
    str << description << "\n";
-   foreach (const KColorCollectionPrivate::ColorNode &node, d->colorList)
+   Q_FOREACH (const KColorCollectionPrivate::ColorNode &node, d->colorList)
    {
        int r,g,b;
        node.color.getRgb(&r, &g, &b);

lima_annoqt/src/kcolorcombo.cpp

@@ -334,7 +334,7 @@ void KColorComboPrivate::_k_slotActivated(int index)
         internalcolor = colorList[index - 1];
     }
 
-    emit q->activated(internalcolor);
+    Q_EMIT q->activated(internalcolor);
 }
 
 void KColorComboPrivate::_k_slotHighlighted(int index)
@@ -347,7 +347,7 @@ void KColorComboPrivate::_k_slotHighlighted(int index)
         internalcolor = colorList[index - 1];
     }
 
-    emit q->highlighted(internalcolor);
+    Q_EMIT q->highlighted(internalcolor);
 }
 
 void KColorComboPrivate::addColors()

lima_annoqt/src/kcolordialog.cpp

@@ -383,7 +383,7 @@ void KColorCells::mouseReleaseEvent(QMouseEvent *e)
 
         d->inMouse = false;
         if (cell != -1)
-            emit colorSelected(cell , color(cell));
+            Q_EMIT colorSelected(cell , color(cell));
     }
 
     QTableWidget::mouseReleaseEvent(e);
@@ -394,7 +394,7 @@ void KColorCells::mouseDoubleClickEvent(QMouseEvent * /*e*/)
     int cell = positionToCell(d->mousePos);
 
     if (cell != -1)
-        emit colorDoubleClicked(cell , color(cell));
+        Q_EMIT colorDoubleClicked(cell , color(cell));
 }
 
 
@@ -455,7 +455,7 @@ void KColorPatch::dropEvent(QDropEvent *event)
     QColor c = KColorMimeData::fromMimeData(event->mimeData());
     if (c.isValid()) {
         setColor(c);
-        emit colorChanged(c);
+        Q_EMIT colorChanged(c);
     }
 }
 
@@ -625,12 +625,12 @@ KColorTable::KColorTablePrivate::slotShowNamedColorReadError(void)
 
 //
 // 2000-02-12 Espen Sand
-// Set the color in two steps. The setColors() slot will not emit a signal
+// Set the color in two steps. The setColors() slot will not Q_EMIT a signal
 // with the current color setting. The reason is that setColors() is used
 // by the color selector dialog on startup. In the color selector dialog
 // we normally want to display a startup color which we specify
 // when the dialog is started. The slotSetColors() slot below will
-// set the palette and then use the information to emit a signal with the
+// set the palette and then use the information to Q_EMIT a signal with the
 // new color setting. It is only used by the combobox widget.
 //
 void
@@ -729,22 +729,22 @@ KColorTable::KColorTablePrivate::slotColorCellSelected(int index , const QColor&
 {
     if (!mPalette || (index >= mPalette->count()))
         return;
-    emit q->colorSelected(mPalette->color(index), mPalette->name(index));
+    Q_EMIT q->colorSelected(mPalette->color(index), mPalette->name(index));
 }
 
 void
 KColorTable::KColorTablePrivate::slotColorCellDoubleClicked(int index , const QColor& /*color*/)
 {
     if (!mPalette || (index >= mPalette->count()))
         return;
-    emit q->colorDoubleClicked(mPalette->color(index), mPalette->name(index));
+    Q_EMIT q->colorDoubleClicked(mPalette->color(index), mPalette->name(index));
 }
 
 
 void
 KColorTable::KColorTablePrivate::slotColorTextSelected(const QString &colorText)
 {
-    emit q->colorSelected(m_namedColorMap[ colorText ], colorText);
+    Q_EMIT q->colorSelected(m_namedColorMap[ colorText ], colorText);
 }
 
 
@@ -1175,7 +1175,7 @@ void KColorDialog::KColorDialogPrivate::slotDefaultColorClicked()
     } else {
         showColor(selColor, QString());
     }
-    emit q->colorSelected(selColor);
+    Q_EMIT q->colorSelected(selColor);
 }
 
 void
@@ -1465,10 +1465,10 @@ void KColorDialog::KColorDialogPrivate::_setColor(const QColor &color, const QSt
 
     showColor(selColor, name);
 
-    emit q->colorSelected(selColor);
+    Q_EMIT q->colorSelected(selColor);
 }
 
-// show but don't set into selColor, nor emit colorSelected
+// show but don't set into selColor, nor Q_EMIT colorSelected
 void KColorDialog::KColorDialogPrivate::showColor(const QColor &color, const QString &name)
 {
     bRecursion = true;

lima_annoqt/src/kcolordialog.h

@@ -226,8 +226,8 @@ class KColorSpinBox : public QSpinBox
     virtual void valueChange()
     {
       updateDisplay();
-      emit valueChanged( value() );
-      emit valueChanged( currentValueText() );
+      Q_EMIT valueChanged( value() );
+      Q_EMIT valueChanged( currentValueText() );
 }*/
 
 };

lima_annoqt/src/kcolorvalueselector.cpp

@@ -108,7 +108,7 @@ void KColorValueSelector::setChooserMode( KColorChooserMode c )
     d->_mode = c;
 
     //really needed?
-    //emit modeChanged();
+    //Q_EMIT modeChanged();
 }
 
 KColorChooserMode KColorValueSelector::chooserMode () const

lima_annoqt/src/kxyselector.cpp

@@ -188,7 +188,7 @@ void KXYSelector::mouseMoveEvent( QMouseEvent *e )
   valuesFromPosition( e->pos().x() - w, e->pos().y() - w, xVal, yVal );
   setValues( xVal, yVal );
 
-  emit valueChanged( d->xPos, d->yPos );
+  Q_EMIT valueChanged( d->xPos, d->yPos );
 }
 
 void KXYSelector::wheelEvent( QWheelEvent *e )
@@ -198,7 +198,7 @@ void KXYSelector::wheelEvent( QWheelEvent *e )
   else
     setValues( xValue(), yValue() + e->delta()/120 );
 
-  emit valueChanged( d->xPos, d->yPos );
+  Q_EMIT valueChanged( d->xPos, d->yPos );
 }
 
 void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const

lima_annoqt/src/specificEntity.cpp

@@ -55,6 +55,6 @@ SpecificEntity& SpecificEntity::operator=(const SpecificEntity& se)
 void SpecificEntity::slotTriggered()
 {
   qDebug() << "SpecificEntity::slotTriggered";
-  emit triggered( this );
+  Q_EMIT triggered( this );
 }
 

lima_antinno/src/antinno.ResourcesIdent.h

@@ -0,0 +1,101 @@
+
+#ifndef ghdghscjenicfhermfuchhmfmaixfxdsqksdogq�jefqojxefoejkg
+#define ghdghscjenicfhermfuchhmfmaixfxdsqksdogq�jefqojxefoejkg
+
+/*
+Code copi� de AntResourcesIdent.h
+
+Sans doute � am�liorer
+
+FW 30/10/2013
+
+
+*/
+//
+// C++ Implementation : AntResourcesIdent
+//
+// Description: analyse les identifiants d'une ressource binaire Ant'inno
+//
+// Author: Jean-Yves Sage <[email protected]>, (C) 2010-2011
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+////////////////////////////////////////////////////////////
+#include <sstream>
+#include <time.h>
+#include <string>
+
+namespace antinno {
+
+//brief This class extracts identifiers from binary resources files
+
+class ResourcesIdent
+{
+public:
+  //------------------------------------------------------------------------------------------------------------------------------
+  //param header header in memory
+  //param headerSize header size (for check)
+  ResourcesIdent(const char *header, const ::std::size_t headerSize)
+    : _pHeader(header), _pHeaderSize(headerSize)
+  {
+  }
+  //------------------------------------------------------------------------------------------------------------------------------
+  //return string ready to display   */ 
+  ::std::string toHumanReadableString()
+  {
+	  unsigned char *currentPtr = (unsigned char*)_pHeader; 
+	  //UNSIGNED indispensable pour calculer les valeurs des entiers
+	  ::std::ostringstream resultoss;
+    //lit les noms d'identifiants
+    const ::std::size_t namesSize = _readInt4LE(currentPtr);
+    const ::std::string names = ::std::string((char*)currentPtr, namesSize);
+	  currentPtr += namesSize;
+    //lit les valeurs
+
+    const ::std::size_t valuesNb = _readInt4LE(currentPtr) / 4;
+    ::std::size_t ptrb = 0;
+    for (::std::size_t i=0; i<valuesNb; i++) {
+		if (ptrb == ::std::string::npos) {
+			resultoss<<"INVALIDFILE A"<<endl;
+			break;   //plus de valeurs que de noms
+		}
+    const ::std::size_t value = _readInt4LE(currentPtr);
+    ::std::size_t ptre = names.find(",", ptrb);
+    ::std::string oneName = names.substr(ptrb, ptre-ptrb);
+		oneName.resize(20, ' ');
+		resultoss<<oneName<<_asciiDate(value)<<"  ("<<value<<")"<<endl;
+        ptrb = ptre;
+        if (ptrb != ::std::string::npos) ptrb++;       //saute la virgule
+    }
+    if (ptrb != ::std::string::npos) resultoss<<"INVALIDFILE B"<<endl;   //plus de noms que de valeurs
+	  if ((char*)currentPtr != _pHeader + _pHeaderSize) resultoss<<"INVALIDFILE C"<<endl;
+	  return resultoss.str();
+  }
+  //------------------------------------------------------------------------------------------------------------------------------
+
+private:
+
+  //------------------------------------------------------------------------------------------------------------------------------
+  const char *_pHeader;
+  const ::std::size_t _pHeaderSize;
+  //------------------------------------------------------------------------------------------------------------------------------
+  ::std::size_t _readInt4LE(unsigned char*& ptr)
+  {
+	  //on n'utilise pas les ptr++ pour eviter les optimisations du compilateur
+	  const ::std::size_t value = ptr[0] + ptr[1]*0x100 + ptr[2]*0x10000 + ptr[3]*0x1000000;
+	  ptr +=4;
+    return value;
+  }
+  //------------------------------------------------------------------------------------------------------------------------------
+  ::std::string _asciiDate(const time_t date)
+  {
+      const ::std::string ascDate(ctime(&date));
+      const ::std::string::size_type nowStop = ascDate.rfind(' ');
+      return ascDate.substr(0,nowStop+5);
+  }
+  //------------------------------------------------------------------------------------------------------------------------------
+}; // end class
+
+} // end namespace
+
+#endif

lima_common/LIMACOMMONConfig-src.cmake

@@ -1,7 +1,7 @@
 # - Find LimaCommon
 
 set(LIMA_VERSION_MAJOR "2")
-set(LIMA_VERSION_MINOR "0")
+set(LIMA_VERSION_MINOR "1")
 set(LIMA_VERSION_RELEASE @LIMA_VERSION_RELEASE@)
 set(LIMA_VERSION "${LIMA_VERSION_MAJOR}.${LIMA_VERSION_MINOR}.${LIMA_VERSION_RELEASE}")
 

lima_common/conf/lima-common-fre.xml

@@ -180,6 +180,10 @@
         <item value="DetAdv"/><!-- for things like "les plus utilisés"-->
         <item value="PrepDetNum"/><!-- for things like "une femme active sur cinq est..."-->
         <item value="IncInc"/><!-- to link unknown works, typically from a foreign language-->
+        <item value="aux"/>
+        <item value="auxpass"/>
+        <item value="det"/>
+	<item value="acl"/>
       </list>
     </group>
     <group name="SyntacticAnalysis">

lima_common/src/common/AbstractFactoryPattern/AbstractFactoryPatternExport.h

@@ -32,7 +32,7 @@
 #define LIMA_ABSTRACTFACTORYPATTERNEXPORT_H
 
 
-#include <boost/strong_typedef.hpp>
+#include <boost/serialization/strong_typedef.hpp>
 
 #ifdef WIN32