txtl10n: cleanup / remove all -QQ and quiet parts

9 files changed, 14 insertions, 79 deletions

diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 923da89988b6..843d1a6de3d2 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -58,7 +58,7 @@ private:
                     const ByteString &rPrj ,
                     const ByteString &rRoot , const ByteString &sActFileName , const ByteString &sID );
 public:
-    LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat, bool bQuiet_in );
+    LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat );
     ~LngParser();
 
     BOOL CreateSDF( const ByteString &rSDFFile, const ByteString &rPrj, const ByteString &rRoot );
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index d1b076d493b9..3fc3aa5b965c 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -177,7 +177,6 @@ main( int argc, char* argv[])
 		fprintf( stdout, " FileIn:   Source files (*.src)\n" );
 		fprintf( stdout, " FileOut:  Destination file (*.*)\n" );
 		fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" );
-		fprintf( stdout, " -QQ: quiet output\n" );
         fprintf( stdout, " -e: Disable writing errorlog\n" );
 		fprintf( stdout, " -b: Break when Token \"HelpText\" found in source\n" );
 		fprintf( stdout, " -u: [english] and [german] are allowed, Id is Taken from DataBase \n" );
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 3e421d2d1046..e8feee1fe3c8 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -59,7 +59,6 @@ BOOL bMergeMode;
 BOOL bErrorLog;
 BOOL bForce;
 BOOL bUTF8;
-bool bQuiet;
 ByteString sPrj;
 ByteString sPrjRoot;
 ByteString sInputFileName;
@@ -83,7 +82,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     bErrorLog       = TRUE;
     bForce          = FALSE;
     bUTF8           = TRUE;
-    bQuiet          = false;
     sPrj            = "";
     sPrjRoot        = "";
     sInputFileName  = "";
@@ -128,9 +126,6 @@ extern char *GetOutputFile( int argc, char* argv[])
             nState = STATE_FORCE;
             bForce = TRUE;
         }
-        else if ( sSwitch == "-QQ" ) {
-            bQuiet = true;
-        }
         else if ( sSwitch == "-L" ) {
             nState = STATE_LANGUAGES;
         }
@@ -184,10 +179,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     // command line is not valid
     return NULL;
 }
-int isQuiet(){
-    if( bQuiet )    return 1;
-    else            return 0;
-}
 /*****************************************************************************/
 int InitCfgExport( char *pOutput , char* pFilename )
 /*****************************************************************************/
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 589c962c112c..d6c7a9533309 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -62,7 +62,6 @@ BOOL bErrorLog;
 BOOL bBreakWhenHelpText;
 BOOL bUnmerge;
 BOOL bUTF8;
-bool bQuiet;
 ByteString sPrj;
 ByteString sPrjRoot;
 ByteString sActFileName;
@@ -98,7 +97,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     Export::sForcedLanguages = "";
     sTempFile = "";
     pTempFile = NULL;
-    bQuiet = false;
     USHORT nState = STATE_NON;
     BOOL bInput = FALSE;
 
@@ -115,9 +113,6 @@ extern char *GetOutputFile( int argc, char* argv[])
         else if (sSwitch == "-p"  || sSwitch == "-P" ) {
             nState = STATE_PRJ; // next token specifies the cur. project
         }
-        else if (sSwitch == "-qq"  || sSwitch == "-QQ" ) {
-            bQuiet = true;
-        }
 
         else if (sSwitch == "-r"  || sSwitch == "-R" ) {
             nState = STATE_ROOT; // next token specifies path to project root
@@ -196,12 +191,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     return NULL;
 }
 /*****************************************************************************/
-int isQuiet(){
-/*****************************************************************************/
-   if( bQuiet ) return 1;
-   else         return 0;
-}
-/*****************************************************************************/
 int InitExport( char *pOutput , char* pFilename )
 /*****************************************************************************/
 {
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index 49a59266a85d..15239db5d9bd 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -61,7 +61,6 @@ ByteString sOutputFile;
 ByteString sOutputFileX;
 ByteString sOutputFileY;
 ByteString sSDFFile;
-bool bQuiet;
 
 /*****************************************************************************/
 BOOL ParseCommandLine( int argc, char* argv[])
@@ -73,7 +72,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
     bUTF8 = TRUE;
     sPrj = "";
     sPrjRoot = "";
-    bQuiet = false;
     Export::sLanguages = "";
     Export::sForcedLanguages = "";
 
@@ -111,9 +109,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
             nState = STATE_ERRORLOG;
             bErrorLog = FALSE;
         }
-        else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-QQ" ) {
-            bQuiet = true;
-        }
         else if ( ByteString( argv[ i ]).ToUpperAscii() == "-UTF8" ) {
             nState = STATE_UTF8;
             bUTF8 = TRUE;
@@ -188,13 +183,12 @@ BOOL ParseCommandLine( int argc, char* argv[])
 void Help()
 /*****************************************************************************/
 {
-    fprintf( stdout, "Syntax: HELPEX[-p Prj][-r PrjRoot]-i FileIn ( -o FileOut | -x path -y relfile )[-m DataBase][-e][-b][-u][-L l1,l2,...][-QQ] -LF l1,l2 \n" );
+    fprintf( stdout, "Syntax: HELPEX[-p Prj][-r PrjRoot]-i FileIn ( -o FileOut | -x path -y relfile )[-m DataBase][-e][-b][-u][-L l1,l2,...] -LF l1,l2 \n" );
     fprintf( stdout, " Prj:      Project\n" );
     fprintf( stdout, " PrjRoot:  Path to project root (..\\.. etc.)\n" );
     fprintf( stdout, " FileIn:   Source file (*.lng)\n" );
     fprintf( stdout, " FileOut:  Destination file (*.*)\n" );
     fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" );
-    fprintf( stdout, " -QQ: quiet output\n" );
     fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (en-US,fr,de...)\n" );
     fprintf( stdout, "     A fallback language can be defined like this: l1=f1.\n" );
     fprintf( stdout, "     f1, f2,... are also elements of (en-US,fr,de...)\n" );
diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx
index 27136dc8797f..4ec069a810f5 100644
--- a/l10ntools/source/lngex.cxx
+++ b/l10ntools/source/lngex.cxx
@@ -53,7 +53,6 @@ BOOL bMergeMode;
 BOOL bErrorLog;
 BOOL bUTF8;
 BOOL bULF; // ULF = Unicode Language File
-bool bQuiet;
 ByteString sPrj;
 ByteString sPrjRoot;
 ByteString sOutputFile;
@@ -68,7 +67,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
     bErrorLog = TRUE;
     bUTF8 = TRUE;
     bULF = FALSE;
-    bQuiet = false;
     sPrj = "";
     sPrjRoot = "";
     Export::sLanguages = "";
@@ -92,9 +90,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
         else if ( sSwitch == "-R" ) {
             nState = STATE_ROOT; // next token specifies path to project root
         }
-        else if ( sSwitch == "-QQ" ) {
-            bQuiet = true;
-        }
         else if ( sSwitch == "-M" ) {
             nState = STATE_MERGESRC; // next token specifies the merge database
         }
@@ -176,9 +171,6 @@ void Help()
     fprintf( stdout, " FileIn:   Source file (*.lng)\n" );
     fprintf( stdout, " FileOut:  Destination file (*.*)\n" );
     fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" );
-    fprintf( stdout, " -QQ: quite output\n" );
-    //fprintf( stdout, " -NOUTF8: disable UTF8 as language independent encoding\n" );
-    //fprintf( stdout, " -ULF: enables Unicode Language File format, leads to UTF8 encoded version of lng files" );
     fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (de,en-US...)\n" );
     fprintf( stdout, "     A fallback language can be defined like this: l1=f1.\n" );
     fprintf( stdout, "     f1, f2,... are also elements of (de,en-US...)\n" );
@@ -202,7 +194,7 @@ int _cdecl main( int argc, char *argv[] )
         fflush( stdout );
 
     if ( sOutputFile.Len()) {
-        LngParser aParser( sInputFile, bUTF8, bULF , bQuiet );
+        LngParser aParser( sInputFile, bUTF8, bULF );
         if ( bMergeMode )
             aParser.Merge( sMergeSrc, sOutputFile , sPrj );
         else
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 5f40a4346f53..f0093bbccea7 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -38,15 +38,14 @@ using namespace std;
 // class LngParser
 //
 /*****************************************************************************/
-LngParser::LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat , bool bQuiet_in )
+LngParser::LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat )
 /*****************************************************************************/
                 :
                 nError( LNG_OK ),
                 pLines( NULL ),
                 sSource( rLngFile ),
                 bDBIsUTF8( bUTF8 ),
-                bULF( bULFFormat ),
-                bQuiet( bQuiet_in )
+                bULF( bULFFormat )
 {
     pLines = new LngLineList( 100, 100 );
     DirEntry aEntry( String( sSource, RTL_TEXTENCODING_ASCII_US ));
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 853dcc97dc3e..bbc27dc229e7 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -134,7 +134,6 @@ private:
     ByteString sLanguageRestriction;
 
     ByteString sOutputFile;
-    bool bQuiet2;
 
     int nFileCnt;
 
@@ -167,7 +166,7 @@ private:
     );
 
 public:
-    SourceTreeLocalizer( const ByteString &rRoot, const ByteString &rVersion , bool bLocal , bool bQuiet2_in , bool skip_links );
+    SourceTreeLocalizer( const ByteString &rRoot, const ByteString &rVersion , bool bLocal , bool skip_links );
     ~SourceTreeLocalizer();
 
     ByteString getSourceLanguages( ByteString sLanguageRestriction , ByteString sCommand );
@@ -183,11 +182,10 @@ public:
 
 /*****************************************************************************/
 SourceTreeLocalizer::SourceTreeLocalizer(
-    const ByteString &rRoot, const ByteString &rVersion, bool bLocal_in , bool bQuiet2_in , bool skip_links )
+    const ByteString &rRoot, const ByteString &rVersion, bool bLocal_in , bool skip_links )
 /*****************************************************************************/
                 : SourceTreeIterator( rRoot, rVersion , bLocal_in ),
                 nMode( LOCALIZE_NONE ),
-                bQuiet2( bQuiet2_in ),
                 nFileCnt( 0 )
 {
         bSkipLinks  = skip_links ;
@@ -323,9 +321,6 @@ void SourceTreeLocalizer::WorkOnFile(
         sCommand += getSourceLanguages( sLanguageRestriction , sCommand );
         }
 
-        if( bQuiet2 ){
-                //sCommand +=" -QQ ";
-            }
             //printf("DBG: %s\n",sCommand.GetBuffer());
             if (system(sCommand.GetBuffer()) == -1)
                 fprintf(stderr, "%s failed\n", sCommand.GetBuffer());
@@ -485,7 +480,6 @@ void SourceTreeLocalizer::OnExecuteDirectory( const rtl::OUString &aDirectory )
 {
     ByteString rDirectory( rtl::OUStringToOString( aDirectory , RTL_TEXTENCODING_UTF8 , aDirectory.getLength() ) ) ;
     if ( nMode == LOCALIZE_NONE ){
-        if( !bQuiet2 ) fprintf( stdout, "%s\n", rDirectory.GetBuffer());
     }
     else
         WorkOnDirectory( rDirectory );
@@ -541,7 +535,6 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
     ByteString sFile( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
 
     ByteString sBCur( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
-    if( !bQuiet2 ) fprintf( stdout, "##### %s #####\n", sBCur.GetBuffer());
 
     ULONG nIndex = 0;
     ByteString sExtension( aEntry.GetExtension(), RTL_TEXTENCODING_ASCII_US );
@@ -589,9 +582,6 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
             sCommand += " -l ";
             sCommand += sLanguageRestriction;
         }
-        if( bQuiet2 ){
-            sCommand +=" -QQ ";
-        }
 
         DirEntry aPath( aEntry.GetPath());
         DirEntry aOldCWD;
@@ -601,7 +591,6 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
             fprintf(stderr, "%s failed\n", sCommand.GetBuffer());
         nFileCnt++;
         printf(".");
-        //if( bQuiet2 ){ printf("."); }
         SvFileStream aInStream( aOut.GetFull(), STREAM_READ );
         if ( !aInStream.IsOpen()) {
             fprintf( stderr,
@@ -792,12 +781,11 @@ void Help()
     fprintf( stdout,
         "As part of the L10N framework, localize extracts and merges translations\n"
         "out of and into the whole source tree.\n\n"
-        "Syntax: localize -e -l en-US -f FileName [-QQ]\n"
+        "Syntax: localize -e -l en-US -f FileName \n"
         "Parameter:\n"
         "\t-e: Extract mode\n"
         "\tFileName: Output file when extract mode, input file when merge mode\n"
         "\tl1...ln: supported languages (\"all\" for all languages).\n"
-        "\tQQ: quiet output)"
     );
 
     fprintf( stdout,
@@ -840,15 +828,12 @@ int _cdecl main( int argc, char *argv[] )
 
     BOOL bExport    = FALSE;
     BOOL bMerge     = FALSE;
-    bool bQuiet     = false;
-    bool bQuiet2    = false;
     bool bSkipLinks = false;
 
     ByteString sLanguages;
     ByteString sFileName;
     ByteString sOutput;
 
-    bQuiet2 = true;
     bExport = TRUE;
 
     for( int i = 1; i < argc; i++ ) {
@@ -861,17 +846,12 @@ int _cdecl main( int argc, char *argv[] )
                 return Error();
             bExport = TRUE;
         }
-        else if( sSwitch.Equals( "-Q" )) {
-            bQuiet = true;
-        }
         else if ( sSwitch.Equals( "-I" ) )
             nState = STATE_ISOCODE;
         else if ( sSwitch.Equals( "-L" ) )
             nState = STATE_LANGUAGES;
         else if ( sSwitch.Equals( "-F" ) )
             nState = STATE_FILENAME;
-        else if ( sSwitch.Equals( "-QQ" ))
-            bQuiet2 = true;
         else if ( ByteString( argv[ i ]).ToUpperAscii().Equals( "-O" ) )
             nState = STATE_OUTPUT;
         else {
@@ -954,10 +934,10 @@ int _cdecl main( int argc, char *argv[] )
         else
             curRepository = string( Export::GetEnv("SOURCE_ROOT_DIR") ) + "/" + *iter;
         cout << "Localizing repository " << curRepository << "\n";
-        SourceTreeLocalizer aIter( ByteString( curRepository.c_str() ) , sVersion , (sOutput.Len() > 0) , bQuiet2 , bSkipLinks );
+        SourceTreeLocalizer aIter( ByteString( curRepository.c_str() ) , sVersion , (sOutput.Len() > 0) , bSkipLinks );
         aIter.SetLanguageRestriction( sLanguages );
         if ( bExport ){
-            if( bQuiet2 ){ /*printf("");*/fflush( stdout );}
+            fflush( stdout );
             if( *iter == "ooo" )
                 aIter.Extract( sFileName );
             else
@@ -967,7 +947,7 @@ int _cdecl main( int argc, char *argv[] )
                 sFileNameWithExt += ByteString( (*iter).c_str() );
                 aIter.Extract( sFileNameWithExt );
             }
-            if( bQuiet2 ){ printf("\n%d files found!\n",aIter.GetFileCnt());}
+            printf("\n%d files found!\n",aIter.GetFileCnt());
         }
     }
     if( hasPwd )
@@ -975,12 +955,12 @@ int _cdecl main( int argc, char *argv[] )
         string pwd;
         Export::getCurrentDir( pwd );
         cout << "Localizing repository " << pwd << "\n";
-        SourceTreeLocalizer aIter( ByteString( pwd.c_str() ) , sVersion , (sOutput.Len() > 0) , bQuiet2 , bSkipLinks );
+        SourceTreeLocalizer aIter( ByteString( pwd.c_str() ) , sVersion , (sOutput.Len() > 0) , bSkipLinks );
         aIter.SetLanguageRestriction( sLanguages );
         if ( bExport ){
-            if( bQuiet2 ){ /*printf("");*/fflush( stdout );}
+            fflush( stdout );
             aIter.Extract( sFileName );
-            if( bQuiet2 ){ printf("\n%d files found!\n",aIter.GetFileCnt());}
+            printf("\n%d files found!\n",aIter.GetFileCnt());
         }
 
     }
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index dc3d2fe6a283..fa7fdb4b4376 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -61,7 +61,6 @@ BOOL bEnableExport;
 BOOL bMergeMode;
 BOOL bErrorLog;
 BOOL bUTF8;
-bool bQuiet;
 ByteString sPrj;
 ByteString sPrjRoot;
 ByteString sInputFileName;
@@ -87,7 +86,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     sInputFileName = "";
     sActFileName = "";
     Export::sLanguages = "";
-    bQuiet = false;
     USHORT nState = STATE_NON;
     BOOL bInput = FALSE;
 
@@ -108,9 +106,6 @@ extern char *GetOutputFile( int argc, char* argv[])
         else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-M" ) {
             nState = STATE_MERGESRC; // next token specifies the merge database
         }
-        else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-QQ" ) {
-            bQuiet = true;
-        }
         else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-E" ) {
             nState = STATE_ERRORLOG;
             bErrorLog = FALSE;
@@ -199,10 +194,6 @@ int InitXrmExport( char *pOutput , char* pFilename)
     return 1;
 }
 
-int isQuiet(){
-    if( bQuiet )    return 1;
-    else            return 0;
-}
 /*****************************************************************************/
 int EndXrmExport()
 /*****************************************************************************/