[QGIS Commit] r11351 - trunk/qgis/src/core/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-08-12 03:43:37 -0400 (Wed, 12 Aug 2009)
New Revision: 11351

Modified:
   trunk/qgis/src/core/composer/qgscomposerlabel.cpp
Log:
Remove legacy code in composer label

Modified: trunk/qgis/src/core/composer/qgscomposerlabel.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerlabel.cpp	2009-08-12 07:35:38 UTC (rev 11350)
+++ trunk/qgis/src/core/composer/qgscomposerlabel.cpp	2009-08-12 07:43:37 UTC (rev 11351)
@@ -61,29 +61,6 @@
 void QgsComposerLabel::setText( const QString& text )
 {
   mText = text;
-
-#if 0
-  //replace '$CURRENT_DATE<(FORMAT)>' with the current date
-  //e.g. $CURRENT_DATE(d 'June' yyyy)
-  mText = text;
-  int currentDatePos = mText.indexOf( "$CURRENT_DATE" );
-  if ( currentDatePos != -1 )
-  {
-    //check if there is a bracket just after $CURRENT_DATE
-    QString formatText;
-    int openingBracketPos = mText.indexOf( "(", currentDatePos );
-    int closingBracketPos = mText.indexOf( ")", openingBracketPos + 1 );
-    if ( openingBracketPos != -1 && closingBracketPos != -1 && ( closingBracketPos - openingBracketPos ) > 1 )
-    {
-      formatText = mText.mid( openingBracketPos + 1, closingBracketPos - openingBracketPos - 1 );
-      mText.replace( currentDatePos, closingBracketPos - currentDatePos + 1, QDate::currentDate().toString( formatText ) );
-    }
-    else //no bracket
-    {
-      mText.replace( "$CURRENT_DATE", QDate::currentDate().toString() );
-    }
-  }
-#endif //0
 }
 
 QString QgsComposerLabel::displayText() const