diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
| commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
| tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kode/kodemain.cpp | |
| parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
| download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip | |
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kode/kodemain.cpp')
| -rw-r--r-- | kode/kodemain.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index 5d01cefa6..dcc073edc 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -140,7 +140,7 @@ int addProperty( KCmdLineArgs *args ) TQFile headerFile( headerFileName ); if ( !headerFile.open( IO_ReadOnly ) ) { - std::cerr << "Unable to open file '" << headerFileName.utf8() << "'" << + std::cerr << "Unable to open file '" << headerFileName.utf8().data() << "'" << std::endl; return 1; } @@ -185,7 +185,7 @@ int addProperty( KCmdLineArgs *args ) { TQRegExp re( "(\\w+)\\s*\\(" ); if ( re.search( line ) >= 0 ) { - TQString function = re.cap( 1 ).lower(); + TQString function = TQString(re.cap( 1 )).lower(); if ( !function.isEmpty() ) { kdDebug() << "Function: " << function << endl; if ( function == className || function == "~" + className ) { @@ -269,8 +269,8 @@ int addProperty( KCmdLineArgs *args ) TQString headerFileNameOut = headerFileName + ".kodeorig" ; KProcess proc; - proc << "cp" << TQFile::encodeName( headerFileName ) << - TQFile::encodeName( headerFileNameOut ); + proc << "cp" << TQFile::encodeName( headerFileName ).data() << + TQFile::encodeName( headerFileNameOut ).data(); if ( !proc.start( KProcess::Block ) ) { kdError() << "Copy failed" << endl; @@ -285,7 +285,7 @@ int addProperty( KCmdLineArgs *args ) o << out << endl; } } else { - std::cout << out.utf8() << std::endl; + std::cout << out.utf8().data() << std::endl; } return 0; @@ -313,7 +313,7 @@ int codify( KCmdLineArgs *args ) line.tqreplace( "\"", "\\\"" ); line = "code += \"" + line; line.append( "\";" ); - std::cout << line.local8Bit() << std::endl; + std::cout << line.local8Bit().data() << std::endl; } } |