summaryrefslogtreecommitdiffstats
path: root/src/kvilib/ext/kvi_stringconversion.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:20 -0600
commitc6611272c2bc4a42580848946c8c5d81bb0409c7 (patch)
tree0fd5b58844663dfcd00fb2b79cf67dd0fd429c62 /src/kvilib/ext/kvi_stringconversion.cpp
parent805c2821ceaddada48b346c6d11bd0dc1351a539 (diff)
downloadkvirc-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/kvi_stringconversion.cpp')
-rw-r--r--src/kvilib/ext/kvi_stringconversion.cpp6
1 files changed, 3 insertions, 3 deletions
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);