Browse Source

Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 8 years ago
parent
commit
8155225c9b
100 changed files with 786 additions and 786 deletions
  1. 7
    7
      drkonqi/backtrace.cpp
  2. 1
    1
      drkonqi/backtrace.h
  3. 8
    8
      drkonqi/debugger.cpp
  4. 1
    1
      drkonqi/debugger.h
  5. 12
    12
      drkonqi/krashconf.cpp
  6. 6
    6
      drkonqi/toplevel.cpp
  7. 5
    5
      kappfinder/common.cpp
  8. 11
    11
      kappfinder/toplevel.cpp
  9. 5
    5
      kate/app/kateapp.cpp
  10. 3
    3
      kate/app/kateconfigdialog.cpp
  11. 1
    1
      kate/app/kateconfigplugindialogpage.cpp
  12. 1
    1
      kate/app/kateconfigplugindialogpage.h
  13. 5
    5
      kate/app/kateconsole.cpp
  14. 1
    1
      kate/app/kateconsole.h
  15. 5
    5
      kate/app/katedocmanager.cpp
  16. 1
    1
      kate/app/katedocmanager.h
  17. 4
    4
      kate/app/katedocmanageriface.cpp
  18. 14
    14
      kate/app/kateexternaltools.cpp
  19. 12
    12
      kate/app/katefilelist.cpp
  20. 1
    1
      kate/app/katefilelist.h
  21. 11
    11
      kate/app/katefileselector.cpp
  22. 2
    2
      kate/app/katefileselector.h
  23. 22
    22
      kate/app/kategrepdialog.cpp
  24. 1
    1
      kate/app/kategrepdialog.h
  25. 3
    3
      kate/app/katemailfilesdialog.cpp
  26. 27
    27
      kate/app/katemainwindow.cpp
  27. 1
    1
      kate/app/katemainwindowiface.cpp
  28. 9
    9
      kate/app/katemdi.cpp
  29. 3
    3
      kate/app/katemdi.h
  30. 1
    1
      kate/app/katemwmodonhddialog.cpp
  31. 1
    1
      kate/app/katepluginmanager.h
  32. 1
    1
      kate/app/katesession.cpp
  33. 1
    1
      kate/app/katesession.h
  34. 9
    9
      kate/app/katetabwidget.cpp
  35. 11
    11
      kate/app/kateviewmanager.cpp
  36. 1
    1
      kate/app/kateviewmanager.h
  37. 11
    11
      kate/app/kateviewspace.cpp
  38. 1
    1
      kate/app/kateviewspace.h
  39. 25
    25
      kate/app/kateviewspacecontainer.cpp
  40. 1
    1
      kate/app/kateviewspacecontainer.h
  41. 1
    1
      kate/app/kbookmarkhandler.cpp
  42. 17
    17
      kate/app/kwritemain.cpp
  43. 1
    1
      kate/interfaces/application.h
  44. 1
    1
      kate/interfaces/documentmanager.h
  45. 1
    1
      kate/interfaces/mainwindow.h
  46. 1
    1
      kate/interfaces/plugin.cpp
  47. 1
    1
      kate/interfaces/plugin.h
  48. 1
    1
      kate/interfaces/pluginconfiginterface.cpp
  49. 1
    1
      kate/interfaces/pluginconfiginterfaceextension.cpp
  50. 1
    1
      kate/interfaces/pluginconfiginterfaceextension.h
  51. 1
    1
      kate/interfaces/pluginmanager.h
  52. 3
    3
      kate/interfaces/toolviewmanager.cpp
  53. 1
    1
      kate/interfaces/toolviewmanager.h
  54. 1
    1
      kate/interfaces/viewmanager.h
  55. 1
    1
      kate/utils/dockviewbase.cpp
  56. 6
    6
      kcminit/main.cpp
  57. 1
    1
      kcontrol/access/kaccess.cpp
  58. 1
    1
      kcontrol/access/kaccess.h
  59. 11
    11
      kcontrol/access/kcmaccess.cpp
  60. 15
    15
      kcontrol/accessibility/accessibilityconfigwidget.ui
  61. 14
    14
      kcontrol/arts/arts.cpp
  62. 20
    20
      kcontrol/arts/generaltab.ui
  63. 25
    25
      kcontrol/arts/hardwaretab.ui
  64. 7
    7
      kcontrol/arts/krichtextlabel.cpp
  65. 2
    2
      kcontrol/arts/krichtextlabel.h
  66. 4
    4
      kcontrol/background/bgadvanced.cpp
  67. 23
    23
      kcontrol/background/bgadvanced_ui.ui
  68. 21
    21
      kcontrol/background/bgdialog.cpp
  69. 39
    39
      kcontrol/background/bgdialog_ui.ui
  70. 2
    2
      kcontrol/background/bghash.h
  71. 4
    4
      kcontrol/background/bgmonitor.cpp
  72. 3
    3
      kcontrol/background/bgmonitor.h
  73. 24
    24
      kcontrol/background/bgrender.cpp
  74. 15
    15
      kcontrol/background/bgsettings.cpp
  75. 1
    1
      kcontrol/background/bgwallpaper.h
  76. 14
    14
      kcontrol/background/bgwallpaper_ui.ui
  77. 1
    1
      kcontrol/background/main.cpp
  78. 11
    11
      kcontrol/clock/dtime.cpp
  79. 13
    13
      kcontrol/clock/dtime.h
  80. 2
    2
      kcontrol/clock/tzone.cpp
  81. 1
    1
      kcontrol/clock/tzone.h
  82. 6
    6
      kcontrol/colors/colorscm.cpp
  83. 15
    15
      kcontrol/colors/widgetcanvas.cpp
  84. 1
    1
      kcontrol/colors/widgetcanvas.h
  85. 10
    10
      kcontrol/componentchooser/browserconfig_ui.ui
  86. 16
    16
      kcontrol/componentchooser/componentchooser.cpp
  87. 6
    6
      kcontrol/componentchooser/componentchooser_ui.ui
  88. 4
    4
      kcontrol/componentchooser/componentconfig_ui.ui
  89. 12
    12
      kcontrol/componentchooser/emailclientconfig_ui.ui
  90. 10
    10
      kcontrol/componentchooser/terminalemulatorconfig_ui.ui
  91. 31
    31
      kcontrol/crypto/certgen.ui
  92. 60
    60
      kcontrol/crypto/crypto.cpp
  93. 5
    5
      kcontrol/crypto/crypto.h
  94. 1
    1
      kcontrol/crypto/kdatetimedlg.cpp
  95. 12
    12
      kcontrol/css/cssconfig.ui
  96. 29
    29
      kcontrol/css/csscustom.ui
  97. 2
    2
      kcontrol/css/kcmcss.cpp
  98. 4
    4
      kcontrol/css/preview.ui
  99. 3
    3
      kcontrol/css/template.cpp
  100. 0
    0
      kcontrol/display/display.cpp

+ 7
- 7
drkonqi/backtrace.cpp View File

@@ -71,7 +71,7 @@ void BackTrace::start()
71 71
   TQString exec = m_krashconf->tryExec();
72 72
   if ( !exec.isEmpty() && KStandardDirs::findExe(exec).isEmpty() )
73 73
   {
74
-    TQObject * o = parent();
74
+    TQObject * o = tqparent();
75 75
 
76 76
     if (o && !o->inherits("QWidget"))
77 77
     {
@@ -137,7 +137,7 @@ bool BackTrace::usefulBacktrace()
137 137
 {
138 138
   // remove crap
139 139
   if( !m_krashconf->removeFromBacktraceRegExp().isEmpty())
140
-    m_strBt.replace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null);
140
+    m_strBt.tqreplace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString());
141 141
 
142 142
   if( m_krashconf->disableChecks())
143 143
       return true;
@@ -146,16 +146,16 @@ bool BackTrace::usefulBacktrace()
146 146
   // how many " ?? " in the bt ?
147 147
   int unknown = 0;
148 148
   if( !m_krashconf->invalidStackFrameRegExp().isEmpty())
149
-    unknown = strBt.contains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
149
+    unknown = strBt.tqcontains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
150 150
   // how many stack frames in the bt ?
151 151
   int frames = 0;
152 152
   if( !m_krashconf->frameRegExp().isEmpty())
153
-    frames = strBt.contains( TQRegExp( m_krashconf->frameRegExp()));
153
+    frames = strBt.tqcontains( TQRegExp( m_krashconf->frameRegExp()));
154 154
   else
155
-    frames = strBt.contains('\n');
155
+    frames = strBt.tqcontains('\n');
156 156
   bool tooShort = false;
157 157
   if( !m_krashconf->neededInValidBacktraceRegExp().isEmpty())
158
-    tooShort = ( strBt.find( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 );
158
+    tooShort = ( strBt.tqfind( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 );
159 159
   return !m_strBt.isNull() && !tooShort && (unknown < frames);
160 160
 }
161 161
 
@@ -175,7 +175,7 @@ void BackTrace::processBacktrace()
175 175
         --len;
176 176
         }
177 177
       m_strBt.remove( pos, len );
178
-      m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" ));
178
+      m_strBt.insert( pos, TQString::tqfromLatin1( "[KCrash handler]\n" ));
179 179
       }
180 180
     }
181 181
 }

+ 1
- 1
drkonqi/backtrace.h View File

@@ -34,7 +34,7 @@ class KTempFile;
34 34
 
35 35
 #include <tqobject.h>
36 36
 
37
-class BackTrace : public QObject
37
+class BackTrace : public TQObject
38 38
 {
39 39
   Q_OBJECT
40 40
 

+ 8
- 8
drkonqi/debugger.cpp View File

@@ -54,15 +54,15 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
54 54
   vbox->setAutoAdd(TRUE);
55 55
 
56 56
   m_backtrace = new KTextBrowser(this);
57
-  m_backtrace->setTextFormat(Qt::PlainText);
57
+  m_backtrace->setTextFormat(TQt::PlainText);
58 58
   m_backtrace->setFont(KGlobalSettings::fixedFont());
59 59
 
60 60
   TQWidget *w = new TQWidget( this );
61 61
   ( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true );
62 62
   m_status = new TQLabel( w );
63
-  m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
63
+  m_status->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
64 64
   //m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
65
-  KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) );
65
+  KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "editcopy" ) );
66 66
   m_copyButton = new KPushButton( item, w );
67 67
   connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) );
68 68
   m_copyButton->setEnabled( false );
@@ -109,9 +109,9 @@ void KrashDebugger :: slotSave()
109 109
   }
110 110
   else
111 111
   {
112
-    TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" );
113
-    if( defname.contains( '/' ))
114
-        defname = defname.mid( defname.findRev( '/' ) + 1 );
112
+    TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" );
113
+    if( defname.tqcontains( '/' ))
114
+        defname = defname.mid( defname.tqfindRev( '/' ) + 1 );
115 115
     TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename"));
116 116
     if (!filename.isEmpty())
117 117
     {
@@ -193,7 +193,7 @@ void KrashDebugger :: startDebugger()
193 193
   }
194 194
   m_status->setText(i18n("Loading symbols..."));
195 195
 
196
-  m_proctrace = new BackTrace(m_krashconf, this);
196
+  m_proctrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
197 197
 
198 198
   connect(m_proctrace, TQT_SIGNAL(append(const TQString &)),
199 199
           TQT_SLOT(slotAppend(const TQString &)));
@@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger()
208 208
 bool KrashDebugger::performChecks( TQString* msg )
209 209
 {
210 210
   bool ret = true;
211
-  KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
211
+  KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true );
212 212
   kdedcfg.setGroup( "General" );
213 213
   if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
214 214
   {

+ 1
- 1
drkonqi/debugger.h View File

@@ -36,7 +36,7 @@ class BackTrace;
36 36
 
37 37
 #include <tqwidget.h>
38 38
 
39
-class KrashDebugger : public QWidget
39
+class KrashDebugger : public TQWidget
40 40
 {
41 41
   Q_OBJECT
42 42
 

+ 12
- 12
drkonqi/krashconf.cpp View File

@@ -93,12 +93,12 @@ void KrashConfig :: readConfig()
93 93
 
94 94
   // maybe we should check if it's relative?
95 95
   TQString configname = config->readEntry("ConfigName",
96
-                                         TQString::fromLatin1("enduser"));
96
+                                         TQString::tqfromLatin1("enduser"));
97 97
 
98 98
   TQString debuggername = config->readEntry("Debugger",
99
-                                           TQString::fromLatin1("gdb"));
99
+                                           TQString::tqfromLatin1("gdb"));
100 100
 
101
-  KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
101
+  KConfig debuggers(TQString::tqfromLatin1("debuggers/%1rc").arg(debuggername),
102 102
                     true, false, "appdata");
103 103
 
104 104
   debuggers.setGroup("General");
@@ -112,7 +112,7 @@ void KrashConfig :: readConfig()
112 112
   m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
113 113
   m_kcrashRegExp = debuggers.readEntry("KCrashRegExp");
114 114
 
115
-  KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
115
+  KConfig preset(TQString::tqfromLatin1("presets/%1rc").arg(configname),
116 116
                  true, false, "appdata");
117 117
 
118 118
   preset.setGroup("ErrorDescription");
@@ -138,7 +138,7 @@ void KrashConfig :: readConfig()
138 138
   TQString str = TQString::number(m_signalnum);
139 139
   // use group unknown if signal not found
140 140
   if (!preset.hasGroup(str))
141
-    str = TQString::fromLatin1("unknown");
141
+    str = TQString::tqfromLatin1("unknown");
142 142
   preset.setGroup(str);
143 143
   m_signalName = preset.readEntry("Name");
144 144
   if (b)
@@ -149,13 +149,13 @@ void KrashConfig :: readConfig()
149 149
 void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const
150 150
 {
151 151
   TQMap<TQString,TQString> map;
152
-  map[TQString::fromLatin1("appname")] = TQString::fromLatin1(appName());
153
-  map[TQString::fromLatin1("execname")] = startedByKdeinit() ? TQString::fromLatin1("kdeinit") : m_execname;
154
-  map[TQString::fromLatin1("signum")] = TQString::number(signalNumber());
155
-  map[TQString::fromLatin1("signame")] = signalName();
156
-  map[TQString::fromLatin1("progname")] = programName();
157
-  map[TQString::fromLatin1("pid")] = TQString::number(pid());
158
-  map[TQString::fromLatin1("tempfile")] = tempFile;
152
+  map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName());
153
+  map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("kdeinit") : m_execname;
154
+  map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber());
155
+  map[TQString::tqfromLatin1("signame")] = signalName();
156
+  map[TQString::tqfromLatin1("progname")] = programName();
157
+  map[TQString::tqfromLatin1("pid")] = TQString::number(pid());
158
+  map[TQString::tqfromLatin1("tempfile")] = tempFile;
159 159
   if (shell)
160 160
     str = KMacroExpander::expandMacrosShellQuote( str, map );
161 161
   else

+ 6
- 6
drkonqi/toplevel.cpp View File

@@ -67,12 +67,12 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name)
67 67
   // picture of konqi
68 68
   TQLabel *lab = new TQLabel(page);
69 69
   lab->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
70
-  TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png")));
70
+  TQPixmap pix(locate("appdata", TQString::tqfromLatin1("pics/konqi.png")));
71 71
   lab->setPixmap(pix);
72
-  lab->setFixedSize( lab->sizeHint() );
72
+  lab->setFixedSize( lab->tqsizeHint() );
73 73
 
74 74
   TQLabel * info = new TQLabel(generateText(), page);
75
-  info->setMinimumSize(info->sizeHint());
75
+  info->setMinimumSize(info->tqsizeHint());
76 76
 
77 77
   if (m_krashconf->showBacktrace())
78 78
   {
@@ -151,10 +151,10 @@ void Toplevel :: slotUser1()
151 151
   m_bugreport = new DrKBugReport(0, true, m_krashconf->aboutData());
152 152
 
153 153
   if (i == KMessageBox::Yes) {
154
-    TQApplication::setOverrideCursor ( waitCursor );
154
+    TQApplication::setOverrideCursor ( tqwaitCursor );
155 155
 
156 156
     // generate the backtrace
157
-    BackTrace *backtrace = new BackTrace(m_krashconf, this);
157
+    BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
158 158
     connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotBacktraceSomeError()));
159 159
     connect(backtrace, TQT_SIGNAL(done(const TQString &)),
160 160
             TQT_SLOT(slotBacktraceDone(const TQString &)));
@@ -196,7 +196,7 @@ void Toplevel :: slotUser3()
196 196
 void Toplevel :: slotBacktraceDone(const TQString &str)
197 197
 {
198 198
   // Do not translate.. This will be included in the _MAIL_.
199
-  TQString buf = TQString::fromLatin1
199
+  TQString buf = TQString::tqfromLatin1
200 200
     ("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str;
201 201
 
202 202
   m_bugreport->setText(buf);

+ 5
- 5
kappfinder/common.cpp View File

@@ -61,13 +61,13 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
61 61
 
62 62
   // find out the name of the file to store
63 63
   destName = templ;
64
-  int pos = templ.find( "kappfinder/apps/" );
64
+  int pos = templ.tqfind( "kappfinder/apps/" );
65 65
   if ( pos > 0 )
66 66
     destName = destName.mid( pos + strlen( "kappfinder/apps/" ) );
67 67
 
68 68
   // calculate real dir and filename
69 69
   destName = destDir + destName;
70
-  pos = destName.findRev( '/' );
70
+  pos = destName.tqfindRev( '/' );
71 71
   if ( pos > 0 ) {
72 72
     destDir = destName.left( pos );
73 73
     destName = destName.mid( pos + 1 );
@@ -77,7 +77,7 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
77 77
   TQString exec = desktop.readPathEntry( "TryExec" );
78 78
   if ( exec.isEmpty() )
79 79
     exec = desktop.readPathEntry( "Exec" );
80
-  pos = exec.find( ' ' );
80
+  pos = exec.tqfind( ' ' );
81 81
   if ( pos > 0 )
82 82
     exec = exec.left( pos );
83 83
 
@@ -117,7 +117,7 @@ void createDesktopFiles( TQPtrList<AppLnkCache> &appCache, int &added )
117 117
       destDir += "/";
118 118
       TQDir d;
119 119
       int pos = -1;
120
-      while ( ( pos = destDir.find( '/', pos + 1 ) ) >= 0 ) {
120
+      while ( ( pos = destDir.tqfind( '/', pos + 1 ) ) >= 0 ) {
121 121
         TQString path = destDir.left( pos + 1 );
122 122
         d = path;
123 123
         if ( !d.exists() )
@@ -144,7 +144,7 @@ void decorateDirs( TQString destDir )
144 144
   for ( it = dirs.begin(); it != dirs.end(); ++it ) {
145 145
     // find out the name of the file to store
146 146
     TQString destName = *it;
147
-    int pos = destName.find( "kappfinder/apps/" );
147
+    int pos = destName.tqfind( "kappfinder/apps/" );
148 148
     if ( pos > 0 )
149 149
       destName = destName.mid( pos + strlen( "kappfinder/apps/" ) );
150 150
 

+ 11
- 11
kappfinder/toplevel.cpp View File

@@ -54,7 +54,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
54 54
                                     "applications on your system and adds "
55 55
                                     "them to the KDE menu system. "
56 56
                                     "Click 'Scan' to begin, select the desired applications and then click 'Apply'."), this);
57
-  label->setAlignment( AlignAuto | WordBreak );
57
+  label->tqsetAlignment( AlignAuto | WordBreak );
58 58
   layout->addWidget( label );
59 59
 
60 60
   layout->addSpacing( 5 );
@@ -77,18 +77,18 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
77 77
   layout->addWidget( mSummary );
78 78
 
79 79
   KButtonBox* bbox = new KButtonBox( this );
80
-  mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), this, TQT_SLOT( slotScan() ) );
80
+  mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), TQT_TQOBJECT(this), TQT_SLOT( slotScan() ) );
81 81
   bbox->addStretch( 5 );
82
-  mSelectButton = bbox->addButton( i18n( "Select All" ), this,
82
+  mSelectButton = bbox->addButton( i18n( "Select All" ), TQT_TQOBJECT(this),
83 83
                                    TQT_SLOT( slotSelectAll() ) );
84 84
   mSelectButton->setEnabled( false );
85
-  mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), this,
85
+  mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this),
86 86
                                      TQT_SLOT( slotUnselectAll() ) );
87 87
   mUnSelectButton->setEnabled( false );
88 88
   bbox->addStretch( 5 );
89
-  mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQT_SLOT( slotCreate() ) );
89
+  mApplyButton = bbox->addButton( KStdGuiItem::apply(), TQT_TQOBJECT(this), TQT_SLOT( slotCreate() ) );
90 90
   mApplyButton->setEnabled( false );
91
-  bbox->addButton( KStdGuiItem::close(), kapp, TQT_SLOT( quit() ) );
91
+  bbox->addButton( KStdGuiItem::close(), TQT_TQOBJECT(kapp), TQT_SLOT( quit() ) );
92 92
   bbox->layout();
93 93
 
94 94
   layout->addWidget( bbox );
@@ -100,7 +100,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
100 100
   adjustSize();
101 101
 
102 102
   mDestDir = destDir;
103
-  mDestDir = mDestDir.replace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
103
+  mDestDir = mDestDir.tqreplace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
104 104
 	
105 105
   KStartupInfo::appStarted();
106 106
 
@@ -183,9 +183,9 @@ void TopLevel::slotScan()
183 183
     mProgress->setProgress( mProgress->progress() + 1 );
184 184
 
185 185
     TQString desktopName = *it;
186
-    int i = desktopName.findRev('/');
186
+    int i = desktopName.tqfindRev('/');
187 187
     desktopName = desktopName.mid(i+1);
188
-    i = desktopName.findRev('.');
188
+    i = desktopName.tqfindRev('.');
189 189
     if (i != -1)
190 190
        desktopName = desktopName.left(i);
191 191
 
@@ -207,9 +207,9 @@ void TopLevel::slotScan()
207 207
     // copy over the desktop file, if exists
208 208
     if ( scanDesktopFile( mAppCache, *it, mDestDir ) ) {
209 209
       TQString relPath = *it;
210
-      int pos = relPath.find( "kappfinder/apps/" );
210
+      int pos = relPath.tqfind( "kappfinder/apps/" );
211 211
       relPath = relPath.mid( pos + strlen( "kappfinder/apps/" ) );
212
-      relPath = relPath.left( relPath.findRev( '/' ) + 1 );
212
+      relPath = relPath.left( relPath.tqfindRev( '/' ) + 1 );
213 213
       TQStringList dirList = TQStringList::split( '/', relPath );
214 214
 
215 215
       TQListViewItem *dirItem = 0;

+ 5
- 5
kate/app/kateapp.cpp View File

@@ -69,19 +69,19 @@ KateApp::KateApp (KCmdLineArgs *args)
69 69
   m_application = new Kate::Application (this);
70 70
 
71 71
   // doc + project man
72
-  m_docManager = new KateDocManager (this);
72
+  m_docManager = new KateDocManager (TQT_TQOBJECT(this));
73 73
 
74 74
   // init all normal plugins
75
-  m_pluginManager = new KatePluginManager (this);
75
+  m_pluginManager = new KatePluginManager (TQT_TQOBJECT(this));
76 76
 
77 77
   // session manager up
78
-  m_sessionManager = new KateSessionManager (this);
78
+  m_sessionManager = new KateSessionManager (TQT_TQOBJECT(this));
79 79
 
80 80
   // application dcop interface
81 81
   m_obj = new KateAppDCOPIface (this);
82 82
 
83 83
   kdDebug()<<"Setting KATE_PID: '"<<getpid()<<"'"<<endl;
84
-  ::setenv( "KATE_PID", TQString("%1").arg(getpid()).latin1(), 1 );
84
+  ::setenv( "KATE_PID", TQString(TQString("%1").arg(getpid())).latin1(), 1 );
85 85
 
86 86
   // handle restore different
87 87
   if (isRestored())
@@ -375,7 +375,7 @@ KateMainWindow *KateApp::activeMainWindow ()
375 375
   if (m_mainWindows.isEmpty())
376 376
     return 0;
377 377
 
378
-  int n = m_mainWindows.findIndex ((KateMainWindow *)activeWindow());
378
+  int n = m_mainWindows.tqfindIndex ((KateMainWindow *)activeWindow());
379 379
 
380 380
   if (n < 0)
381 381
     n=0;

+ 3
- 3
kate/app/kateconfigdialog.cpp View File

@@ -261,7 +261,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
261 261
   /*TQVBox **/page=addVBoxPage(path,i18n("Plugin Manager"),
262 262
                           BarIcon("connect_established",KIcon::SizeSmall));
263 263
   KateConfigPluginPage *configPluginPage = new KateConfigPluginPage(page, this);
264
-  connect( configPluginPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
264
+  connect( configPluginPage, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotChanged() ) );
265 265
 
266 266
   // Tools->External Tools menu
267 267
   path.clear();
@@ -269,7 +269,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
269 269
   page = addVBoxPage( path, i18n("External Tools"),
270 270
       BarIcon("configure", KIcon::SizeSmall) );
271 271
   configExternalToolsPage = new KateExternalToolsConfigWidget(page, "external tools config page");
272
-  connect( configExternalToolsPage, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) );
272
+  connect( configExternalToolsPage, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotChanged()) );
273 273
 
274 274
   // editor widgets from kwrite/kwdialog
275 275
   path.clear();
@@ -334,7 +334,7 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin)
334 334
   {
335 335
     if  ( pluginPages.at(i)->plugin == plugin )
336 336
     {
337
-      TQWidget *w = pluginPages.at(i)->page->parentWidget();
337
+      TQWidget *w = pluginPages.at(i)->page->tqparentWidget();
338 338
       delete pluginPages.at(i)->page;
339 339
       delete w;
340 340
       pluginPages.remove(pluginPages.at(i));

+ 1
- 1
kate/app/kateconfigplugindialogpage.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <kiconloader.h>
34 34
 #include <tqwhatsthis.h>
35 35
 
36
-class KatePluginListItem : public QCheckListItem
36
+class KatePluginListItem : public TQCheckListItem
37 37
 {
38 38
   public:
39 39
     KatePluginListItem(bool checked, KatePluginInfo *info, TQListView *parent);

+ 1
- 1
kate/app/kateconfigplugindialogpage.h View File

@@ -45,7 +45,7 @@ class KatePluginListView : public KListView
45 45
     void stateChanged(KatePluginListItem *, bool);
46 46
 };
47 47
 
48
-class KateConfigPluginPage: public QVBox
48
+class KateConfigPluginPage: public TQVBox
49 49
 {
50 50
   Q_OBJECT
51 51
 

+ 5
- 5
kate/app/kateconsole.cpp View File

@@ -57,14 +57,14 @@ void KateConsole::loadConsoleIfNeeded()
57 57
 {
58 58
   if (m_part) return;
59 59
 
60
-  if (!topLevelWidget() || !parentWidget()) return;
61
-  if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return;
60
+  if (!tqtopLevelWidget() || !tqparentWidget()) return;
61
+  if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return;
62 62
 
63 63
   KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
64 64
 
65 65
   if (!factory) return;
66 66
 
67
-  m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,"libkonsolepart", "KParts::ReadOnlyPart"));
67
+  m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this),"libkonsolepart", "KParts::ReadOnlyPart"));
68 68
 
69 69
   if (!m_part) return;
70 70
 
@@ -86,7 +86,7 @@ void KateConsole::slotDestroyed ()
86 86
   m_part = 0;
87 87
 
88 88
   // hide the dockwidget
89
-  if (parentWidget())
89
+  if (tqparentWidget())
90 90
   {
91 91
     m_mw->hideToolView (m_toolView);
92 92
     m_mw->centralWidget()->setFocus ();
@@ -115,7 +115,7 @@ void KateConsole::sendInput( const TQString& text )
115 115
 
116 116
   if (!m_part) return;
117 117
 
118
-  TerminalInterface *t = static_cast<TerminalInterface*>( m_part->qt_cast( "TerminalInterface" ) );
118
+  TerminalInterface *t = static_cast<TerminalInterface*>( m_part->tqqt_cast( "TerminalInterface" ) );
119 119
 
120 120
   if (!t) return;
121 121
 

+ 1
- 1
kate/app/kateconsole.h View File

@@ -42,7 +42,7 @@ class KateMainWindow;
42 42
  * This class is used for the internal terminal emulator
43 43
  * It uses internally the konsole part, thx to konsole devs :)
44 44
  */
45
-class KateConsole : public QVBox
45
+class KateConsole : public TQVBox
46 46
 {
47 47
   Q_OBJECT
48 48
 

+ 5
- 5
kate/app/katedocmanager.cpp View File

@@ -86,7 +86,7 @@ KateDocManager::~KateDocManager ()
86 86
       {
87 87
         m_metaInfos->setGroup(*it);
88 88
         TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def);
89
-        if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos)
89
+        if (last.daysTo(TQDateTime::tqcurrentDateTime()) > m_daysMetaInfos)
90 90
           m_metaInfos->deleteGroup(*it);
91 91
       }
92 92
       delete def;
@@ -194,7 +194,7 @@ const KateDocumentInfo *KateDocManager::documentInfo (Kate::Document *doc)
194 194
 
195 195
 int KateDocManager::findDocument (Kate::Document *doc)
196 196
 {
197
-  return m_docList.find (doc);
197
+  return m_docList.tqfind (doc);
198 198
 }
199 199
 
200 200
 uint KateDocManager::documents ()
@@ -306,7 +306,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL)
306 306
     KateApp::self()->mainWindow(i)->viewManager()->closeViews(documentNumber);
307 307
   }
308 308
 
309
-  if ( closeURL && m_tempFiles.contains( documentNumber ) )
309
+  if ( closeURL && m_tempFiles.tqcontains( documentNumber ) )
310 310
   {
311 311
     TQFileInfo fi( m_tempFiles[ documentNumber ].first.path() );
312 312
     if ( fi.lastModified() <= m_tempFiles[ documentNumber ].second /*||
@@ -583,7 +583,7 @@ void KateDocManager::saveMetaInfos(Kate::Document *doc)
583 583
     m_metaInfos->setGroup(doc->url().prettyURL());
584 584
     doc->writeSessionConfig(m_metaInfos);
585 585
     m_metaInfos->writeEntry("MD5", (const char *)md5);
586
-    m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime());
586
+    m_metaInfos->writeEntry("Time", TQDateTime::tqcurrentDateTime());
587 587
     m_metaInfos->sync();
588 588
   }
589 589
 }
@@ -596,7 +596,7 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result)
596 596
   {
597 597
     KMD5 md5;
598 598
 
599
-    if (!md5.update(f))
599
+    if (!md5.update(TQT_TQIODEVICE_OBJECT(f)))
600 600
       return false;
601 601
 
602 602
     md5.hexDigest(result);

+ 1
- 1
kate/app/katedocmanager.h View File

@@ -54,7 +54,7 @@ class KateDocumentInfo
54 54
 
55 55
 typedef QPair<KURL,TQDateTime> TPair;
56 56
 
57
-class KateDocManager : public QObject
57
+class KateDocManager : public TQObject
58 58
 {
59 59
   Q_OBJECT
60 60
 

+ 4
- 4
kate/app/katedocmanageriface.cpp View File

@@ -35,7 +35,7 @@ DCOPRef KateDocManagerDCOPIface::document (uint n)
35 35
   if (!doc)
36 36
     return DCOPRef ();
37 37
 
38
-  DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject"));
38
+  DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject"));
39 39
 
40 40
   if (!obj)
41 41
     return DCOPRef ();
@@ -50,7 +50,7 @@ DCOPRef KateDocManagerDCOPIface::activeDocument ()
50 50
   if (!doc)
51 51
     return DCOPRef ();
52 52
 
53
-  DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject"));
53
+  DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject"));
54 54
 
55 55
   if (!obj)
56 56
     return DCOPRef ();
@@ -75,7 +75,7 @@ DCOPRef KateDocManagerDCOPIface::documentWithID (uint id)
75 75
   if (!doc)
76 76
     return DCOPRef ();
77 77
 
78
-  DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject"));
78
+  DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject"));
79 79
 
80 80
   if (!obj)
81 81
     return DCOPRef ();
@@ -90,7 +90,7 @@ DCOPRef KateDocManagerDCOPIface::openURL (KURL url, TQString encoding)
90 90
   if (!doc)
91 91
     return DCOPRef ();
92 92
 
93
-  DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject"));
93
+  DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject"));
94 94
 
95 95
   if (!obj)
96 96
     return DCOPRef ();

+ 14
- 14
kate/app/kateexternaltools.cpp View File

@@ -127,7 +127,7 @@ bool KateExternalTool::checkExec()
127 127
 
128 128
 bool KateExternalTool::valid( const TQString &mt ) const
129 129
 {
130
-  return mimetypes.isEmpty() || mimetypes.contains( mt );
130
+  return mimetypes.isEmpty() || mimetypes.tqcontains( mt );
131 131
 }
132 132
 //END KateExternalTool
133 133
 
@@ -191,7 +191,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
191 191
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
192 192
 		return false;
193 193
 	}
194
-  KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
194
+  KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget());
195 195
 	if (!dmw) {
196 196
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
197 197
 		return false;
@@ -204,7 +204,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
204 204
 		dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
205 205
 	if (!a) return false;
206 206
 // 	kdDebug(13001)<<"trying to find action"<<endl;
207
-	KAction *a1=a->actionCollection()->action(actionName.utf8());
207
+	KAction *a1=a->actionCollection()->action(static_cast<const char *>(actionName.utf8()));
208 208
 	if (!a1) return false;
209 209
 // 	kdDebug(13001)<<"activating action"<<endl;
210 210
 	a1->activate();
@@ -330,8 +330,8 @@ void KateExternalToolsMenuAction::reload()
330 330
     bool sepadded = false;
331 331
     for (TQStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg )
332 332
     {
333
-      if ( ! tools.contains( *itg ) &&
334
-            ! removed.contains( *itg ) )
333
+      if ( ! tools.tqcontains( *itg ) &&
334
+            ! removed.tqcontains( *itg ) )
335 335
       {
336 336
         if ( ! sepadded )
337 337
         {
@@ -394,7 +394,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
394 394
       if ( action )
395 395
       {
396 396
         l = action->tool->mimetypes;
397
-        b = ( ! l.count() || l.contains( mt ) );
397
+        b = ( ! l.count() || l.tqcontains( mt ) );
398 398
         action->setEnabled( b );
399 399
       }
400 400
     }
@@ -407,7 +407,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
407 407
  * This is a TQListBoxItem, that has a KateExternalTool. The text is the Name
408 408
  * of the tool.
409 409
  */
410
-class ToolItem : public QListBoxPixmap
410
+class ToolItem : public TQListBoxPixmap
411 411
 {
412 412
   public:
413 413
     ToolItem( TQListBox *lb, const TQPixmap &icon, KateExternalTool *tool )
@@ -439,7 +439,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
439 439
   leName = new TQLineEdit( w );
440 440
   lo->addWidget( leName, 1, 2 );
441 441
   l = new TQLabel( leName, i18n("&Label:"), w );
442
-  l->setAlignment( l->alignment()|Qt::AlignRight );
442
+  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
443 443
   lo->addWidget( l, 1, 1 );
444 444
   if ( tool ) leName->setText( tool->name );
445 445
   TQWhatsThis::add( leName, i18n(
@@ -454,7 +454,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
454 454
   teCommand = new TQTextEdit( w );
455 455
   lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 );
456 456
   l = new TQLabel( teCommand, i18n("S&cript:"), w );
457
-  l->setAlignment( Qt::AlignTop|Qt::AlignRight );
457
+  l->tqsetAlignment( Qt::AlignTop|Qt::AlignRight );
458 458
   lo->addWidget( l, 2, 1 );
459 459
   if ( tool ) teCommand->setText( tool->command );
460 460
   TQWhatsThis::add( teCommand, i18n(
@@ -477,7 +477,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
477 477
   leExecutable = new TQLineEdit( w );
478 478
   lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 );
479 479
   l = new TQLabel( leExecutable, i18n("&Executable:"), w );
480
-  l->setAlignment( l->alignment()|Qt::AlignRight );
480
+  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
481 481
   lo->addWidget( l, 3, 1 );
482 482
   if ( tool ) leExecutable->setText( tool->tryexec );
483 483
   TQWhatsThis::add( leExecutable, i18n(
@@ -488,7 +488,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
488 488
   leMimetypes = new TQLineEdit( w );
489 489
   lo->addWidget( leMimetypes, 4, 2 );
490 490
   l = new TQLabel( leMimetypes, i18n("&Mime types:"), w );
491
-  l->setAlignment( l->alignment()|Qt::AlignRight );
491
+  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
492 492
   lo->addWidget( l, 4, 1 );
493 493
   if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") );
494 494
   TQWhatsThis::add( leMimetypes, i18n(
@@ -506,7 +506,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
506 506
   cmbSave = new TQComboBox(w);
507 507
   lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 );
508 508
   l = new TQLabel( cmbSave, i18n("&Save:"), w );
509
-  l->setAlignment( l->alignment()|Qt::AlignRight );
509
+  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
510 510
   lo->addWidget( l, 5, 1 );
511 511
   TQStringList sl;
512 512
   sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
@@ -521,7 +521,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
521 521
   leCmdLine = new TQLineEdit( w );
522 522
   lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 );
523 523
   l = new TQLabel( leCmdLine, i18n("&Command line name:"), w );
524
-  l->setAlignment( l->alignment()|Qt::AlignRight );
524
+  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
525 525
   lo->addWidget( l, 6, 1 );
526 526
   if ( tool ) leCmdLine->setText( tool->cmdname );
527 527
   TQWhatsThis::add( leCmdLine, i18n(
@@ -745,7 +745,7 @@ void KateExternalToolsConfigWidget::slotNew()
745 745
 
746 746
     // This is sticky, it does not change again, so that shortcuts sticks
747 747
     // TODO check for dups
748
-    t->acname = "externaltool_" + TQString(t->name).replace( TQRegExp("\\W+"), "" );
748
+    t->acname = "externaltool_" + TQString(t->name).tqreplace( TQRegExp("\\W+"), "" );
749 749
 
750 750
     new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t );
751 751
 

+ 12
- 12
kate/app/katefilelist.cpp View File

@@ -51,7 +51,7 @@
51 51
 //END Includes
52 52
 
53 53
 //BEGIN ToolTip
54
-class ToolTip : public QToolTip
54
+class ToolTip : public TQToolTip
55 55
 {
56 56
   public:
57 57
     ToolTip( TQWidget *parent, KateFileList *lv )
@@ -69,7 +69,7 @@ class ToolTip : public QToolTip
69 69
       KateFileListItem *item = ((KateFileListItem*)i);
70 70
       if ( ! item ) return;
71 71
 
72
-      tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) );
72
+      tip( m_listView->tqitemRect( i ), m_listView->tooltip( item, 0 ) );
73 73
 
74 74
     }
75 75
 
@@ -94,7 +94,7 @@ KateFileList::KateFileList (KateMainWindow *main,
94 94
   m_editShade = TQColor( 255, 102, 153 );
95 95
   m_enableBgShading = false;
96 96
 
97
-  setFocusPolicy ( TQWidget::NoFocus  );
97
+  setFocusPolicy ( TQ_NoFocus  );
98 98
 
99 99
   viewManager = _viewManager;
100 100
 
@@ -134,14 +134,14 @@ KateFileList::~KateFileList ()
134 134
 
135 135
 void KateFileList::setupActions ()
136 136
 {
137
-  windowNext = KStdAction::back(this, TQT_SLOT(slotPrevDocument()), m_main->actionCollection());
138
-  windowPrev = KStdAction::forward(this, TQT_SLOT(slotNextDocument()), m_main->actionCollection());
137
+  windowNext = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotPrevDocument()), m_main->actionCollection());
138
+  windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection());
139 139
   sortAction = new KSelectAction( i18n("Sort &By"), 0,
140 140
       m_main->actionCollection(), "filelist_sortby"  );
141 141
   TQStringList l;
142 142
   l << i18n("Opening Order") << i18n("Document Name") << i18n("URL");
143 143
   sortAction->setItems( l );
144
-  connect( sortAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setSortType(int)) );
144
+  connect( sortAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setSortType(int)) );
145 145
 }
146 146
 
147 147
 void KateFileList::updateActions ()
@@ -273,11 +273,11 @@ void KateFileList::slotModChanged (Kate::Document *doc)
273 273
     for ( uint i=0; i <  m_editHistory.count(); i++ )
274 274
     {
275 275
       m_editHistory.at( i )->setEditHistPos( i+1 );
276
-      repaintItem(  m_editHistory.at( i ) );
276
+      tqrepaintItem(  m_editHistory.at( i ) );
277 277
     }
278 278
   }
279 279
   else
280
-    repaintItem( item );
280
+    tqrepaintItem( item );
281 281
 }
282 282
 
283 283
 void KateFileList::slotModifiedOnDisc (Kate::Document *doc, bool, unsigned char)
@@ -296,7 +296,7 @@ void KateFileList::slotNameChanged (Kate::Document *doc)
296 296
     if ( ((KateFileListItem*)item)->document() == doc )
297 297
     {
298 298
       item->setText( 0, doc->docName() );
299
-      repaintItem( item );
299
+      tqrepaintItem( item );
300 300
       break;
301 301
     }
302 302
     item = item->nextSibling();
@@ -334,7 +334,7 @@ void KateFileList::slotViewChanged ()
334 334
 //   int p = 0;
335 335
 //   if (  m_viewHistory.count() )
336 336
 //   {
337
-//     int p =  m_viewHistory.findRef( item ); // only repaint items that needs it
337
+//     int p =  m_viewHistory.findRef( item ); // only tqrepaint items that needs it
338 338
 //   }
339 339
 
340 340
   m_viewHistory.removeRef( item );
@@ -343,7 +343,7 @@ void KateFileList::slotViewChanged ()
343 343
   for ( uint i=0; i <  m_viewHistory.count(); i++ )
344 344
   {
345 345
     m_viewHistory.at( i )->setViewHistPos( i+1 );
346
-    repaintItem(  m_viewHistory.at( i ) );
346
+    tqrepaintItem(  m_viewHistory.at( i ) );
347 347
   }
348 348
 
349 349
 }
@@ -616,7 +616,7 @@ void KFLConfigPage::apply()
616 616
   m_filelist->m_editShade = kcbEditShade->color();
617 617
   m_filelist->m_enableBgShading = cbEnableShading->isChecked();
618 618
   m_filelist->setSortType( cmbSort->currentItem() );
619
-  // repaint the affected items
619
+  // tqrepaint the affected items
620 620
   m_filelist->triggerUpdate();
621 621
 }
622 622
 

+ 1
- 1
kate/app/katefilelist.h View File

@@ -38,7 +38,7 @@ class KateMainWindow;
38 38
 class KAction;
39 39
 class KSelectAction;
40 40
 
41
-class KateFileListItem : public QListViewItem
41
+class KateFileListItem : public TQListViewItem
42 42
 {
43 43
   public:
44 44
     KateFileListItem( TQListView *lv,

+ 11
- 11
kate/app/katefileselector.cpp View File

@@ -67,7 +67,7 @@
67 67
 
68 68
 //BEGIN Toolbar
69 69
  // from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
70
-static void silenceQToolBar(QtMsgType, const char *){}
70
+static void silenceQToolBar(TQtMsgType, const char *){}
71 71
 
72 72
 // helper classes to be able to have a toolbar without move handle
73 73
 KateFileSelectorToolBar::KateFileSelectorToolBar(TQWidget *parent)
@@ -96,7 +96,7 @@ void KateFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
96 96
 {
97 97
 	if (m_tb)
98 98
 	{
99
-		setMinimumHeight(m_tb->sizeHint().height());
99
+		setMinimumHeight(m_tb->tqsizeHint().height());
100 100
 		m_tb->resize(width(),height());
101 101
 	}
102 102
 }
@@ -113,17 +113,17 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
113 113
 {
114 114
   mActionCollection = new KActionCollection( this );
115 115
 
116
-  QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
116
+  TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
117 117
 
118 118
   KateFileSelectorToolBarParent *tbp=new KateFileSelectorToolBarParent(this);
119 119
   toolbar = new KateFileSelectorToolBar(tbp);
120 120
   tbp->setToolBar(toolbar);
121 121
   toolbar->setMovingEnabled(false);
122 122
   toolbar->setFlat(true);
123
-  qInstallMsgHandler( oldHandler );
123
+  tqInstallMsgHandler( oldHandler );
124 124
 
125 125
   cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
126
-  cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
126
+  cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
127 127
   KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion);
128 128
   cmbPath->setCompletionObject( cmpl );
129 129
   cmbPath->setAutoDeleteCompletionObject( true );
@@ -157,7 +157,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
157 157
   btnFilter->setIconSet( SmallIconSet("filter" ) );
158 158
   btnFilter->setToggleButton( true );
159 159
   filter = new KHistoryCombo( true, filterBox, "filter");
160
-  filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
160
+  filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
161 161
   filterBox->setStretchFactor(filter, 2);
162 162
   connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
163 163
 
@@ -168,7 +168,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
168 168
 
169 169
   // kaction for the dir sync method
170 170
   acSyncDir = new KAction( i18n("Current Document Folder"), "curfiledir", 0,
171
-        this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
171
+        TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
172 172
   toolbar->setIconText( KToolBar::IconOnly );
173 173
   toolbar->setIconSize( 16 );
174 174
   toolbar->setEnableContextMenu( false );
@@ -354,7 +354,7 @@ void KateFileSelector::setDir( KURL u )
354 354
   newurl.setPath(pathstr);
355 355
 
356 356
   if ( !kateFileSelectorIsReadable ( newurl ) )
357
-    newurl.cd(TQString::fromLatin1(".."));
357
+    newurl.cd(TQString::tqfromLatin1(".."));
358 358
 
359 359
   if ( !kateFileSelectorIsReadable (newurl) )
360 360
      newurl.setPath( TQDir::homeDirPath() );
@@ -486,7 +486,7 @@ bool KateFileSelector::eventFilter( TQObject* o, TQEvent *e )
486 486
       And the popup is rather useless, if the paths are only partly visible.
487 487
   */
488 488
   TQListBox *lb = cmbPath->listBox();
489
-  if ( o == lb && e->type() == TQEvent::Show ) {
489
+  if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) {
490 490
     int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0;
491 491
     int w = QMIN( mainwin->width(), lb->contentsWidth() + add );
492 492
     lb->resize( w, lb->height() );
@@ -692,13 +692,13 @@ void KFSConfigPage::init()
692 692
   KAction *ac;
693 693
   TQListBox *lb;
694 694
   for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) {
695
-    lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
695
+    lb = l.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
696 696
     if ( *it == "bookmarks" || *it == "sync_dir" )
697 697
       ac = fileSelector->actionCollection()->action( (*it).latin1() );
698 698
     else
699 699
       ac = fileSelector->dirOperator()->actionCollection()->action( (*it).latin1() );
700 700
     if ( ac )
701
-      new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it );
701
+      new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().tqreplace( re, "" ), *it );
702 702
   }
703 703
 
704 704
   // sync

+ 2
- 2
kate/app/katefileselector.h View File

@@ -56,7 +56,7 @@ public:
56 56
 	 virtual void setMovingEnabled( bool b );
57 57
 };
58 58
 
59
-class KateFileSelectorToolBarParent: public QFrame
59
+class KateFileSelectorToolBarParent: public TQFrame
60 60
 {
61 61
 	Q_OBJECT
62 62
 public:
@@ -69,7 +69,7 @@ protected:
69 69
 	virtual void resizeEvent ( TQResizeEvent * );
70 70
 };
71 71
 
72
-class KateFileSelector : public QVBox
72
+class KateFileSelector : public TQVBox
73 73
 {
74 74
   Q_OBJECT
75 75
 

+ 22
- 22
kate/app/kategrepdialog.cpp View File

@@ -100,8 +100,8 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
100 100
   loInput->setColStretch(1, 20);
101 101
 
102 102
   TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this);
103
-  lPattern->setFixedSize(lPattern->sizeHint());
104
-  loInput->addWidget(lPattern, 0, 0, AlignRight | AlignVCenter);
103
+  lPattern->setFixedSize(lPattern->tqsizeHint());
104
+  loInput->addWidget(lPattern, 0, 0, Qt::AlignRight | Qt::AlignVCenter);
105 105
 
106 106
   TQBoxLayout *loPattern = new TQHBoxLayout( 4 );
107 107
   loInput->addLayout( loPattern, 0, 1 );
@@ -112,23 +112,23 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
112 112
   cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion);
113 113
   lPattern->setBuddy(cmbPattern);
114 114
   cmbPattern->setFocus();
115
-  cmbPattern->setMinimumSize(cmbPattern->sizeHint());
115
+  cmbPattern->setMinimumSize(cmbPattern->tqsizeHint());
116 116
   loPattern->addWidget( cmbPattern );
117 117
 
118 118
   cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this);
119
-  cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width());
119
+  cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width());
120 120
   cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true));
121 121
   loPattern->addWidget(cbCasesensitive);
122 122
 
123 123
   cbRegex = new TQCheckBox( i18n("Regular expression"), this );
124
-  cbRegex->setMinimumWidth( cbRegex->sizeHint().width() );
124
+  cbRegex->setMinimumWidth( cbRegex->tqsizeHint().width() );
125 125
   cbRegex->setChecked( config->readBoolEntry( "Regex", true ) );
126 126
   loPattern->addWidget( cbRegex );
127 127
   loPattern->setStretchFactor( cmbPattern, 100 );
128 128
 
129 129
   TQLabel *lTemplate = new TQLabel(i18n("Template:"), this);
130
-  lTemplate->setFixedSize(lTemplate->sizeHint());
131
-  loInput->addWidget(lTemplate, 1, 0, AlignRight | AlignVCenter);
130
+  lTemplate->setFixedSize(lTemplate->tqsizeHint());
131
+  loInput->addWidget(lTemplate, 1, 0, Qt::AlignRight | Qt::AlignVCenter);
132 132
 
133 133
   TQBoxLayout *loTemplate = new TQHBoxLayout(4);
134 134
   loInput->addLayout(loTemplate, 1, 1);
@@ -136,7 +136,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
136 136
   leTemplate = new KLineEdit(this);
137 137
   lTemplate->setBuddy(leTemplate);
138 138
   leTemplate->setText(strTemplate[0]);
139
-  leTemplate->setMinimumSize(leTemplate->sizeHint());
139
+  leTemplate->setMinimumSize(leTemplate->tqsizeHint());
140 140
   loTemplate->addWidget(leTemplate);
141 141
 
142 142
   KComboBox *cmbTemplate = new KComboBox(false, this);
@@ -146,20 +146,20 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
146 146
   loTemplate->addWidget(cmbTemplate);
147 147
 
148 148
   TQLabel *lFiles = new TQLabel(i18n("Files:"), this);
149
-  lFiles->setFixedSize(lFiles->sizeHint());
150
-  loInput->addWidget(lFiles, 2, 0, AlignRight | AlignVCenter);
149
+  lFiles->setFixedSize(lFiles->tqsizeHint());
150
+  loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter);
151 151
 
152 152
   cmbFiles = new KComboBox(true, this);
153
-  lFiles->setBuddy(cmbFiles->focusProxy());
154
-  cmbFiles->setMinimumSize(cmbFiles->sizeHint());
153
+  lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy()));
154
+  cmbFiles->setMinimumSize(cmbFiles->tqsizeHint());
155 155
   cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion);
156 156
   cmbFiles->setDuplicatesEnabled(false);
157 157
   cmbFiles->insertStringList(lastSearchFiles);
158 158
   loInput->addWidget(cmbFiles, 2, 1);
159 159
 
160 160
   TQLabel *lDir = new TQLabel(i18n("Folder:"), this);
161
-  lDir->setFixedSize(lDir->sizeHint());
162
-  loInput->addWidget(lDir, 3, 0, AlignRight | AlignVCenter);
161
+  lDir->setFixedSize(lDir->tqsizeHint());
162
+  loInput->addWidget(lDir, 3, 0, Qt::AlignRight | Qt::AlignVCenter);
163 163
 
164 164
   TQBoxLayout *loDir = new TQHBoxLayout(3);
165 165
   loInput->addLayout(loDir, 3, 1);
@@ -176,7 +176,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
176 176
   lDir->setBuddy(cmbDir);
177 177
 
178 178
   cbRecursive = new TQCheckBox(i18n("Recursive"), this);
179
-  cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width());
179
+  cbRecursive->setMinimumWidth(cbRecursive->tqsizeHint().width());
180 180
   cbRecursive->setChecked(config->readBoolEntry("Recursive", true));
181 181
   loDir->addWidget(cbRecursive);
182 182
 
@@ -286,11 +286,11 @@ void GrepTool::itemSelected(const TQString& item)
286 286
   TQString filename, linenumber;
287 287
 
288 288
   TQString str = item;
289
-  if ( (pos = str.find(':')) != -1)
289
+  if ( (pos = str.tqfind(':')) != -1)
290 290
   {
291 291
     filename = str.left(pos);
292 292
     str = str.mid(pos+1);
293
-    if ( (pos = str.find(':')) != -1)
293
+    if ( (pos = str.tqfind(':')) != -1)
294 294
     {
295 295
       filename = m_workingDir + TQDir::separator() + filename;
296 296
       linenumber = str.left(pos);
@@ -302,7 +302,7 @@ void GrepTool::itemSelected(const TQString& item)
302 302
 void GrepTool::processOutput()
303 303
 {
304 304
   int pos;
305
-  while ( (pos = buf.find('\n')) != -1)
305
+  while ( (pos = buf.tqfind('\n')) != -1)
306 306
   {
307 307
     TQString item = buf.mid(2,pos-2);
308 308
     if (!item.isEmpty())
@@ -329,7 +329,7 @@ void GrepTool::slotSearch()
329 329
     return;
330 330
   }
331 331
 
332
-  if ( ! leTemplate->text().contains("%s") )
332
+  if ( ! leTemplate->text().tqcontains("%s") )
333 333
   {
334 334
     leTemplate->setFocus();
335 335
     return;
@@ -347,9 +347,9 @@ void GrepTool::slotSearch()
347 347
 
348 348
   TQString s = cmbPattern->currentText();
349 349
   if ( ! cbRegex->isChecked() )
350
-    s.replace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
350
+    s.tqreplace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
351 351
   TQString pattern = leTemplate->text();
352
-  pattern.replace( "%s", s );
352
+  pattern.tqreplace( "%s", s );
353 353
 
354 354
   childproc = new KProcess();
355 355
   childproc->setWorkingDirectory( m_workingDir );
@@ -476,7 +476,7 @@ void GrepTool::childExited()
476 476
 
477 477
   if ( ! errbuf.isEmpty() )
478 478
   {
479
-    KMessageBox::information( parentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
479
+    KMessageBox::information( tqparentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
480 480
     errbuf.truncate(0);
481 481
   }
482 482
   else

+ 1
- 1
kate/app/kategrepdialog.h View File

@@ -35,7 +35,7 @@ class KConfig;
35 35
 class KURLRequester;
36 36
 class TQEvent;
37 37
 
38
-class GrepTool : public QWidget
38
+class GrepTool : public TQWidget
39 39
 {
40 40
     Q_OBJECT
41 41
 

+ 3
- 3
kate/app/katemailfilesdialog.cpp View File

@@ -78,7 +78,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow  *mainwin )
78 78
   }
79 79
   list->hide();
80 80
   connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) );
81
-  mw->setMinimumSize( lInfo->sizeHint() );
81
+  mw->setMinimumSize( lInfo->tqsizeHint() );
82 82
 }
83 83
 
84 84
 TQPtrList<Kate::Document> KateMailDialog::selectedDocs()
@@ -105,8 +105,8 @@ void KateMailDialog::slotShowButton()
105 105
     lInfo->setText( i18n("Press <strong>Mail...</strong> to send selected documents") );
106 106
 
107 107
   }
108
-  mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) );
109
-  setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) );
108
+  mw->setMinimumSize( TQSize( lInfo->tqsizeHint().width(), mw->tqsizeHint().height()) );
109
+  setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) );
110 110
   resize( width(), minimumHeight() );
111 111
 }
112 112
 #include "katemailfilesdialog.moc"

+ 27
- 27
kate/app/katemainwindow.cpp View File

@@ -87,7 +87,7 @@
87 87
 uint KateMainWindow::uniqueID = 1;
88 88
 
89 89
 KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
90
-  : KateMDI::MainWindow (0,(TQString("__KateMainWindow#%1").arg(uniqueID)).latin1())
90
+  : KateMDI::MainWindow (0,(TQString(TQString("__KateMainWindow#%1").arg(uniqueID))).latin1())
91 91
 {
92 92
   // first the very important id
93 93
   myID = uniqueID;
@@ -101,7 +101,7 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
101 101
   // here we go, set some usable default sizes
102 102
   if (!initialGeometrySet())
103 103
   {
104
-    int scnum = TQApplication::desktop()->screenNumber(parentWidget());
104
+    int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
105 105
     TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
106 106
 
107 107
     TQSize size;
@@ -110,8 +110,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
110 110
     if (sconfig)
111 111
     {
112 112
       sconfig->setGroup (sgroup);
113
-      size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
114
-      size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
113
+      size.setWidth (sconfig->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
114
+      size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
115 115
     }
116 116
 
117 117
     // if thats fails, try to reuse size
@@ -131,8 +131,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
131 131
       {
132 132
         // first try global app config
133 133
         KateApp::self()->config()->setGroup ("MainWindow");
134
-        size.setWidth (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
135
-        size.setHeight (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
134
+        size.setWidth (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
135
+        size.setHeight (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
136 136
 
137 137
         if (size.isEmpty())
138 138
           size = TQSize (kMin (700, desk.width()), kMin(480, desk.height()));
@@ -239,25 +239,25 @@ void KateMainWindow::setupActions()
239 239
 {
240 240
   KAction *a;
241 241
 
242
-  KStdAction::openNew( m_viewManager, TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document"));
243
-  KStdAction::open( m_viewManager, TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing"));
242
+  KStdAction::openNew( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document"));
243
+  KStdAction::open( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing"));
244 244
 
245
-  fileOpenRecent = KStdAction::openRecent (m_viewManager, TQT_SLOT(openURL (const KURL&)), actionCollection());
245
+  fileOpenRecent = KStdAction::openRecent (TQT_TQOBJECT(m_viewManager), TQT_SLOT(openURL (const KURL&)), actionCollection());
246 246
   fileOpenRecent->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
247 247
 
248 248
   a=new KAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQT_SLOT( saveAll() ), actionCollection(), "file_save_all" );
249 249
   a->setWhatsThis(i18n("Save all open, modified documents to disk."));
250 250
 
251
-  KStdAction::close( m_viewManager, TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document."));
251
+  KStdAction::close( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document."));
252 252
 
253
-  a=new KAction( i18n( "Clos&e All" ), 0, this, TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" );
253
+  a=new KAction( i18n( "Clos&e All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" );
254 254
   a->setWhatsThis(i18n("Close all open documents."));
255 255
 
256
-  KStdAction::mail( this, TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments."));
256
+  KStdAction::mail( TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments."));
257 257
 
258
-  KStdAction::quit( this, TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window"));
258
+  KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window"));
259 259
 
260
-  a=new KAction(i18n("&New Window"), "window_new", 0, this, TQT_SLOT(newWindow()), actionCollection(), "view_new_view");
260
+  a=new KAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view");
261 261
   a->setWhatsThis(i18n("Create a new Kate view (a new window with the same document list)."));
262 262
 
263 263
   if ( KateApp::self()->authorize("shell_access") )
@@ -274,39 +274,39 @@ void KateMainWindow::setupActions()
274 274
   connect(documentOpenWith->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(mSlotFixOpenWithMenu()));
275 275
   connect(documentOpenWith->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenWithMenuAction(int)));
276 276
 
277
-  a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection());
277
+  a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection());
278 278
   a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
279 279
 
280
-  a=KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
280
+  a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
281 281
   a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
282 282
 
283
-  KAction* settingsConfigure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure");
283
+  KAction* settingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure");
284 284
   settingsConfigure->setWhatsThis(i18n("Configure various aspects of this application and the editing component."));
285 285
 
286 286
   // pipe to terminal action
287 287
   if (KateApp::self()->authorize("shell_access"))
288
-    new KAction(i18n("&Pipe to Console"), "pipe", 0, console, TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal");
288
+    new KAction(i18n("&Pipe to Console"), "pipe", 0, TQT_TQOBJECT(console), TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal");
289 289
 
290 290
   // tip of the day :-)
291
-  KStdAction::tipOfDay( this, TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application."));
291
+  KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application."));
292 292
 
293 293
   if (KatePluginManager::self()->pluginList().count() > 0)
294 294
   {
295
-    a=new KAction(i18n("&Plugins Handbook"), 0, this, TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents");
295
+    a=new KAction(i18n("&Plugins Handbook"), 0, TQT_TQOBJECT(this), TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents");
296 296
     a->setWhatsThis(i18n("This shows help files for various available plugins."));
297 297
   }
298 298
 
299
-  connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotWindowActivated()));
300
-  connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotUpdateOpenWith()));
299
+  connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotWindowActivated()));
300
+  connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdateOpenWith()));
301 301
 
302 302
   slotWindowActivated ();
303 303
 
304 304
   // session actions
305
-  new KAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, KateSessionManager::self(), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new");
306
-  new KAction(i18n("&Open..."), "fileopen", 0, KateSessionManager::self(), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open");
307
-  new KAction(i18n("&Save"), "filesave", 0, KateSessionManager::self(), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save");
308
-  new KAction(i18n("Save &As..."), "filesaveas", 0, KateSessionManager::self(), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as");
309
-  new KAction(i18n("&Manage..."), "view_choose", 0, KateSessionManager::self(), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage");
305
+  new KAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new");
306
+  new KAction(i18n("&Open..."), "fileopen", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open");
307
+  new KAction(i18n("&Save"), "filesave", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save");
308
+  new KAction(i18n("Save &As..."), "filesaveas", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as");
309
+  new KAction(i18n("&Manage..."), "view_choose", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage");
310 310
 
311 311
   // quick open menu ;)
312 312
   new KateSessionsAction (i18n("&Quick Open"), actionCollection(), "sessions_list");

+ 1
- 1
kate/app/katemainwindowiface.cpp View File

@@ -22,6 +22,6 @@
22 22
 
23 23
 #include <kdebug.h>
24 24
 
25
-KateMainWindowDCOPIface::KateMainWindowDCOPIface (KateMainWindow *w) : DCOPObject ((TQString("KateMainWindow#%1").arg(w->mainWindowNumber())).latin1()), m_w (w)
25
+KateMainWindowDCOPIface::KateMainWindowDCOPIface (KateMainWindow *w) : DCOPObject (TQString(TQString("KateMainWindow#%1").arg(w->mainWindowNumber())).latin1()), m_w (w)
26 26
 {
27 27
 }

+ 9
- 9
kate/app/katemdi.cpp View File

@@ -128,7 +128,7 @@ GUIClient::GUIClient ( MainWindow *mw )
128 128
 
129 129
   if ( domDocument().documentElement().isNull() )
130 130
   {
131
-    TQString completeDescription = TQString::fromLatin1( guiDescription )
131
+    TQString completeDescription = TQString::tqfromLatin1( guiDescription )
132 132
           .arg( actionListName );
133 133
 
134 134
     setXML( completeDescription, false /*merge*/ );
@@ -176,7 +176,7 @@ void GUIClient::registerToolView (ToolView *tv)
176 176
   KToggleAction *a = new ToggleToolViewAction(i18n("Show %1").arg(tv->text),
177 177
     sc,tv, actionCollection(), aname.latin1() );
178 178
 
179
-  a->setCheckedState(i18n("Hide %1").arg(tv->text));
179
+  a->setCheckedState(TQString(i18n("Hide %1").arg(tv->text)));
180 180
 
181 181
   m_toolViewActions.append(a);
182 182
   m_toolMenu->insert(a);
@@ -256,8 +256,8 @@ bool ToolView::visible () const
256 256
 void ToolView::childEvent ( TQChildEvent *ev )
257 257
 {
258 258
   // set the widget to be focus proxy if possible
259
-  if (ev->inserted() && ev->child() && ev->child()->qt_cast("TQWidget"))
260
-    setFocusProxy ((TQWidget *)(ev->child()->qt_cast("TQWidget")));
259
+  if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqqt_cast("TQWidget"))
260
+    setFocusProxy ((TQWidget *)(TQT_TQOBJECT(ev->child())->tqqt_cast("TQWidget")));
261 261
 
262 262
   TQVBox::childEvent (ev);
263 263
 }
@@ -339,7 +339,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi
339 339
 
340 340
 bool Sidebar::removeWidget (ToolView *widget)
341 341
 {
342
-  if (!m_widgetToId.contains(widget))
342
+  if (!m_widgetToId.tqcontains(widget))
343 343
     return false;
344 344
 
345 345
   removeTab(m_widgetToId[widget]);
@@ -369,7 +369,7 @@ bool Sidebar::removeWidget (ToolView *widget)
369 369
 
370 370
 bool Sidebar::showWidget (ToolView *widget)
371 371
 {
372
-  if (!m_widgetToId.contains(widget))
372
+  if (!m_widgetToId.tqcontains(widget))
373 373
     return false;
374 374
 
375 375
   // hide other non-persistent views
@@ -394,7 +394,7 @@ bool Sidebar::showWidget (ToolView *widget)
394 394
 
395 395
 bool Sidebar::hideWidget (ToolView *widget)
396 396
 {
397
-  if (!m_widgetToId.contains(widget))
397
+  if (!m_widgetToId.tqcontains(widget))
398 398
     return false;
399 399
 
400 400
   bool anyVis = false;
@@ -659,8 +659,8 @@ void Sidebar::saveSession (KConfig *config)
659 659
 
660 660
 //BEGIN MAIN WINDOW
661 661
 
662
-MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
663
- : KParts::MainWindow( parentWidget, name)
662
+MainWindow::MainWindow (TQWidget* tqparentWidget, const char* name)
663
+ : KParts::MainWindow( tqparentWidget, name)
664 664
  , m_sidebarsVisible(true)
665 665
  , m_restoreConfig (0)
666 666
  , m_guiClient (new GUIClient (this))

+ 3
- 3
kate/app/katemdi.h View File

@@ -38,7 +38,7 @@ namespace KateMDI {
38 38
 
39 39
 
40 40
 /** This class is needed because TQSplitter cant return an index for a widget. */
41
-class Splitter : public QSplitter
41
+class Splitter : public TQSplitter
42 42
 {
43 43
   Q_OBJECT
44 44
 
@@ -99,7 +99,7 @@ class GUIClient : public TQObject, public KXMLGUIClient
99 99
     KActionMenu *m_toolMenu;
100 100
 };
101 101
 
102
-class ToolView : public QVBox
102
+class ToolView : public TQVBox
103 103
 {
104 104
   Q_OBJECT
105 105
 
@@ -258,7 +258,7 @@ class MainWindow : public KParts::MainWindow
258 258
     /**
259 259
      * Constructor
260 260
      */
261
-    MainWindow (TQWidget* parentWidget = 0, const char* name = 0);
261
+    MainWindow (TQWidget* tqparentWidget = 0, const char* name = 0);
262 262
 
263 263
     /**
264 264
      * Destructor

+ 1
- 1
kate/app/katemwmodonhddialog.cpp View File

@@ -40,7 +40,7 @@
40 40
 #include <tqwhatsthis.h>
41 41
 #include <tqvbox.h>
42 42
 
43
-class KateDocItem : public QCheckListItem
43
+class KateDocItem : public TQCheckListItem
44 44
 {
45 45
   public:
46 46
     KateDocItem( Kate::Document *doc, const TQString &status, KListView *lv )

+ 1
- 1
kate/app/katepluginmanager.h View File

@@ -41,7 +41,7 @@ class KatePluginInfo
41 41
 
42 42
 typedef TQValueList<KatePluginInfo> KatePluginList;
43 43
 
44
-class KatePluginManager : public QObject
44
+class KatePluginManager : public TQObject
45 45
 {
46 46
   Q_OBJECT
47 47
 

+ 1
- 1
kate/app/katesession.cpp View File

@@ -596,7 +596,7 @@ void KateSessionManager::sessionManage ()
596 596
 
597 597
 //BEGIN CHOOSER DIALOG
598 598
 
599
-class KateSessionChooserItem : public QListViewItem
599
+class KateSessionChooserItem : public TQListViewItem
600 600
 {
601 601
   public:
602 602
     KateSessionChooserItem (KListView *lv, KateSession::Ptr s)

+ 1
- 1
kate/app/katesession.h View File

@@ -160,7 +160,7 @@ class KateSession  : public KShared
160 160
 
161 161
 typedef TQValueList<KateSession::Ptr> KateSessionList;
162 162
 
163
-class KateSessionManager : public QObject
163
+class KateSessionManager : public TQObject
164 164
 {
165 165
   Q_OBJECT
166 166
 

+ 9
- 9
kate/app/katetabwidget.cpp View File

@@ -70,7 +70,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQString & label, int in
70 70
   KTabWidget::insertTab(child,label,index);
71 71
   showPage(child);
72 72
   maybeShow();
73
-  tabBar()->repaint();
73
+  tabBar()->tqrepaint();
74 74
 }
75 75
 
76 76
 void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index )
@@ -78,7 +78,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, con
78 78
   KTabWidget::insertTab(child,iconset,label,index);
79 79
   showPage(child);
80 80
   maybeShow();
81
-  tabBar()->repaint();
81
+  tabBar()->tqrepaint();
82 82
 }
83 83
 
84 84
 void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
@@ -86,7 +86,7 @@ void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
86 86
   KTabWidget::insertTab(child,tab,index);
87 87
   showPage(child);
88 88
   maybeShow();
89
-  tabBar()->repaint();
89
+  tabBar()->tqrepaint();
90 90
 }
91 91
 
92 92
 void KateTabWidget::removePage ( TQWidget * w )
@@ -132,18 +132,18 @@ void KateTabWidget::setCornerWidgetVisibility(bool visible)
132 132
 {
133 133
   // there are two corner widgets: on TopLeft and on TopTight!
134 134
 
135
-  if (cornerWidget(Qt::TopLeft) ) {
135
+  if (cornerWidget(TQt::TopLeft) ) {
136 136
     if (visible)
137
-      cornerWidget(Qt::TopLeft)->show();
137
+      cornerWidget(TQt::TopLeft)->show();
138 138
     else
139
-      cornerWidget(Qt::TopLeft)->hide();
139
+      cornerWidget(TQt::TopLeft)->hide();
140 140
   }
141 141
 
142
-  if (cornerWidget(Qt::TopRight) ) {
142
+  if (cornerWidget(TQt::TopRight) ) {
143 143
     if (visible)
144
-      cornerWidget(Qt::TopRight)->show();
144
+      cornerWidget(TQt::TopRight)->show();
145 145
     else
146
-      cornerWidget(Qt::TopRight)->hide();
146
+      cornerWidget(TQt::TopRight)->hide();
147 147
   }
148 148
 }
149 149
 

+ 11
- 11
kate/app/kateviewmanager.cpp View File

@@ -94,47 +94,47 @@ void KateViewManager::setupActions ()
94 94
   /**
95 95
    * tabbing
96 96
    */
97
-  a=new KAction ( i18n("New Tab"),"tab_new", 0, this, TQT_SLOT(slotNewTab()),
97
+  a=new KAction ( i18n("New Tab"),"tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTab()),
98 98
                   m_mainWindow->actionCollection(), "view_new_tab" );
99 99
 
100
-  m_closeTab = new KAction ( i18n("Close Current Tab"),"tab_remove",0,this,TQT_SLOT(slotCloseTab()),
100
+  m_closeTab = new KAction ( i18n("Close Current Tab"),"tab_remove",0,TQT_TQOBJECT(this),TQT_SLOT(slotCloseTab()),
101 101
                              m_mainWindow->actionCollection(),"view_close_tab");
102 102
 
103 103
   m_activateNextTab
104 104
       = new KAction( i18n( "Activate Next Tab" ),
105 105
                      TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(),
106
-                     this, TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" );
106
+                     TQT_TQOBJECT(this), TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" );
107 107
 
108 108
   m_activatePrevTab
109 109
       = new KAction( i18n( "Activate Previous Tab" ),
110 110
                      TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(),
111
-                     this, TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" );
111
+                     TQT_TQOBJECT(this), TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" );
112 112
 
113 113
   /**
114 114
    * view splitting
115 115
    */
116
-  a=new KAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, this, TQT_SLOT(
116
+  a=new KAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT(
117 117
                   slotSplitViewSpaceVert() ), m_mainWindow->actionCollection(), "view_split_vert");
118 118
 
119 119
   a->setWhatsThis(i18n("Split the currently active view vertically into two views."));
120 120
 
121
-  a=new KAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT(
121
+  a=new KAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(
122 122
                   slotSplitViewSpaceHoriz() ), m_mainWindow->actionCollection(), "view_split_horiz");
123 123
 
124 124
   a->setWhatsThis(i18n("Split the currently active view horizontally into two views."));
125 125
 
126
-  m_closeView = new KAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, this,
126
+  m_closeView = new KAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this),
127 127
                     TQT_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(),
128 128
                     "view_close_current_space" );
129 129
 
130 130
   m_closeView->setWhatsThis(i18n("Close the currently active splitted view"));
131 131
 
132
-  goNext=new KAction(i18n("Next View"),Key_F8,this,
132
+  goNext=new KAction(i18n("Next View"),Key_F8,TQT_TQOBJECT(this),
133 133
                      TQT_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next");
134 134
 
135 135
   goNext->setWhatsThis(i18n("Make the next split view the active one."));
136 136
 
137
-  goPrev=new KAction(i18n("Previous View"),SHIFT+Key_F8, this, TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev");
137
+  goPrev=new KAction(i18n("Previous View"),SHIFT+Key_F8, TQT_TQOBJECT(this), TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev");
138 138
 
139 139
   goPrev->setWhatsThis(i18n("Make the previous split view the active one."));
140 140
 
@@ -168,7 +168,7 @@ void KateViewManager::updateViewSpaceActions ()
168 168
 }
169 169
 
170 170
 void KateViewManager::tabChanged(TQWidget* widget) {
171
-  KateViewSpaceContainer *container=static_cast<KateViewSpaceContainer*>(widget->qt_cast("KateViewSpaceContainer"));
171
+  KateViewSpaceContainer *container=static_cast<KateViewSpaceContainer*>(widget->tqqt_cast("KateViewSpaceContainer"));
172 172
   Q_ASSERT(container);
173 173
   m_currentContainer=container;
174 174
 
@@ -215,7 +215,7 @@ void KateViewManager::slotCloseTab()
215 215
   if (m_viewSpaceContainerList.count() <= 1) return;
216 216
   if (!m_currentContainer) return;
217 217
 
218
-  int pos = m_viewSpaceContainerList.find (m_currentContainer);
218
+  int pos = m_viewSpaceContainerList.tqfind (m_currentContainer);
219 219
 
220 220
   if (pos == -1)
221 221
     return;

+ 1
- 1
kate/app/kateviewmanager.h View File

@@ -36,7 +36,7 @@ class KAction;
36 36
 
37 37
 class TQToolButton;
38 38
 
39
-class KateViewManager : public QObject
39
+class KateViewManager : public TQObject
40 40
 {
41 41
   Q_OBJECT
42 42
 

+ 11
- 11
kate/app/kateviewspace.cpp View File

@@ -67,9 +67,9 @@ protected:
67 67
   void paintEvent( TQPaintEvent *e )
68 68
   {
69 69
     TQPainter p( this );
70
-    p.setPen( colorGroup().shadow() );
70
+    p.setPen( tqcolorGroup().shadow() );
71 71
     p.drawLine( e->rect().left(), 0, e->rect().right(), 0 );
72
-    p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() );
72
+    p.setPen( ((KateViewSpace*)tqparentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() );
73 73
     p.drawLine( e->rect().left(), 1, e->rect().right(), 1 );
74 74
   }
75 75
 };
@@ -228,7 +228,7 @@ bool KateViewSpace::event( TQEvent *e )
228 228
 
229 229
 void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg)
230 230
 {
231
-  if ((TQWidgetStack *)view->parentWidget() != stack)
231
+  if ((TQWidgetStack *)view->tqparentWidget() != stack)
232 232
     return;
233 233
   mStatusBar->setStatus( r, c, ovr, block, mod, msg );
234 234
 }
@@ -309,29 +309,29 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name )
309 309
 {
310 310
   m_lineColLabel = new TQLabel( this );
311 311
   addWidget( m_lineColLabel, 0, false );
312
-  m_lineColLabel->setAlignment( Qt::AlignCenter );
312
+  m_lineColLabel->tqsetAlignment( Qt::AlignCenter );
313 313
   m_lineColLabel->installEventFilter( this );
314 314
 
315 315
   m_modifiedLabel = new TQLabel( TQString("   "), this );
316 316
   addWidget( m_modifiedLabel, 0, false );
317
-  m_modifiedLabel->setAlignment( Qt::AlignCenter );
317
+  m_modifiedLabel->tqsetAlignment( Qt::AlignCenter );
318 318
   m_modifiedLabel->installEventFilter( this );
319 319
 
320 320
   m_insertModeLabel = new TQLabel( i18n(" INS "), this );
321 321
   addWidget( m_insertModeLabel, 0, false );
322
-  m_insertModeLabel->setAlignment( Qt::AlignCenter );
322
+  m_insertModeLabel->tqsetAlignment( Qt::AlignCenter );
323 323
   m_insertModeLabel->installEventFilter( this );
324 324
 
325 325
   m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
326 326
   addWidget( m_selectModeLabel, 0, false );
327
-  m_selectModeLabel->setAlignment( Qt::AlignCenter );
327
+  m_selectModeLabel->tqsetAlignment( Qt::AlignCenter );
328 328
   m_selectModeLabel->installEventFilter( this );
329 329
 
330 330
   m_fileNameLabel=new KSqueezedTextLabel( this );
331 331
   addWidget( m_fileNameLabel, 1, true );
332 332
   m_fileNameLabel->setMinimumSize( 0, 0 );
333
-  m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
334
-  m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
333
+  m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
334
+  m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
335 335
   m_fileNameLabel->installEventFilter( this );
336 336
 
337 337
   installEventFilter( this );
@@ -396,7 +396,7 @@ void KateVSStatusBar::modifiedChanged()
396 396
 
397 397
 void KateVSStatusBar::showMenu()
398 398
 {
399
-   KMainWindow* mainWindow = static_cast<KMainWindow*>( topLevelWidget() );
399
+   KMainWindow* mainWindow = static_cast<KMainWindow*>( tqtopLevelWidget() );
400 400
    TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) );
401 401
 
402 402
    if (menu)
@@ -410,7 +410,7 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
410 410
     if ( m_viewSpace->currentView() )
411 411
       m_viewSpace->currentView()->setFocus();
412 412
 
413
-    if ( ((TQMouseEvent*)e)->button()==RightButton)
413
+    if ( ((TQMouseEvent*)e)->button()==Qt::RightButton)
414 414
       showMenu();
415 415
 
416 416
     return true;

+ 1
- 1
kate/app/kateviewspace.h View File

@@ -68,7 +68,7 @@ class KateVSStatusBar : public KStatusBar
68 68
       class KateViewSpace *m_viewSpace;
69 69
 };
70 70
 
71
-class KateViewSpace : public QVBox
71
+class KateViewSpace : public TQVBox
72 72
 {
73 73
   friend class KateViewSpaceContainer;
74 74
   friend class KateVSStatusBar;

+ 25
- 25
kate/app/kateviewspacecontainer.cpp View File

@@ -141,7 +141,7 @@ bool KateViewSpaceContainer::deleteView (Kate::View *view, bool delViewSpace)
141 141
 {
142 142
   if (!view) return true;
143 143
 
144
-  KateViewSpace *viewspace = (KateViewSpace *)view->parentWidget()->parentWidget();
144
+  KateViewSpace *viewspace = (KateViewSpace *)view->tqparentWidget()->tqparentWidget();
145 145
 
146 146
   viewspace->removeView (view);
147 147
 
@@ -241,7 +241,7 @@ void KateViewSpaceContainer::activateSpace (Kate::View* v)
241 241
 {
242 242
   if (!v) return;
243 243
 
244
-  KateViewSpace* vs = (KateViewSpace*)v->parentWidget()->parentWidget();
244
+  KateViewSpace* vs = (KateViewSpace*)v->tqparentWidget()->tqparentWidget();
245 245
 
246 246
   if (!vs->isActiveSpace()) {
247 247
     setActiveSpace (vs);
@@ -275,7 +275,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view )
275 275
     }
276 276
 
277 277
     setActiveView (view);
278
-    m_viewList.findRef (view);
278
+    m_viewList.tqfindRef (view);
279 279
 
280 280
     mainWindow()->toolBar ()->setUpdatesEnabled (false);
281 281
 
@@ -337,7 +337,7 @@ void KateViewSpaceContainer::slotViewChanged()
337 337
 
338 338
 void KateViewSpaceContainer::activateNextView()
339 339
 {
340
-  uint i = m_viewSpaceList.find (activeViewSpace())+1;
340
+  uint i = m_viewSpaceList.tqfind (activeViewSpace())+1;
341 341
 
342 342
   if (i >= m_viewSpaceList.count())
343 343
     i=0;
@@ -348,7 +348,7 @@ void KateViewSpaceContainer::activateNextView()
348 348
 
349 349
 void KateViewSpaceContainer::activatePrevView()
350 350
 {
351
-  int i = m_viewSpaceList.find (activeViewSpace())-1;
351
+  int i = m_viewSpaceList.tqfind (activeViewSpace())-1;
352 352
 
353 353
   if (i < 0)
354 354
     i=m_viewSpaceList.count()-1;
@@ -446,23 +446,23 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
446 446
   if (!activeView()) return;
447 447
   if (!vs) vs = activeViewSpace();
448 448
 
449
-  bool isFirstTime = vs->parentWidget() == this;
449
+  bool isFirstTime = vs->tqparentWidget() == this;
450 450
 
451 451
   TQValueList<int> psizes;
452 452
   if ( ! isFirstTime )
453
-    if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->qt_cast("TQSplitter")) )
453
+    if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->tqqt_cast("TQSplitter")) )
454 454
       psizes = ps->sizes();
455 455
 
456 456
   Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
457
-  KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
457
+  KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->tqparentWidget());
458 458
   s->setOpaqueResize( KGlobalSettings::opaqueResize() );
459 459
 
460 460
   if (! isFirstTime) {
461 461
     // anders: make sure the split' viewspace is always
462 462
     // correctly positioned.
463 463
     // If viewSpace is the first child, the new splitter must be moveToFirst'd
464
-    if ( !((KateMDI::Splitter*)vs->parentWidget())->isLastChild( vs ) )
465
-       ((KateMDI::Splitter*)s->parentWidget())->moveToFirst( s );
464
+    if ( !((KateMDI::Splitter*)vs->tqparentWidget())->isLastChild( vs ) )
465
+       ((KateMDI::Splitter*)s->tqparentWidget())->moveToFirst( s );
466 466
   }
467 467
   vs->reparent( s, 0, TQPoint(), true );
468 468
   KateViewSpace* vsNew = new KateViewSpace( this, s );
@@ -471,13 +471,13 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
471 471
     s->moveToFirst( vsNew );
472 472
 
473 473
   if (!isFirstTime)
474
-    if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->qt_cast("TQSplitter")) )
474
+    if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->tqqt_cast("TQSplitter")) )
475 475
       ps->setSizes( psizes );
476 476
 
477 477
   s->show();
478 478
 
479 479
   TQValueList<int> sizes;
480
-  int space = 50;//isHoriz ? s->parentWidget()->height()/2 : s->parentWidget()->width()/2;
480
+  int space = 50;//isHoriz ? s->tqparentWidget()->height()/2 : s->tqparentWidget()->width()/2;
481 481
   sizes << space << space;
482 482
   s->setSizes( sizes );
483 483
 
@@ -503,7 +503,7 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
503 503
   // abort if this is the last viewspace
504 504
   if (m_viewSpaceList.count() < 2) return;
505 505
 
506
-  KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->parentWidget();
506
+  KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->tqparentWidget();
507 507
 
508 508
   // find out if it is the first child for repositioning
509 509
   // see below
@@ -512,16 +512,16 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
512 512
   // save some size information
513 513
   KateMDI::Splitter* pp=0L;
514 514
   TQValueList<int> ppsizes;
515
-  if (m_viewSpaceList.count() > 2 && p->parentWidget() != this)
515
+  if (m_viewSpaceList.count() > 2 && p->tqparentWidget() != this)
516 516
   {
517
-    pp = (KateMDI::Splitter*)p->parentWidget();
517
+    pp = (KateMDI::Splitter*)p->tqparentWidget();
518 518
     ppsizes = pp->sizes();
519 519
     pIsFirst = !pp->isLastChild( p ); // simple logic, right-
520 520
   }
521 521
 
522 522
   // Figure out where to put views that are still needed
523 523
   KateViewSpace* next;
524
-  if (m_viewSpaceList.find(viewspace) == 0)
524
+  if (m_viewSpaceList.tqfind(viewspace) == 0)
525 525
     next = m_viewSpaceList.next();
526 526
   else
527 527
     next = m_viewSpaceList.prev();
@@ -550,14 +550,14 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
550 550
   m_viewSpaceList.remove( viewspace );
551 551
 
552 552
   // reparent the other sibling of the parent.
553
-  while (p->children ())
553
+  while (!p->childrenListObject().isEmpty())
554 554
   {
555
-    TQWidget* other = ((TQWidget *)(( TQPtrList<TQObject>*)p->children())->first());
555
+    TQWidget* other = ((TQWidget *)(( TQPtrList<TQObject>)p->childrenListObject()).first());
556 556
 
557
-    other->reparent( p->parentWidget(), 0, TQPoint(), true );
557
+    other->reparent( p->tqparentWidget(), 0, TQPoint(), true );
558 558
     // We also need to find the right viewspace to become active
559 559
     if (pIsFirst)
560
-       ((KateMDI::Splitter*)p->parentWidget())->moveToFirst( other );
560
+       ((KateMDI::Splitter*)p->tqparentWidget())->moveToFirst( other );
561 561
     if ( other->isA("KateViewSpace") ) {
562 562
       setActiveSpace( (KateViewSpace*)other );
563 563
     }
@@ -676,20 +676,20 @@ void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx,
676 676
 
677 677
   TQStringList childList;
678 678
   // a katesplitter has two children, of which one may be a KateSplitter.
679
-  const TQObjectList* l = s->children();
680
-  TQObjectListIt it( *l );
679
+  const TQObjectList l = s->childrenListObject();
680
+  TQObjectListIt it( l );
681 681
   TQObject* obj;
682 682
   for (; it.current(); ++it) {
683 683
    obj = it.current();
684 684
    TQString n;  // name for child list, see below
685 685
    // For KateViewSpaces, ask them to save the file list.
686 686
    if ( obj->isA("KateViewSpace") ) {
687
-     n = TQString(viewConfGrp+"-ViewSpace %1").arg( m_viewSpaceList.find((KateViewSpace*)obj) );
688
-     ((KateViewSpace*)obj)->saveConfig ( config, m_viewSpaceList.find((KateViewSpace*)obj), viewConfGrp);
687
+     n = TQString(viewConfGrp+"-ViewSpace %1").arg( m_viewSpaceList.tqfind((KateViewSpace*)obj) );
688
+     ((KateViewSpace*)obj)->saveConfig ( config, m_viewSpaceList.tqfind((KateViewSpace*)obj), viewConfGrp);
689 689
      // save active viewspace
690 690
      if ( ((KateViewSpace*)obj)->isActiveSpace() ) {
691 691
        config->setGroup(viewConfGrp);
692
-       config->writeEntry("Active Viewspace", m_viewSpaceList.find((KateViewSpace*)obj) );
692
+       config->writeEntry("Active Viewspace", m_viewSpaceList.tqfind((KateViewSpace*)obj) );
693 693
      }
694 694
    }
695 695
    // For KateSplitters, recurse

+ 1
- 1
kate/app/kateviewspacecontainer.h View File

@@ -32,7 +32,7 @@
32 32
 class KConfig;
33 33
 class KateMainWindow;
34 34
 
35
-class KateViewSpaceContainer: public QVBox
35
+class KateViewSpaceContainer: public TQVBox
36 36
 {
37 37
   Q_OBJECT
38 38
 

+ 1
- 1
kate/app/kbookmarkhandler.cpp View File

@@ -73,7 +73,7 @@ void KBookmarkHandler::slotNewBookmark( const TQString& /*text*/,
73 73
 {
74 74
     *m_importStream << "<bookmark icon=\"" << KMimeType::iconForURL( KURL( url ) );
75 75
     *m_importStream << "\" href=\"" << TQString::fromUtf8(url) << "\">\n";
76
-    *m_importStream << "<title>" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\n";
76
+    *m_importStream << "<title>" << (additionalInfo.isEmpty() ? TQString(TQString::fromUtf8(url)) : additionalInfo) << "</title>\n</bookmark>\n";
77 77
 }
78 78
 
79 79
 void KBookmarkHandler::slotNewFolder( const TQString& text, bool /*open*/,

+ 17
- 17
kate/app/kwritemain.cpp View File

@@ -107,12 +107,12 @@ KWrite::KWrite (KTextEditor::Document *doc)
107 107
   guiFactory()->addClient( m_view );
108 108
 
109 109
   // install a working kate part popup dialog thingy
110
-  if (static_cast<Kate::View*>(m_view->qt_cast("Kate::View")))
111
-    static_cast<Kate::View*>(m_view->qt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) );
110
+  if (static_cast<Kate::View*>(m_view->tqqt_cast("Kate::View")))
111
+    static_cast<Kate::View*>(m_view->tqqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) );
112 112
 
113 113
   // init with more usefull size, stolen from konq :)
114 114
   if (!initialGeometrySet())
115
-    resize( TQSize(700, 480).expandedTo(minimumSizeHint()));
115
+    resize( TQSize(700, 480).expandedTo(tqminimumSizeHint()));
116 116
 
117 117
   // call it as last thing, must be sure everything is already set up ;)
118 118
   setAutoSaveSettings ();
@@ -139,41 +139,41 @@ KWrite::~KWrite()
139 139
 
140 140
 void KWrite::setupActions()
141 141
 {
142
-  KStdAction::close( this, TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document"));
142
+  KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document"));
143 143
 
144 144
   // setup File menu
145
-  KStdAction::print(this, TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document"));
146
-  KStdAction::openNew( this, TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document"));
147
-  KStdAction::open( this, TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing"));
145
+  KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document"));
146
+  KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document"));
147
+  KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing"));
148 148
 
149
-  m_recentFiles = KStdAction::openRecent(this, TQT_SLOT(slotOpen(const KURL&)),
149
+  m_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotOpen(const KURL&)),
150 150
                                          actionCollection());
151 151
   m_recentFiles->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
152 152
 
153
-  KAction *a=new KAction(i18n("&New Window"), "window_new", 0, this, TQT_SLOT(newView()),
153
+  KAction *a=new KAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()),
154 154
               actionCollection(), "view_new_view");
155 155
   a->setWhatsThis(i18n("Create another view containing the current document"));
156 156
 
157
-  a=new KAction(i18n("Choose Editor..."),0,this,TQT_SLOT(changeEditor()),
157
+  a=new KAction(i18n("Choose Editor..."),0,TQT_TQOBJECT(this),TQT_SLOT(changeEditor()),
158 158
 		actionCollection(),"settings_choose_editor");
159 159
   a->setWhatsThis(i18n("Override the system wide setting for the default editing component"));
160 160
 
161
-  KStdAction::quit(this, TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view"));
161
+  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view"));
162 162
 
163 163
   // setup Settings menu
164 164
   setStandardToolBarMenuEnabled(true);
165 165
 
166
-  m_paShowStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
166
+  m_paShowStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
167 167
   m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar"));
168 168
 
169
-  m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, this, TQT_SLOT(newCaption()),
169
+  m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, TQT_TQOBJECT(this), TQT_SLOT(newCaption()),
170 170
                     actionCollection(), "set_showPath");
171 171
   m_paShowPath->setCheckedState(i18n("Hide Path"));
172 172
   m_paShowPath->setWhatsThis(i18n("Show the complete document path in the window caption"));
173
-  a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection());
173
+  a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection());
174 174
   a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
175 175
 
176
-  a=KStdAction::configureToolbars(this, TQT_SLOT(editToolbars()), actionCollection());
176
+  a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection());
177 177
   a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
178 178
 }
179 179
 
@@ -458,7 +458,7 @@ void KWrite::readProperties(KConfig *config)
458 458
 void KWrite::saveProperties(KConfig *config)
459 459
 {
460 460
   writeConfig(config);
461
-  config->writeEntry("DocumentNumber",docList.find(m_view->document()) + 1);
461
+  config->writeEntry("DocumentNumber",docList.tqfind(m_view->document()) + 1);
462 462
 
463 463
   if (KTextEditor::sessionConfigInterface(m_view))
464 464
     KTextEditor::sessionConfigInterface(m_view)->writeSessionConfig(config);
@@ -485,7 +485,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents
485 485
      TQString buf = TQString("Window %1").arg(z);
486 486
      config->setGroup(buf);
487 487
 
488
-     config->writeEntry("DocumentNumber",docList.find(winList.at(z-1)->view()->document()) + 1);
488
+     config->writeEntry("DocumentNumber",docList.tqfind(winList.at(z-1)->view()->document()) + 1);
489 489
   }
490 490
 }
491 491
 

+ 1
- 1
kate/interfaces/application.h View File

@@ -35,7 +35,7 @@ class MainWindow;
35 35
  * other objects like document/projectmanager, ... no way goes around this
36 36
  * central interface
37 37
  */
38
-class KDE_EXPORT Application : public QObject
38
+class KDE_EXPORT Application : public TQObject
39 39
 {
40 40
   friend class PrivateApplication;
41 41
 

+ 1
- 1
kate/interfaces/documentmanager.h View File

@@ -26,7 +26,7 @@ namespace Kate
26 26
 {
27 27
 /** This interface provides access to the Kate Document Manager.
28 28
 */
29
-class KDE_EXPORT DocumentManager : public QObject
29
+class KDE_EXPORT DocumentManager : public TQObject
30 30
 {
31 31
   friend class PrivateDocumentManager;
32 32
 

+ 1
- 1
kate/interfaces/mainwindow.h View File

@@ -29,7 +29,7 @@ namespace Kate
29 29
 
30 30
 class ViewManager;
31 31
 
32
-class KDE_EXPORT MainWindow : public QObject
32
+class KDE_EXPORT MainWindow : public TQObject
33 33
 {
34 34
   friend class PrivateMainWindow;
35 35
 

+ 1
- 1
kate/interfaces/plugin.cpp View File

@@ -99,7 +99,7 @@ PluginViewInterface *pluginViewInterface (Plugin *plugin)
99 99
   if (!plugin)
100 100
     return 0;
101 101
 
102
-  return static_cast<PluginViewInterface*>(plugin->qt_cast("Kate::PluginViewInterface"));
102
+  return static_cast<PluginViewInterface*>(plugin->tqqt_cast("Kate::PluginViewInterface"));
103 103
 }
104 104
 
105 105
 }

+ 1
- 1
kate/interfaces/plugin.h View File

@@ -32,7 +32,7 @@ namespace Kate
32 32
 class Application;
33 33
 class MainWindow;
34 34
 
35
-class KDE_EXPORT Plugin : public QObject
35
+class KDE_EXPORT Plugin : public TQObject
36 36
 {
37 37
   friend class PrivatePlugin;
38 38
 

+ 1
- 1
kate/interfaces/pluginconfiginterface.cpp View File

@@ -59,5 +59,5 @@ PluginConfigInterface *Kate::pluginConfigInterface (Plugin *plugin)
59 59
   if (!plugin)
60 60
     return 0;
61 61
 
62
-  return static_cast<PluginConfigInterface*>(plugin->qt_cast("Kate::PluginConfigInterface"));
62
+  return static_cast<PluginConfigInterface*>(plugin->tqqt_cast("Kate::PluginConfigInterface"));
63 63
 }

+ 1
- 1
kate/interfaces/pluginconfiginterfaceextension.cpp View File

@@ -64,5 +64,5 @@ PluginConfigInterfaceExtension *Kate::pluginConfigInterfaceExtension (Plugin *pl
64 64
   if (!plugin)
65 65
     return 0;
66 66
 
67
-  return static_cast<PluginConfigInterfaceExtension*>(plugin->qt_cast("Kate::PluginConfigInterfaceExtension"));
67
+  return static_cast<PluginConfigInterfaceExtension*>(plugin->tqqt_cast("Kate::PluginConfigInterfaceExtension"));
68 68
 }

+ 1
- 1
kate/interfaces/pluginconfiginterfaceextension.h View File

@@ -26,7 +26,7 @@
26 26
 namespace Kate
27 27
 {
28 28
 
29
-class KDE_EXPORT PluginConfigPage : public QWidget
29
+class KDE_EXPORT PluginConfigPage : public TQWidget
30 30
 {
31 31
   Q_OBJECT
32 32
 

+ 1
- 1
kate/interfaces/pluginmanager.h View File

@@ -27,7 +27,7 @@ namespace Kate
27 27
 {
28 28
 /** This interface provides access to the Kate Plugin Manager.
29 29
 */
30
-class KDE_EXPORT PluginManager : public QObject
30
+class KDE_EXPORT PluginManager : public TQObject
31 31
 {
32 32
   friend class PrivatePluginManager;
33 33
 

+ 3
- 3
kate/interfaces/toolviewmanager.cpp View File

@@ -60,7 +60,7 @@ TQWidget *ToolViewManager::createToolView (const TQString &identifier, ToolViewM
60 60
 
61 61
 bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position  pos)
62 62
 {
63
-  if (!widget || !widget->qt_cast("KateMDI::ToolView"))
63
+  if (!widget || !widget->tqqt_cast("KateMDI::ToolView"))
64 64
     return false;
65 65
 
66 66
   return d->toolViewMan->moveToolView (static_cast<KateMDI::ToolView*>(widget), (KMultiTabBar::KMultiTabBarPosition)pos);
@@ -68,7 +68,7 @@ bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position
68 68
 
69 69
 bool ToolViewManager::showToolView(TQWidget *widget)
70 70
 {
71
-  if (!widget || !widget->qt_cast("KateMDI::ToolView"))
71
+  if (!widget || !widget->tqqt_cast("KateMDI::ToolView"))
72 72
     return false;
73 73
 
74 74
   return d->toolViewMan->showToolView (static_cast<KateMDI::ToolView*>(widget));
@@ -76,7 +76,7 @@ bool ToolViewManager::showToolView(TQWidget *widget)
76 76
 
77 77
 bool ToolViewManager::hideToolView(TQWidget *widget)
78 78
 {
79
-  if (!widget || !widget->qt_cast("KateMDI::ToolView"))
79
+  if (!widget || !widget->tqqt_cast("KateMDI::ToolView"))
80 80
     return false;
81 81
 
82 82
   return d->toolViewMan->hideToolView (static_cast<KateMDI::ToolView*>(widget));

+ 1
- 1
kate/interfaces/toolviewmanager.h View File

@@ -29,7 +29,7 @@ namespace Kate
29 29
 /**
30 30
   Interface to the toolviewmanager
31 31
  */
32
-class KDE_EXPORT ToolViewManager : public QObject
32
+class KDE_EXPORT ToolViewManager : public TQObject
33 33
 {
34 34
   friend class PrivateToolViewManager;
35 35
 

+ 1
- 1
kate/interfaces/viewmanager.h View File

@@ -30,7 +30,7 @@ class View;
30 30
 /**
31 31
  * Interface to the viewmanager
32 32
  */
33
-class KDE_EXPORT ViewManager : public QObject
33
+class KDE_EXPORT ViewManager : public TQObject
34 34
 {
35 35
   friend class PrivateViewManager;
36 36
 

+ 1
- 1
kate/utils/dockviewbase.cpp View File

@@ -87,7 +87,7 @@ void Kate::DockViewBase::init( const TQString &prefix, const TQString &title )
87 87
 {
88 88
   setSpacing( 4 );
89 89
   d->header = new TQWidget( this );
90
-  d->header->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
90
+  d->header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
91 91
   TQHBoxLayout *lo = new TQHBoxLayout( d->header );
92 92
   lo->setSpacing( 6 );
93 93
   lo->insertSpacing( 0, 6 ); 

+ 6
- 6
kcminit/main.cpp View File

@@ -113,10 +113,10 @@ void KCMInit::runModules( int phase )
113 113
       TQString libName = TQString("kcm_%1").arg(library);
114 114
 
115 115
       // try to load the library
116
-      if (! alreadyInitialized.contains( libName.ascii() )) {
116
+      if (! alreadyInitialized.tqcontains( libName.ascii() )) {
117 117
 	  if (!runModule(libName, service)) {
118 118
 	      libName = TQString("libkcm_%1").arg(library);
119
-	      if (! alreadyInitialized.contains( libName.ascii() )) {
119
+	      if (! alreadyInitialized.tqcontains( libName.ascii() )) {
120 120
 		  runModule(libName, service);
121 121
 		  alreadyInitialized.append( libName.ascii() );
122 122
 	      }
@@ -159,7 +159,7 @@ KCMInit::KCMInit( KCmdLineArgs* args )
159 159
     KService::Ptr serv = KService::serviceByStorageId( module );
160 160
     if ( !serv || serv->library().isEmpty() ||
161 161
 	 serv->init().isEmpty()) {
162
-      kdError(1208) << i18n("Module %1 not found!").arg(module) << endl;
162
+      kdError(1208) << TQString(i18n("Module %1 not found!").arg(module)) << endl;
163 163
       return;
164 164
     } else
165 165
       list.append(serv);
@@ -193,8 +193,8 @@ KCMInit::KCMInit( KCmdLineArgs* args )
193 193
      runModules( 0 );
194 194
      kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)",  TQString("kcminit"));
195 195
      sendReady();
196
-     TQTimer::singleShot( 300 * 1000, qApp, TQT_SLOT( quit())); // just in case
197
-     qApp->exec(); // wait for runPhase1() and runPhase2()
196
+     TQTimer::singleShot( 300 * 1000, tqApp, TQT_SLOT( quit())); // just in case
197
+     tqApp->exec(); // wait for runPhase1() and runPhase2()
198 198
   }
199 199
   else
200 200
      runModules( -1 ); // all phases
@@ -215,7 +215,7 @@ void KCMInit::runPhase2()
215 215
 {
216 216
   runModules( 2 );
217 217
   emitDCOPSignal( "phase2Done()", TQByteArray());
218
-  qApp->exit( 0 );
218
+  tqApp->exit( 0 );
219 219
 }
220 220
 
221 221
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])

+ 1
- 1
kcontrol/access/kaccess.cpp View File

@@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() {
585 585
       TQVBoxLayout * vlay = new TQVBoxLayout(lay);
586 586
 
587 587
       featuresLabel = new TQLabel( "", contents );
588
-      featuresLabel->setAlignment( WordBreak|AlignVCenter );
588
+      featuresLabel->tqsetAlignment( WordBreak|AlignVCenter );
589 589
       vlay->addWidget( featuresLabel );
590 590
       vlay->addStretch();
591 591
 

+ 1
- 1
kcontrol/access/kaccess.h View File

@@ -86,7 +86,7 @@ private:
86 86
 };
87 87
 
88 88
 
89
-class VisualBell : public QWidget
89
+class VisualBell : public TQWidget
90 90
 {
91 91
   Q_OBJECT
92 92
 

+ 11
- 11
kcontrol/access/kcmaccess.cpp View File

@@ -248,7 +248,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
248 248
   grp->setColumnLayout( 0, Qt::Horizontal );
249 249
   vbox->addWidget(grp);
250 250
 
251
-  TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
251
+  TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(),
252 252
       KDialogBase::spacingHint());
253 253
 
254 254
   systemBell = new TQCheckBox(i18n("Use &system bell"), grp);
@@ -291,7 +291,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
291 291
   grp->setColumnLayout( 0, Qt::Horizontal );
292 292
   vbox->addWidget(grp);
293 293
 
294
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
294
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
295 295
 
296 296
   visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp);
297 297
   vvbox->addWidget(visibleBell);
@@ -311,7 +311,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
311 311
   TQWhatsThis::add( flashScreen, i18n("The screen will turn to a custom color for the amount of time specified below.") );
312 312
   hbox->addSpacing(12);
313 313
   colorButton = new KColorButton(grp);
314
-  colorButton->setFixedWidth(colorButton->sizeHint().height()*2);
314
+  colorButton->setFixedWidth(colorButton->tqsizeHint().height()*2);
315 315
   hbox->addWidget(colorButton);
316 316
   hbox->addStretch();
317 317
   TQWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") );
@@ -353,7 +353,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
353 353
   grp->setColumnLayout( 0, Qt::Horizontal );
354 354
   vbox->addWidget(grp);
355 355
 
356
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
356
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
357 357
 
358 358
   stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp);
359 359
   vvbox->addWidget(stickyKeys);
@@ -377,7 +377,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
377 377
   grp->setColumnLayout( 0, Qt::Horizontal );
378 378
   vbox->addWidget(grp);
379 379
 
380
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
380
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
381 381
 
382 382
   toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp);
383 383
   vvbox->addWidget(toggleKeysBeep);
@@ -388,7 +388,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
388 388
   hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
389 389
   hbox->addStretch(1);
390 390
   kNotifyModifiersButton = new TQPushButton(i18n("Configure System Notification..."), grp);
391
-  kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
391
+  kNotifyModifiersButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
392 392
   hbox->addWidget(kNotifyModifiersButton);
393 393
 
394 394
   connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
@@ -415,7 +415,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
415 415
   grp->setColumnLayout( 0, Qt::Horizontal );
416 416
   vbox->addWidget(grp);
417 417
 
418
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
418
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
419 419
 
420 420
   slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp);
421 421
   vvbox->addWidget(slowKeys);
@@ -447,7 +447,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
447 447
   grp->setColumnLayout( 0, Qt::Horizontal );
448 448
   vbox->addWidget(grp);
449 449
 
450
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
450
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
451 451
 
452 452
   bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp);
453 453
   vvbox->addWidget(bounceKeys);
@@ -491,7 +491,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
491 491
   grp->setColumnLayout( 0, Qt::Horizontal );
492 492
   vbox->addWidget(grp);
493 493
 
494
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
494
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
495 495
 
496 496
   gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp);
497 497
   vvbox->addWidget(gestures);
@@ -521,7 +521,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
521 521
   grp->setColumnLayout( 0, Qt::Horizontal );
522 522
   vbox->addWidget(grp);
523 523
 
524
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
524
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
525 525
 
526 526
   accessxBeep = new TQCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp);
527 527
   vvbox->addWidget(accessxBeep);
@@ -536,7 +536,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
536 536
   hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
537 537
   hbox->addStretch(1);
538 538
   kNotifyAccessXButton = new TQPushButton(i18n("Configure System Notification..."), grp);
539
-  kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
539
+  kNotifyAccessXButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
540 540
   hbox->addWidget(kNotifyAccessXButton);
541 541
 
542 542
   connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));

+ 15
- 15
kcontrol/accessibility/accessibilityconfigwidget.ui View File

@@ -95,7 +95,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
95 95
                                         <property name="sizeType">
96 96
                                             <enum>Fixed</enum>
97 97
                                         </property>
98
-                                        <property name="sizeHint">
98
+                                        <property name="tqsizeHint">
99 99
                                             <size>
100 100
                                                 <width>20</width>
101 101
                                                 <height>20</height>
@@ -244,7 +244,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
244 244
                                         <property name="sizeType">
245 245
                                             <enum>Fixed</enum>
246 246
                                         </property>
247
-                                        <property name="sizeHint">
247
+                                        <property name="tqsizeHint">
248 248
                                             <size>
249 249
                                                 <width>20</width>
250 250
                                                 <height>20</height>
@@ -338,7 +338,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
338 338
                                                         <property name="sizeType">
339 339
                                                             <enum>Expanding</enum>
340 340
                                                         </property>
341
-                                                        <property name="sizeHint">
341
+                                                        <property name="tqsizeHint">
342 342
                                                             <size>
343 343
                                                                 <width>0</width>
344 344
                                                                 <height>15</height>
@@ -363,7 +363,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
363 363
                         <property name="sizeType">
364 364
                             <enum>Expanding</enum>
365 365
                         </property>
366
-                        <property name="sizeHint">
366
+                        <property name="tqsizeHint">
367 367
                             <size>
368 368
                                 <width>20</width>
369 369
                                 <height>0</height>
@@ -420,7 +420,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
420 420
                                         <property name="sizeType">
421 421
                                             <enum>Fixed</enum>
422 422
                                         </property>
423
-                                        <property name="sizeHint">
423
+                                        <property name="tqsizeHint">
424 424
                                             <size>
425 425
                                                 <width>20</width>
426 426
                                                 <height>20</height>
@@ -534,7 +534,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
534 534
                                         <property name="sizeType">
535 535
                                             <enum>Fixed</enum>
536 536
                                         </property>
537
-                                        <property name="sizeHint">
537
+                                        <property name="tqsizeHint">
538 538
                                             <size>
539 539
                                                 <width>20</width>
540 540
                                                 <height>20</height>
@@ -625,7 +625,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
625 625
                                         <property name="sizeType">
626 626
                                             <enum>Fixed</enum>
627 627
                                         </property>
628
-                                        <property name="sizeHint">
628
+                                        <property name="tqsizeHint">
629 629
                                             <size>
630 630
                                                 <width>20</width>
631 631
                                                 <height>20</height>
@@ -683,7 +683,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
683 683
                         <property name="sizeType">
684 684
                             <enum>Expanding</enum>
685 685
                         </property>
686
-                        <property name="sizeHint">
686
+                        <property name="tqsizeHint">
687 687
                             <size>
688 688
                                 <width>21</width>
689 689
                                 <height>61</height>
@@ -789,7 +789,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
789 789
                                         <property name="text">
790 790
                                             <string>Ma&amp;ximum speed:</string>
791 791
                                         </property>
792
-                                        <property name="alignment">
792
+                                        <property name="tqalignment">
793 793
                                             <set>AlignVCenter|AlignRight</set>
794 794
                                         </property>