diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:57:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:57:20 -0600 |
| commit | c6611272c2bc4a42580848946c8c5d81bb0409c7 (patch) | |
| tree | 0fd5b58844663dfcd00fb2b79cf67dd0fd429c62 /src/kvilib/ext | |
| parent | 805c2821ceaddada48b346c6d11bd0dc1351a539 (diff) | |
| download | kvirc-c6611272c2bc4a42580848946c8c5d81bb0409c7.tar.gz kvirc-c6611272c2bc4a42580848946c8c5d81bb0409c7.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 805c2821ceaddada48b346c6d11bd0dc1351a539.
Diffstat (limited to 'src/kvilib/ext')
| -rw-r--r-- | src/kvilib/ext/kvi_osinfo.cpp | 6 | ||||
| -rw-r--r-- | src/kvilib/ext/kvi_stringconversion.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/kvilib/ext/kvi_osinfo.cpp b/src/kvilib/ext/kvi_osinfo.cpp index f2f39d29..9d443c0b 100644 --- a/src/kvilib/ext/kvi_osinfo.cpp +++ b/src/kvilib/ext/kvi_osinfo.cpp @@ -350,17 +350,17 @@ static TQString queryWinInfo( QueryInfo info) TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Hotfix\\Q246009"), 0, KEY_TQUERY_VALUE, &hKey ); if( lRet == ERROR_SUCCESS ) - szVersion+= TQString("Service Pack 6a (Build %1)").arg( osvi.dwBuildNumber & 0xFFFF ); + szVersion+= TQString("Service Pack 6a (Build %1)").tqarg( osvi.dwBuildNumber & 0xFFFF ); else // Windows NT 4.0 prior to SP6a { - szVersion+= TQString( "%1 (Build %2)").arg( osvi.szCSDVersion).arg( osvi.dwBuildNumber & 0xFFFF); + szVersion+= TQString( "%1 (Build %2)").tqarg( osvi.szCSDVersion).tqarg( osvi.dwBuildNumber & 0xFFFF); } RegCloseKey( hKey ); } else // not Windows NT 4.0 { - szVersion+= TQString( "%1 (Build %2)").arg( osvi.szCSDVersion).arg( osvi.dwBuildNumber & 0xFFFF); + szVersion+= TQString( "%1 (Build %2)").tqarg( osvi.szCSDVersion).tqarg( osvi.dwBuildNumber & 0xFFFF); } break; diff --git a/src/kvilib/ext/kvi_stringconversion.cpp b/src/kvilib/ext/kvi_stringconversion.cpp index f316fc2a..2836628c 100644 --- a/src/kvilib/ext/kvi_stringconversion.cpp +++ b/src/kvilib/ext/kvi_stringconversion.cpp @@ -234,17 +234,17 @@ namespace KviStringConversion bool fromString(const TQString & szValue,TQFont &buffer) { KviStr str = szValue; - KviStr family,pointSize,styleHint,weight,options; + KviStr family,pointSize,tqstyleHint,weight,options; str.getToken(family,','); str.getToken(pointSize,','); - str.getToken(styleHint,','); + str.getToken(tqstyleHint,','); str.getToken(weight,','); if(!family.isEmpty())buffer.setFamily(family.ptr()); int i; bool bOk; i = pointSize.toInt(&bOk); if(bOk && (i > 0))buffer.setPointSize(i); - i = styleHint.toInt(&bOk); + i = tqstyleHint.toInt(&bOk); if(bOk && (i >= 0))buffer.setStyleHint((TQFont::StyleHint)i); i = weight.toInt(&bOk); if(bOk && (i >= 0))buffer.setWeight(i); |