1 files changed, 8 insertions, 8 deletions

diff --git a/kvoctrain/kvoctrain/kvt-core/langset.cpp b/kvoctrain/kvoctrain/kvt-core/langset.cpp
index 633e6f59..a9ed5dcb 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/langset.cpp
@@ -82,7 +82,7 @@ TQString LangSet::shortId (int index) const
   if (index >= 0 && index < (int) langs.size() )
     return langs[index].shortId;
 
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -91,7 +91,7 @@ TQString LangSet::shortId2 (int index) const
   if (index >= 0 && index < (int) langs.size() )
     return langs[index].shortId2;
 
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -100,7 +100,7 @@ TQString LangSet::longId (int index) const
   if (index >= 0 && index < (int) langs.size() )
     return langs[index].longId;
 
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -117,7 +117,7 @@ TQString LangSet::keyboardLayout (int index) const
     return langs[index].keyboardLayout;
   }
   else {
-    return TQString::null;
+    return TQString();
   }
 }
 
@@ -131,7 +131,7 @@ TQString LangSet::findShortId (const TQString &_longId) const
     if (_longId == langs[i].longId)
       return langs[i].shortId;
 
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -145,7 +145,7 @@ TQString LangSet::findLongId (const TQString &_shortId) const
         || _shortId == langs[i].shortId2)
       return langs[i].longId;
 
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -212,9 +212,9 @@ void LangSet::setPixMapFile (const TQString & s, int index)
     langs[index].PixMapFile = s;
 }
 
-void LangSet::setKeyboardLayout(const TQString& layout, int index)
+void LangSet::setKeyboardLayout(const TQString& tqlayout, int index)
 {
   if (index < (int) langs.size()) {
-    langs[index].keyboardLayout = layout;
+    langs[index].keyboardLayout = tqlayout;
   }
 }