1 files changed, 7 insertions, 7 deletions
diff --git a/kregexpeditor/userdefinedregexps.cpp b/kregexpeditor/userdefinedregexps.cpp
index 85dc96e..d1c63ee 100644
--- a/kregexpeditor/userdefinedregexps.cpp
+++ b/kregexpeditor/userdefinedregexps.cpp
@@ -32,7 +32,7 @@
 #include <tqdir.h>
 #include "widgetfactory.h"
 #include "compoundregexp.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 UserDefinedRegExps::UserDefinedRegExps( TQWidget *parent, const char *name )
@@ -68,7 +68,7 @@ void UserDefinedRegExps::slotPopulateUserRegexps()
 
 #ifdef TQT_ONLY
   TQStringList dirs;
-  dirs << TQString::tqfromLatin1( "predefined" );
+  dirs << TQString::fromLatin1( "predefined" );
 #else
   TQStringList dirs = KGlobal::dirs()->findDirs( "data", TQString::fromLocal8Bit("kregexpeditor/predefined/") );
 #endif
@@ -88,7 +88,7 @@ void UserDefinedRegExps::slotPopulateUserRegexps()
 void UserDefinedRegExps::createItems( const TQString& _title, const TQString& dir, bool usersRegExp )
 {
   TQString title = _title;
-  if (_title == TQString::tqfromLatin1("general"))
+  if (_title == TQString::fromLatin1("general"))
 	  title = i18n("General");
 
   TQListViewItem* lvItem = new TQListViewItem( _userDefined, title );
@@ -101,7 +101,7 @@ void UserDefinedRegExps::createItems( const TQString& _title, const TQString& di
 
     TQFile file( fileName );
     if ( ! file.open(IO_ReadOnly) ) {
-      KMessageBox::sorry( this, i18n("Could not open file for reading: %1").tqarg(fileName) );
+      KMessageBox::sorry( this, i18n("Could not open file for reading: %1").arg(fileName) );
       continue;
     }
 
@@ -111,7 +111,7 @@ void UserDefinedRegExps::createItems( const TQString& _title, const TQString& di
 
     RegExp* regexp = WidgetFactory::createRegExp( data );
     if ( ! regexp ) {
-      KMessageBox::sorry( this, i18n("File %1 containing user defined regular expression contained an error").tqarg( fileName ) );
+      KMessageBox::sorry( this, i18n("File %1 containing user defined regular expression contained an error").arg( fileName ) );
       continue;
     }
 
@@ -200,7 +200,7 @@ void UserDefinedRegExps::slotEdit( TQListViewItem* item, const TQPoint& pos )
       TQString fileName = WidgetWinItem::path() + TQString::fromLocal8Bit("/") + txt + TQString::fromLocal8Bit(".regexp");
       TQFileInfo finfo( fileName );
       if ( finfo.exists() ) {
-        int answer = KMessageBox::warningYesNo( this, i18n("<p>Overwrite named regular expression <b>%1</b>?</p>").tqarg(txt), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") );
+        int answer = KMessageBox::warningYesNo( this, i18n("<p>Overwrite named regular expression <b>%1</b>?</p>").arg(txt), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") );
         if ( answer != KMessageBox::Yes )
           return;
 
@@ -256,7 +256,7 @@ void WidgetWinItem::setName( const TQString& nm )
 TQString WidgetWinItem::path()
 {
 #ifdef TQT_ONLY
-    return TQString::tqfromLatin1( "predefined" );
+    return TQString::fromLatin1( "predefined" );
 #else
   return locateLocal("data", TQString::fromLocal8Bit("KRegExpEditor/"));
 #endif