diff options
| author | Slávek Banko <[email protected]> | 2019-05-11 17:41:22 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2019-05-12 17:38:30 +0200 |
| commit | 518045aebbfa9cf4cd1f9f4b36d5003f2414795e (patch) | |
| tree | a4f0888ef3228dab49d298b0bd1f19e0001382dd /src | |
| parent | 87aa164bb841a8ffe4f418f14f861b16a6780003 (diff) | |
| download | kchmviewer-518045aebbfa9cf4cd1f9f4b36d5003f2414795e.tar.gz kchmviewer-518045aebbfa9cf4cd1f9f4b36d5003f2414795e.zip | |
Added controlled conversions to char* instead of automatic ascii conversions.
The definition of -UTQT_NO_ASCII_CAST is no longer needed.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit c0263d89c688f750a6e68a7f77257b2be0c55990)
Diffstat (limited to 'src')
| -rw-r--r-- | src/kchmmainwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp index 9778b1c..157b7d4 100644 --- a/src/kchmmainwindow.cpp +++ b/src/kchmmainwindow.cpp @@ -632,7 +632,7 @@ bool KCHMMainWindow::parseCmdLineArgs( ) search_index = args->getOption ("sindex"); if ( args->count() > 0 ) - filename = args->arg(0); + filename = TQString::fromLocal8Bit(args->arg(0)); #else // argv[0] in TQt is still a program name for ( int i = 1; i < tqApp->argc(); i++ ) @@ -651,13 +651,13 @@ bool KCHMMainWindow::parseCmdLineArgs( ) exit (1); } else - filename = tqApp->argv()[i]; + filename = TQSTring::fromLocal8Bit(tqApp->argv()[i]); } #endif if ( !filename.isEmpty() ) { - if ( !loadChmFile( TQString::fromLocal8Bit( filename )) ) + if ( !loadChmFile( filename ) ) return true; // skip the latest checks, but do not exit from the program if ( !search_index.isEmpty() ) @@ -667,7 +667,7 @@ bool KCHMMainWindow::parseCmdLineArgs( ) tqApp->postEvent( this, new KCHMUserEvent( "findInIndex", event_args ) ); } - if ( !search_query.isEmpty() ) + if ( !search_query.isEmpty() ) { TQStringList event_args; event_args.push_back( search_query ); |