Browse Source

Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 8 years ago
parent
commit
fd3a982e26
100 changed files with 592 additions and 592 deletions
  1. 2
    2
      applnk/kde-utilities-xutils.directory
  2. 2
    2
      applnk/kde-utilities.directory
  3. 5
    5
      drkonqi/backtrace.cpp
  4. 1
    1
      drkonqi/backtrace.h
  5. 6
    6
      drkonqi/debugger.cpp
  6. 13
    13
      drkonqi/krashconf.cpp
  7. 4
    4
      drkonqi/toplevel.cpp
  8. 1
    1
      kappfinder/README.apps
  9. 11
    11
      kappfinder/apps/Games/Toys/xpinguin.desktop
  10. 1
    1
      kappfinder/apps/Utilities/Editors/emacs.desktop
  11. 1
    1
      kappfinder/apps/Utilities/Editors/gvim.desktop
  12. 1
    1
      kappfinder/apps/Utilities/Editors/lemacs.desktop
  13. 1
    1
      kappfinder/apps/Utilities/Editors/nedit.desktop
  14. 1
    1
      kappfinder/apps/Utilities/Editors/xemacs.desktop
  15. 2
    2
      kappfinder/apps/Utilities/calctool.desktop
  16. 2
    2
      kappfinder/apps/Utilities/xutils/xcalc.desktop
  17. 1
    1
      kappfinder/apps/Utilities/xutils/xload.desktop
  18. 10
    10
      kappfinder/toplevel.cpp
  19. 6
    6
      kate/COPYING.LIB
  20. 3
    3
      kate/ChangeLog
  21. 1
    1
      kate/README
  22. 2
    2
      kate/app/kateapp.cpp
  23. 1
    1
      kate/app/kateappIface.cpp
  24. 1
    1
      kate/app/kateconfigdialog.cpp
  25. 3
    3
      kate/app/kateconsole.cpp
  26. 4
    4
      kate/app/katedocmanager.cpp
  27. 1
    1
      kate/app/katedocmanager.h
  28. 13
    13
      kate/app/kateexternaltools.cpp
  29. 1
    1
      kate/app/kateexternaltools.h
  30. 9
    9
      kate/app/katefilelist.cpp
  31. 1
    1
      kate/app/katefilelist.h
  32. 9
    9
      kate/app/katefileselector.cpp
  33. 1
    1
      kate/app/katefileselector.h
  34. 29
    29
      kate/app/kategrepdialog.cpp
  35. 3
    3
      kate/app/katemailfilesdialog.cpp
  36. 1
    1
      kate/app/katemain.cpp
  37. 6
    6
      kate/app/katemainwindow.cpp
  38. 1
    1
      kate/app/katemainwindow.h
  39. 7
    7
      kate/app/katemdi.cpp
  40. 1
    1
      kate/app/katemdi.h
  41. 2
    2
      kate/app/katemwmodonhddialog.cpp
  42. 1
    1
      kate/app/katemwmodonhddialog.h
  43. 1
    1
      kate/app/katesession.cpp
  44. 3
    3
      kate/app/katetabwidget.cpp
  45. 1
    1
      kate/app/kateviewmanager.cpp
  46. 12
    12
      kate/app/kateviewspace.cpp
  47. 2
    2
      kate/app/kateviewspace.h
  48. 19
    19
      kate/app/kateviewspacecontainer.cpp
  49. 6
    6
      kate/app/kwritemain.cpp
  50. 2
    2
      kate/app/kwritemain.h
  51. 2
    2
      kate/data/tips
  52. 1
    1
      kate/interfaces/mainwindow.cpp
  53. 1
    1
      kate/interfaces/mainwindow.h
  54. 1
    1
      kate/utils/dockviewbase.cpp
  55. 5
    5
      kcminit/main.cpp
  56. 6
    6
      kcontrol/TODO
  57. 4
    4
      kcontrol/access/eventsrc
  58. 11
    11
      kcontrol/access/kaccess.cpp
  59. 12
    12
      kcontrol/access/kcmaccess.cpp
  60. 19
    19
      kcontrol/accessibility/accessibilityconfigwidget.ui
  61. 20
    20
      kcontrol/arts/arts.cpp
  62. 1
    1
      kcontrol/arts/arts.h
  63. 9
    9
      kcontrol/arts/generaltab.ui
  64. 10
    10
      kcontrol/arts/hardwaretab.ui
  65. 5
    5
      kcontrol/arts/krichtextlabel.cpp
  66. 3
    3
      kcontrol/arts/krichtextlabel.h
  67. 1
    1
      kcontrol/background/bgadvanced.cpp
  68. 8
    8
      kcontrol/background/bgadvanced_ui.ui
  69. 10
    10
      kcontrol/background/bgdialog.cpp
  70. 20
    20
      kcontrol/background/bgdialog_ui.ui
  71. 1
    1
      kcontrol/background/bghash.h
  72. 7
    7
      kcontrol/background/bgmonitor.cpp
  73. 17
    17
      kcontrol/background/bgrender.cpp
  74. 5
    5
      kcontrol/background/bgsettings.cpp
  75. 8
    8
      kcontrol/background/bgwallpaper_ui.ui
  76. 3
    3
      kcontrol/background/main.cpp
  77. 4
    4
      kcontrol/bell/bell.cpp
  78. 13
    13
      kcontrol/clock/dtime.cpp
  79. 4
    4
      kcontrol/clock/main.cpp
  80. 1
    1
      kcontrol/colors/colorscm.cpp
  81. 7
    7
      kcontrol/colors/stdclient_bitmaps.h
  82. 18
    18
      kcontrol/colors/widgetcanvas.cpp
  83. 2
    2
      kcontrol/componentchooser/EXAMPLE.desktop
  84. 6
    6
      kcontrol/componentchooser/browserconfig_ui.ui
  85. 8
    8
      kcontrol/componentchooser/componentchooser.cpp
  86. 4
    4
      kcontrol/componentchooser/componentchooser_ui.ui
  87. 4
    4
      kcontrol/componentchooser/componentconfig_ui.ui
  88. 8
    8
      kcontrol/componentchooser/emailclientconfig_ui.ui
  89. 6
    6
      kcontrol/componentchooser/terminalemulatorconfig_ui.ui
  90. 33
    33
      kcontrol/crypto/certgen.ui
  91. 21
    21
      kcontrol/crypto/crypto.cpp
  92. 11
    11
      kcontrol/css/cssconfig.ui
  93. 10
    10
      kcontrol/css/csscustom.ui
  94. 4
    4
      kcontrol/css/preview.ui
  95. 1
    1
      kcontrol/css/template.cpp
  96. 10
    10
      kcontrol/dnssd/configdialog.ui
  97. 5
    5
      kcontrol/dnssd/kcmdnssd.cpp
  98. 1
    1
      kcontrol/ebrowsing/ebrowsing.desktop
  99. 3
    3
      kcontrol/ebrowsing/main.cpp
  100. 0
    0
      kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui

+ 2
- 2
applnk/kde-utilities-xutils.directory View File

@@ -29,7 +29,7 @@ Name[gl]=Utilidades das X
29 29
 Name[he]=כלי X
30 30
 Name[hi]=एक्स-यूटिलिटीज़
31 31
 Name[hr]=X-alati
32
-Name[hsb]=Potqmocniki za X
32
+Name[hsb]=Pomocniki za X
33 33
 Name[hu]=X segédprogramok
34 34
 Name[is]=X Tól
35 35
 Name[it]=Programmi di X
@@ -112,7 +112,7 @@ Comment[gl]=Utilidades das X Window
112 112
 Comment[he]=כלים של X Window
113 113
 Comment[hi]=एक्स विंडो यूटिलिटीज़
114 114
 Comment[hr]=Alati X prozora
115
-Comment[hsb]=Potqmocne programy za X11
115
+Comment[hsb]=Pomocne programy za X11
116 116
 Comment[hu]=X Window segédprogramok
117 117
 Comment[is]=X gluggatól
118 118
 Comment[it]=Programmi di X Window

+ 2
- 2
applnk/kde-utilities.directory View File

@@ -31,7 +31,7 @@ Name[gl]=Utilidades
31 31
 Name[he]=כלים
32 32
 Name[hi]=यूटिलिटीज़
33 33
 Name[hr]=Alati
34
-Name[hsb]=Potqmocniki
34
+Name[hsb]=Pomocniki
35 35
 Name[hu]=Segédprogramok
36 36
 Name[is]=Nytjatól
37 37
 Name[it]=Accessori
@@ -115,7 +115,7 @@ Comment[gl]=Utilidades
115 115
 Comment[he]=כלים
116 116
 Comment[hi]=यूटिलिटीज़
117 117
 Comment[hr]=Alati
118
-Comment[hsb]=Potqmocne programy
118
+Comment[hsb]=Pomocne programy
119 119
 Comment[hu]=Segédprogramok
120 120
 Comment[is]=Ýmis nytsamleg áhöld
121 121
 Comment[it]=Accessori

+ 5
- 5
drkonqi/backtrace.cpp View File

@@ -137,7 +137,7 @@ bool BackTrace::usefulBacktrace()
137 137
 {
138 138
   // remove crap
139 139
   if( !m_krashconf->removeFromBacktraceRegExp().isEmpty())
140
-    m_strBt.tqreplace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null);
140
+    m_strBt.replace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null);
141 141
 
142 142
   if( m_krashconf->disableChecks())
143 143
       return true;
@@ -146,13 +146,13 @@ 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.tqcontains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
149
+    unknown = strBt.contains( 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.tqcontains( TQRegExp( m_krashconf->frameRegExp()));
153
+    frames = strBt.contains( TQRegExp( m_krashconf->frameRegExp()));
154 154
   else
155
-    frames = strBt.tqcontains('\n');
155
+    frames = strBt.contains('\n');
156 156
   bool tooShort = false;
157 157
   if( !m_krashconf->neededInValidBacktraceRegExp().isEmpty())
158 158
     tooShort = ( strBt.find( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 );
@@ -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::tqfromLatin1( "[KCrash handler]\n" ));
178
+      m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" ));
179 179
       }
180 180
     }
181 181
 }

+ 1
- 1
drkonqi/backtrace.h View File

@@ -49,7 +49,7 @@ signals:
49 49
   void append(const TQString &str); // Just the new text
50 50
 
51 51
   void someError();
52
-  void done(const TQString &); // tqreplaces whole text
52
+  void done(const TQString &); // replaces whole text
53 53
 
54 54
 protected slots:
55 55
   void slotProcessExited(KProcess * proc);

+ 6
- 6
drkonqi/debugger.cpp View File

@@ -60,9 +60,9 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
63
+  m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
64 64
   //m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
65
-  KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "editcopy" ) );
65
+  KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "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 );
@@ -82,7 +82,7 @@ void KrashDebugger :: slotDone(const TQString& str)
82 82
   m_status->setText(i18n("Done."));
83 83
   m_copyButton->setEnabled( true );
84 84
   m_saveButton->setEnabled( true );
85
-  m_backtrace->setText( m_prependText + str ); // tqreplace with possibly post-processed backtrace
85
+  m_backtrace->setText( m_prependText + str ); // replace with possibly post-processed backtrace
86 86
 }
87 87
 
88 88
 void KrashDebugger :: slotCopy()
@@ -109,8 +109,8 @@ void KrashDebugger :: slotSave()
109 109
   }
110 110
   else
111 111
   {
112
-    TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" );
113
-    if( defname.tqcontains( '/' ))
112
+    TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" );
113
+    if( defname.contains( '/' ))
114 114
         defname = defname.mid( defname.findRev( '/' ) + 1 );
115 115
     TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename"));
116 116
     if (!filename.isEmpty())
@@ -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::tqfromLatin1( "kdedrc" ), true );
211
+  KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
212 212
   kdedcfg.setGroup( "General" );
213 213
   if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
214 214
   {

+ 13
- 13
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::tqfromLatin1("enduser"));
96
+                                         TQString::fromLatin1("enduser"));
97 97
 
98 98
   TQString debuggername = config->readEntry("Debugger",
99
-                                           TQString::tqfromLatin1("gdb"));
99
+                                           TQString::fromLatin1("gdb"));
100 100
 
101
-  KConfig debuggers(TQString::tqfromLatin1("debuggers/%1rc").arg(debuggername),
101
+  KConfig debuggers(TQString::fromLatin1("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::tqfromLatin1("presets/%1rc").arg(configname),
115
+  KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
116 116
                  true, false, "appdata");
117 117
 
118 118
   preset.setGroup("ErrorDescription");
@@ -138,24 +138,24 @@ 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::tqfromLatin1("unknown");
141
+    str = TQString::fromLatin1("unknown");
142 142
   preset.setGroup(str);
143 143
   m_signalName = preset.readEntry("Name");
144 144
   if (b)
145 145
     m_signalText = preset.readEntry("Comment");
146 146
 }
147 147
 
148
-// tqreplace some of the strings
148
+// replace some of the strings
149 149
 void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const
150 150
 {
151 151
   TQMap<TQString,TQString> map;
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;
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;
159 159
   if (shell)
160 160
     str = KMacroExpander::expandMacrosShellQuote( str, map );
161 161
   else

+ 4
- 4
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::tqfromLatin1("pics/konqi.png")));
70
+  TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png")));
71 71
   lab->setPixmap(pix);
72
-  lab->setFixedSize( lab->tqsizeHint() );
72
+  lab->setFixedSize( lab->sizeHint() );
73 73
 
74 74
   TQLabel * info = new TQLabel(generateText(), page);
75
-  info->setMinimumSize(info->tqsizeHint());
75
+  info->setMinimumSize(info->sizeHint());
76 76
 
77 77
   if (m_krashconf->showBacktrace())
78 78
   {
@@ -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::tqfromLatin1
199
+  TQString buf = TQString::fromLatin1
200 200
     ("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str;
201 201
 
202 202
   m_bugreport->setText(buf);

+ 1
- 1
kappfinder/README.apps View File

@@ -1,4 +1,4 @@
1
-The apps directory tqcontains .desktop files for commonly used non-KDE
1
+The apps directory contains .desktop files for commonly used non-KDE
2 2
 programs which kappfinder installs into the applnk directory of KDE.
3 3
 
4 4
 kappfinder used to install .directory files as well because in the past the

+ 11
- 11
kappfinder/apps/Games/Toys/xpinguin.desktop View File

@@ -18,26 +18,26 @@ GenericName[az]=Linuks Maskotu
18 18
 GenericName[be]=Талісман Linux
19 19
 GenericName[bg]=Талисманът на Linux
20 20
 GenericName[bn]=লিনাক্স ম্যাস্কট
21
-GenericName[bs]=Linux tqmaskota
21
+GenericName[bs]=Linux maskota
22 22
 GenericName[ca]=Mascota de Linux
23 23
 GenericName[cs]=Maskot Linuxu
24 24
 GenericName[csb]=Glingòtka Linuksa
25 25
 GenericName[cy]=Masgot Linux 
26
-GenericName[da]=Linux-tqmaskot
26
+GenericName[da]=Linux-maskot
27 27
 GenericName[de]=Linux-Maskottchen
28 28
 GenericName[el]=Η μασκότ του Linux
29 29
 GenericName[eo]=La linuksa simbolbesto
30 30
 GenericName[es]=Mascota de Linux
31
-GenericName[et]=Linuxi tqmaskott
32
-GenericName[eu]=Linuxen tqmaskota
33
-GenericName[fi]=Linux-tqmaskotti
31
+GenericName[et]=Linuxi maskott
32
+GenericName[eu]=Linuxen maskota
33
+GenericName[fi]=Linux-maskotti
34 34
 GenericName[fr]=La mascotte de Linux
35
-GenericName[fy]=Linux-tqmaskotte
35
+GenericName[fy]=Linux-maskotte
36 36
 GenericName[ga]=Sonóg Linux
37 37
 GenericName[gl]=Mascota Linux
38 38
 GenericName[he]=הקמע של לינוקס
39 39
 GenericName[hi]=लिनक्स शुभंकर
40
-GenericName[hr]=Linux tqmaskota
40
+GenericName[hr]=Linux maskota
41 41
 GenericName[hu]=Linux-kabalaállatka
42 42
 GenericName[is]=Linux lukkudýrið
43 43
 GenericName[it]=Mascotte di Linux
@@ -51,11 +51,11 @@ GenericName[mk]=Маскотата на Линукс
51 51
 GenericName[mn]=Линукс-азын тэнгэр
52 52
 GenericName[ms]=Maskot Linux
53 53
 GenericName[mt]=Maskott tal-Linux
54
-GenericName[nb]=Linux-tqmaskot
54
+GenericName[nb]=Linux-maskot
55 55
 GenericName[nds]=Dat Maskottje vun Linux
56 56
 GenericName[ne]=लिनक्स मासकोट
57 57
 GenericName[nl]=Linux-mascotte
58
-GenericName[nn]=Linux-tqmaskot
58
+GenericName[nn]=Linux-maskot
59 59
 GenericName[nso]=Mascot wa Linux
60 60
 GenericName[pa]=ਲੀਨਕਸ ਮਾਸਕੋਟ
61 61
 GenericName[pl]=Maskotka Linuksa
@@ -66,8 +66,8 @@ GenericName[ru]=Эмблема Linux
66 66
 GenericName[sk]=Maskot Linuxu
67 67
 GenericName[sl]=Maskota Linuxa
68 68
 GenericName[sr]=Linux-ова маскота
69
-GenericName[sr@Latn]=Linux-ova tqmaskota
70
-GenericName[sv]=Linux-tqmaskot
69
+GenericName[sr@Latn]=Linux-ova maskota
70
+GenericName[sv]=Linux-maskot
71 71
 GenericName[ta]=Linux சின்னம்
72 72
 GenericName[te]=లినక్స్ మాస్కాట్
73 73
 GenericName[tg]=Таъвизи Linux

+ 1
- 1
kappfinder/apps/Utilities/Editors/emacs.desktop View File

@@ -86,7 +86,7 @@ GenericName[xh]=Umhleli Wombhalo
86 86
 GenericName[zh_CN]=文本编辑器
87 87
 GenericName[zh_TW]=文字編輯器
88 88
 GenericName[zu]=Umlungisi wombhalo
89
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
89
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
90 90
 Exec=emacs %f
91 91
 Icon=emacs
92 92
 Path=

+ 1
- 1
kappfinder/apps/Utilities/Editors/gvim.desktop View File

@@ -115,7 +115,7 @@ GenericName[xh]=Umhleli Wombhalo
115 115
 GenericName[zh_CN]=文本编辑器
116 116
 GenericName[zh_TW]=文字編輯器
117 117
 GenericName[zu]=Umlungisi wombhalo
118
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
118
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
119 119
 Exec=gvim -f %f
120 120
 Icon=gvim
121 121
 Type=Application

+ 1
- 1
kappfinder/apps/Utilities/Editors/lemacs.desktop View File

@@ -90,7 +90,7 @@ GenericName[xh]=Umhleli Wombhalo
90 90
 GenericName[zh_CN]=文本编辑器
91 91
 GenericName[zh_TW]=文字編輯器
92 92
 GenericName[zu]=Umlungisi wombhalo
93
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
93
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
94 94
 Exec=lemacs %f
95 95
 Icon=emacs
96 96
 Path=

+ 1
- 1
kappfinder/apps/Utilities/Editors/nedit.desktop View File

@@ -1,5 +1,5 @@
1 1
 [Desktop Entry]
2
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
2
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
3 3
 Name=Nedit
4 4
 Name[hi]=नेडिट
5 5
 Name[ka]=NEdit

+ 1
- 1
kappfinder/apps/Utilities/Editors/xemacs.desktop View File

@@ -95,7 +95,7 @@ GenericName[xh]=Umhleli Wombhalo
95 95
 GenericName[zh_CN]=文本编辑器
96 96
 GenericName[zh_TW]=文字編輯器
97 97
 GenericName[zu]=Umlungisi wombhalo
98
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
98
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
99 99
 Exec=xemacs %f
100 100
 Icon=emacs
101 101
 Type=Application

+ 2
- 2
kappfinder/apps/Utilities/calctool.desktop View File

@@ -37,7 +37,7 @@ GenericName[ca]=Calculadora
37 37
 GenericName[cs]=Kalkulátor
38 38
 GenericName[csb]=Kalkùlator
39 39
 GenericName[cy]=Cyfrifiannell
40
-GenericName[da]=Regnetqmaskine
40
+GenericName[da]=Regnemaskine
41 41
 GenericName[de]=Rechner
42 42
 GenericName[el]=Αριθμομηχανή
43 43
 GenericName[eo]=Kalkulilo
@@ -46,7 +46,7 @@ GenericName[et]=Kalkulaator
46 46
 GenericName[eu]=Kalkulagailua
47 47
 GenericName[fa]=ماشین حساب
48 48
 GenericName[fi]=Laskin
49
-GenericName[fo]=Roknitqmaskina
49
+GenericName[fo]=Roknimaskina
50 50
 GenericName[fr]=Calculatrice
51 51
 GenericName[fy]=Rekkenmasine
52 52
 GenericName[ga]=Áireamhán

+ 2
- 2
kappfinder/apps/Utilities/xutils/xcalc.desktop View File

@@ -50,7 +50,7 @@ GenericName[ca]=Calculadora
50 50
 GenericName[cs]=Kalkulátor
51 51
 GenericName[csb]=Kalkùlator
52 52
 GenericName[cy]=Cyfrifiannell
53
-GenericName[da]=Regnetqmaskine
53
+GenericName[da]=Regnemaskine
54 54
 GenericName[de]=Rechner
55 55
 GenericName[el]=Αριθμομηχανή
56 56
 GenericName[eo]=Kalkulilo
@@ -59,7 +59,7 @@ GenericName[et]=Kalkulaator
59 59
 GenericName[eu]=Kalkulagailua
60 60
 GenericName[fa]=ماشین حساب
61 61
 GenericName[fi]=Laskin
62
-GenericName[fo]=Roknitqmaskina
62
+GenericName[fo]=Roknimaskina
63 63
 GenericName[fr]=Calculatrice
64 64
 GenericName[fy]=Rekkenmasine
65 65
 GenericName[ga]=Áireamhán

+ 1
- 1
kappfinder/apps/Utilities/xutils/xload.desktop View File

@@ -1,6 +1,6 @@
1 1
 [Desktop Entry]
2 2
 Exec=xload
3
-SwallowExec=xload -nolabel -fg green -bg Black -hl red -update 3 -tqgeometry 25x25
3
+SwallowExec=xload -nolabel -fg green -bg Black -hl red -update 3 -geometry 25x25
4 4
 SwallowTitle=xload
5 5
 SwallowTitle[no]=xload
6 6
 SwallowTitle[es]=xload

+ 10
- 10
kappfinder/toplevel.cpp View File

@@ -48,16 +48,16 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
48 48
   : KDialog( parent, name, true )
49 49
 {
50 50
   setCaption( i18n( "KAppfinder" ) );
51
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, marginHint() );
51
+  TQVBoxLayout *layout = new TQVBoxLayout( this, marginHint() );
52 52
 
53 53
   TQLabel *label = new TQLabel( i18n( "The application finder looks for non-KDE "
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->tqsetAlignment( AlignAuto | WordBreak );
58
-  tqlayout->addWidget( label );
57
+  label->setAlignment( AlignAuto | WordBreak );
58
+  layout->addWidget( label );
59 59
 
60
-  tqlayout->addSpacing( 5 );
60
+  layout->addSpacing( 5 );
61 61
 
62 62
   mListView = new TQListView( this );
63 63
   mListView->addColumn( i18n( "Application" ) );
@@ -67,14 +67,14 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
67 67
   mListView->setRootIsDecorated( true );
68 68
   mListView->setAllColumnsShowFocus( true );
69 69
   mListView->setSelectionMode(TQListView::NoSelection);
70
-  tqlayout->addWidget( mListView );
70
+  layout->addWidget( mListView );
71 71
 
72 72
   mProgress = new KProgress( this );
73 73
   mProgress->setPercentageVisible( false );
74
-  tqlayout->addWidget( mProgress );
74
+  layout->addWidget( mProgress );
75 75
 
76 76
   mSummary = new TQLabel( i18n( "Summary:" ), this );
77
-  tqlayout->addWidget( mSummary );
77
+  layout->addWidget( mSummary );
78 78
 
79 79
   KButtonBox* bbox = new KButtonBox( this );
80 80
   mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), this, TQT_SLOT( slotScan() ) );
@@ -89,9 +89,9 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
89 89
   mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQT_SLOT( slotCreate() ) );
90 90
   mApplyButton->setEnabled( false );
91 91
   bbox->addButton( KStdGuiItem::close(), kapp, TQT_SLOT( quit() ) );
92
-  bbox->tqlayout();
92
+  bbox->layout();
93 93
 
94
-  tqlayout->addWidget( bbox );
94
+  layout->addWidget( bbox );
95 95
 
96 96
 	connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) );
97 97
 
@@ -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.tqreplace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
103
+  mDestDir = mDestDir.replace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
104 104
 	
105 105
   KStartupInfo::appStarted();
106 106
 

+ 6
- 6
kate/COPYING.LIB View File

@@ -94,7 +94,7 @@ will lead to faster development of free libraries.
94 94
   The precise terms and conditions for copying, distribution and
95 95
 modification follow.  Pay close attention to the difference between a
96 96
 "work based on the library" and a "work that uses the library".  The
97
-former tqcontains code derived from the library, while the latter only
97
+former contains code derived from the library, while the latter only
98 98
 works together with the library.
99 99
 
100 100
   Note that it is possible for a library to be covered by the ordinary
@@ -104,7 +104,7 @@ General Public License rather than by this special one.
104 104
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
105 105
 
106 106
   0. This License Agreement applies to any software library which
107
-tqcontains a notice placed by the copyright holder or other authorized
107
+contains a notice placed by the copyright holder or other authorized
108 108
 party saying it may be distributed under the terms of this Library
109 109
 General Public License (also called "this License").  Each licensee is
110 110
 addressed as "you".
@@ -123,7 +123,7 @@ included without limitation in the term "modification".)
123 123
 
124 124
   "Source code" for a work means the preferred form of the work for
125 125
 making modifications to it.  For a library, complete source code means
126
-all the source code for all modules it tqcontains, plus any associated
126
+all the source code for all modules it contains, plus any associated
127 127
 interface definition files, plus the scripts used to control compilation
128 128
 and installation of the library.
129 129
 
@@ -225,7 +225,7 @@ source code from the same place satisfies the requirement to
225 225
 distribute the source code, even though third parties are not
226 226
 compelled to copy the source along with the object code.
227 227
 
228
-  5. A program that tqcontains no derivative of any portion of the
228
+  5. A program that contains no derivative of any portion of the
229 229
 Library, but is designed to work with the Library by being compiled or
230 230
 linked with it, is called a "work that uses the Library".  Such a
231 231
 work, in isolation, is not a derivative work of the Library, and
@@ -233,7 +233,7 @@ therefore falls outside the scope of this License.
233 233
 
234 234
   However, linking a "work that uses the Library" with the Library
235 235
 creates an executable that is a derivative of the Library (because it
236
-tqcontains portions of the Library), rather than a "work that uses the
236
+contains portions of the Library), rather than a "work that uses the
237 237
 library".  The executable is therefore covered by this License.
238 238
 Section 6 states terms for distribution of such executables.
239 239
 
@@ -245,7 +245,7 @@ linked without the Library, or if the work is itself a library.  The
245 245
 threshold for this to be true is not precisely defined by law.
246 246
 
247 247
   If such an object file uses only numerical parameters, data
248
-structure tqlayouts and accessors, and small macros and small inline
248
+structure layouts and accessors, and small macros and small inline
249 249
 functions (ten lines or less in length), then the use of the object
250 250
 file is unrestricted, regardless of whether it is legally a derivative
251 251
 work.  (Executables containing this object code plus portions of the

+ 3
- 3
kate/ChangeLog View File

@@ -1,5 +1,5 @@
1 1
 2004-04-22 Christoph Cullmann <cullmann@kde.org>
2
-  * kate switched over to katemdi, even smaller tqreplacement for kmdi2 :)
2
+  * kate switched over to katemdi, even smaller replacement for kmdi2 :)
3 3
 
4 4
 2004-10-06 Christoph Cullmann <cullmann@kde.org>
5 5
   * kate switched over to kmdi2, a slim version of old kmdi
@@ -133,7 +133,7 @@
133 133
   * now the pluginconfig pages work ;)
134 134
 
135 135
 2001-04-24 Joseph Wenninger <jowenn@kde.org>
136
-  *  now <keywords> and <types> is tqreplaced by <list name="XXXX">
136
+  *  now <keywords> and <types> is replaced by <list name="XXXX">
137 137
 
138 138
 2001-04-20 Christoph Cullmann <cullmann@kde.org>
139 139
   * new configdialog
@@ -268,7 +268,7 @@
268 268
 
269 269
   * Filter - select text, hit <Ctrl+Backslash>, and enter an OS command.
270 270
     we pipe the selected text thru that command, such as "sort", and then
271
-    tqreplace the selection with the result. Impress your friends.
271
+    replace the selection with the result. Impress your friends.
272 272
 
273 273
 2001-02-21 Joseph Wenninger <jowenn@kde.org>
274 274
   * Makefile.am's     : correction for linking

+ 1
- 1
kate/README View File

@@ -2,7 +2,7 @@
2 2
 Kate is a fast texteditor for the KDE destop with an Emacs-style document interface.
3 3
 I hope it works well and improves workspeed on many little textfiles. ;-)
4 4
 Our new buffer managment will allow it to open 50MB files ++ in less than 5 seconds
5
-(at least on my 400Mhz P2 ;) It is thought as a more powerful tqreplacement for the old
5
+(at least on my 400Mhz P2 ;) It is thought as a more powerful replacement for the old
6 6
 KWrite app, which will still keep alive for the existing userbase and because it is
7 7
 just a lot smaller and therefor faster on launch than kate.
8 8
 For Kate Plugins, Kate provides the Kate Interfaces, which allow deeper access

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

@@ -127,7 +127,7 @@ Kate::Application *KateApp::application ()
127 127
 
128 128
 /**
129 129
  * Has always been the Kate Versioning Scheme:
130
- * KDE X.Y.Z tqcontains Kate X-1.Y.Z
130
+ * KDE X.Y.Z contains Kate X-1.Y.Z
131 131
  */
132 132
 TQString KateApp::kateVersion (bool fullVersion)
133 133
 {
@@ -396,4 +396,4 @@ KateMainWindow *KateApp::mainWindow (uint n)
396 396
   return 0;
397 397
 }
398 398
 
399
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
399
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -101,4 +101,4 @@ const TQString & KateAppDCOPIface::session() const
101 101
   return m_app->sessionManager()->activeSession()->sessionName();
102 102
 }
103 103
 
104
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
104
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -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->tqparentWidget();
337
+      TQWidget *w = pluginPages.at(i)->page->parentWidget();
338 338
       delete pluginPages.at(i)->page;
339 339
       delete w;
340 340
       pluginPages.remove(pluginPages.at(i));

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

@@ -57,8 +57,8 @@ void KateConsole::loadConsoleIfNeeded()
57 57
 {
58 58
   if (m_part) return;
59 59
 
60
-  if (!tqtopLevelWidget() || !tqparentWidget()) return;
61
-  if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return;
60
+  if (!topLevelWidget() || !parentWidget()) return;
61
+  if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return;
62 62
 
63 63
   KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
64 64
 
@@ -86,7 +86,7 @@ void KateConsole::slotDestroyed ()
86 86
   m_part = 0;
87 87
 
88 88
   // hide the dockwidget
89
-  if (tqparentWidget())
89
+  if (parentWidget())
90 90
   {
91 91
     m_mw->hideToolView (m_toolView);
92 92
     m_mw->centralWidget()->setFocus ();

+ 4
- 4
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::tqcurrentDateTime()) > m_daysMetaInfos)
89
+        if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos)
90 90
           m_metaInfos->deleteGroup(*it);
91 91
       }
92 92
       delete def;
@@ -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.tqcontains( documentNumber ) )
309
+  if ( closeURL && m_tempFiles.contains( 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::tqcurrentDateTime());
586
+    m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime());
587 587
     m_metaInfos->sync();
588 588
   }
589 589
 }
@@ -608,4 +608,4 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result)
608 608
   return true;
609 609
 }
610 610
 
611
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
611
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -154,4 +154,4 @@ class KateDocManager : public QObject
154 154
 };
155 155
 
156 156
 #endif
157
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
157
+// kate: space-indent on; indent-width 2; replace-tabs on;

+ 13
- 13
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.tqcontains( mt );
130
+  return mimetypes.isEmpty() || mimetypes.contains( 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->tqtopLevelWidget());
194
+  KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
195 195
 	if (!dmw) {
196 196
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
197 197
 		return false;
@@ -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.tqcontains( *itg ) &&
334
-            ! removed.tqcontains( *itg ) )
333
+      if ( ! tools.contains( *itg ) &&
334
+            ! removed.contains( *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.tqcontains( mt ) );
397
+        b = ( ! l.count() || l.contains( mt ) );
398 398
         action->setEnabled( b );
399 399
       }
400 400
     }
@@ -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->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
442
+  l->setAlignment( l->alignment()|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->tqsetAlignment( Qt::AlignTop|Qt::AlignRight );
457
+  l->setAlignment( 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->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
480
+  l->setAlignment( l->alignment()|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->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
491
+  l->setAlignment( l->alignment()|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->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
509
+  l->setAlignment( l->alignment()|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->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
524
+  l->setAlignment( l->alignment()|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).tqreplace( TQRegExp("\\W+"), "" );
748
+    t->acname = "externaltool_" + TQString(t->name).replace( TQRegExp("\\W+"), "" );
749 749
 
750 750
     new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t );
751 751
 
@@ -870,4 +870,4 @@ void KateExternalToolsConfigWidget::slotMoveDown()
870 870
   m_changed = true;
871 871
 }
872 872
 //END KateExternalToolsConfigWidget
873
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
873
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -76,7 +76,7 @@ class KateExternalToolsMenuAction : public KActionMenu
76 76
 };
77 77
 
78 78
 /**
79
- * This Action tqcontains a KateExternalTool
79
+ * This Action contains a KateExternalTool
80 80
  */
81 81
 class KateExternalToolAction : public KAction, public KWordMacroExpander
82 82
 {

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

@@ -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->tqitemRect( i ), m_listView->tooltip( item, 0 ) );
72
+      tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) );
73 73
 
74 74
     }
75 75
 
@@ -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
-      tqrepaintItem(  m_editHistory.at( i ) );
276
+      repaintItem(  m_editHistory.at( i ) );
277 277
     }
278 278
   }
279 279
   else
280
-    tqrepaintItem( item );
280
+    repaintItem( 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
-      tqrepaintItem( item );
299
+      repaintItem( 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 tqrepaint items that needs it
337
+//     int p =  m_viewHistory.findRef( item ); // only repaint 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
-    tqrepaintItem(  m_viewHistory.at( i ) );
346
+    repaintItem(  m_viewHistory.at( i ) );
347 347
   }
348 348
 
349 349
 }
@@ -475,7 +475,7 @@ void KateFileListItem::paintCell( TQPainter *painter, const TQColorGroup & cg, i
475 475
   {
476 476
     TQColorGroup cgNew = cg;
477 477
 
478
-    // tqreplace the base color with a different shading if necessary...
478
+    // replace the base color with a different shading if necessary...
479 479
     if ( fl->shadingEnabled() && m_viewhistpos > 1 )
480 480
     {
481 481
       TQColor b( cg.base() );
@@ -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
-  // tqrepaint the affected items
619
+  // repaint the affected items
620 620
   m_filelist->triggerUpdate();
621 621
 }
622 622
 
@@ -649,4 +649,4 @@ void KFLConfigPage::slotMyChanged()
649 649
 //END KFLConfigPage
650 650
 
651 651
 
652
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
652
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -188,4 +188,4 @@ class KFLConfigPage : public Kate::ConfigPage {
188 188
 
189 189
 
190 190
 #endif
191
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
191
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -96,7 +96,7 @@ void KateFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
96 96
 {
97 97
 	if (m_tb)
98 98
 	{
99
-		setMinimumHeight(m_tb->tqsizeHint().height());
99
+		setMinimumHeight(m_tb->sizeHint().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 = tqInstallMsgHandler( silenceQToolBar );
116
+  QtMsgHandler oldHandler = qInstallMsgHandler( 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
-  tqInstallMsgHandler( oldHandler );
123
+  qInstallMsgHandler( oldHandler );
124 124
 
125 125
   cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
126
-  cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
126
+  cmbPath->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
160
+  filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
161 161
   filterBox->setStretchFactor(filter, 2);
162 162
   connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
163 163
 
@@ -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::tqfromLatin1(".."));
357
+    newurl.cd(TQString::fromLatin1(".."));
358 358
 
359 359
   if ( !kateFileSelectorIsReadable (newurl) )
360 360
      newurl.setPath( TQDir::homeDirPath() );
@@ -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.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
695
+    lb = l.contains( *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().tqreplace( re, "" ), *it );
701
+      new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it );
702 702
   }
703 703
 
704 704
   // sync
@@ -719,4 +719,4 @@ void KFSConfigPage::slotMyChanged()
719 719
   slotChanged();
720 720
 }
721 721
 //END KFSConfigPage
722
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
722
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -169,4 +169,4 @@ class KFSConfigPage : public Kate::ConfigPage {
169 169
 
170 170
 
171 171
 #endif //__KATE_FILESELECTOR_H__
172
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
172
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -85,22 +85,22 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
85 85
                     << "*";
86 86
   }
87 87
 
88
-  TQGridLayout *tqlayout = new TQGridLayout(this, 6, 3, 4, 4);
89
-  tqlayout->setColStretch(0, 10);
90
-  tqlayout->addColSpacing(1, 10);
91
-  tqlayout->setColStretch(1, 0);
92
-  tqlayout->setColStretch(2, 1);
93
-  tqlayout->setRowStretch(1, 0);
94
-  tqlayout->setRowStretch(2, 10);
95
-  tqlayout->setRowStretch(4, 0);
88
+  TQGridLayout *layout = new TQGridLayout(this, 6, 3, 4, 4);
89
+  layout->setColStretch(0, 10);
90
+  layout->addColSpacing(1, 10);
91
+  layout->setColStretch(1, 0);
92
+  layout->setColStretch(2, 1);
93
+  layout->setRowStretch(1, 0);
94
+  layout->setRowStretch(2, 10);
95
+  layout->setRowStretch(4, 0);
96 96
 
97 97
   TQGridLayout *loInput = new TQGridLayout(4, 2, 4);
98
-  tqlayout->addLayout(loInput, 0, 0);
98
+  layout->addLayout(loInput, 0, 0);
99 99
   loInput->setColStretch(0, 0);
100 100
   loInput->setColStretch(1, 20);
101 101
 
102 102
   TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this);
103
-  lPattern->setFixedSize(lPattern->tqsizeHint());
103
+  lPattern->setFixedSize(lPattern->sizeHint());
104 104
   loInput->addWidget(lPattern, 0, 0, AlignRight | AlignVCenter);
105 105
 
106 106
   TQBoxLayout *loPattern = new TQHBoxLayout( 4 );
@@ -112,22 +112,22 @@ 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->tqsizeHint());
115
+  cmbPattern->setMinimumSize(cmbPattern->sizeHint());
116 116
   loPattern->addWidget( cmbPattern );
117 117
 
118 118
   cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this);
119
-  cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width());
119
+  cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().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->tqsizeHint().width() );
124
+  cbRegex->setMinimumWidth( cbRegex->sizeHint().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->tqsizeHint());
130
+  lTemplate->setFixedSize(lTemplate->sizeHint());
131 131
   loInput->addWidget(lTemplate, 1, 0, AlignRight | AlignVCenter);
132 132
 
133 133
   TQBoxLayout *loTemplate = new TQHBoxLayout(4);
@@ -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->tqsizeHint());
139
+  leTemplate->setMinimumSize(leTemplate->sizeHint());
140 140
   loTemplate->addWidget(leTemplate);
141 141
 
142 142
   KComboBox *cmbTemplate = new KComboBox(false, this);
@@ -146,19 +146,19 @@ 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->tqsizeHint());
149
+  lFiles->setFixedSize(lFiles->sizeHint());
150 150
   loInput->addWidget(lFiles, 2, 0, AlignRight | AlignVCenter);
151 151
 
152 152
   cmbFiles = new KComboBox(true, this);
153 153
   lFiles->setBuddy(cmbFiles->focusProxy());
154
-  cmbFiles->setMinimumSize(cmbFiles->tqsizeHint());
154
+  cmbFiles->setMinimumSize(cmbFiles->sizeHint());
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->tqsizeHint());
161
+  lDir->setFixedSize(lDir->sizeHint());
162 162
   loInput->addWidget(lDir, 3, 0, AlignRight | AlignVCenter);
163 163
 
164 164
   TQBoxLayout *loDir = new TQHBoxLayout(3);
@@ -176,24 +176,24 @@ 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->tqsizeHint().width());
179
+  cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width());
180 180
   cbRecursive->setChecked(config->readBoolEntry("Recursive", true));
181 181
   loDir->addWidget(cbRecursive);
182 182
 
183 183
   KButtonBox *actionbox = new KButtonBox(this, Qt::Vertical);
184
-  tqlayout->addWidget(actionbox, 0, 2);
184
+  layout->addWidget(actionbox, 0, 2);
185 185
   actionbox->addStretch();
186 186
   btnSearch = static_cast<KPushButton*>(actionbox->addButton(KGuiItem(i18n("Find"),"find")));
187 187
   btnSearch->setDefault(true);
188 188
   btnClear = static_cast<KPushButton*>(actionbox->addButton( KStdGuiItem::clear() ));
189 189
   actionbox->addStretch();
190
-  actionbox->tqlayout();
190
+  actionbox->layout();
191 191
 
192 192
   lbResult = new TQListBox(this);
193 193
   TQFontMetrics rb_fm(lbResult->fontMetrics());
194
-  tqlayout->addMultiCellWidget(lbResult, 2, 2, 0, 2);
194
+  layout->addMultiCellWidget(lbResult, 2, 2, 0, 2);
195 195
 
196
-  tqlayout->activate();
196
+  layout->activate();
197 197
 
198 198
   KAcceleratorManager::manage( this );
199 199
 
@@ -225,11 +225,11 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
225 225
      "You may give several patterns separated by commas."));
226 226
   TQWhatsThis::add(lTemplate,
227 227
     i18n("You can choose a template for the pattern from the combo box\n"
228
-     "and edit it here. The string %s in the template is tqreplaced\n"
228
+     "and edit it here. The string %s in the template is replaced\n"
229 229
      "by the pattern input field, resulting in the regular expression\n"
230 230
      "to search for."));
231 231
   TQWhatsThis::add(lDir,
232
-    i18n("Enter the folder which tqcontains the files in which you want to search."));
232
+    i18n("Enter the folder which contains the files in which you want to search."));
233 233
   TQWhatsThis::add(cbRecursive,
234 234
     i18n("Check this box to search in all subfolders."));
235 235
   TQWhatsThis::add(cbCasesensitive,
@@ -329,7 +329,7 @@ void GrepTool::slotSearch()
329 329
     return;
330 330
   }
331 331
 
332
-  if ( ! leTemplate->text().tqcontains("%s") )
332
+  if ( ! leTemplate->text().contains("%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.tqreplace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
350
+    s.replace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
351 351
   TQString pattern = leTemplate->text();
352
-  pattern.tqreplace( "%s", s );
352
+  pattern.replace( "%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( tqparentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
479
+    KMessageBox::information( parentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
480 480
     errbuf.truncate(0);
481 481
   }
482 482
   else

+ 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->tqsizeHint() );
81
+  mw->setMinimumSize( lInfo->sizeHint() );
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->tqsizeHint().width(), mw->tqsizeHint().height()) );
109
-  setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) );
108
+  mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) );
109
+  setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) );
110 110
   resize( width(), minimumHeight() );
111 111
 }
112 112
 #include "katemailfilesdialog.moc"

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

@@ -253,4 +253,4 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
253 253
   return app.exec();
254 254
 }
255 255
 
256
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
256
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;

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

@@ -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(tqparentWidget());
104
+    int scnum = TQApplication::desktop()->screenNumber(parentWidget());
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::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
114
-      size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
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 ));
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::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
135
-        size.setHeight (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
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 ));
136 136
 
137 137
         if (size.isEmpty())
138 138
           size = TQSize (kMin (700, desk.width()), kMin(480, desk.height()));
@@ -851,4 +851,4 @@ void KateMainWindow::saveGlobalProperties( KConfig* sessionConfig )
851 851
   sessionConfig->writeEntry ("Last Session", KateApp::self()->sessionManager()->activeSession()->sessionFileRelative());
852 852
 }
853 853
 
854
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
854
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -213,4 +213,4 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
213 213
 
214 214
 #endif
215 215
 
216
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
216
+// kate: space-indent on; indent-width 2; replace-tabs on;

+ 7
- 7
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::tqfromLatin1( guiDescription )
131
+    TQString completeDescription = TQString::fromLatin1( guiDescription )
132 132
           .arg( actionListName );
133 133
 
134 134
     setXML( completeDescription, false /*merge*/ );
@@ -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.tqcontains(widget))
342
+  if (!m_widgetToId.contains(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.tqcontains(widget))
372
+  if (!m_widgetToId.contains(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.tqcontains(widget))
397
+  if (!m_widgetToId.contains(widget))
398 398
     return false;
399 399
 
400 400
   bool anyVis = false;
@@ -579,7 +579,7 @@ void Sidebar::restoreSession (KConfig *config)
579 579
         }
580 580
 
581 581
     // then: remove this items from the button bar
582
-    // do this backwards, to minimize the retqlayout efforts
582
+    // do this backwards, to minimize the relayout efforts
583 583
     for (int i=m_toolviews.size()-1; i >= (int)firstWrong; --i)
584 584
     {
585 585
       removeTab (m_widgetToId[m_toolviews[i]]);
@@ -659,8 +659,8 @@ void Sidebar::saveSession (KConfig *config)
659 659
 
660 660
 //BEGIN MAIN WINDOW
661 661
 
662
-MainWindow::MainWindow (TQWidget* tqparentWidget, const char* name)
663
- : KParts::MainWindow( tqparentWidget, name)
662
+MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
663
+ : KParts::MainWindow( parentWidget, name)
664 664
  , m_sidebarsVisible(true)
665 665
  , m_restoreConfig (0)
666 666
  , m_guiClient (new GUIClient (this))

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

@@ -258,7 +258,7 @@ class MainWindow : public KParts::MainWindow
258 258
     /**
259 259
      * Constructor
260 260
      */
261
-    MainWindow (TQWidget* tqparentWidget = 0, const char* name = 0);
261
+    MainWindow (TQWidget* parentWidget = 0, const char* name = 0);
262 262
 
263 263
     /**
264 264
      * Destructor

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

@@ -91,7 +91,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons
91 91
   // document list
92 92
   lvDocuments = new KListView( w );
93 93
   lvDocuments->addColumn( i18n("Filename") );
94
-  lvDocuments->addColumn( i18n("tqStatus on Disk") );
94
+  lvDocuments->addColumn( i18n("Status on Disk") );
95 95
   lvDocuments->setSelectionMode( TQListView::Single );
96 96
 
97 97
   TQStringList l;
@@ -278,4 +278,4 @@ void KateMwModOnHdDialog::slotPDone( KProcess *p )
278 278
   m_tmpfile = 0;
279 279
 }
280 280
 
281
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
281
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -58,4 +58,4 @@ class KateMwModOnHdDialog : public KDialogBase
58 58
 };
59 59
 
60 60
 #endif // _KATE_MW_MODONHD_DIALOG_H_
61
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
61
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -917,4 +917,4 @@ void KateSessionsAction::openSession (int i)
917 917
 
918 918
   KateSessionManager::self()->activateSession(slist[(uint)i]);
919 919
 }
920
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
920
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;

+ 3
- 3
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()->tqrepaint();
73
+  tabBar()->repaint();
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()->tqrepaint();
81
+  tabBar()->repaint();
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()->tqrepaint();
89
+  tabBar()->repaint();
90 90
 }
91 91
 
92 92
 void KateTabWidget::removePage ( TQWidget * w )

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

@@ -511,4 +511,4 @@ KateMainWindow *KateViewManager::mainWindow() {
511 511
         return m_mainWindow;
512 512
 }
513 513
 
514
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
514
+// kate: space-indent on; indent-width 2; replace-tabs on;

+ 12
- 12
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( tqcolorGroup().shadow() );
70
+    p.setPen( colorGroup().shadow() );
71 71
     p.drawLine( e->rect().left(), 0, e->rect().right(), 0 );
72
-    p.setPen( ((KateViewSpace*)tqparentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() );
72
+    p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() );
73 73
     p.drawLine( e->rect().left(), 1, e->rect().right(), 1 );
74 74
   }
75 75
 };
@@ -226,9 +226,9 @@ bool KateViewSpace::event( TQEvent *e )
226 226
   return TQVBox::event( e );
227 227
 }
228 228
 
229
-void KateViewSpace::slottqStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg)
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->tqparentWidget() != stack)
231
+  if ((TQWidgetStack *)view->parentWidget() != 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->tqsetAlignment( Qt::AlignCenter );
312
+  m_lineColLabel->setAlignment( 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->tqsetAlignment( Qt::AlignCenter );
317
+  m_modifiedLabel->setAlignment( 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->tqsetAlignment( Qt::AlignCenter );
322
+  m_insertModeLabel->setAlignment( 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->tqsetAlignment( Qt::AlignCenter );
327
+  m_selectModeLabel->setAlignment( 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->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
334
-  m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
333
+  m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
334
+  m_fileNameLabel->setAlignment( /*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*>( tqtopLevelWidget() );
399
+   KMainWindow* mainWindow = static_cast<KMainWindow*>( topLevelWidget() );
400 400
    TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) );
401 401
 
402 402
    if (menu)
@@ -419,4 +419,4 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
419 419
   return false;
420 420
 }
421 421
 //END KateVSStatusBar
422
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
422
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -110,7 +110,7 @@ class KateViewSpace : public QVBox
110 110
     TQString m_group;
111 111
 
112 112
   private slots:
113
-    void slottqStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg);
113
+    void slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg);
114 114
 
115 115
   public slots:
116 116
     void polish();
@@ -118,4 +118,4 @@ class KateViewSpace : public QVBox
118 118
 };
119 119
 
120 120
 #endif
121
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
121
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -69,7 +69,7 @@ KateViewSpaceContainer::KateViewSpaceContainer (TQWidget *parent, KateViewManage
69 69
   m_viewSpaceList.setAutoDelete(true);
70 70
 
71 71
   KateViewSpace* vs = new KateViewSpace( this, this );
72
-  connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQT_SLOT(slottqStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&)));
72
+  connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&)));
73 73
   vs->setActive( true );
74 74
   m_viewSpaceList.append(vs);
75 75
   connect( this, TQT_SIGNAL(viewChanged()), this, TQT_SLOT(slotViewChanged()) );
@@ -124,7 +124,7 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc )
124 124
 
125 125
   connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg()));
126 126
   connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg()));
127
-  connect(view,TQT_SIGNAL(newtqStatus()),this,TQT_SLOT(statusMsg()));
127
+  connect(view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(statusMsg()));
128 128
   connect(view->getDoc(), TQT_SIGNAL(undoChanged()), this, TQT_SLOT(statusMsg()));
129 129
   connect(view,TQT_SIGNAL(dropEventPass(TQDropEvent *)), mainWindow(),TQT_SLOT(slotDropEvent(TQDropEvent *)));
130 130
   connect(view,TQT_SIGNAL(gotFocus(Kate::View *)),this,TQT_SLOT(activateSpace(Kate::View *)));
@@ -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->tqparentWidget()->tqparentWidget();
144
+  KateViewSpace *viewspace = (KateViewSpace *)view->parentWidget()->parentWidget();
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->tqparentWidget()->tqparentWidget();
244
+  KateViewSpace* vs = (KateViewSpace*)v->parentWidget()->parentWidget();
245 245
 
246 246
   if (!vs->isActiveSpace()) {
247 247
     setActiveSpace (vs);
@@ -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->tqparentWidget() == this;
449
+  bool isFirstTime = vs->parentWidget() == this;
450 450
 
451 451
   TQValueList<int> psizes;
452 452
   if ( ! isFirstTime )
453
-    if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->qt_cast("TQSplitter")) )
453
+    if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->qt_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->tqparentWidget());
457
+  KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
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->tqparentWidget())->isLastChild( vs ) )
465
-       ((KateMDI::Splitter*)s->tqparentWidget())->moveToFirst( s );
464
+    if ( !((KateMDI::Splitter*)vs->parentWidget())->isLastChild( vs ) )
465
+       ((KateMDI::Splitter*)s->parentWidget())->moveToFirst( s );
466 466
   }
467 467
   vs->reparent( s, 0, TQPoint(), true );
468 468
   KateViewSpace* vsNew = new KateViewSpace( this, s );
@@ -471,17 +471,17 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
471 471
     s->moveToFirst( vsNew );
472 472
 
473 473
   if (!isFirstTime)
474
-    if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->qt_cast("TQSplitter")) )
474
+    if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->qt_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->tqparentWidget()->height()/2 : s->tqparentWidget()->width()/2;
480
+  int space = 50;//isHoriz ? s->parentWidget()->height()/2 : s->parentWidget()->width()/2;
481 481
   sizes << space << space;
482 482
   s->setSizes( sizes );
483 483
 
484
-  connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQT_SLOT(slottqStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &)));
484
+  connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQT_SLOT(slotStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &)));
485 485
   m_viewSpaceList.append( vsNew );
486 486
   activeViewSpace()->setActive( false );
487 487
   vsNew->setActive( true, true );
@@ -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->tqparentWidget();
506
+  KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->parentWidget();
507 507
 
508 508
   // find out if it is the first child for repositioning
509 509
   // see below
@@ -512,9 +512,9 @@ 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->tqparentWidget() != this)
515
+  if (m_viewSpaceList.count() > 2 && p->parentWidget() != this)
516 516
   {
517
-    pp = (KateMDI::Splitter*)p->tqparentWidget();
517
+    pp = (KateMDI::Splitter*)p->parentWidget();
518 518
     ppsizes = pp->sizes();
519 519
     pIsFirst = !pp->isLastChild( p ); // simple logic, right-
520 520
   }
@@ -554,10 +554,10 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
554 554
   {
555 555
     TQWidget* other = ((TQWidget *)(( TQPtrList<TQObject>*)p->children())->first());
556 556
 
557
-    other->reparent( p->tqparentWidget(), 0, TQPoint(), true );
557
+    other->reparent( p->parentWidget(), 0, TQPoint(), true );
558 558
     // We also need to find the right viewspace to become active
559 559
     if (pIsFirst)
560
-       ((KateMDI::Splitter*)p->tqparentWidget())->moveToFirst( other );
560
+       ((KateMDI::Splitter*)p->parentWidget())->moveToFirst( other );
561 561
     if ( other->isA("KateViewSpace") ) {
562 562
       setActiveSpace( (KateViewSpace*)other );
563 563
     }
@@ -726,7 +726,7 @@ void KateViewSpaceContainer::restoreSplitter( KConfig* config, const TQString &g
726 726
     {
727 727
      KateViewSpace* vs = new KateViewSpace( this, s );
728 728
 
729
-     connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQT_SLOT(slottqStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &)));
729
+     connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &)));
730 730
 
731 731
      if (m_viewSpaceList.isEmpty())
732 732
        vs->setActive (true);
@@ -755,4 +755,4 @@ KateMainWindow *KateViewSpaceContainer::mainWindow() {
755 755
   return m_viewManager->mainWindow();
756 756
 }
757 757
 
758
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
758
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -96,8 +96,8 @@ KWrite::KWrite (KTextEditor::Document *doc)
96 96
 
97 97
   setAcceptDrops(true);
98 98
 
99
-  connect(m_view,TQT_SIGNAL(newtqStatus()),this,TQT_SLOT(newCaption()));
100
-  connect(m_view,TQT_SIGNAL(viewtqStatusMsg(const TQString &)),this,TQT_SLOT(newtqStatus(const TQString &)));
99
+  connect(m_view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(newCaption()));
100
+  connect(m_view,TQT_SIGNAL(viewStatusMsg(const TQString &)),this,TQT_SLOT(newStatus(const TQString &)));
101 101
   connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(newCaption()));
102 102
   connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(slotFileNameChanged()));
103 103
   connect(m_view,TQT_SIGNAL(dropEventPass(TQDropEvent *)),this,TQT_SLOT(slotDropEvent(TQDropEvent *)));
@@ -112,7 +112,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
112 112
 
113 113
   // init with more usefull size, stolen from konq :)
114 114
   if (!initialGeometrySet())
115
-    resize( TQSize(700, 480).expandedTo(tqminimumSizeHint()));
115
+    resize( TQSize(700, 480).expandedTo(minimumSizeHint()));
116 116
 
117 117
   // call it as last thing, must be sure everything is already set up ;)
118 118
   setAutoSaveSettings ();
@@ -163,7 +163,7 @@ void KWrite::setupActions()
163 163
   // setup Settings menu
164 164
   setStandardToolBarMenuEnabled(true);
165 165
 
166
-  m_paShowStatusBar = KStdAction::showtqStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
166
+  m_paShowStatusBar = KStdAction::showStatusbar(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 169
   m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, this, TQT_SLOT(newCaption()),
@@ -320,7 +320,7 @@ void KWrite::printDlg()
320 320
   KTextEditor::printInterface(m_view->document())->printDialog ();
321 321
 }
322 322
 
323
-void KWrite::newtqStatus(const TQString &msg)
323
+void KWrite::newStatus(const TQString &msg)
324 324
 {
325 325
   newCaption();
326 326
 
@@ -709,4 +709,4 @@ void KWriteEditorChooser::slotOk() {
709 709
 	m_chooser->writeAppSetting();
710 710
 	KDialogBase::slotOk();
711 711
 }
712
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
712
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;

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

@@ -76,7 +76,7 @@ class KWrite : public KParts::MainWindow
76 76
     void printNow();
77 77
     void printDlg();
78 78
 
79
-    void newtqStatus(const TQString &msg);
79
+    void newStatus(const TQString &msg);
80 80
     void newCaption();
81 81
 
82 82
     void slotDropEvent(TQDropEvent *);
@@ -135,4 +135,4 @@ class KWriteEditorChooser: public KDialogBase
135 135
 };
136 136
 
137 137
 #endif
138
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
138
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;

+ 2
- 2
kate/data/tips View File

@@ -83,9 +83,9 @@ in the active frame.</p>
83 83
 </tip>
84 84
 <tip category="Kate|part">
85 85
 <html>
86
-<p>You can do cool sed-like regular expression tqreplacements using <em>Command Line</em>.</p>
86
+<p>You can do cool sed-like regular expression replacements using <em>Command Line</em>.</p>
87 87
 <p>For example, press <strong>F7</strong> and enter <code>s /oldtext/newtext/g</code>
88
-to tqreplace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current
88
+to replace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current
89 89
 line.</p>
90 90
 </html>
91 91
 </tip>

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

@@ -79,4 +79,4 @@ ToolViewManager *MainWindow::toolViewManager () const
79 79
 
80 80
 }
81 81
 
82
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
82
+// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -62,4 +62,4 @@ class KDE_EXPORT MainWindow : public QObject
62 62
 
63 63
 #endif
64 64
 
65
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
65
+// kate: space-indent on; indent-width 2; replace-tabs on;

+ 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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
90
+  d->header->setSizePolicy( 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 ); 

+ 5
- 5
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.tqcontains( libName.ascii() )) {
116
+      if (! alreadyInitialized.contains( libName.ascii() )) {
117 117
 	  if (!runModule(libName, service)) {
118 118
 	      libName = TQString("libkcm_%1").arg(library);
119
-	      if (! alreadyInitialized.tqcontains( libName.ascii() )) {
119
+	      if (! alreadyInitialized.contains( libName.ascii() )) {
120 120
 		  runModule(libName, service);
121 121
 		  alreadyInitialized.append( libName.ascii() );
122 122
 	      }
@@ -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, tqApp, TQT_SLOT( quit())); // just in case
197
-     tqApp->exec(); // wait for runPhase1() and runPhase2()
196
+     TQTimer::singleShot( 300 * 1000, qApp, TQT_SLOT( quit())); // just in case
197
+     qApp->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
-  tqApp->exit( 0 );
218
+  qApp->exit( 0 );
219 219
 }
220 220
 
221 221
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])

+ 6
- 6
kcontrol/TODO View File

@@ -88,11 +88,11 @@ The desktop file is called "kcm_fonts" with "Name=Fonts" and "Categories=X-KDE-s
88 88
 
89 89
 // Not sure where these next three are is this OLD and from KDE2 and has already been done?
90 90
 
91
-* Remove "Internet & Network/Email". It is tqreplaced by the new kcm_useraccount
91
+* Remove "Internet & Network/Email". It is replaced by the new kcm_useraccount
92 92
 
93
-* Remove "System Administration/User Info". It is tqreplaced by the new kcm_useraccount
93
+* Remove "System Administration/User Info". It is replaced by the new kcm_useraccount
94 94
 
95
-* Remove "Privacy & Crypto/Passwords". It is tqreplaced by the new kcm_useraccount. Probably. (awaiting comment from Aaron)
95
+* Remove "Privacy & Crypto/Passwords". It is replaced by the new kcm_useraccount. Probably. (awaiting comment from Aaron)
96 96
 
97 97
 * Tell Konqi to go burn the 11 tabs of keyboard options(5 KCMs). Because it is.. bizarre. Two KCMs with two tabs each is absolute maximum. One KCM with three tabs is quite ok too.
98 98
 
@@ -151,9 +151,9 @@ The current dialog should appear as an advanced tab behind the "Theme"-tab.
151 151
 Network -> Talk Configuration
152 152
 -----------------------------
153 153
 Answering Machine: A groupbox around "Address:, Subject:, First Line:" would be nice. That way one wouldn't need to mention "Mail" each time. The Groupbox could be named something like "Anwering Mail".
154
-That way one would have a much cleaner tqlayout and it would be much easier to see at once what the dialog is about.
154
+That way one would have a much cleaner layout and it would be much easier to see at once what the dialog is about.
155 155
 Forward: Way too much text here. I see the point of having a direct explanation in the dialog. But this could look much friendlier using the following solution:
156
-There should be a Textbox below the "Forward method"-Combobox. This Textbox only tqcontains the information for the Forward-method which is currently selected (So the text changes each time a different Forward-method is selected).
156
+There should be a Textbox below the "Forward method"-Combobox. This Textbox only contains the information for the Forward-method which is currently selected (So the text changes each time a different Forward-method is selected).
157 157
 
158 158
 Sound -> Sound Server
159 159
 ---------------------
@@ -164,5 +164,5 @@ Web Browsing -> User Agent
164 164
 The Dialog suffers from the cockpit-dilemma.
165 165
 All the new "Add"-checkboxes are only there for finetuning. Most of the time the useragent-strings should work
166 166
 w/o the need to tune them this way. Better Solution: Remove the Customize-Group-box and simply add a Button "Customize ..." below the Text: "Current User Agent String: Mozilla/5.0 (comp.; Konq.orwhateveritis)".
167
-After pressing the "Customize"-Button a dialog should pop up which tqcontains all the nice
167
+After pressing the "Customize"-Button a dialog should pop up which contains all the nice
168 168
 "Add"-checkboxes which have been added recently.

+ 4
- 4
kcontrol/access/eventsrc View File

@@ -130,7 +130,7 @@ Comment[ca]=Una tecla modificadora (p.ex. Majús o Ctrl) ha canviat d'estat i ar
130 130
 Comment[cs]=Modifikační kláves (např. Shift nebo Control) změnila svůj stav a je nyní aktivní.
131 131
 Comment[csb]=Klawisza zjinaczi (n.p. Shift czë Control) zmieniła stón ë je terô aktiwnô
132 132
 Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) har ændret sin tilstand og er nu aktiv
133
-Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren tqStatus geändert und ist jetzt aktiv
133
+Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren Status geändert und ist jetzt aktiv
134 134
 Comment[el]=Άλλαξε η κατάσταση ενός πλήκτρου τροποποιητή (π.χ. Shift ή Control) και τώρα είναι ενεργό
135 135
 Comment[eo]=Modifa klavo (ekz. majuskliga klavo aŭ stirklavo) ŝanĝis sian staton kaj nun estas aktiva
136 136
 Comment[es]=Una tecla modificadora (p.ej. Mayúsculas o Control) ha cambiado su estado y está activa ahora
@@ -242,7 +242,7 @@ Comment[ca]=Una tecla modificadora (p.ex. Majús o Ctrl) ha canviat d'estat i ar
242 242
 Comment[cs]=Modifikační kláves (např. Shift nebo Control) změnila svůj stav a je nyní neaktivní.
243 243
 Comment[csb]=Klawisza zjinaczi (n.p. Shift czë Control) zmieniła stón ë je terô aktiwnô
244 244
 Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) har ændret sin tilstand og er nu inaktiv
245
-Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren tqStatus geändert und ist jetzt inaktiv
245
+Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren Status geändert und ist jetzt inaktiv
246 246
 Comment[el]=Άλλαξε η κατάσταση ενός πλήκτρου τροποποιητή (π.χ. Shift ή Control) και τώρα είναι ανενεργό
247 247
 Comment[eo]=Modifa klavo (ekz. majuskliga klavo aŭ stirklavo) ŝanĝis sian staton kaj nun estas malaktiva
248 248
 Comment[es]=Una tecla modificadora (p.ej. Mayúsculas o Control) ha cambiado su estado y ahora está inactiva
@@ -466,7 +466,7 @@ Comment[ca]=Una tecla de bloqueig (p.ex. BloqMajús o BloqNum) ha canviat d'esta
466 466
 Comment[cs]=Klávesa zámku (např. Caps Lock nebo Num Lock) změnila svůj stav a je nyní aktivní
467 467
 Comment[csb]=Klawisza blokadë (np. Caps Lock czë Num Lock) zmieniłą stón ë nie je terô aktiwnô
468 468
 Comment[da]=En låsetast (f.eks., Caps Lock eller Num Lock) har ændret sin tilstand og er nu aktiv
469
-Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren tqStatus geändert und ist nun aktiv
469
+Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren Status geändert und ist nun aktiv
470 470
 Comment[el]=Ένα πλήκτρο κλειδώματος (π.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι τώρα ανενεργό
471 471
 Comment[eo]=Ŝlosa klavo (ekz. majuskla baskulo aŭ Cifera baskulo) ŝanĝis sian staton kaj nun estas aktiva
472 472
 Comment[es]=Una tecla de bloqueo (p. ej., Bloq Mayús o Bloq Num) ha cambiado su estado y ahora está inactiva
@@ -579,7 +579,7 @@ Comment[ca]=Una tecla de bloqueig (p.ex. BloqMajús o BloqNum) ha canviat d'esta
579 579
 Comment[cs]=Klávesa zámku (např. Caps Lock nebo Num Lock) změnila svůj stav a je nyní aktivní
580 580
 Comment[csb]=Klawisza blokadë (np. Caps Lock czë Num Lock) zmieniła stón ë nie je terô aktiwnô
581 581
 Comment[da]=En låsetast (f.eks., Caps Lock eller Num Lock) har ændret sin tilstand og er nu inaktiv
582
-Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren tqStatus geändert und ist nun inaktiv
582
+Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren Status geändert und ist nun inaktiv
583 583
 Comment[el]=Ένα πλήκτρο κλειδώματος (π.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι τώρα ανενεργό
584 584
 Comment[eo]=baskula klavo (ekz. majuskla baskulo aŭ nombra baskulo) ŝanĝis staton, kaj jam ne estas aktiva
585 585
 Comment[es]=Una tecla de bloqueo (p. ej., Bloq Mayús o Bloq Num) ha cambiado su estado y ahora está inactiva

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

@@ -31,7 +31,7 @@
31 31
 #include "kaccess.moc"
32 32
 
33 33
 struct ModifierKey {
34
-   const unsigned int tqmask;
34
+   const unsigned int mask;
35 35
    const KeySym keysym;
36 36
    const char *name;
37 37
    const char *lockedText;
@@ -303,9 +303,9 @@ void KAccessApp::readSettings()
303 303
   overlay = 0;
304 304
 }
305 305
 
306
-static int tqmaskToBit (int tqmask) {
306
+static int maskToBit (int mask) {
307 307
    for (int i = 0; i < 8; i++)
308
-      if (tqmask & (1 << i))
308
+      if (mask & (1 << i))
309 309
          return i;
310 310
    return -1;
311 311
 }
@@ -316,19 +316,19 @@ void KAccessApp::initMasks() {
316 316
    state = 0;
317 317
 
318 318
    for (int i = 0; strcmp (modifierKeys[i].name, "") != 0; i++) {
319
-      int tqmask = modifierKeys[i].tqmask;
320
-      if (tqmask == 0)
319
+      int mask = modifierKeys[i].mask;
320
+      if (mask == 0)
321 321
          if (modifierKeys[i].keysym != 0)
322
-            tqmask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym);
322
+            mask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym);
323 323
          else if (!strcmp(modifierKeys[i].name, "Win"))
324
-            tqmask = KKeyNative::modX(KKey::WIN);
324
+            mask = KKeyNative::modX(KKey::WIN);
325 325
          else
326
-            tqmask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch)
326
+            mask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch)
327 327
                  | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Shift)
328 328
                  | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Latch)
329 329
                  | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Lock);
330 330
 
331
-      int bit = tqmaskToBit (tqmask);
331
+      int bit = maskToBit (mask);
332 332
       if (bit != -1 && keys[bit] == -1)
333 333
          keys[bit] = i;
334 334
    }
@@ -496,7 +496,7 @@ TQString mouseKeysShortcut (Display *display) {
496 496
            {
497 497
               if (type->map[i].active && (type->map[i].level == level))
498 498
               {
499
-                 modifiers = type->map[i].mods.tqmask;
499
+                 modifiers = type->map[i].mods.mask;
500 500
                  found = true;
501 501
               }
502 502
            }
@@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() {
585 585
       TQVBoxLayout * vlay = new TQVBoxLayout(lay);
586 586
 
587 587
       featuresLabel = new TQLabel( "", contents );
588
-      featuresLabel->tqsetAlignment( WordBreak|AlignVCenter );
588
+      featuresLabel->setAlignment( WordBreak|AlignVCenter );
589 589
       vlay->addWidget( featuresLabel );
590 590
       vlay->addStretch();
591 591
 

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

@@ -142,7 +142,7 @@ TQString mouseKeysShortcut (Display *display) {
142 142
            {
143 143
               if (type->map[i].active && (type->map[i].level == level))
144 144
               {
145
-                 modifiers = type->map[i].mods.tqmask;
145
+                 modifiers = type->map[i].mods.mask;
146 146
                  found = true;
147 147
               }
148 148
            }
@@ -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->tqlayout(),
251
+  TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
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->tqlayout(), KDialog::spacingHint());
294
+  vvbox = new TQVBoxLayout(grp->layout(), 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->tqsizeHint().height()*2);
314
+  colorButton->setFixedWidth(colorButton->sizeHint().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->tqlayout(), KDialog::spacingHint());
356
+  vvbox = new TQVBoxLayout(grp->layout(), 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->tqlayout(), KDialog::spacingHint());
380
+  vvbox = new TQVBoxLayout(grp->layout(), 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->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
391
+  kNotifyModifiersButton->setSizePolicy(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->tqlayout(), KDialog::spacingHint());
418
+  vvbox = new TQVBoxLayout(grp->layout(), 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->tqlayout(), KDialog::spacingHint());
450
+  vvbox = new TQVBoxLayout(grp->layout(), 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->tqlayout(), KDialog::spacingHint());
494
+  vvbox = new TQVBoxLayout(grp->layout(), 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->tqlayout(), KDialog::spacingHint());
524
+  vvbox = new TQVBoxLayout(grp->layout(), 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->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
539
+  kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
540 540
   hbox->addWidget(kNotifyAccessXButton);
541 541
 
542 542
   connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));

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

@@ -5,7 +5,7 @@
5 5
     <property name="name">
6 6
         <cstring>AccessibilityConfigWidget</cstring>
7 7
     </property>
8
-    <property name="tqgeometry">
8
+    <property name="geometry">
9 9
         <rect>
10 10
             <x>0</x>
11 11
             <y>0</y>
@@ -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="tqsizeHint">
98
+                                        <property name="sizeHint">
99 99
                                             <size>
100 100
                                                 <width>20</width>
101 101
                                                 <height>20</height>
@@ -152,7 +152,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
152 152
                             </widget>
153 153
                             <widget class="QLayoutWidget">
154 154
                                 <property name="name">
155
-                                    <cstring>tqlayout9</cstring>
155
+                                    <cstring>layout9</cstring>
156 156
                                 </property>
157 157
                                 <grid>
158 158
                                     <property name="name">
@@ -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="tqsizeHint">
247
+                                        <property name="sizeHint">
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="tqsizeHint">
341
+                                                        <property name="sizeHint">
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="tqsizeHint">
366
+                        <property name="sizeHint">
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="tqsizeHint">
423
+                                        <property name="sizeHint">
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="tqsizeHint">
537
+                                        <property name="sizeHint">
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="tqsizeHint">
628
+                                        <property name="sizeHint">
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="tqsizeHint">
686
+                        <property name="sizeHint">
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="tqalignment">
792
+                                        <property name="alignment">
793 793
                                             <set>AlignVCenter|AlignRight</set>
794 794
                                         </property>
795 795
                                         <property name="buddy" stdset="0">
@@ -806,7 +806,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
806 806
                                         <property name="text">
807 807
                                             <string>Acceleration &amp;time:</string>
808 808
                                         </property>
809
-                                        <property name="tqalignment">
809
+                                        <property name="alignment">
810 810
                                             <set>AlignVCenter|AlignRight</set>
811 811
                                         </property>
812 812
                                         <property name="buddy" stdset="0">
@@ -895,7 +895,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
895 895
                                         <property name="sizeType">
896 896
                                             <enum>Fixed</enum>
897 897
                                         </property>
898
-                                        <property name="tqsizeHint">
898
+                                        <property name="sizeHint">
899 899
                                             <size>
900 900
                                                 <width>20</width>
901 901
                                                 <height>20</height>
@@ -944,7 +944,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
944 944
                                         <property name="text">
945 945
                                             <string>&amp;Repeat interval:</string>
946 946
                                         </property>
947
-                                        <property name="tqalignment">
947
+                                        <property name="alignment">
948 948
                                             <set>AlignVCenter|AlignRight</set>
949 949
                                         </property>
950 950
                                         <property name="buddy" stdset="0">
@@ -992,7 +992,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
992 992
                                         <property name="text">
993 993
                                             <string>Acceleration &amp;profile:</string>
994 994
                                         </property>
995
-                                        <property name="tqalignment">
995
+                                        <property name="alignment">
996 996
                                             <set>AlignVCenter|AlignRight</set>
997 997
                                         </property>
998 998
                                         <property name="buddy" stdset="0">
@@ -1087,7 +1087,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
1087 1087
                                         <property name="text">
1088 1088
                                             <string>&amp;Acceleration delay:</string>
1089 1089
                                         </property>
1090
-                                        <property name="tqalignment">
1090
+                                        <property name="alignment">
1091 1091
                                             <set>AlignVCenter|AlignRight</set>
1092 1092
                                         </property>
1093 1093
                                         <property name="buddy" stdset="0">
@@ -1108,7 +1108,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
1108 1108
                         <property name="sizeType">
1109 1109
                             <enum>Expanding</enum>
1110 1110
                         </property>
1111
-                        <property name="tqsizeHint">
1111
+                        <property name="sizeHint">
1112 1112
                             <size>
1113 1113
                                 <width>20</width>
1114 1114
                                 <height>1</height>
@@ -1610,8 +1610,8 @@ Please note that on slow machines this may cause a "lag" between the event causi
1610 1610
 <slots>
1611 1611
     <slot access="private" specifier="non virtual">updateFlashScreenColor()</slot>
1612 1612
 </slots>
1613
-<tqlayoutdefaults spacing="3" margin="6"/>
1614
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
1613
+<layoutdefaults spacing="3" margin="6"/>
1614
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
1615 1615
 <includehints>
1616 1616
     <includehint>kcmodule.h</includehint>
1617 1617
     <includehint>kurlrequester.h</includehint>

+ 20
- 20
kcontrol/arts/arts.cpp View File

@@ -116,7 +116,7 @@ void KArtsModule::initAudioIOList()
116 116
 
117 117
 void KArtsModule::slotArtsdExited(KProcess* proc)
118 118
 {
119
-	latestProcesstqStatus = proc->exitStatus();
119
+	latestProcessStatus = proc->exitStatus();
120 120
 	delete proc;
121 121
 }
122 122
 
@@ -151,17 +151,17 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
151 151
 
152 152
 	initAudioIOList();
153 153
 
154
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
154
+	TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
155 155
 	TQTabWidget *tab = new TQTabWidget(this);
156
-	tqlayout->addWidget(tab);
156
+	layout->addWidget(tab);
157 157
 
158 158
 	general = new generalTab(tab);
159 159
 	hardware = new hardwareTab(tab);
160 160
 	//mixer = KCModuleLoader::loadModule("kmixcfg", tab);
161 161
 	//midi = new KMidConfig(tab, "kmidconfig");
162 162
 
163
-	general->tqlayout()->setMargin( KDialog::marginHint() );
164
-	hardware->tqlayout()->setMargin( KDialog::marginHint() );
163
+	general->layout()->setMargin( KDialog::marginHint() );
164
+	hardware->layout()->setMargin( KDialog::marginHint() );
165 165
 	general->latencyLabel->setFixedHeight(general->latencyLabel->fontMetrics().lineSpacing());
166 166
 
167 167
 	tab->addTab(general, i18n("&General"));
@@ -499,7 +499,7 @@ void KArtsModule::updateWidgets()
499 499
 	if (item >= 0)
500 500
 	{
501 501
 		audioIO = audioIOList.at(item)->name;
502
-		bool jack = (audioIO == TQString::tqfromLatin1("jack"));
502
+		bool jack = (audioIO == TQString::fromLatin1("jack"));
503 503
 		if(jack)
504 504
 		{
505 505
 			customRate->setChecked(false);
@@ -549,7 +549,7 @@ bool KArtsModule::realtimeIsPossible()
549 549
 		delete checkProcess;
550 550
 		realtimePossible =  false;
551 551
 	}
552
-	else if (latestProcesstqStatus == 0)
552
+	else if (latestProcessStatus == 0)
553 553
 	{
554 554
 		realtimePossible =  true;
555 555
 	}
@@ -620,39 +620,39 @@ TQString KArtsModule::createArgs(bool netTrans,
620 620
 	TQString args;
621 621
 
622 622
 	if(fragmentCount)
623
-		args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount);
623
+		args += TQString::fromLatin1(" -F %1").arg(fragmentCount);
624 624
 
625 625
 	if(fragmentSize)
626
-		args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize);
626
+		args += TQString::fromLatin1(" -S %1").arg(fragmentSize);
627 627
 
628 628
 	if (!audioIO.isEmpty())
629
-		args += TQString::tqfromLatin1(" -a %1").arg(audioIO);
629
+		args += TQString::fromLatin1(" -a %1").arg(audioIO);
630 630
 
631 631
 	if (duplex)
632
-		args += TQString::tqfromLatin1(" -d");
632
+		args += TQString::fromLatin1(" -d");
633 633
 
634 634
 	if (netTrans)
635
-		args += TQString::tqfromLatin1(" -n");
635
+		args += TQString::fromLatin1(" -n");
636 636
 
637 637
 	if (!deviceName.isEmpty())
638
-		args += TQString::tqfromLatin1(" -D ") + deviceName;
638
+		args += TQString::fromLatin1(" -D ") + deviceName;
639 639
 
640 640
 	if (rate)
641
-		args += TQString::tqfromLatin1(" -r %1").arg(rate);
641
+		args += TQString::fromLatin1(" -r %1").arg(rate);
642 642
 
643 643
 	if (bits)
644
-		args += TQString::tqfromLatin1(" -b %1").arg(bits);
644
+		args += TQString::fromLatin1(" -b %1").arg(bits);
645 645
 
646 646
 	if (autoSuspend && suspendTime)
647
-		args += TQString::tqfromLatin1(" -s %1").arg(suspendTime);
647
+		args += TQString::fromLatin1(" -s %1").arg(suspendTime);
648 648
 
649 649
 	if (!addOptions.isEmpty())
650 650
 		args += TQChar(' ') + addOptions;
651 651
 
652
-	args += TQString::tqfromLatin1(" -m artsmessage");
653
-	args += TQString::tqfromLatin1(" -c drkonqi");
654
-	args += TQString::tqfromLatin1(" -l 3");
655
-	args += TQString::tqfromLatin1(" -f");
652
+	args += TQString::fromLatin1(" -m artsmessage");
653
+	args += TQString::fromLatin1(" -c drkonqi");
654
+	args += TQString::fromLatin1(" -l 3");
655
+	args += TQString::fromLatin1(" -f");
656 656
 
657 657
 	return args;
658 658
 }

+ 1
- 1
kcontrol/arts/arts.h View File

@@ -92,7 +92,7 @@ private:
92 92
   hardwareTab *hardware;
93 93
   KConfig *config;
94 94
   DeviceManager *deviceManager;
95
-  int latestProcesstqStatus;
95
+  int latestProcessStatus;
96 96
   int fragmentCount;
97 97
   int fragmentSize;
98 98
   bool configChanged;

+ 9
- 9
kcontrol/arts/generaltab.ui View File

@@ -4,7 +4,7 @@
4 4
     <property name="name">
5 5
         <cstring>generalTab</cstring>
6 6
     </property>
7
-    <property name="tqgeometry">
7
+    <property name="geometry">
8 8
         <rect>
9 9
             <x>0</x>
10 10
             <y>0</y>
@@ -12,7 +12,7 @@
12 12
             <height>613</height>
13 13
         </rect>
14 14
     </property>
15
-    <property name="tqminimumSize">
15
+    <property name="minimumSize">
16 16
         <size>
17 17
             <width>0</width>
18 18
             <height>450</height>
@@ -186,7 +186,7 @@ Recommended if you want sound.</string>
186 186
                 </widget>
187 187
                 <widget class="QLayoutWidget">
188 188
                     <property name="name">
189
-                        <cstring>tqlayout7</cstring>
189
+                        <cstring>layout7</cstring>
190 190
                     </property>
191 191
                     <hbox>
192 192
                         <property name="name">
@@ -227,7 +227,7 @@ Recommended if you want sound.</string>
227 227
                             <property name="sizeType">
228 228
                                 <enum>Expanding</enum>
229 229
                             </property>
230
-                            <property name="tqsizeHint">
230
+                            <property name="sizeHint">
231 231
                                 <size>
232 232
                                     <width>173</width>
233 233
                                     <height>20</height>
@@ -240,7 +240,7 @@ Recommended if you want sound.</string>
240 240
         </widget>
241 241
         <widget class="QLayoutWidget">
242 242
             <property name="name">
243
-                <cstring>tqlayout3</cstring>
243
+                <cstring>layout3</cstring>
244 244
             </property>
245 245
             <hbox>
246 246
                 <property name="name">
@@ -256,7 +256,7 @@ Recommended if you want sound.</string>
256 256
                     <property name="sizeType">
257 257
                         <enum>Expanding</enum>
258 258
                     </property>
259
-                    <property name="tqsizeHint">
259
+                    <property name="sizeHint">
260 260
                         <size>
261 261
                             <width>40</width>
262 262
                             <height>20</height>
@@ -289,7 +289,7 @@ Recommended if you want sound.</string>
289 289
                     <property name="sizeType">
290 290
                         <enum>Expanding</enum>
291 291
                     </property>
292
-                    <property name="tqsizeHint">