The unified diff between revisions [b890c13a..] and [4771a171..] is displayed below. It can also be downloaded as a raw diff.

#
#
# patch "src/cmdline.cpp"
#  from [204fc1b0dbe2201e921c074dcf2fd9a4ab8e4217]
#    to [45ca3e402ec4353f07077eec9eb6c0d0136d6171]
#
============================================================
--- src/cmdline.cpp	204fc1b0dbe2201e921c074dcf2fd9a4ab8e4217
+++ src/cmdline.cpp	45ca3e402ec4353f07077eec9eb6c0d0136d6171
@@ -482,25 +482,25 @@ bool XxCmdline::parseCommandLine( const
          } break;

          case 'D': {
-            QTextStream oss( _cmdlineResources, IO_WriteOnly | IO_Append );
+            QTextStream oss( &_cmdlineResources, IO_WriteOnly | IO_Append );
             oss << XxResParser::getBoolOptName( BOOL_EXIT_ON_SAME )
                 << ": true" << endl;
          } break;

          case 'E': {
-            QTextStream oss( _cmdlineResources, IO_WriteOnly | IO_Append );
+            QTextStream oss( &_cmdlineResources, IO_WriteOnly | IO_Append );
             oss << XxResParser::getBoolOptName( BOOL_EXIT_IF_NO_CONFLICTS )
                 << ": true" << endl;
          } break;

          case 'X': {
-            QTextStream oss( _cmdlineResources, IO_WriteOnly | IO_Append );
+            QTextStream oss( &_cmdlineResources, IO_WriteOnly | IO_Append );
             oss << XxResParser::getBoolOptName( BOOL_EXIT_WITH_MERGE_STATUS )
                 << ": true" << endl;
          } break;

          case 'm': {
-            QTextStream oss( _cmdlineResources, IO_WriteOnly | IO_Append );
+            QTextStream oss( &_cmdlineResources, IO_WriteOnly | IO_Append );
             oss << XxResParser::getBoolOptName( BOOL_SELECT_MERGE )
                 << ": true" << endl;
          } break;
@@ -552,7 +552,7 @@ bool XxCmdline::parseCommandLine( const
             break;

          case 'R': {
-            QTextStream oss( _cmdlineResources, IO_WriteOnly | IO_Append );
+            QTextStream oss( &_cmdlineResources, IO_WriteOnly | IO_Append );
             oss << optarg << endl << flush;
          } break;

@@ -569,7 +569,7 @@ bool XxCmdline::parseCommandLine( const
          } break;

          case 'c': {
-            QTextStream oss( _cmdlineResources, IO_WriteOnly | IO_Append );
+            QTextStream oss( &_cmdlineResources, IO_WriteOnly | IO_Append );
             oss << XxResParser::getShowOptName( SHOW_PANE_MERGED_VIEW )
                 << ": true" << endl;
          } break;
@@ -611,7 +611,7 @@ bool XxCmdline::parseCommandLine( const
             break;

          case 'r': {
-            QTextStream oss( _cmdlineResources, IO_WriteOnly | IO_Append );
+            QTextStream oss( &_cmdlineResources, IO_WriteOnly | IO_Append );
             oss << XxResParser::getBoolOptName( BOOL_DIRDIFF_RECURSIVE )
                 << ": true" << endl;
          } break;
@@ -691,7 +691,7 @@ bool XxCmdline::parseCommandLine( const
                                    "Missing argument for text font." );
             }

-            QTextStream oss( _cmdlineResources, IO_WriteOnly | IO_Append );
+            QTextStream oss( &_cmdlineResources, IO_WriteOnly | IO_Append );
             oss << XxResParser::getKwdName( FONT_TEXT )
                 << ": \"" << optarg << "\"" << endl;
          } break;