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-ecb5cbfe19da
tags/v3.5.13
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
Name[he]=כלי X
Name[hi]=एक्स-यूटिलिटीज़
Name[hr]=X-alati
Name[hsb]=Potqmocniki za X
Name[hsb]=Pomocniki za X
Name[hu]=X segédprogramok
Name[is]=X Tól
Name[it]=Programmi di X
@@ -112,7 +112,7 @@ Comment[gl]=Utilidades das X Window
Comment[he]=כלים של X Window
Comment[hi]=एक्स विंडो यूटिलिटीज़
Comment[hr]=Alati X prozora
Comment[hsb]=Potqmocne programy za X11
Comment[hsb]=Pomocne programy za X11
Comment[hu]=X Window segédprogramok
Comment[is]=X gluggatól
Comment[it]=Programmi di X Window

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

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

+ 5
- 5
drkonqi/backtrace.cpp View File

@@ -137,7 +137,7 @@ bool BackTrace::usefulBacktrace()
{
// remove crap
if( !m_krashconf->removeFromBacktraceRegExp().isEmpty())
m_strBt.tqreplace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null);
m_strBt.replace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null);

if( m_krashconf->disableChecks())
return true;
@@ -146,13 +146,13 @@ bool BackTrace::usefulBacktrace()
// how many " ?? " in the bt ?
int unknown = 0;
if( !m_krashconf->invalidStackFrameRegExp().isEmpty())
unknown = strBt.tqcontains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
unknown = strBt.contains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
// how many stack frames in the bt ?
int frames = 0;
if( !m_krashconf->frameRegExp().isEmpty())
frames = strBt.tqcontains( TQRegExp( m_krashconf->frameRegExp()));
frames = strBt.contains( TQRegExp( m_krashconf->frameRegExp()));
else
frames = strBt.tqcontains('\n');
frames = strBt.contains('\n');
bool tooShort = false;
if( !m_krashconf->neededInValidBacktraceRegExp().isEmpty())
tooShort = ( strBt.find( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 );
@@ -175,7 +175,7 @@ void BackTrace::processBacktrace()
--len;
}
m_strBt.remove( pos, len );
m_strBt.insert( pos, TQString::tqfromLatin1( "[KCrash handler]\n" ));
m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" ));
}
}
}

+ 1
- 1
drkonqi/backtrace.h View File

@@ -49,7 +49,7 @@ signals:
void append(const TQString &str); // Just the new text

void someError();
void done(const TQString &); // tqreplaces whole text
void done(const TQString &); // replaces whole text

protected slots:
void slotProcessExited(KProcess * proc);

+ 6
- 6
drkonqi/debugger.cpp View File

@@ -60,9 +60,9 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
TQWidget *w = new TQWidget( this );
( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true );
m_status = new TQLabel( w );
m_status->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
//m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "editcopy" ) );
KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) );
m_copyButton = new KPushButton( item, w );
connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) );
m_copyButton->setEnabled( false );
@@ -82,7 +82,7 @@ void KrashDebugger :: slotDone(const TQString& str)
m_status->setText(i18n("Done."));
m_copyButton->setEnabled( true );
m_saveButton->setEnabled( true );
m_backtrace->setText( m_prependText + str ); // tqreplace with possibly post-processed backtrace
m_backtrace->setText( m_prependText + str ); // replace with possibly post-processed backtrace
}

void KrashDebugger :: slotCopy()
@@ -109,8 +109,8 @@ void KrashDebugger :: slotSave()
}
else
{
TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" );
if( defname.tqcontains( '/' ))
TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" );
if( defname.contains( '/' ))
defname = defname.mid( defname.findRev( '/' ) + 1 );
TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename"));
if (!filename.isEmpty())
@@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger()
bool KrashDebugger::performChecks( TQString* msg )
{
bool ret = true;
KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true );
KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
kdedcfg.setGroup( "General" );
if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
{

+ 13
- 13
drkonqi/krashconf.cpp View File

@@ -93,12 +93,12 @@ void KrashConfig :: readConfig()

// maybe we should check if it's relative?
TQString configname = config->readEntry("ConfigName",
TQString::tqfromLatin1("enduser"));
TQString::fromLatin1("enduser"));

TQString debuggername = config->readEntry("Debugger",
TQString::tqfromLatin1("gdb"));
TQString::fromLatin1("gdb"));

KConfig debuggers(TQString::tqfromLatin1("debuggers/%1rc").arg(debuggername),
KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
true, false, "appdata");

debuggers.setGroup("General");
@@ -112,7 +112,7 @@ void KrashConfig :: readConfig()
m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
m_kcrashRegExp = debuggers.readEntry("KCrashRegExp");

KConfig preset(TQString::tqfromLatin1("presets/%1rc").arg(configname),
KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
true, false, "appdata");

preset.setGroup("ErrorDescription");
@@ -138,24 +138,24 @@ void KrashConfig :: readConfig()
TQString str = TQString::number(m_signalnum);
// use group unknown if signal not found
if (!preset.hasGroup(str))
str = TQString::tqfromLatin1("unknown");
str = TQString::fromLatin1("unknown");
preset.setGroup(str);
m_signalName = preset.readEntry("Name");
if (b)
m_signalText = preset.readEntry("Comment");
}

// tqreplace some of the strings
// replace some of the strings
void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const
{
TQMap<TQString,TQString> map;
map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName());
map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("kdeinit") : m_execname;
map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber());
map[TQString::tqfromLatin1("signame")] = signalName();
map[TQString::tqfromLatin1("progname")] = programName();
map[TQString::tqfromLatin1("pid")] = TQString::number(pid());
map[TQString::tqfromLatin1("tempfile")] = tempFile;
map[TQString::fromLatin1("appname")] = TQString::fromLatin1(appName());
map[TQString::fromLatin1("execname")] = startedByKdeinit() ? TQString::fromLatin1("kdeinit") : m_execname;
map[TQString::fromLatin1("signum")] = TQString::number(signalNumber());
map[TQString::fromLatin1("signame")] = signalName();
map[TQString::fromLatin1("progname")] = programName();
map[TQString::fromLatin1("pid")] = TQString::number(pid());
map[TQString::fromLatin1("tempfile")] = tempFile;
if (shell)
str = KMacroExpander::expandMacrosShellQuote( str, map );
else

+ 4
- 4
drkonqi/toplevel.cpp View File

@@ -67,12 +67,12 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name)
// picture of konqi
TQLabel *lab = new TQLabel(page);
lab->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
TQPixmap pix(locate("appdata", TQString::tqfromLatin1("pics/konqi.png")));
TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png")));
lab->setPixmap(pix);
lab->setFixedSize( lab->tqsizeHint() );
lab->setFixedSize( lab->sizeHint() );

TQLabel * info = new TQLabel(generateText(), page);
info->setMinimumSize(info->tqsizeHint());
info->setMinimumSize(info->sizeHint());

if (m_krashconf->showBacktrace())
{
@@ -196,7 +196,7 @@ void Toplevel :: slotUser3()
void Toplevel :: slotBacktraceDone(const TQString &str)
{
// Do not translate.. This will be included in the _MAIL_.
TQString buf = TQString::tqfromLatin1
TQString buf = TQString::fromLatin1
("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str;

m_bugreport->setText(buf);

+ 1
- 1
kappfinder/README.apps View File

@@ -1,4 +1,4 @@
The apps directory tqcontains .desktop files for commonly used non-KDE
The apps directory contains .desktop files for commonly used non-KDE
programs which kappfinder installs into the applnk directory of KDE.

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
GenericName[be]=Талісман Linux
GenericName[bg]=Талисманът на Linux
GenericName[bn]=লিনাক্স ম্যাস্কট
GenericName[bs]=Linux tqmaskota
GenericName[bs]=Linux maskota
GenericName[ca]=Mascota de Linux
GenericName[cs]=Maskot Linuxu
GenericName[csb]=Glingòtka Linuksa
GenericName[cy]=Masgot Linux
GenericName[da]=Linux-tqmaskot
GenericName[da]=Linux-maskot
GenericName[de]=Linux-Maskottchen
GenericName[el]=Η μασκότ του Linux
GenericName[eo]=La linuksa simbolbesto
GenericName[es]=Mascota de Linux
GenericName[et]=Linuxi tqmaskott
GenericName[eu]=Linuxen tqmaskota
GenericName[fi]=Linux-tqmaskotti
GenericName[et]=Linuxi maskott
GenericName[eu]=Linuxen maskota
GenericName[fi]=Linux-maskotti
GenericName[fr]=La mascotte de Linux
GenericName[fy]=Linux-tqmaskotte
GenericName[fy]=Linux-maskotte
GenericName[ga]=Sonóg Linux
GenericName[gl]=Mascota Linux
GenericName[he]=הקמע של לינוקס
GenericName[hi]=लिनक्स शुभंकर
GenericName[hr]=Linux tqmaskota
GenericName[hr]=Linux maskota
GenericName[hu]=Linux-kabalaállatka
GenericName[is]=Linux lukkudýrið
GenericName[it]=Mascotte di Linux
@@ -51,11 +51,11 @@ GenericName[mk]=Маскотата на Линукс
GenericName[mn]=Линукс-азын тэнгэр
GenericName[ms]=Maskot Linux
GenericName[mt]=Maskott tal-Linux
GenericName[nb]=Linux-tqmaskot
GenericName[nb]=Linux-maskot
GenericName[nds]=Dat Maskottje vun Linux
GenericName[ne]=लिनक्स मासकोट
GenericName[nl]=Linux-mascotte
GenericName[nn]=Linux-tqmaskot
GenericName[nn]=Linux-maskot
GenericName[nso]=Mascot wa Linux
GenericName[pa]=ਲੀਨਕਸ ਮਾਸਕੋਟ
GenericName[pl]=Maskotka Linuksa
@@ -66,8 +66,8 @@ GenericName[ru]=Эмблема Linux
GenericName[sk]=Maskot Linuxu
GenericName[sl]=Maskota Linuxa
GenericName[sr]=Linux-ова маскота
GenericName[sr@Latn]=Linux-ova tqmaskota
GenericName[sv]=Linux-tqmaskot
GenericName[sr@Latn]=Linux-ova maskota
GenericName[sv]=Linux-maskot
GenericName[ta]=Linux சின்னம்
GenericName[te]=లినక్స్ మాస్కాట్
GenericName[tg]=Таъвизи Linux

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

@@ -86,7 +86,7 @@ GenericName[xh]=Umhleli Wombhalo
GenericName[zh_CN]=文本编辑器
GenericName[zh_TW]=文字編輯器
GenericName[zu]=Umlungisi wombhalo
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++;
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++;
Exec=emacs %f
Icon=emacs
Path=

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

@@ -115,7 +115,7 @@ GenericName[xh]=Umhleli Wombhalo
GenericName[zh_CN]=文本编辑器
GenericName[zh_TW]=文字編輯器
GenericName[zu]=Umlungisi wombhalo
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++;
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++;
Exec=gvim -f %f
Icon=gvim
Type=Application

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

@@ -90,7 +90,7 @@ GenericName[xh]=Umhleli Wombhalo
GenericName[zh_CN]=文本编辑器
GenericName[zh_TW]=文字編輯器
GenericName[zu]=Umlungisi wombhalo
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++;
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++;
Exec=lemacs %f
Icon=emacs
Path=

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

@@ -1,5 +1,5 @@
[Desktop Entry]
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++;
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++;
Name=Nedit
Name[hi]=नेडिट
Name[ka]=NEdit

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

@@ -95,7 +95,7 @@ GenericName[xh]=Umhleli Wombhalo
GenericName[zh_CN]=文本编辑器
GenericName[zh_TW]=文字編輯器
GenericName[zu]=Umlungisi wombhalo
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++;
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++;
Exec=xemacs %f
Icon=emacs
Type=Application

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

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

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

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

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

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

+ 10
- 10
kappfinder/toplevel.cpp View File

@@ -48,16 +48,16 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
: KDialog( parent, name, true )
{
setCaption( i18n( "KAppfinder" ) );
TQVBoxLayout *tqlayout = new TQVBoxLayout( this, marginHint() );
TQVBoxLayout *layout = new TQVBoxLayout( this, marginHint() );

TQLabel *label = new TQLabel( i18n( "The application finder looks for non-KDE "
"applications on your system and adds "
"them to the KDE menu system. "
"Click 'Scan' to begin, select the desired applications and then click 'Apply'."), this);
label->tqsetAlignment( AlignAuto | WordBreak );
tqlayout->addWidget( label );
label->setAlignment( AlignAuto | WordBreak );
layout->addWidget( label );

tqlayout->addSpacing( 5 );
layout->addSpacing( 5 );

mListView = new TQListView( this );
mListView->addColumn( i18n( "Application" ) );
@@ -67,14 +67,14 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
mListView->setRootIsDecorated( true );
mListView->setAllColumnsShowFocus( true );
mListView->setSelectionMode(TQListView::NoSelection);
tqlayout->addWidget( mListView );
layout->addWidget( mListView );

mProgress = new KProgress( this );
mProgress->setPercentageVisible( false );
tqlayout->addWidget( mProgress );
layout->addWidget( mProgress );

mSummary = new TQLabel( i18n( "Summary:" ), this );
tqlayout->addWidget( mSummary );
layout->addWidget( mSummary );

KButtonBox* bbox = new KButtonBox( this );
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
mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQT_SLOT( slotCreate() ) );
mApplyButton->setEnabled( false );
bbox->addButton( KStdGuiItem::close(), kapp, TQT_SLOT( quit() ) );
bbox->tqlayout();
bbox->layout();

tqlayout->addWidget( bbox );
layout->addWidget( bbox );

connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) );

@@ -100,7 +100,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
adjustSize();

mDestDir = destDir;
mDestDir = mDestDir.tqreplace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
mDestDir = mDestDir.replace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
KStartupInfo::appStarted();


+ 6
- 6
kate/COPYING.LIB View File

@@ -94,7 +94,7 @@ will lead to faster development of free libraries.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former tqcontains code derived from the library, while the latter only
former contains code derived from the library, while the latter only
works together with the library.

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.
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License Agreement applies to any software library which
tqcontains a notice placed by the copyright holder or other authorized
contains a notice placed by the copyright holder or other authorized
party saying it may be distributed under the terms of this Library
General Public License (also called "this License"). Each licensee is
addressed as "you".
@@ -123,7 +123,7 @@ included without limitation in the term "modification".)

"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it tqcontains, plus any associated
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

@@ -225,7 +225,7 @@ source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

5. A program that tqcontains no derivative of any portion of the
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
@@ -233,7 +233,7 @@ therefore falls outside the scope of this License.

However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
tqcontains portions of the Library), rather than a "work that uses the
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

@@ -245,7 +245,7 @@ linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.

If such an object file uses only numerical parameters, data
structure tqlayouts and accessors, and small macros and small inline
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the

+ 3
- 3
kate/ChangeLog View File

@@ -1,5 +1,5 @@
2004-04-22 Christoph Cullmann <cullmann@kde.org>
* kate switched over to katemdi, even smaller tqreplacement for kmdi2 :)
* kate switched over to katemdi, even smaller replacement for kmdi2 :)

2004-10-06 Christoph Cullmann <cullmann@kde.org>
* kate switched over to kmdi2, a slim version of old kmdi
@@ -133,7 +133,7 @@
* now the pluginconfig pages work ;)

2001-04-24 Joseph Wenninger <jowenn@kde.org>
* now <keywords> and <types> is tqreplaced by <list name="XXXX">
* now <keywords> and <types> is replaced by <list name="XXXX">

2001-04-20 Christoph Cullmann <cullmann@kde.org>
* new configdialog
@@ -268,7 +268,7 @@

* Filter - select text, hit <Ctrl+Backslash>, and enter an OS command.
we pipe the selected text thru that command, such as "sort", and then
tqreplace the selection with the result. Impress your friends.
replace the selection with the result. Impress your friends.

2001-02-21 Joseph Wenninger <jowenn@kde.org>
* Makefile.am's : correction for linking

+ 1
- 1
kate/README View File

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

/**
* Has always been the Kate Versioning Scheme:
* KDE X.Y.Z tqcontains Kate X-1.Y.Z
* KDE X.Y.Z contains Kate X-1.Y.Z
*/
TQString KateApp::kateVersion (bool fullVersion)
{
@@ -396,4 +396,4 @@ KateMainWindow *KateApp::mainWindow (uint n)
return 0;
}

// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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
return m_app->sessionManager()->activeSession()->sessionName();
}

// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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)
{
if ( pluginPages.at(i)->plugin == plugin )
{
TQWidget *w = pluginPages.at(i)->page->tqparentWidget();
TQWidget *w = pluginPages.at(i)->page->parentWidget();
delete pluginPages.at(i)->page;
delete w;
pluginPages.remove(pluginPages.at(i));

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

@@ -57,8 +57,8 @@ void KateConsole::loadConsoleIfNeeded()
{
if (m_part) return;

if (!tqtopLevelWidget() || !tqparentWidget()) return;
if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return;
if (!topLevelWidget() || !parentWidget()) return;
if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return;

KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");

@@ -86,7 +86,7 @@ void KateConsole::slotDestroyed ()
m_part = 0;

// hide the dockwidget
if (tqparentWidget())
if (parentWidget())
{
m_mw->hideToolView (m_toolView);
m_mw->centralWidget()->setFocus ();

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

@@ -86,7 +86,7 @@ KateDocManager::~KateDocManager ()
{
m_metaInfos->setGroup(*it);
TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def);
if (last.daysTo(TQDateTime::tqcurrentDateTime()) > m_daysMetaInfos)
if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos)
m_metaInfos->deleteGroup(*it);
}
delete def;
@@ -306,7 +306,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL)
KateApp::self()->mainWindow(i)->viewManager()->closeViews(documentNumber);
}

if ( closeURL && m_tempFiles.tqcontains( documentNumber ) )
if ( closeURL && m_tempFiles.contains( documentNumber ) )
{
TQFileInfo fi( m_tempFiles[ documentNumber ].first.path() );
if ( fi.lastModified() <= m_tempFiles[ documentNumber ].second /*||
@@ -583,7 +583,7 @@ void KateDocManager::saveMetaInfos(Kate::Document *doc)
m_metaInfos->setGroup(doc->url().prettyURL());
doc->writeSessionConfig(m_metaInfos);
m_metaInfos->writeEntry("MD5", (const char *)md5);
m_metaInfos->writeEntry("Time", TQDateTime::tqcurrentDateTime());
m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime());
m_metaInfos->sync();
}
}
@@ -608,4 +608,4 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result)
return true;
}

// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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
};

#endif
// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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()

bool KateExternalTool::valid( const TQString &mt ) const
{
return mimetypes.isEmpty() || mimetypes.tqcontains( mt );
return mimetypes.isEmpty() || mimetypes.contains( mt );
}
//END KateExternalTool

@@ -191,7 +191,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
// kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
return false;
}
KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget());
KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
if (!dmw) {
// kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
return false;
@@ -330,8 +330,8 @@ void KateExternalToolsMenuAction::reload()
bool sepadded = false;
for (TQStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg )
{
if ( ! tools.tqcontains( *itg ) &&
! removed.tqcontains( *itg ) )
if ( ! tools.contains( *itg ) &&
! removed.contains( *itg ) )
{
if ( ! sepadded )
{
@@ -394,7 +394,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
if ( action )
{
l = action->tool->mimetypes;
b = ( ! l.count() || l.tqcontains( mt ) );
b = ( ! l.count() || l.contains( mt ) );
action->setEnabled( b );
}
}
@@ -439,7 +439,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leName = new TQLineEdit( w );
lo->addWidget( leName, 1, 2 );
l = new TQLabel( leName, i18n("&Label:"), w );
l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
l->setAlignment( l->alignment()|Qt::AlignRight );
lo->addWidget( l, 1, 1 );
if ( tool ) leName->setText( tool->name );
TQWhatsThis::add( leName, i18n(
@@ -454,7 +454,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
teCommand = new TQTextEdit( w );
lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 );
l = new TQLabel( teCommand, i18n("S&cript:"), w );
l->tqsetAlignment( Qt::AlignTop|Qt::AlignRight );
l->setAlignment( Qt::AlignTop|Qt::AlignRight );
lo->addWidget( l, 2, 1 );
if ( tool ) teCommand->setText( tool->command );
TQWhatsThis::add( teCommand, i18n(
@@ -477,7 +477,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leExecutable = new TQLineEdit( w );
lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 );
l = new TQLabel( leExecutable, i18n("&Executable:"), w );
l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
l->setAlignment( l->alignment()|Qt::AlignRight );
lo->addWidget( l, 3, 1 );
if ( tool ) leExecutable->setText( tool->tryexec );
TQWhatsThis::add( leExecutable, i18n(
@@ -488,7 +488,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leMimetypes = new TQLineEdit( w );
lo->addWidget( leMimetypes, 4, 2 );
l = new TQLabel( leMimetypes, i18n("&Mime types:"), w );
l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
l->setAlignment( l->alignment()|Qt::AlignRight );
lo->addWidget( l, 4, 1 );
if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") );
TQWhatsThis::add( leMimetypes, i18n(
@@ -506,7 +506,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
cmbSave = new TQComboBox(w);
lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 );
l = new TQLabel( cmbSave, i18n("&Save:"), w );
l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
l->setAlignment( l->alignment()|Qt::AlignRight );
lo->addWidget( l, 5, 1 );
TQStringList sl;
sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
@@ -521,7 +521,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leCmdLine = new TQLineEdit( w );
lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 );
l = new TQLabel( leCmdLine, i18n("&Command line name:"), w );
l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
l->setAlignment( l->alignment()|Qt::AlignRight );
lo->addWidget( l, 6, 1 );
if ( tool ) leCmdLine->setText( tool->cmdname );
TQWhatsThis::add( leCmdLine, i18n(
@@ -745,7 +745,7 @@ void KateExternalToolsConfigWidget::slotNew()

// This is sticky, it does not change again, so that shortcuts sticks
// TODO check for dups
t->acname = "externaltool_" + TQString(t->name).tqreplace( TQRegExp("\\W+"), "" );
t->acname = "externaltool_" + TQString(t->name).replace( TQRegExp("\\W+"), "" );

new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t );

@@ -870,4 +870,4 @@ void KateExternalToolsConfigWidget::slotMoveDown()
m_changed = true;
}
//END KateExternalToolsConfigWidget
// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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
};

/**
* This Action tqcontains a KateExternalTool
* This Action contains a KateExternalTool
*/
class KateExternalToolAction : public KAction, public KWordMacroExpander
{

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

@@ -69,7 +69,7 @@ class ToolTip : public QToolTip
KateFileListItem *item = ((KateFileListItem*)i);
if ( ! item ) return;

tip( m_listView->tqitemRect( i ), m_listView->tooltip( item, 0 ) );
tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) );

}

@@ -273,11 +273,11 @@ void KateFileList::slotModChanged (Kate::Document *doc)
for ( uint i=0; i < m_editHistory.count(); i++ )
{
m_editHistory.at( i )->setEditHistPos( i+1 );
tqrepaintItem( m_editHistory.at( i ) );
repaintItem( m_editHistory.at( i ) );
}
}
else
tqrepaintItem( item );
repaintItem( item );
}

void KateFileList::slotModifiedOnDisc (Kate::Document *doc, bool, unsigned char)
@@ -296,7 +296,7 @@ void KateFileList::slotNameChanged (Kate::Document *doc)
if ( ((KateFileListItem*)item)->document() == doc )
{
item->setText( 0, doc->docName() );
tqrepaintItem( item );
repaintItem( item );
break;
}
item = item->nextSibling();
@@ -334,7 +334,7 @@ void KateFileList::slotViewChanged ()
// int p = 0;
// if ( m_viewHistory.count() )
// {
// int p = m_viewHistory.findRef( item ); // only tqrepaint items that needs it
// int p = m_viewHistory.findRef( item ); // only repaint items that needs it
// }

m_viewHistory.removeRef( item );
@@ -343,7 +343,7 @@ void KateFileList::slotViewChanged ()
for ( uint i=0; i < m_viewHistory.count(); i++ )
{
m_viewHistory.at( i )->setViewHistPos( i+1 );
tqrepaintItem( m_viewHistory.at( i ) );
repaintItem( m_viewHistory.at( i ) );
}

}
@@ -475,7 +475,7 @@ void KateFileListItem::paintCell( TQPainter *painter, const TQColorGroup & cg, i
{
TQColorGroup cgNew = cg;

// tqreplace the base color with a different shading if necessary...
// replace the base color with a different shading if necessary...
if ( fl->shadingEnabled() && m_viewhistpos > 1 )
{
TQColor b( cg.base() );
@@ -616,7 +616,7 @@ void KFLConfigPage::apply()
m_filelist->m_editShade = kcbEditShade->color();
m_filelist->m_enableBgShading = cbEnableShading->isChecked();
m_filelist->setSortType( cmbSort->currentItem() );
// tqrepaint the affected items
// repaint the affected items
m_filelist->triggerUpdate();
}

@@ -649,4 +649,4 @@ void KFLConfigPage::slotMyChanged()
//END KFLConfigPage


// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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 {


#endif
// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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 * )
{
if (m_tb)
{
setMinimumHeight(m_tb->tqsizeHint().height());
setMinimumHeight(m_tb->sizeHint().height());
m_tb->resize(width(),height());
}
}
@@ -113,17 +113,17 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
{
mActionCollection = new KActionCollection( this );

QtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );

KateFileSelectorToolBarParent *tbp=new KateFileSelectorToolBarParent(this);
toolbar = new KateFileSelectorToolBar(tbp);
tbp->setToolBar(toolbar);
toolbar->setMovingEnabled(false);
toolbar->setFlat(true);
tqInstallMsgHandler( oldHandler );
qInstallMsgHandler( oldHandler );

cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion);
cmbPath->setCompletionObject( cmpl );
cmbPath->setAutoDeleteCompletionObject( true );
@@ -157,7 +157,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
btnFilter->setIconSet( SmallIconSet("filter" ) );
btnFilter->setToggleButton( true );
filter = new KHistoryCombo( true, filterBox, "filter");
filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filterBox->setStretchFactor(filter, 2);
connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );

@@ -354,7 +354,7 @@ void KateFileSelector::setDir( KURL u )
newurl.setPath(pathstr);

if ( !kateFileSelectorIsReadable ( newurl ) )
newurl.cd(TQString::tqfromLatin1(".."));
newurl.cd(TQString::fromLatin1(".."));

if ( !kateFileSelectorIsReadable (newurl) )
newurl.setPath( TQDir::homeDirPath() );
@@ -692,13 +692,13 @@ void KFSConfigPage::init()
KAction *ac;
TQListBox *lb;
for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) {
lb = l.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
if ( *it == "bookmarks" || *it == "sync_dir" )
ac = fileSelector->actionCollection()->action( (*it).latin1() );
else
ac = fileSelector->dirOperator()->actionCollection()->action( (*it).latin1() );
if ( ac )
new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().tqreplace( re, "" ), *it );
new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it );
}

// sync
@@ -719,4 +719,4 @@ void KFSConfigPage::slotMyChanged()
slotChanged();
}
//END KFSConfigPage
// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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 {


#endif //__KATE_FILESELECTOR_H__
// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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)
<< "*";
}

TQGridLayout *tqlayout = new TQGridLayout(this, 6, 3, 4, 4);
tqlayout->setColStretch(0, 10);
tqlayout->addColSpacing(1, 10);
tqlayout->setColStretch(1, 0);
tqlayout->setColStretch(2, 1);
tqlayout->setRowStretch(1, 0);
tqlayout->setRowStretch(2, 10);
tqlayout->setRowStretch(4, 0);
TQGridLayout *layout = new TQGridLayout(this, 6, 3, 4, 4);
layout->setColStretch(0, 10);
layout->addColSpacing(1, 10);
layout->setColStretch(1, 0);
layout->setColStretch(2, 1);
layout->setRowStretch(1, 0);
layout->setRowStretch(2, 10);
layout->setRowStretch(4, 0);

TQGridLayout *loInput = new TQGridLayout(4, 2, 4);
tqlayout->addLayout(loInput, 0, 0);
layout->addLayout(loInput, 0, 0);
loInput->setColStretch(0, 0);
loInput->setColStretch(1, 20);

TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this);
lPattern->setFixedSize(lPattern->tqsizeHint());
lPattern->setFixedSize(lPattern->sizeHint());
loInput->addWidget(lPattern, 0, 0, AlignRight | AlignVCenter);

TQBoxLayout *loPattern = new TQHBoxLayout( 4 );
@@ -112,22 +112,22 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion);
lPattern->setBuddy(cmbPattern);
cmbPattern->setFocus();
cmbPattern->setMinimumSize(cmbPattern->tqsizeHint());
cmbPattern->setMinimumSize(cmbPattern->sizeHint());
loPattern->addWidget( cmbPattern );

cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this);
cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width());
cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width());
cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true));
loPattern->addWidget(cbCasesensitive);

cbRegex = new TQCheckBox( i18n("Regular expression"), this );
cbRegex->setMinimumWidth( cbRegex->tqsizeHint().width() );
cbRegex->setMinimumWidth( cbRegex->sizeHint().width() );
cbRegex->setChecked( config->readBoolEntry( "Regex", true ) );
loPattern->addWidget( cbRegex );
loPattern->setStretchFactor( cmbPattern, 100 );

TQLabel *lTemplate = new TQLabel(i18n("Template:"), this);
lTemplate->setFixedSize(lTemplate->tqsizeHint());
lTemplate->setFixedSize(lTemplate->sizeHint());
loInput->addWidget(lTemplate, 1, 0, AlignRight | AlignVCenter);

TQBoxLayout *loTemplate = new TQHBoxLayout(4);
@@ -136,7 +136,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
leTemplate = new KLineEdit(this);
lTemplate->setBuddy(leTemplate);
leTemplate->setText(strTemplate[0]);
leTemplate->setMinimumSize(leTemplate->tqsizeHint());
leTemplate->setMinimumSize(leTemplate->sizeHint());
loTemplate->addWidget(leTemplate);

KComboBox *cmbTemplate = new KComboBox(false, this);
@@ -146,19 +146,19 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
loTemplate->addWidget(cmbTemplate);

TQLabel *lFiles = new TQLabel(i18n("Files:"), this);
lFiles->setFixedSize(lFiles->tqsizeHint());
lFiles->setFixedSize(lFiles->sizeHint());
loInput->addWidget(lFiles, 2, 0, AlignRight | AlignVCenter);

cmbFiles = new KComboBox(true, this);
lFiles->setBuddy(cmbFiles->focusProxy());
cmbFiles->setMinimumSize(cmbFiles->tqsizeHint());
cmbFiles->setMinimumSize(cmbFiles->sizeHint());
cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion);
cmbFiles->setDuplicatesEnabled(false);
cmbFiles->insertStringList(lastSearchFiles);
loInput->addWidget(cmbFiles, 2, 1);

TQLabel *lDir = new TQLabel(i18n("Folder:"), this);
lDir->setFixedSize(lDir->tqsizeHint());
lDir->setFixedSize(lDir->sizeHint());
loInput->addWidget(lDir, 3, 0, AlignRight | AlignVCenter);

TQBoxLayout *loDir = new TQHBoxLayout(3);
@@ -176,24 +176,24 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
lDir->setBuddy(cmbDir);

cbRecursive = new TQCheckBox(i18n("Recursive"), this);
cbRecursive->setMinimumWidth(cbRecursive->tqsizeHint().width());
cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width());
cbRecursive->setChecked(config->readBoolEntry("Recursive", true));
loDir->addWidget(cbRecursive);

KButtonBox *actionbox = new KButtonBox(this, Qt::Vertical);
tqlayout->addWidget(actionbox, 0, 2);
layout->addWidget(actionbox, 0, 2);
actionbox->addStretch();
btnSearch = static_cast<KPushButton*>(actionbox->addButton(KGuiItem(i18n("Find"),"find")));
btnSearch->setDefault(true);
btnClear = static_cast<KPushButton*>(actionbox->addButton( KStdGuiItem::clear() ));
actionbox->addStretch();
actionbox->tqlayout();
actionbox->layout();

lbResult = new TQListBox(this);
TQFontMetrics rb_fm(lbResult->fontMetrics());
tqlayout->addMultiCellWidget(lbResult, 2, 2, 0, 2);
layout->addMultiCellWidget(lbResult, 2, 2, 0, 2);

tqlayout->activate();
layout->activate();

KAcceleratorManager::manage( this );

@@ -225,11 +225,11 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
"You may give several patterns separated by commas."));
TQWhatsThis::add(lTemplate,
i18n("You can choose a template for the pattern from the combo box\n"
"and edit it here. The string %s in the template is tqreplaced\n"
"and edit it here. The string %s in the template is replaced\n"
"by the pattern input field, resulting in the regular expression\n"
"to search for."));
TQWhatsThis::add(lDir,
i18n("Enter the folder which tqcontains the files in which you want to search."));
i18n("Enter the folder which contains the files in which you want to search."));
TQWhatsThis::add(cbRecursive,
i18n("Check this box to search in all subfolders."));
TQWhatsThis::add(cbCasesensitive,
@@ -329,7 +329,7 @@ void GrepTool::slotSearch()
return;
}

if ( ! leTemplate->text().tqcontains("%s") )
if ( ! leTemplate->text().contains("%s") )
{
leTemplate->setFocus();
return;
@@ -347,9 +347,9 @@ void GrepTool::slotSearch()

TQString s = cmbPattern->currentText();
if ( ! cbRegex->isChecked() )
s.tqreplace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
s.replace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
TQString pattern = leTemplate->text();
pattern.tqreplace( "%s", s );
pattern.replace( "%s", s );

childproc = new KProcess();
childproc->setWorkingDirectory( m_workingDir );
@@ -476,7 +476,7 @@ void GrepTool::childExited()

if ( ! errbuf.isEmpty() )
{
KMessageBox::information( tqparentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
KMessageBox::information( parentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
errbuf.truncate(0);
}
else

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

@@ -78,7 +78,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin )
}
list->hide();
connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) );
mw->setMinimumSize( lInfo->tqsizeHint() );
mw->setMinimumSize( lInfo->sizeHint() );
}

TQPtrList<Kate::Document> KateMailDialog::selectedDocs()
@@ -105,8 +105,8 @@ void KateMailDialog::slotShowButton()
lInfo->setText( i18n("Press <strong>Mail...</strong> to send selected documents") );

}
mw->setMinimumSize( TQSize( lInfo->tqsizeHint().width(), mw->tqsizeHint().height()) );
setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) );
mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) );
setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) );
resize( width(), minimumHeight() );
}
#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 )
return app.exec();
}

// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
// 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)
// here we go, set some usable default sizes
if (!initialGeometrySet())
{
int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);

TQSize size;
@@ -110,8 +110,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
if (sconfig)
{
sconfig->setGroup (sgroup);
size.setWidth (sconfig->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
}

// if thats fails, try to reuse size
@@ -131,8 +131,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
{
// first try global app config
KateApp::self()->config()->setGroup ("MainWindow");
size.setWidth (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
size.setHeight (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
size.setWidth (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
size.setHeight (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));

if (size.isEmpty())
size = TQSize (kMin (700, desk.width()), kMin(480, desk.height()));
@@ -851,4 +851,4 @@ void KateMainWindow::saveGlobalProperties( KConfig* sessionConfig )
sessionConfig->writeEntry ("Last Session", KateApp::self()->sessionManager()->activeSession()->sessionFileRelative());
}

// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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

#endif

// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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 )

if ( domDocument().documentElement().isNull() )
{
TQString completeDescription = TQString::tqfromLatin1( guiDescription )
TQString completeDescription = TQString::fromLatin1( guiDescription )
.arg( actionListName );

setXML( completeDescription, false /*merge*/ );
@@ -339,7 +339,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi

bool Sidebar::removeWidget (ToolView *widget)
{
if (!m_widgetToId.tqcontains(widget))
if (!m_widgetToId.contains(widget))
return false;

removeTab(m_widgetToId[widget]);
@@ -369,7 +369,7 @@ bool Sidebar::removeWidget (ToolView *widget)

bool Sidebar::showWidget (ToolView *widget)
{
if (!m_widgetToId.tqcontains(widget))
if (!m_widgetToId.contains(widget))
return false;

// hide other non-persistent views
@@ -394,7 +394,7 @@ bool Sidebar::showWidget (ToolView *widget)

bool Sidebar::hideWidget (ToolView *widget)
{
if (!m_widgetToId.tqcontains(widget))
if (!m_widgetToId.contains(widget))
return false;

bool anyVis = false;
@@ -579,7 +579,7 @@ void Sidebar::restoreSession (KConfig *config)
}

// then: remove this items from the button bar
// do this backwards, to minimize the retqlayout efforts
// do this backwards, to minimize the relayout efforts
for (int i=m_toolviews.size()-1; i >= (int)firstWrong; --i)
{
removeTab (m_widgetToId[m_toolviews[i]]);
@@ -659,8 +659,8 @@ void Sidebar::saveSession (KConfig *config)

//BEGIN MAIN WINDOW

MainWindow::MainWindow (TQWidget* tqparentWidget, const char* name)
: KParts::MainWindow( tqparentWidget, name)
MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
: KParts::MainWindow( parentWidget, name)
, m_sidebarsVisible(true)
, m_restoreConfig (0)
, m_guiClient (new GUIClient (this))

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

@@ -258,7 +258,7 @@ class MainWindow : public KParts::MainWindow
/**
* Constructor
*/
MainWindow (TQWidget* tqparentWidget = 0, const char* name = 0);
MainWindow (TQWidget* parentWidget = 0, const char* name = 0);

/**
* Destructor

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

@@ -91,7 +91,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons
// document list
lvDocuments = new KListView( w );
lvDocuments->addColumn( i18n("Filename") );
lvDocuments->addColumn( i18n("tqStatus on Disk") );
lvDocuments->addColumn( i18n("Status on Disk") );
lvDocuments->setSelectionMode( TQListView::Single );

TQStringList l;
@@ -278,4 +278,4 @@ void KateMwModOnHdDialog::slotPDone( KProcess *p )
m_tmpfile = 0;
}

// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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
};

#endif // _KATE_MW_MODONHD_DIALOG_H_
// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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)

KateSessionManager::self()->activateSession(slist[(uint)i]);
}
// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
// 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
KTabWidget::insertTab(child,label,index);
showPage(child);
maybeShow();
tabBar()->tqrepaint();
tabBar()->repaint();
}

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
KTabWidget::insertTab(child,iconset,label,index);
showPage(child);
maybeShow();
tabBar()->tqrepaint();
tabBar()->repaint();
}

void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
@@ -86,7 +86,7 @@ void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
KTabWidget::insertTab(child,tab,index);
showPage(child);
maybeShow();
tabBar()->tqrepaint();
tabBar()->repaint();
}

void KateTabWidget::removePage ( TQWidget * w )

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

@@ -511,4 +511,4 @@ KateMainWindow *KateViewManager::mainWindow() {
return m_mainWindow;
}

// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// kate: space-indent on; indent-width 2; replace-tabs on;

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

@@ -67,9 +67,9 @@ protected:
void paintEvent( TQPaintEvent *e )
{
TQPainter p( this );
p.setPen( tqcolorGroup().shadow() );
p.setPen( colorGroup().shadow() );
p.drawLine( e->rect().left(), 0, e->rect().right(), 0 );
p.setPen( ((KateViewSpace*)tqparentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() );
p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() );
p.drawLine( e->rect().left(), 1, e->rect().right(), 1 );
}
};
@@ -226,9 +226,9 @@ bool KateViewSpace::event( TQEvent *e )
return TQVBox::event( e );
}

void KateViewSpace::slottqStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg)
void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg)
{
if ((TQWidgetStack *)view->tqparentWidget() != stack)
if ((TQWidgetStack *)view->parentWidget() != stack)
return;
mStatusBar->setStatus( r, c, ovr, block, mod, msg );
}
@@ -309,29 +309,29 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name )
{
m_lineColLabel = new TQLabel( this );
addWidget( m_lineColLabel, 0, false );
m_lineColLabel->tqsetAlignment( Qt::AlignCenter );
m_lineColLabel->setAlignment( Qt::AlignCenter );
m_lineColLabel->installEventFilter( this );

m_modifiedLabel = new TQLabel( TQString(" "), this );
addWidget( m_modifiedLabel, 0, false );
m_modifiedLabel->tqsetAlignment( Qt::AlignCenter );
m_modifiedLabel->setAlignment( Qt::AlignCenter );
m_modifiedLabel->installEventFilter( this );

m_insertModeLabel = new TQLabel( i18n(" INS "), this );
addWidget( m_insertModeLabel, 0, false );
m_insertModeLabel->tqsetAlignment( Qt::AlignCenter );
m_insertModeLabel->setAlignment( Qt::AlignCenter );
m_insertModeLabel->installEventFilter( this );

m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
addWidget( m_selectModeLabel, 0, false );
m_selectModeLabel->tqsetAlignment( Qt::AlignCenter );
m_selectModeLabel->setAlignment( Qt::AlignCenter );
m_selectModeLabel->installEventFilter( this );

m_fileNameLabel=new KSqueezedTextLabel( this );
addWidget( m_fileNameLabel, 1, true );
m_fileNameLabel->setMinimumSize( 0, 0 );
m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
m_fileNameLabel->installEventFilter( this );

installEventFilter( this );
@@ -396,7 +396,7 @@ void KateVSStatusBar::modifiedChanged()

void KateVSStatusBar::showMenu()
{
KMainWindow* mainWindow = static_cast<KMainWindow*>( tqtopLevelWidget() );
KMainWindow* mainWindow = static_cast<KMainWindow*>( topLevelWidget() );
TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) );

if (menu)
@@ -419,4 +419,4 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
return false;
}
//END KateVSStatusBar
// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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
TQString m_group;

private slots:
void slottqStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg);
void slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg);

public slots:
void polish();
@@ -118,4 +118,4 @@ class KateViewSpace : public QVBox
};

#endif
// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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
m_viewSpaceList.setAutoDelete(true);

KateViewSpace* vs = new KateViewSpace( this, this );
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&)));
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&)));
vs->setActive( true );
m_viewSpaceList.append(vs);
connect( this, TQT_SIGNAL(viewChanged()), this, TQT_SLOT(slotViewChanged()) );
@@ -124,7 +124,7 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc )

connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg()));
connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg()));
connect(view,TQT_SIGNAL(newtqStatus()),this,TQT_SLOT(statusMsg()));
connect(view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(statusMsg()));
connect(view->getDoc(), TQT_SIGNAL(undoChanged()), this, TQT_SLOT(statusMsg()));
connect(view,TQT_SIGNAL(dropEventPass(TQDropEvent *)), mainWindow(),TQT_SLOT(slotDropEvent(TQDropEvent *)));
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)
{
if (!view) return true;

KateViewSpace *viewspace = (KateViewSpace *)view->tqparentWidget()->tqparentWidget();
KateViewSpace *viewspace = (KateViewSpace *)view->parentWidget()->parentWidget();

viewspace->removeView (view);

@@ -241,7 +241,7 @@ void KateViewSpaceContainer::activateSpace (Kate::View* v)
{
if (!v) return;

KateViewSpace* vs = (KateViewSpace*)v->tqparentWidget()->tqparentWidget();
KateViewSpace* vs = (KateViewSpace*)v->parentWidget()->parentWidget();

if (!vs->isActiveSpace()) {
setActiveSpace (vs);
@@ -446,23 +446,23 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
if (!activeView()) return;
if (!vs) vs = activeViewSpace();

bool isFirstTime = vs->tqparentWidget() == this;
bool isFirstTime = vs->parentWidget() == this;

TQValueList<int> psizes;
if ( ! isFirstTime )
if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->qt_cast("TQSplitter")) )
if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->qt_cast("TQSplitter")) )
psizes = ps->sizes();

Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->tqparentWidget());
KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
s->setOpaqueResize( KGlobalSettings::opaqueResize() );

if (! isFirstTime) {
// anders: make sure the split' viewspace is always
// correctly positioned.
// If viewSpace is the first child, the new splitter must be moveToFirst'd
if ( !((KateMDI::Splitter*)vs->tqparentWidget())->isLastChild( vs ) )
((KateMDI::Splitter*)s->tqparentWidget())->moveToFirst( s );
if ( !((KateMDI::Splitter*)vs->parentWidget())->isLastChild( vs ) )
((KateMDI::Splitter*)s->parentWidget())->moveToFirst( s );
}
vs->reparent( s, 0, TQPoint(), true );
KateViewSpace* vsNew = new KateViewSpace( this, s );
@@ -471,17 +471,17 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
s->moveToFirst( vsNew );

if (!isFirstTime)
if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->qt_cast("TQSplitter")) )
if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->qt_cast("TQSplitter")) )
ps->setSizes( psizes );

s->show();

TQValueList<int> sizes;
int space = 50;//isHoriz ? s->tqparentWidget()->height()/2 : s->tqparentWidget()->width()/2;
int space = 50;//isHoriz ? s->parentWidget()->height()/2 : s->parentWidget()->width()/2;
sizes << space << space;
s->setSizes( sizes );

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 &)));
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 &)));
m_viewSpaceList.append( vsNew );
activeViewSpace()->setActive( false );
vsNew->setActive( true, true );
@@ -503,7 +503,7 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
// abort if this is the last viewspace
if (m_viewSpaceList.count() < 2) return;

KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->tqparentWidget();
KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->parentWidget();

// find out if it is the first child for repositioning
// see below
@@ -512,9 +512,9 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
// save some size information
KateMDI::Splitter* pp=0L;
TQValueList<int> ppsizes;
if (m_viewSpaceList.count() > 2 && p->tqparentWidget() != this)
if (m_viewSpaceList.count() > 2 && p->parentWidget() != this)
{
pp = (KateMDI::Splitter*)p->tqparentWidget();
pp = (KateMDI::Splitter*)p->parentWidget();
ppsizes = pp->sizes();
pIsFirst = !pp->isLastChild( p ); // simple logic, right-
}
@@ -554,10 +554,10 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
{
TQWidget* other = ((TQWidget *)(( TQPtrList<TQObject>*)p->children())->first());

other->reparent( p->tqparentWidget(), 0, TQPoint(), true );
other->reparent( p->parentWidget(), 0, TQPoint(), true );
// We also need to find the right viewspace to become active
if (pIsFirst)
((KateMDI::Splitter*)p->tqparentWidget())->moveToFirst( other );
((KateMDI::Splitter*)p->parentWidget())->moveToFirst( other );
if ( other->isA("KateViewSpace") ) {
setActiveSpace( (KateViewSpace*)other );
}
@@ -726,7 +726,7 @@ void KateViewSpaceContainer::restoreSplitter( KConfig* config, const TQString &g
{
KateViewSpace* vs = new KateViewSpace( this, s );

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 &)));
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 &)));

if (m_viewSpaceList.isEmpty())
vs->setActive (true);
@@ -755,4 +755,4 @@ KateMainWindow *KateViewSpaceContainer::mainWindow() {
return m_viewManager->mainWindow();
}

// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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)

setAcceptDrops(true);

connect(m_view,TQT_SIGNAL(newtqStatus()),this,TQT_SLOT(newCaption()));
connect(m_view,TQT_SIGNAL(viewtqStatusMsg(const TQString &)),this,TQT_SLOT(newtqStatus(const TQString &)));
connect(m_view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(newCaption()));
connect(m_view,TQT_SIGNAL(viewStatusMsg(const TQString &)),this,TQT_SLOT(newStatus(const TQString &)));
connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(newCaption()));
connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(slotFileNameChanged()));
connect(m_view,TQT_SIGNAL(dropEventPass(TQDropEvent *)),this,TQT_SLOT(slotDropEvent(TQDropEvent *)));
@@ -112,7 +112,7 @@ KWrite::KWrite (KTextEditor::Document *doc)

// init with more usefull size, stolen from konq :)
if (!initialGeometrySet())
resize( TQSize(700, 480).expandedTo(tqminimumSizeHint()));
resize( TQSize(700, 480).expandedTo(minimumSizeHint()));

// call it as last thing, must be sure everything is already set up ;)
setAutoSaveSettings ();
@@ -163,7 +163,7 @@ void KWrite::setupActions()
// setup Settings menu
setStandardToolBarMenuEnabled(true);

m_paShowStatusBar = KStdAction::showtqStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
m_paShowStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar"));

m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, this, TQT_SLOT(newCaption()),
@@ -320,7 +320,7 @@ void KWrite::printDlg()
KTextEditor::printInterface(m_view->document())->printDialog ();
}

void KWrite::newtqStatus(const TQString &msg)
void KWrite::newStatus(const TQString &msg)
{
newCaption();

@@ -709,4 +709,4 @@ void KWriteEditorChooser::slotOk() {
m_chooser->writeAppSetting();
KDialogBase::slotOk();
}
// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
// 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
void printNow();
void printDlg();

void newtqStatus(const TQString &msg);
void newStatus(const TQString &msg);
void newCaption();

void slotDropEvent(TQDropEvent *);
@@ -135,4 +135,4 @@ class KWriteEditorChooser: public KDialogBase
};

#endif
// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
// 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>
</tip>
<tip category="Kate|part">
<html>
<p>You can do cool sed-like regular expression tqreplacements using <em>Command Line</em>.</p>
<p>You can do cool sed-like regular expression replacements using <em>Command Line</em>.</p>
<p>For example, press <strong>F7</strong> and enter <code>s /oldtext/newtext/g</code>
to tqreplace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current
to replace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current
line.</p>
</html>
</tip>

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

@@ -79,4 +79,4 @@ ToolViewManager *MainWindow::toolViewManager () const

}

// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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

#endif

// kate: space-indent on; indent-width 2; tqreplace-tabs on;
// 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 )
{
setSpacing( 4 );
d->header = new TQWidget( this );
d->header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
d->header->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
TQHBoxLayout *lo = new TQHBoxLayout( d->header );
lo->setSpacing( 6 );
lo->insertSpacing( 0, 6 );

+ 5
- 5
kcminit/main.cpp View File

@@ -113,10 +113,10 @@ void KCMInit::runModules( int phase )
TQString libName = TQString("kcm_%1").arg(library);

// try to load the library
if (! alreadyInitialized.tqcontains( libName.ascii() )) {
if (! alreadyInitialized.contains( libName.ascii() )) {
if (!runModule(libName, service)) {
libName = TQString("libkcm_%1").arg(library);
if (! alreadyInitialized.tqcontains( libName.ascii() )) {
if (! alreadyInitialized.contains( libName.ascii() )) {
runModule(libName, service);
alreadyInitialized.append( libName.ascii() );
}
@@ -193,8 +193,8 @@ KCMInit::KCMInit( KCmdLineArgs* args )
runModules( 0 );
kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("kcminit"));
sendReady();
TQTimer::singleShot( 300 * 1000, tqApp, TQT_SLOT( quit())); // just in case
tqApp->exec(); // wait for runPhase1() and runPhase2()
TQTimer::singleShot( 300 * 1000, qApp, TQT_SLOT( quit())); // just in case
qApp->exec(); // wait for runPhase1() and runPhase2()
}
else
runModules( -1 ); // all phases
@@ -215,7 +215,7 @@ void KCMInit::runPhase2()
{
runModules( 2 );
emitDCOPSignal( "phase2Done()", TQByteArray());
tqApp->exit( 0 );
qApp->exit( 0 );
}

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

// Not sure where these next three are is this OLD and from KDE2 and has already been done?

* Remove "Internet & Network/Email". It is tqreplaced by the new kcm_useraccount
* Remove "Internet & Network/Email". It is replaced by the new kcm_useraccount

* Remove "System Administration/User Info". It is tqreplaced by the new kcm_useraccount
* Remove "System Administration/User Info". It is replaced by the new kcm_useraccount

* Remove "Privacy & Crypto/Passwords". It is tqreplaced by the new kcm_useraccount. Probably. (awaiting comment from Aaron)
* Remove "Privacy & Crypto/Passwords". It is replaced by the new kcm_useraccount. Probably. (awaiting comment from Aaron)

* 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.

@@ -151,9 +151,9 @@ The current dialog should appear as an advanced tab behind the "Theme"-tab.
Network -> Talk Configuration
-----------------------------
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".
That way one would have a much cleaner tqlayout and it would be much easier to see at once what the dialog is about.
That way one would have a much cleaner layout and it would be much easier to see at once what the dialog is about.
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:
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).
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).

Sound -> Sound Server
---------------------
@@ -164,5 +164,5 @@ Web Browsing -> User Agent
The Dialog suffers from the cockpit-dilemma.
All the new "Add"-checkboxes are only there for finetuning. Most of the time the useragent-strings should work
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)".
After pressing the "Customize"-Button a dialog should pop up which tqcontains all the nice
After pressing the "Customize"-Button a dialog should pop up which contains all the nice
"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
Comment[cs]=Modifikační kláves (např. Shift nebo Control) změnila svůj stav a je nyní aktivní.
Comment[csb]=Klawisza zjinaczi (n.p. Shift czë Control) zmieniła stón ë je terô aktiwnô
Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) har ændret sin tilstand og er nu aktiv
Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren tqStatus geändert und ist jetzt aktiv
Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren Status geändert und ist jetzt aktiv
Comment[el]=Άλλαξε η κατάσταση ενός πλήκτρου τροποποιητή (π.χ. Shift ή Control) και τώρα είναι ενεργό
Comment[eo]=Modifa klavo (ekz. majuskliga klavo aŭ stirklavo) ŝanĝis sian staton kaj nun estas aktiva
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
Comment[cs]=Modifikační kláves (např. Shift nebo Control) změnila svůj stav a je nyní neaktivní.
Comment[csb]=Klawisza zjinaczi (n.p. Shift czë Control) zmieniła stón ë je terô aktiwnô
Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) har ændret sin tilstand og er nu inaktiv
Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren tqStatus geändert und ist jetzt inaktiv
Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren Status geändert und ist jetzt inaktiv
Comment[el]=Άλλαξε η κατάσταση ενός πλήκτρου τροποποιητή (π.χ. Shift ή Control) και τώρα είναι ανενεργό
Comment[eo]=Modifa klavo (ekz. majuskliga klavo aŭ stirklavo) ŝanĝis sian staton kaj nun estas malaktiva
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
Comment[cs]=Klávesa zámku (např. Caps Lock nebo Num Lock) změnila svůj stav a je nyní aktivní
Comment[csb]=Klawisza blokadë (np. Caps Lock czë Num Lock) zmieniłą stón ë nie je terô aktiwnô
Comment[da]=En låsetast (f.eks., Caps Lock eller Num Lock) har ændret sin tilstand og er nu aktiv
Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren tqStatus geändert und ist nun aktiv
Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren Status geändert und ist nun aktiv
Comment[el]=Ένα πλήκτρο κλειδώματος (π.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι τώρα ανενεργό
Comment[eo]=Ŝlosa klavo (ekz. majuskla baskulo aŭ Cifera baskulo) ŝanĝis sian staton kaj nun estas aktiva
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
Comment[cs]=Klávesa zámku (např. Caps Lock nebo Num Lock) změnila svůj stav a je nyní aktivní
Comment[csb]=Klawisza blokadë (np. Caps Lock czë Num Lock) zmieniła stón ë nie je terô aktiwnô
Comment[da]=En låsetast (f.eks., Caps Lock eller Num Lock) har ændret sin tilstand og er nu inaktiv
Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren tqStatus geändert und ist nun inaktiv
Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren Status geändert und ist nun inaktiv
Comment[el]=Ένα πλήκτρο κλειδώματος (π.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι τώρα ανενεργό
Comment[eo]=baskula klavo (ekz. majuskla baskulo aŭ nombra baskulo) ŝanĝis staton, kaj jam ne estas aktiva
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 @@
#include "kaccess.moc"

struct ModifierKey {
const unsigned int tqmask;
const unsigned int mask;
const KeySym keysym;
const char *name;
const char *lockedText;
@@ -303,9 +303,9 @@ void KAccessApp::readSettings()
overlay = 0;
}

static int tqmaskToBit (int tqmask) {
static int maskToBit (int mask) {
for (int i = 0; i < 8; i++)
if (tqmask & (1 << i))
if (mask & (1 << i))
return i;
return -1;
}
@@ -316,19 +316,19 @@ void KAccessApp::initMasks() {
state = 0;

for (int i = 0; strcmp (modifierKeys[i].name, "") != 0; i++) {
int tqmask = modifierKeys[i].tqmask;
if (tqmask == 0)
int mask = modifierKeys[i].mask;
if (mask == 0)
if (modifierKeys[i].keysym != 0)
tqmask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym);
mask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym);
else if (!strcmp(modifierKeys[i].name, "Win"))
tqmask = KKeyNative::modX(KKey::WIN);
mask = KKeyNative::modX(KKey::WIN);
else
tqmask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch)
mask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch)
| XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Shift)
| XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Latch)
| XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Lock);

int bit = tqmaskToBit (tqmask);
int bit = maskToBit (mask);
if (bit != -1 && keys[bit] == -1)
keys[bit] = i;
}
@@ -496,7 +496,7 @@ TQString mouseKeysShortcut (Display *display) {
{
if (type->map[i].active && (type->map[i].level == level))
{
modifiers = type->map[i].mods.tqmask;
modifiers = type->map[i].mods.mask;
found = true;
}
}
@@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() {
TQVBoxLayout * vlay = new TQVBoxLayout(lay);

featuresLabel = new TQLabel( "", contents );
featuresLabel->tqsetAlignment( WordBreak|AlignVCenter );
featuresLabel->setAlignment( WordBreak|AlignVCenter );
vlay->addWidget( featuresLabel );
vlay->addStretch();


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

@@ -142,7 +142,7 @@ TQString mouseKeysShortcut (Display *display) {
{
if (type->map[i].active && (type->map[i].level == level))
{
modifiers = type->map[i].mods.tqmask;
modifiers = type->map[i].mods.mask;
found = true;
}
}
@@ -248,7 +248,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(),
TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
KDialogBase::spacingHint());

systemBell = new TQCheckBox(i18n("Use &system bell"), grp);
@@ -291,7 +291,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());

visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp);
vvbox->addWidget(visibleBell);
@@ -311,7 +311,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
TQWhatsThis::add( flashScreen, i18n("The screen will turn to a custom color for the amount of time specified below.") );
hbox->addSpacing(12);
colorButton = new KColorButton(grp);
colorButton->setFixedWidth(colorButton->tqsizeHint().height()*2);
colorButton->setFixedWidth(colorButton->sizeHint().height()*2);
hbox->addWidget(colorButton);
hbox->addStretch();
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 *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());

stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp);
vvbox->addWidget(stickyKeys);
@@ -377,7 +377,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());

toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp);
vvbox->addWidget(toggleKeysBeep);
@@ -388,7 +388,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
hbox->addStretch(1);
kNotifyModifiersButton = new TQPushButton(i18n("Configure System Notification..."), grp);
kNotifyModifiersButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
hbox->addWidget(kNotifyModifiersButton);

connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
@@ -415,7 +415,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());

slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp);
vvbox->addWidget(slowKeys);
@@ -447,7 +447,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());

bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp);
vvbox->addWidget(bounceKeys);
@@ -491,7 +491,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());

gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp);
vvbox->addWidget(gestures);
@@ -521,7 +521,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());

accessxBeep = new TQCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp);
vvbox->addWidget(accessxBeep);
@@ -536,7 +536,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
hbox->addStretch(1);
kNotifyAccessXButton = new TQPushButton(i18n("Configure System Notification..."), grp);
kNotifyAccessXButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
hbox->addWidget(kNotifyAccessXButton);

connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));

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

@@ -5,7 +5,7 @@
<property name="name">
<cstring>AccessibilityConfigWidget</cstring>
</property>
<property name="tqgeometry">
<property name="geometry">
<rect>