summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kbabel/common/poinfo.cpp4
-rw-r--r--kbabel/filters/gettext/gettextimport.cpp1
-rw-r--r--kspy/propsview.cpp5
3 files changed, 2 insertions, 8 deletions
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index 535292db..17d930d9 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -305,7 +305,7 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem)
TQString value=(*it).mid(res+1);
// "Chop" the \n at the end
if (value.endsWith("\\n"))
- value.remove(value.length()-2,2); // ### TQt4: use value.chop(2)
+ value.remove(value.length()-2,2);
value=value.simplifyWhiteSpace();
kdDebug(KBABEL) << "Header key: " << key << " value: " << value << endl;
if (key=="Project-Id-Version")
@@ -335,7 +335,7 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem)
TQString line=(*it);
if(line.right(2)=="\\n")
- line.remove(line.length()-2,2); // ### TQt4: use value.chop(2)
+ line.remove(line.length()-2,2);
if(!info.others.isEmpty())
info.others+='\n';
diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp
index cf44b248..fb59fb4b 100644
--- a/kbabel/filters/gettext/gettextimport.cpp
+++ b/kbabel/filters/gettext/gettextimport.cpp
@@ -406,7 +406,6 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream)
//kdDebug() << "Parsing line: " << line << endl;
- // ### TQt4: no need of a such a check
if(line.isNull()) // file end
break;
else if ( line.startsWith( "<<<<<<<" ) || line.startsWith( "=======" ) || line.startsWith( ">>>>>>>" ) )
diff --git a/kspy/propsview.cpp b/kspy/propsview.cpp
index 2b625c6a..12beae7b 100644
--- a/kspy/propsview.cpp
+++ b/kspy/propsview.cpp
@@ -114,13 +114,8 @@ void PropsView::buildList( TQObject *o )
case TQVariant::Int:
val.setNum( v.toInt() );
if (mp->isEnumType()) {
-#ifdef USE_QT4
-// TQMetaObject * metaObject = *(mp->meta); // FIXME
- val = TQString("%1::%2").arg("QT4_CANNOT_FIND_TQMETAOBJECT_FOR_TQMETAPROPERTY").arg(mp->valueToKey(val.toInt())); // FIXME
-#else // USE_QT4
TQMetaObject * metaObject = *(mp->meta);
val = TQString("%1::%2").arg(metaObject->className()).arg(mp->valueToKey(val.toInt()));
-#endif // USE_QT4
}
break;
case TQVariant::Point: