Browse Source

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
28edc0aa2a
100 changed files with 381 additions and 381 deletions
  1. +17
    -17
      KDE2PORTING.html
  2. +1
    -1
      KDE3PORTING.html
  3. +3
    -3
      TODO
  4. +2
    -2
      arts/kde/kartsserver.cpp
  5. +12
    -12
      arts/knotify/knotify.cpp
  6. +2
    -2
      arts/knotify/knotify.h
  7. +1
    -1
      arts/message/artsmessage.cc
  8. +3
    -3
      interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
  9. +8
    -8
      interfaces/kscript/sample/shellscript.cpp
  10. +4
    -4
      interfaces/kscript/sample/shellscript.h
  11. +5
    -5
      interfaces/ktexteditor/templateinterface.cpp
  12. +1
    -1
      interfaces/terminal/kde_terminal_interface.h
  13. +6
    -6
      kabc/address.cpp
  14. +1
    -1
      kabc/addressbook.cpp
  15. +1
    -1
      kabc/addresseedialog.cpp
  16. +9
    -9
      kabc/addresslineedit.cpp
  17. +2
    -2
      kabc/field.h
  18. +1
    -1
      kabc/formatfactory.cpp
  19. +2
    -2
      kabc/kab2kabc.cpp
  20. +1
    -1
      kabc/lock.cpp
  21. +1
    -1
      kabc/plugins/ldapkio/resourceldapkio.cpp
  22. +1
    -1
      kabc/plugins/ldapkio/resourceldapkioplugin.cpp
  23. +2
    -2
      kabc/scripts/field.src.cpp
  24. +8
    -8
      kate/part/kateconfig.cpp
  25. +9
    -9
      kate/part/katedialogs.cpp
  26. +2
    -2
      kate/part/katedialogs.h
  27. +1
    -1
      kate/part/katedocument.cpp
  28. +4
    -4
      kate/part/katefont.cpp
  29. +1
    -1
      kate/part/katehighlight.cpp
  30. +2
    -2
      kate/part/katejscript.cpp
  31. +1
    -1
      kate/part/kateluaindentscript.cpp
  32. +5
    -5
      kate/part/kateprinter.cpp
  33. +11
    -11
      kate/part/kateschema.cpp
  34. +1
    -1
      kate/part/katesyntaxdocument.cpp
  35. +2
    -2
      kate/part/kateview.cpp
  36. +4
    -4
      kate/part/kateviewhelpers.cpp
  37. +1
    -1
      kate/part/kateviewinternal.cpp
  38. +1
    -1
      kate/part/test_regression.cpp
  39. +1
    -1
      kcert/kcertpart.cc
  40. +2
    -2
      kcmshell/main.cpp
  41. +1
    -1
      kconf_update/kconf_update.cpp
  42. +16
    -16
      kded/kbuildsycoca.cpp
  43. +1
    -1
      kded/kde-menu.cpp
  44. +2
    -2
      kded/kded.cpp
  45. +12
    -12
      kded/khostname.cpp
  46. +13
    -13
      kded/vfolder_menu.cpp
  47. +2
    -2
      kdoctools/kio_help.cpp
  48. +2
    -2
      kdoctools/meinproc.cpp
  49. +1
    -1
      khtml/css/cssstyleselector.cpp
  50. +5
    -5
      khtml/ecma/kjs_debugwin.cpp
  51. +1
    -1
      khtml/ecma/kjs_navigator.cpp
  52. +7
    -7
      khtml/ecma/kjs_window.cpp
  53. +5
    -5
      khtml/html/html_formimpl.cpp
  54. +2
    -2
      khtml/html/htmltokenizer.cpp
  55. +10
    -10
      khtml/java/kjavaprocess.cpp
  56. +4
    -4
      khtml/java/kjavaprocess.h
  57. +2
    -2
      khtml/khtml_ext.cpp
  58. +1
    -1
      khtml/khtml_factory.cpp
  59. +11
    -11
      khtml/khtml_part.cpp
  60. +5
    -5
      khtml/khtml_settings.cc
  61. +1
    -1
      khtml/khtmlimage.cpp
  62. +8
    -8
      khtml/khtmlview.cpp
  63. +1
    -1
      khtml/misc/decoder.cpp
  64. +3
    -3
      khtml/misc/loader.cpp
  65. +1
    -1
      khtml/rendering/render_form.cpp
  66. +1
    -1
      khtml/rendering/render_replaced.cpp
  67. +1
    -1
      khtml/test_regression.cpp
  68. +1
    -1
      khtml/testkhtml.cpp
  69. +1
    -1
      khtml/xml/dom_docimpl.cpp
  70. +5
    -5
      kinit/autostart.cpp
  71. +1
    -1
      kinit/kdostartupconfig.cpp
  72. +2
    -2
      kinit/kinit.cpp
  73. +1
    -1
      kinit/klauncher.cpp
  74. +3
    -3
      kio/bookmarks/kbookmark.cc
  75. +2
    -2
      kio/bookmarks/kbookmarkbar.cc
  76. +5
    -5
      kio/bookmarks/kbookmarkmanager.cc
  77. +2
    -2
      kio/kfile/kcustommenueditor.cpp
  78. +2
    -2
      kio/kfile/kdiroperator.cpp
  79. +2
    -2
      kio/kfile/kdiroperator.h
  80. +3
    -3
      kio/kfile/kdirselectdialog.cpp
  81. +2
    -2
      kio/kfile/kdirsize.cpp
  82. +6
    -6
      kio/kfile/kdiskfreesp.cpp
  83. +3
    -3
      kio/kfile/kdiskfreesp.h
  84. +3
    -3
      kio/kfile/kencodingfiledialog.cpp
  85. +2
    -2
      kio/kfile/kfiledetailview.cpp
  86. +15
    -15
      kio/kfile/kfiledialog.cpp
  87. +2
    -2
      kio/kfile/kfileiconview.cpp
  88. +5
    -5
      kio/kfile/kfilesharedlg.cpp
  89. +6
    -6
      kio/kfile/kfilespeedbar.cpp
  90. +1
    -1
      kio/kfile/kfileview.cpp
  91. +3
    -3
      kio/kfile/kicondialog.cpp
  92. +2
    -2
      kio/kfile/kimagefilepreview.cpp
  93. +1
    -1
      kio/kfile/kmetaprops.cpp
  94. +4
    -4
      kio/kfile/knotifydialog.cpp
  95. +2
    -2
      kio/kfile/knotifydialog.h
  96. +7
    -7
      kio/kfile/kopenwith.cpp
  97. +1
    -1
      kio/kfile/kpreviewprops.cpp
  98. +19
    -19
      kio/kfile/kpropertiesdialog.cpp
  99. +3
    -3
      kio/kfile/krecentdirs.cpp
  100. +3
    -3
      kio/kfile/krecentdocument.cpp

+ 17
- 17
KDE2PORTING.html View File

@@ -22,7 +22,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<LI><A HREF="#TDEApplication">TDEApplication</A></LI>
<LI><A HREF="#TDECmdLineArgs">TDECmdLineArgs</A></LI>
<LI><A HREF="#KLocale">KLocale</A></LI>
<LI><A HREF="#KGlobal">KGlobal: access to KDE global objects.</A></LI>
<LI><A HREF="#TDEGlobal">TDEGlobal: access to KDE global objects.</A></LI>
<LI><A HREF="#KIconLoader">KIconLoader</A></LI>
<LI><A HREF="#KTMainWindow">KTMainWindow</A></LI>
<LI><A HREF="#KHelpMenu">KHelpMenu</A></LI>
@@ -37,7 +37,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<LI><A HREF="#kcharsets">kcharsets</A></LI>
<LI><A HREF="#KWizard">KWizard, KNoteBook</A></LI>
<LI><A HREF="#KSpinBox">KSpinBox, KNumericSpinBox</A></LI>
<LI><A HREF="#KClipboard">KClipboard</A></LI>
<LI><A HREF="#TDEClipboard">TDEClipboard</A></LI>
<LI><A HREF="#KPanner">KPanner, KNewPanner</A></LI>
<LI><A HREF="#KTreeList">KTreeList, KTreeListItem</A></LI>
<LI><A HREF="#KMsgBox">KMsgBox</A></LI>
@@ -110,11 +110,11 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<H3><A NAME="TDEApplication">TDEApplication</A></H3>

doesn't hold any longer a KLocale instance. With this getLocale()
and isLocaleInstantiated are now replaced by KGlobal::locale()<P>
and isLocaleInstantiated are now replaced by TDEGlobal::locale()<P>

it also doesn't hold a KiconLoader instance. As this also getIconLoader()
has been removed. Replace kapp-&gt;getIconLoader()-&gt;loadIcon() with
BarIcon() or use KGlobal::iconLoader() instead of getIconLoader()<P>
BarIcon() or use TDEGlobal::iconLoader() instead of getIconLoader()<P>

kde_*dir() have been removed as they require a unique top level directory
for all applications (TDEDIR). This concept doesn't exist in KDE 2.0
@@ -125,16 +125,16 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
Replace code that uses kde_*dir() + filename with calls to
locate(filetype, filename) where filetype is what * used to be
in kde_*dir(). locate is defined as function in kstddirs.h to call
KGlobal::dirs()-&gt;findResource.<P>
TDEGlobal::dirs()-&gt;findResource.<P>

Use locateLocal to get the path of a writable file. For instance,
TDEApplication::localconfigdir()+filename is now locateLocal( "config", filename ),
but for most cases, simply using KGlobal::config() is enough, if you're happy
but for most cases, simply using TDEGlobal::config() is enough, if you're happy
with saving the application's configuration into appnamerc, or
KSimpleConfig cfg("anothercfgfile") to create a config file with another name.<P>

generalFont() and fixedFont() are deprecated and will be removed soon.
Please use KGlobalSettings::generalFont() and KGlobalSettings::fixedFont() instead.<P>
Please use TDEGlobalSettings::generalFont() and TDEGlobalSettings::fixedFont() instead.<P>

appName() is deprecated. Please use TQApplication::name() or instanceName
instead.<P>
@@ -193,9 +193,9 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

<H3><A NAME="KGlobal">KGlobal: access to KDE global objects.</A></H3>
<H3><A NAME="TDEGlobal">TDEGlobal: access to KDE global objects.</A></H3>

KGlobal allows centralized access to KDE global objects without including
TDEGlobal allows centralized access to KDE global objects without including
extraneous headers. object creation is deferred if possible.<P>

All methods are static and headers for returned types are not included. You
@@ -215,11 +215,11 @@ must have created a TDEApplication object before the methods can be used.<P>
<TD>
<PRE>
...
KConfig *appcfg = KGlobal::config();
KConfig *appcfg = TDEGlobal::config();
TQString mystr = i18n( "This is a string" );


KIconLoader *loader = KGlobal::iconLoader();
KIconLoader *loader = TDEGlobal::iconLoader();
</PRE>
</TD>
</TR>
@@ -309,9 +309,9 @@ you should or should not use them.
<H4>1. fork + exec</H4>
<P>
You never want to use this unless you have a very good reason why it is
impossible to use KProcess.
impossible to use TDEProcess.
</P>
<H4>2. KProcess</H4>
<H4>2. TDEProcess</H4>
<P>
You want to use this if you need to start a new process which needs to be a
child of your process, e.g. because you want to catch stdout/stderr or need
@@ -323,7 +323,7 @@ off with KProcIO

<H4>3. KProcIO</H4>
<P>
Like KProcess. Unlike KProcess, this class actually makes it easy to
Like TDEProcess. Unlike TDEProcess, this class actually makes it easy to
send data to and receive data from the process.

</P>
@@ -534,7 +534,7 @@ The kcharsets class has been completely rewritten, and most of it has
vanished, since support for it moved to Qt.<P>

Most applications will only need to replace kapp-&gt;getKCharsets() with
KGlobal::charsets().<P>
TDEGlobal::charsets().<P>

For conversion of various input formats to QStrings, please have a
look at TQTextCodec and classes derived from it.<P>
@@ -570,9 +570,9 @@ HINTS:<P>

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

<H3><A NAME="KClipboard">KClipboard</A></H3>
<H3><A NAME="TDEClipboard">TDEClipboard</A></H3>

KClipboard has been removed. In case you've been using KClipboard,
TDEClipboard has been removed. In case you've been using TDEClipboard,
QClipboard is the way to go now, as it has all the functionality the K
version had, and more.<P>



+ 1
- 1
KDE3PORTING.html View File

@@ -179,7 +179,7 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
this, TQT_SLOT(scrollUp()), actionCollection(), "Scroll Up" );
</pre>

<h5>KGlobalAccel</h5>
<h5>TDEGlobalAccel</h5>
<ul>
<li>Call <i>updateConnections()</i> after all <i>insert()</i> or
<i>insertItem()</i> (deprecated) calls have been made. This function then performs the


+ 3
- 3
TODO View File

@@ -68,7 +68,7 @@ that we would like to make for the next binary incompatible release.
KGuiItem has one of these dangerous ctors, too. KUser has a whole bunch
of them.

- Solve need for casting when using bitfield enums (e.g. KProcess::Communication),
- Solve need for casting when using bitfield enums (e.g. TDEProcess::Communication),
if Simon's solution works.

- Merge tdelibs/tdecore/kuser.h and tdeadmin/kuser/kuser.h.
@@ -133,7 +133,7 @@ that we would like to make for the next binary incompatible release.
- kpassdlg.h needs to be renamed to kpassworddialog.h - consistent with other classes(it won't
break many apps). The class needs a facelift - see the comments in kpassdlg.{h,cpp}

- KProcess needs a major facelift. Not all of these items need to be BIC, but not needing to
- TDEProcess needs a major facelift. Not all of these items need to be BIC, but not needing to
worry about legacy will certainly allow an overall cleaner solution.
- the internals need to be encapsulated properly. many of the virtuals shouldn't be virtual;
lots of protected members should be accessible only via accessors. the current model is
@@ -149,7 +149,7 @@ that we would like to make for the next binary incompatible release.
- do something about the NoRead comm mode
- add setComm(); remove comm arg from start(). as a side effect, this will allow for using
writeStdin() in Block mode.
- merge KProcIO into KProcess; add setBuffered() for separate channels.
- merge KProcIO into TDEProcess; add setBuffered() for separate channels.
- use QByteArray for writeStdin(). better than the buf+len arg, as it is ref-counted.

- To discuss: Migrate the about dialog to use qhtml or khtml rather then the current


+ 2
- 2
arts/kde/kartsserver.cpp View File

@@ -60,7 +60,7 @@ Arts::SoundServerV2 KArtsServer::server(void)
// aRts seems not to be running, let's try to run it
// First, let's read the configuration as in kcmarts
KConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/);
KProcess proc;
TDEProcess proc;

config.setGroup("Arts");

@@ -86,7 +86,7 @@ Arts::SoundServerV2 KArtsServer::server(void)

proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );

if(proc.start(KProcess::Block) && proc.normalExit())
if(proc.start(TDEProcess::Block) && proc.normalExit())
{
// We could have a race-condition here.
// The correct way to do it is to make artsd fork-and-exit


+ 12
- 12
arts/knotify/knotify.cpp View File

@@ -78,7 +78,7 @@ public:
TQMap<TQString, KConfig*> events;
TQMap<TQString, KConfig*> configs;
TQString externalPlayer;
KProcess *externalPlayerProc;
TDEProcess *externalPlayerProc;

#ifndef WITHOUT_ARTS
TQPtrList<KDE::PlayObject> playObjects;
@@ -136,7 +136,7 @@ KDE_EXPORT int kdemain(int argc, char **argv)
// abort this.

#ifndef WITHOUT_ARTS
KConfigGroup config( KGlobal::config(), "StartProgress" );
KConfigGroup config( TDEGlobal::config(), "StartProgress" );
KConfig artsKCMConfig( "kcmartsrc" );
artsKCMConfig.setGroup( "Arts" );
bool useArts = artsKCMConfig.readBoolEntry( "StartServer", true );
@@ -285,7 +285,7 @@ KNotify::~KNotify()

void KNotify::loadConfig() {
// load external player settings
KConfig *kc = KGlobal::config();
KConfig *kc = TDEGlobal::config();
kc->setGroup("Misc");
d->useExternal = kc->readBoolEntry( "Use external player", false );
d->externalPlayer = kc->readPathEntry("External player");
@@ -452,7 +452,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
if ( TQFileInfo(sound).isRelative() )
{
TQString search = TQString("%1/sounds/%2").arg(appname).arg(sound);
soundFile = KGlobal::instance()->dirs()->findResource("data", search);
soundFile = TDEGlobal::instance()->dirs()->findResource("data", search);
if ( soundFile.isEmpty() )
soundFile = locate( "sound", sound );
}
@@ -537,12 +537,12 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int

} else if(!d->externalPlayer.isEmpty()) {
// use an external player to play the sound
KProcess *proc = d->externalPlayerProc;
TDEProcess *proc = d->externalPlayerProc;
if (!proc)
{
proc = d->externalPlayerProc = new KProcess;
connect( proc, TQT_SIGNAL( processExited( KProcess * )),
TQT_SLOT( slotPlayerProcessExited( KProcess * )));
proc = d->externalPlayerProc = new TDEProcess;
connect( proc, TQT_SIGNAL( processExited( TDEProcess * )),
TQT_SLOT( slotPlayerProcessExited( TDEProcess * )));
}
if (proc->isRunning())
{
@@ -552,7 +552,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
proc->clearArguments();
(*proc) << d->externalPlayer << TQFile::encodeName( soundFile ).data();
d->externalPlayerEventId = eventId;
proc->start(KProcess::NotifyOnExit);
proc->start(TDEProcess::NotifyOnExit);
return true;
}

@@ -619,10 +619,10 @@ bool KNotify::notifyByExecute(const TQString &command, const TQString& event,
if ( execLine.isEmpty() )
execLine = command; // fallback

KProcess p;
TDEProcess p;
p.setUseShell(true);
p << execLine;
p.start(KProcess::DontCare);
p.start(TDEProcess::DontCare);
return true;
}
return false;
@@ -721,7 +721,7 @@ bool KNotify::isPlaying( const TQString& soundFile ) const
return false;
}

void KNotify::slotPlayerProcessExited( KProcess *proc )
void KNotify::slotPlayerProcessExited( TDEProcess *proc )
{
soundFinished( d->externalPlayerEventId,
(proc->normalExit() && proc->exitStatus() == 0) ? PlayedOK : Unknown );


+ 2
- 2
arts/knotify/knotify.h View File

@@ -25,7 +25,7 @@
#include <dcopobject.h>

class KNotifyPrivate;
class KProcess;
class TDEProcess;
class KConfig;

class KNotify : public TQObject, public DCOPObject
@@ -98,7 +98,7 @@ private:

private slots:
void playTimeout();
void slotPlayerProcessExited( KProcess *proc );
void slotPlayerProcessExited( TDEProcess *proc );
void restartedArtsd();

private:


+ 1
- 1
arts/message/artsmessage.cc View File

@@ -57,7 +57,7 @@ TDEAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1",

int main(int argc, char **argv) {
aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org");
KGlobal::locale()->setMainCatalogue("tdelibs");
TDEGlobal::locale()->setMainCatalogue("tdelibs");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
TDEApplication app;


+ 3
- 3
interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp View File

@@ -56,7 +56,7 @@ public:
KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
: KPreviewWidgetBase( parent, name )
{
KGlobal::locale()->insertCatalogue("kfileaudiopreview");
TDEGlobal::locale()->insertCatalogue("kfileaudiopreview");

TQStringList formats = KDE::PlayObjectFactory::mimeTypes();
// ###
@@ -91,14 +91,14 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
}

m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box );
KConfigGroup config( KGlobal::config(), ConfigGroup );
KConfigGroup config( TDEGlobal::config(), ConfigGroup );
m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) );
connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
}

KFileAudioPreview::~KFileAudioPreview()
{
KConfigGroup config( KGlobal::config(), ConfigGroup );
KConfigGroup config( TDEGlobal::config(), ConfigGroup );
config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() );

delete d;


+ 8
- 8
interfaces/kscript/sample/shellscript.cpp View File

@@ -30,10 +30,10 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" )

ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent)
{
m_script = new KProcess();
connect ( m_script, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(Exit(KProcess *)));
connect ( m_script, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(stdOut(KProcess *, char *, int )));
connect ( m_script, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(stdErr(KProcess *, char *, int )));
m_script = new TDEProcess();
connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *)));
connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int )));
connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int )));
// Connect feedback signals and slots
//kdDebug() << "Building new script engine" << endl;
}
@@ -60,7 +60,7 @@ void ShellScript::setScript( const TQString &, const TQString & )

void ShellScript::run(TQObject *, const TQVariant &)
{
m_script->start(KProcess::NotifyOnExit,KProcess::All);
m_script->start(TDEProcess::NotifyOnExit,TDEProcess::All);
}
void ShellScript::kill()
{
@@ -68,16 +68,16 @@ void ShellScript::kill()
m_script->kill(9); // Kill it harder
}

void ShellScript::Exit(KProcess *proc)
void ShellScript::Exit(TDEProcess *proc)
{
ScriptClientInterface->done((KScriptClientInterface::Result)proc->exitStatus(), "");
}

void ShellScript::stdErr(KProcess *, char *buffer, int)
void ShellScript::stdErr(TDEProcess *, char *buffer, int)
{
ScriptClientInterface->error(buffer);
}
void ShellScript::stdOut(KProcess *, char *buffer, int)
void ShellScript::stdOut(TDEProcess *, char *buffer, int)
{
ScriptClientInterface->output(buffer);
}


+ 4
- 4
interfaces/kscript/sample/shellscript.h View File

@@ -36,11 +36,11 @@ public:
void run(TQObject *context = 0, const TQVariant &arg = 0);
void kill();
private slots:
void Exit(KProcess *proc);
void stdErr(KProcess *proc, char *buffer, int buflen);
void stdOut(KProcess *proc, char *buffer, int buflen);
void Exit(TDEProcess *proc);
void stdErr(TDEProcess *proc, char *buffer, int buflen);
void stdOut(TDEProcess *proc, char *buffer, int buflen);
private:
KProcess *m_script;
TDEProcess *m_script;
KScriptClientInterface *ScriptClientInterface;
TQString m_scriptName;
};


+ 5
- 5
interfaces/ktexteditor/templateinterface.cpp View File

@@ -113,23 +113,23 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
}
else if ( placeholder == "date" )
{
map[ placeholder ] = KGlobal::locale() ->formatDate( date, true );
map[ placeholder ] = TDEGlobal::locale() ->formatDate( date, true );
}
else if ( placeholder == "time" )
{
map[ placeholder ] = KGlobal::locale() ->formatTime( time, true, false );
map[ placeholder ] = TDEGlobal::locale() ->formatTime( time, true, false );
}
else if ( placeholder == "year" )
{
map[ placeholder ] = KGlobal::locale() ->calendar() ->yearString( date, false );
map[ placeholder ] = TDEGlobal::locale() ->calendar() ->yearString( date, false );
}
else if ( placeholder == "month" )
{
map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->month( date ) );
map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->month( date ) );
}
else if ( placeholder == "day" )
{
map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->day( date ) );
map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->day( date ) );
}
else if ( placeholder == "hostname" )
{


+ 1
- 1
interfaces/terminal/kde_terminal_interface.h View File

@@ -35,7 +35,7 @@ class TQStrList;
* we can't have signals without having a TQObject, which
* TerminalInterface is not.
* These are the signals you can connect to:
* void processExited( KProcess *process );
* void processExited( TDEProcess *process );
* void receivedData( const TQString& s );
* See the example code below for how to connect to these..
*


+ 6
- 6
kabc/address.cpp View File

@@ -338,7 +338,7 @@ TQString Address::formattedAddress( const TQString &realName,
ciso = countryToISO( country() );
} else {
// fall back to our own country
ciso = KGlobal::locale()->country();
ciso = TDEGlobal::locale()->country();
}
KSimpleConfig entry( locate( "locale",
TQString( "l10n/" ) + ciso + TQString( "/entry.desktop" ) ) );
@@ -369,7 +369,7 @@ TQString Address::formattedAddress( const TQString &realName,
// the rules of our own system country )
if ( !country().isEmpty() ) {
KSimpleConfig entry( locate( "locale", TQString( "l10n/" )
+ KGlobal::locale()->country() + TQString( "/entry.desktop" ) ) );
+ TDEGlobal::locale()->country() + TQString( "/entry.desktop" ) ) );
entry.setGroup( "KCM Locale" );
TQString cpos = entry.readEntry( "AddressCountryPosition" );
if ( "BELOW" == cpos || cpos.isEmpty() ) {
@@ -520,7 +520,7 @@ TQString Address::countryToISO( const TQString &cname )
if ( it != mISOMap->end() )
return it.data();

TQString mapfile = KGlobal::dirs()->findResource( "data",
TQString mapfile = TDEGlobal::dirs()->findResource( "data",
TQString::fromLatin1( "kabc/countrytransl.map" ) );

TQFile file( mapfile );
@@ -540,8 +540,8 @@ TQString Address::countryToISO( const TQString &cname )
}
// fall back to system country
mISOMap->insert( cname, KGlobal::locale()->country() );
return KGlobal::locale()->country();
mISOMap->insert( cname, TDEGlobal::locale()->country() );
return TDEGlobal::locale()->country();
}

TQString Address::ISOtoCountry( const TQString &ISOname )
@@ -550,7 +550,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
if ( ISOname.simplifyWhiteSpace().isEmpty() )
return TQString::null;

TQString mapfile = KGlobal::dirs()->findResource( "data",
TQString mapfile = TDEGlobal::dirs()->findResource( "data",
TQString::fromLatin1( "kabc/countrytransl.map" ) );

TQFile file( mapfile );


+ 1
- 1
kabc/addressbook.cpp View File

@@ -673,7 +673,7 @@ bool AddressBook::addCustomField( const TQString &label, int category,
d->mAllFields = Field::allFields();
}

TQString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
TQString a = app.isNull() ? TDEGlobal::instance()->instanceName() : app;
TQString k = key.isNull() ? label : key;

Field *field = Field::createCustomField( label, category, k, a );


+ 1
- 1
kabc/addresseedialog.cpp View File

@@ -78,7 +78,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
TQT_SLOT( updateEdit( TQListViewItem * ) ) );

mAddresseeEdit = new KLineEdit( topWidget );
mAddresseeEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
mAddresseeEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
connect( mAddresseeEdit->completionObject(), TQT_SIGNAL( match( const TQString & ) ),
TQT_SLOT( selectItem( const TQString & ) ) );
mAddresseeEdit->setFocus();


+ 9
- 9
kabc/addresslineedit.cpp View File

@@ -326,16 +326,16 @@ void AddressLineEdit::doCompletion(bool ctrlT)
return;
}
KGlobalSettings::Completion mode = completionMode();
TDEGlobalSettings::Completion mode = completionMode();
switch ( mode )
{
case KGlobalSettings::CompletionPopupAuto:
case TDEGlobalSettings::CompletionPopupAuto:
{
if (s.isEmpty())
break;
}
case KGlobalSettings::CompletionPopup:
case TDEGlobalSettings::CompletionPopup:
{
m_previousAddresses = prevAddr;
TQStringList items = s_completion->allMatches( s );
@@ -368,7 +368,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
// completion (suggestion) since it does not know how to deal
// with providing proper completions for different items on the
// same line, e.g. comma-separated list of email addresses.
bool autoSuggest = (mode != KGlobalSettings::CompletionPopupAuto);
bool autoSuggest = (mode != TDEGlobalSettings::CompletionPopupAuto);
setCompletedItems( items, autoSuggest );
if (!autoSuggest)
@@ -385,7 +385,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
break;
}

case KGlobalSettings::CompletionShell:
case TDEGlobalSettings::CompletionShell:
{
TQString match = s_completion->makeCompletion( s );
if ( !match.isNull() && match != s )
@@ -396,8 +396,8 @@ void AddressLineEdit::doCompletion(bool ctrlT)
break;
}

case KGlobalSettings::CompletionMan: // Short-Auto in fact
case KGlobalSettings::CompletionAuto:
case TDEGlobalSettings::CompletionMan: // Short-Auto in fact
case TDEGlobalSettings::CompletionAuto:
{
if (!s.isEmpty())
{
@@ -410,7 +410,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
break;
}
}
case KGlobalSettings::CompletionNone:
case TDEGlobalSettings::CompletionNone:
default: // fall through
break;
}
@@ -496,7 +496,7 @@ void AddressLineEdit::slotLDAPSearchData( const TQStringList& adrs )
if( hasFocus() || completionBox()->hasFocus())
{
if( completionMode() != KGlobalSettings::CompletionNone )
if( completionMode() != TDEGlobalSettings::CompletionNone )
{
doCompletion( false );
}


+ 2
- 2
kabc/field.h View File

@@ -138,7 +138,7 @@ public:
const Field::List &fields );
/**
* This is the same as above, with the difference, that
* the list is stored in KGlobal::config() in group "KABCFields".
* the list is stored in TDEGlobal::config() in group "KABCFields".
*/
static void saveFields( const TQString &identifier,
const Field::List &fields );
@@ -153,7 +153,7 @@ public:

/**
* This is the same as above, with the difference, that
* the list is loaded from KGlobal::config() from group "KABCFields".
* the list is loaded from TDEGlobal::config() from group "KABCFields".
*/
static Field::List restoreFields( const TQString &identifier );



+ 1
- 1
kabc/formatfactory.cpp View File

@@ -56,7 +56,7 @@ FormatFactory::FormatFactory()
info->descriptionLabel = i18n( "vCard Format" );
mFormatList.insert( "vcard", info );

const TQStringList list = KGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
const TQStringList list = TDEGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
{
KSimpleConfig config( *it, true );


+ 2
- 2
kabc/kab2kabc.cpp View File

@@ -251,7 +251,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a )
} else if ( fieldName == "ROLE" ) {
a.setRole( fieldValue );
} else if ( fieldName == "BDAY" ) {
a.setBirthday( KGlobal::locale()->readDate( fieldValue ) );
a.setBirthday( TDEGlobal::locale()->readDate( fieldValue ) );
} else if ( fieldName == "WEBPAGE" ) {
a.setUrl( KURL( fieldValue ) );
} else if ( fieldName == "N" ) {
@@ -280,7 +280,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a )

void importKab( KABC::AddressBook *ab, bool override, bool quiet )
{
TQString fileName = KGlobal::dirs()->saveLocation( "data", "kab/" );
TQString fileName = TDEGlobal::dirs()->saveLocation( "data", "kab/" );
fileName += "addressbook.kab";
if ( !TQFile::exists( fileName ) ) {
if ( !quiet ) {


+ 1
- 1
kabc/lock.cpp View File

@@ -68,7 +68,7 @@ bool Lock::writeLockFile( const TQString &filename )
TQFile file( filename );
if ( !file.open( IO_WriteOnly ) ) return false;
TQTextStream t( &file );
t << ::getpid() << endl << TQString( KGlobal::instance()->instanceName() );
t << ::getpid() << endl << TQString( TDEGlobal::instance()->instanceName() );

return true;
}


+ 1
- 1
kabc/plugins/ldapkio/resourceldapkio.cpp View File

@@ -110,7 +110,7 @@ ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config )
d->mCachePolicy = Cache_No;
d->mAutoCache = true;
}
d->mCacheDst = KGlobal::dirs()->saveLocation("cache", "ldapkio") + "/" +
d->mCacheDst = TDEGlobal::dirs()->saveLocation("cache", "ldapkio") + "/" +
type() + "_" + identifier();
init();
}


+ 1
- 1
kabc/plugins/ldapkio/resourceldapkioplugin.cpp View File

@@ -30,7 +30,7 @@ extern "C"
{
KDE_EXPORT void *init_kabc_ldapkio()
{
KGlobal::locale()->insertCatalogue("kabc_ldapkio");
TDEGlobal::locale()->insertCatalogue("kabc_ldapkio");
return new KRES::PluginFactory<ResourceLDAPKIO, ResourceLDAPKIOConfig>();
}
}

+ 2
- 2
kabc/scripts/field.src.cpp View File

@@ -428,7 +428,7 @@ void Field::deleteFields()
void Field::saveFields( const TQString &identifier,
const Field::List &fields )
{
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
KConfigGroupSaver( cfg, "KABCFields" );

saveFields( cfg, identifier, fields );
@@ -458,7 +458,7 @@ void Field::saveFields( KConfig *cfg, const TQString &identifier,

Field::List Field::restoreFields( const TQString &identifier )
{
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
KConfigGroupSaver( cfg, "KABCFields" );
return restoreFields( cfg, identifier );


+ 8
- 8
kate/part/kateconfig.cpp View File

@@ -422,11 +422,11 @@ TQTextCodec *KateDocumentConfig::codec ()
if (m_encodingSet || isGlobal())
{
if (m_encoding.isEmpty() && isGlobal())
return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding()));
return TDEGlobal::charsets()->codecForName (TQString::fromLatin1(TDEGlobal::locale()->encoding()));
else if (m_encoding.isEmpty())
return s_global->codec ();
else
return KGlobal::charsets()->codecForName (m_encoding);
return TDEGlobal::charsets()->codecForName (m_encoding);
}

return s_global->codec ();
@@ -439,7 +439,7 @@ void KateDocumentConfig::setEncoding (const TQString &encoding)
if (!enc.isEmpty())
{
bool found = false;
TQTextCodec *codec = KGlobal::charsets()->codecForName (encoding, found);
TQTextCodec *codec = TDEGlobal::charsets()->codecForName (encoding, found);

if (!found || !codec)
return;
@@ -1127,12 +1127,12 @@ void KateRendererConfig::setSchemaInternal( int schema )

KConfig *config (KateFactory::self()->schemaManager()->schema(schema));

TQColor tmp0 (KGlobalSettings::baseColor());
TQColor tmp1 (KGlobalSettings::highlightColor());
TQColor tmp2 (KGlobalSettings::alternateBackgroundColor());
TQColor tmp0 (TDEGlobalSettings::baseColor());
TQColor tmp1 (TDEGlobalSettings::highlightColor());
TQColor tmp2 (TDEGlobalSettings::alternateBackgroundColor());
TQColor tmp3 ( "#FFFF99" );
TQColor tmp4 (tmp2.dark());
TQColor tmp5 ( KGlobalSettings::textColor() );
TQColor tmp5 ( TDEGlobalSettings::textColor() );
TQColor tmp6 ( "#EAE9E8" );
TQColor tmp7 ( "#000000" );

@@ -1170,7 +1170,7 @@ void KateRendererConfig::setSchemaInternal( int schema )
m_lineMarkerColor[index] = col;
}

TQFont f (KGlobalSettings::fixedFont());
TQFont f (TDEGlobalSettings::fixedFont());

if (!m_fontSet)
{


+ 9
- 9
kate/part/katedialogs.cpp View File

@@ -999,7 +999,7 @@ void KateSaveConfigTab::apply()

KateDocumentConfig::global()->setConfigFlags(configFlags);

KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : KGlobal::charsets()->encodingForName(m_encoding->currentText()));
KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : TDEGlobal::charsets()->encodingForName(m_encoding->currentText()));

KateDocumentConfig::global()->setEol(m_eol->currentItem());
KateDocumentConfig::global()->setAllowEolDetection(allowEolDetection->isChecked());
@@ -1013,12 +1013,12 @@ void KateSaveConfigTab::reload()
m_encoding->clear ();
m_encoding->insertItem (i18n("TDE Default"));
m_encoding->setCurrentItem(0);
TQStringList encodings (KGlobal::charsets()->descriptiveEncodingNames());
TQStringList encodings (TDEGlobal::charsets()->descriptiveEncodingNames());
int insert = 1;
for (uint i=0; i < encodings.count(); i++)
{
bool found = false;
TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encodings[i]), found);
TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(encodings[i]), found);

if (found)
{
@@ -1529,7 +1529,7 @@ void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data)

void KateHlDownloadDialog::slotUser1()
{
TQString destdir=KGlobal::dirs()->saveLocation("data","katepart/syntax/");
TQString destdir=TDEGlobal::dirs()->saveLocation("data","katepart/syntax/");
for (TQListViewItem *it=list->firstChild();it;it=it->nextSibling())
{
if (list->isSelected(it))
@@ -1640,16 +1640,16 @@ KateModOnHdPrompt::~KateModOnHdPrompt()

void KateModOnHdPrompt::slotDiff()
{
// Start a KProcess that creates a diff
// Start a TDEProcess that creates a diff
KProcIO *p = new KProcIO();
p->setComm( KProcess::All );
p->setComm( TDEProcess::All );
*p << "diff" << "-u" << "-" << m_doc->url().path();
connect( p, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPDone(KProcess*)) );
connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) );
connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) );

setCursor( WaitCursor );

p->start( KProcess::NotifyOnExit, true );
p->start( TDEProcess::NotifyOnExit, true );

uint lastln = m_doc->numLines();
for ( uint l = 0; l < lastln; l++ )
@@ -1678,7 +1678,7 @@ void KateModOnHdPrompt::slotPRead( KProcIO *p)
p->ackRead();
}

void KateModOnHdPrompt::slotPDone( KProcess *p )
void KateModOnHdPrompt::slotPDone( TDEProcess *p )
{
setCursor( ArrowCursor );
if( ! m_tmpfile )


+ 2
- 2
kate/part/katedialogs.h View File

@@ -360,7 +360,7 @@ class KateHlDownloadDialog: public KDialogBase
};

class KProcIO;
class KProcess;
class TDEProcess;
/**
* This dialog will prompt the user for what do with a file that is
* modified on disk.
@@ -394,7 +394,7 @@ class KateModOnHdPrompt : public KDialogBase

private slots:
void slotPRead(KProcIO*); ///< Read from the diff process
void slotPDone(KProcess*); ///< Runs the diff file when done
void slotPDone(TDEProcess*); ///< Runs the diff file when done

private:
KateDocument *m_doc;


+ 1
- 1
kate/part/katedocument.cpp View File

@@ -1955,7 +1955,7 @@ void KateDocument::readSessionConfig(KConfig *kconfig)

void KateDocument::writeSessionConfig(KConfig *kconfig)
{
if ( m_url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/"))
if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/"))
return;
// save url
kconfig->writeEntry("URL", m_url.prettyURL() );


+ 4
- 4
kate/part/katefont.cpp View File

@@ -68,10 +68,10 @@ int KateFontMetrics::width(TQChar c)
//

KateFontStruct::KateFontStruct()
: myFont(KGlobalSettings::fixedFont()),
myFontBold(KGlobalSettings::fixedFont()),
myFontItalic(KGlobalSettings::fixedFont()),
myFontBI(KGlobalSettings::fixedFont()),
: myFont(TDEGlobalSettings::fixedFont()),
myFontBold(TDEGlobalSettings::fixedFont()),
myFontItalic(TDEGlobalSettings::fixedFont()),
myFontBI(TDEGlobalSettings::fixedFont()),
myFontMetrics(myFont),
myFontMetricsBold(myFontBold),
myFontMetricsItalic(myFontItalic),


+ 1
- 1
kate/part/katehighlight.cpp View File

@@ -2094,7 +2094,7 @@ bool KateHighlighting::isInWord( TQChar c, int attrib ) const

bool KateHighlighting::canBreakAt( TQChar c, int attrib ) const
{
static const TQString& sq = KGlobal::staticQString("\"'");
static const TQString& sq = TDEGlobal::staticQString("\"'");
return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.find(c) != -1) && (sq.find(c) == -1);
}



+ 2
- 2
kate/part/katejscript.cpp View File

@@ -653,7 +653,7 @@ void KateJScriptManager::collectScripts (bool force)
}

// Let's get a list of all the .js files
TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true);
TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true);

// Let's iterate through the list and build the Mode List
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
@@ -1028,7 +1028,7 @@ void KateIndentJScriptManager::collectScripts (bool force)
#endif

// Let's get a list of all the .js files
TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true);
TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true);

// Let's iterate through the list and build the Mode List
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )


+ 1
- 1
kate/part/kateluaindentscript.cpp View File

@@ -383,7 +383,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force)
#endif

// Let's get a list of all the .js files
TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.lua",false,true);
TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.lua",false,true);

// Let's iterate through the list and build the Mode List
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )


+ 5
- 5
kate/part/kateprinter.cpp View File

@@ -190,11 +190,11 @@ bool KatePrinter::print (KateDocument *doc)
KUser u (KUser::UseRealUserID);
tags["u"] = u.loginName();

tags["d"] = KGlobal::locale()->formatDateTime(dt, true, false);
tags["D"] = KGlobal::locale()->formatDateTime(dt, false, false);
tags["h"] = KGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false);
tags["y"] = KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true);
tags["Y"] = KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false);
tags["d"] = TDEGlobal::locale()->formatDateTime(dt, true, false);
tags["D"] = TDEGlobal::locale()->formatDateTime(dt, false, false);
tags["h"] = TDEGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false);
tags["y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true);
tags["Y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false);
tags["f"] = doc->url().fileName();
tags["U"] = doc->url().prettyURL();
if ( selectionOnly )


+ 11
- 11
kate/part/kateschema.cpp View File

@@ -209,7 +209,7 @@ KConfig *KateSchemaManager::schema (uint number)
void KateSchemaManager::addSchema (const TQString &t)
{
m_config.setGroup (t);
m_config.writeEntry("Color Background", KGlobalSettings::baseColor());
m_config.writeEntry("Color Background", TDEGlobalSettings::baseColor());

update (false);
}
@@ -419,12 +419,12 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
if ( ! m_schemas.contains( newSchema ) )
{
// fallback defaults
TQColor tmp0 (KGlobalSettings::baseColor());
TQColor tmp1 (KGlobalSettings::highlightColor());
TQColor tmp2 (KGlobalSettings::alternateBackgroundColor());
TQColor tmp0 (TDEGlobalSettings::baseColor());
TQColor tmp1 (TDEGlobalSettings::highlightColor());
TQColor tmp2 (TDEGlobalSettings::alternateBackgroundColor());
TQColor tmp3 ( "#FFFF99" );
TQColor tmp4 (tmp2.dark());
TQColor tmp5 ( KGlobalSettings::textColor() );
TQColor tmp5 ( TDEGlobalSettings::textColor() );
TQColor tmp6 ( "#EAE9E8" );
TQColor tmp7 ( "#000000" );

@@ -578,7 +578,7 @@ void KateSchemaConfigFontTab::schemaChanged( int newSchema )

m_schema = newSchema;

TQFont f (KGlobalSettings::fixedFont());
TQFont f (TDEGlobalSettings::fixedFont());

m_fontchooser->disconnect ( this );
m_fontchooser->setFont ( KateFactory::self()->schemaManager()->schema( newSchema )->readFontEntry("Font", &f) );
@@ -635,11 +635,11 @@ void KateSchemaConfigFontColorTab::schemaChanged (uint schema)

// set colors
TQPalette p ( m_defaultStyles->palette() );
TQColor _c ( KGlobalSettings::baseColor() );
TQColor _c ( TDEGlobalSettings::baseColor() );
p.setColor( TQColorGroup::Base,
KateFactory::self()->schemaManager()->schema(schema)->
readColorEntry( "Color Background", &_c ) );
_c = KGlobalSettings::highlightColor();
_c = TDEGlobalSettings::highlightColor();
p.setColor( TQColorGroup::Highlight,
KateFactory::self()->schemaManager()->schema(schema)->
readColorEntry( "Color Selection", &_c ) );
@@ -762,11 +762,11 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
// TODO this reads of the KConfig object, which should be changed when
// the color tab is fixed.
TQPalette p ( m_styles->palette() );
TQColor _c ( KGlobalSettings::baseColor() );
TQColor _c ( TDEGlobalSettings::baseColor() );
p.setColor( TQColorGroup::Base,
KateFactory::self()->schemaManager()->schema(m_schema)->
readColorEntry( "Color Background", &_c ) );
_c = KGlobalSettings::highlightColor();
_c = TDEGlobalSettings::highlightColor();
p.setColor( TQColorGroup::Highlight,
KateFactory::self()->schemaManager()->schema(m_schema)->
readColorEntry( "Color Selection", &_c ) );
@@ -1066,7 +1066,7 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults )
connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)),
this, TQT_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) );
// grap the bg color, selected color and default font
normalcol = KGlobalSettings::textColor();
normalcol = TDEGlobalSettings::textColor();
bgcol = KateRendererConfig::global()->backgroundColor();
selcol = KateRendererConfig::global()->selectionColor();
docfont = *KateRendererConfig::global()->font();


+ 1
- 1
kate/part/katesyntaxdocument.cpp View File

@@ -346,7 +346,7 @@ void KateSyntaxDocument::setupModeList (bool force)
}

// Let's get a list of all the xml files for hl
TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/syntax/*.xml",false,true);
TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/syntax/*.xml",false,true);

// Let's iterate through the list and build the Mode List
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )


+ 2
- 2
kate/part/kateview.cpp View File

@@ -709,8 +709,8 @@ void KateView::slotStatusMsg ()
uint r = cursorLine() + 1;
uint c = cursorColumn() + 1;

TQString s1 = i18n(" Line: %1").arg(KGlobal::locale()->formatNumber(r, 0));
TQString s2 = i18n(" Col: %1").arg(KGlobal::locale()->formatNumber(c, 0));
TQString s1 = i18n(" Line: %1").arg(TDEGlobal::locale()->formatNumber(r, 0));
TQString s2 = i18n(" Col: %1").arg(TDEGlobal::locale()->formatNumber(c, 0));

TQString modstr = m_doc->isModified() ? TQString (" * ") : TQString (" ");
TQString blockstr = blockSelectionMode() ? i18n(" BLK ") : i18n(" NORM ");


+ 4
- 4
kate/part/kateviewhelpers.cpp View File

@@ -1175,7 +1175,7 @@ KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_vi

void KateViewEncodingAction::slotAboutToShow()
{
TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames());
TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames());

popupMenu()->clear ();
for (uint z=0; z<modes.size(); ++z)
@@ -1183,7 +1183,7 @@ void KateViewEncodingAction::slotAboutToShow()
popupMenu()->insertItem ( modes[z], this, TQT_SLOT(setMode(int)), 0, z);

bool found = false;
TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(modes[z]), found);
TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(modes[z]), found);

if (found && codecForEnc)
{
@@ -1195,8 +1195,8 @@ void KateViewEncodingAction::slotAboutToShow()

void KateViewEncodingAction::setMode (int mode)
{
TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames());
doc->config()->setEncoding( KGlobal::charsets()->encodingForName( modes[mode] ) );
TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames());
doc->config()->setEncoding( TDEGlobal::charsets()->encodingForName( modes[mode] ) );
// now we don't want the encoding changed again unless the user does so using the menu.
doc->setEncodingSticky( true );
doc->reloadFile();


+ 1
- 1
kate/part/kateviewinternal.cpp View File

@@ -2986,7 +2986,7 @@ void KateViewInternal::mouseMoveEvent( TQMouseEvent* e )
TQPoint p( e->pos() - dragInfo.start );

// we've left the drag square, we can start a real drag operation now
if( p.manhattanLength() > KGlobalSettings::dndEventDelay() )
if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() )
doDrag();

return;


+ 1
- 1
kate/part/test_regression.cpp View File

@@ -928,7 +928,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )

TQString relOutputDir = makeRelativePath(m_baseDir, m_outputDir);

// are blocking reads possible with KProcess?
// are blocking reads possible with TDEProcess?
char pwd[PATH_MAX];
(void) getcwd( pwd, PATH_MAX );
chdir( TQFile::encodeName( m_baseDir ) );


+ 1
- 1
kcert/kcertpart.cc View File

@@ -775,7 +775,7 @@ void KCertPart::slotDone() {
void KCertPart::slotLaunch() {
KShellProcess p;
p << "kcmshell" << "crypto";
p.start(KProcess::DontCare);
p.start(TDEProcess::DontCare);
}




+ 2
- 2
kcmshell/main.cpp View File

@@ -211,7 +211,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org");
KGlobal::locale()->setMainCatalogue("kcmshell");
TDEGlobal::locale()->setMainCatalogue("kcmshell");

TDECmdLineArgs::init(_argc, _argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
@@ -221,7 +221,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])

const TQCString lang = args->getOption("lang");
if( !lang.isNull() )
KGlobal::locale()->setLanguage(lang);
TDEGlobal::locale()->setLanguage(lang);

if (args->isSet("list"))
{


+ 1
- 1
kconf_update/kconf_update.cpp View File

@@ -209,7 +209,7 @@ KonfUpdate::log()
TQStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
{
TQStringList result;
TQStringList list = KGlobal::dirs()->findAllResources("data", "kconf_update/*.upd", false, true);
TQStringList list = TDEGlobal::dirs()->findAllResources("data", "kconf_update/*.upd", false, true);
for(TQStringList::ConstIterator it = list.begin();
it != list.end();
++it)


+ 16
- 16
kded/kbuildsycoca.cpp View File

@@ -104,13 +104,13 @@ static TQString sycocaPath()

if (bGlobalDatabase)
{
path = KGlobal::dirs()->saveLocation("services")+"ksycoca";
path = TDEGlobal::dirs()->saveLocation("services")+"ksycoca";
}
else
{
TQCString ksycoca_env = getenv("TDESYCOCA");
if (ksycoca_env.isEmpty())
path = KGlobal::dirs()->saveLocation("cache")+"ksycoca";
path = TDEGlobal::dirs()->saveLocation("cache")+"ksycoca";
else
path = TQFile::decodeName(ksycoca_env);
}
@@ -122,7 +122,7 @@ static TQString oldSycocaPath()
{
TQCString ksycoca_env = getenv("TDESYCOCA");
if (ksycoca_env.isEmpty())
return KGlobal::dirs()->saveLocation("tmp")+"ksycoca";
return TDEGlobal::dirs()->saveLocation("tmp")+"ksycoca";

return TQString::null;
}
@@ -189,7 +189,7 @@ KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory)
TQ_UINT32 timeStamp = g_ctimeInfo->ctime(file);
if (!timeStamp)
{
timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, file, true);
timeStamp = TDEGlobal::dirs()->calcResourceHash( g_resource, file, true);
}
KSycocaEntry* entry = 0;
if (g_allEntries)
@@ -317,7 +317,7 @@ bool KBuildSycoca::build()

TQStringList relFiles;

(void) KGlobal::dirs()->findAllResources( g_resource,
(void) TDEGlobal::dirs()->findAllResources( g_resource,
TQString::null,
true, // Recursive!
true, // uniq
@@ -417,7 +417,7 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM
TQ_UINT32 timeStamp = g_ctimeInfo->ctime(directoryFile);
if (!timeStamp)
{
timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true);
timeStamp = TDEGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true);
}

KServiceGroup* entry = 0;
@@ -563,10 +563,10 @@ void KBuildSycoca::save()
}
(*m_str) << (TQ_INT32) 0; // No more factories.
// Write TDEDIRS
(*m_str) << KGlobal::dirs()->kfsstnd_prefixes();
(*m_str) << TDEGlobal::dirs()->kfsstnd_prefixes();
(*m_str) << newTimestamp;
(*m_str) << KGlobal::locale()->language();
(*m_str) << KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
(*m_str) << TDEGlobal::locale()->language();
(*m_str) << TDEGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
(*m_str) << (*g_allResourceDirs);

// Write factory data....
@@ -673,7 +673,7 @@ TQStringList KBuildSycoca::existingResourceDirs()
while( !resources.empty())
{
TQString res = resources.front();
*dirs += KGlobal::dirs()->resourceDirs( res.latin1());
*dirs += TDEGlobal::dirs()->resourceDirs( res.latin1());
resources.remove( res ); // remove this 'res' and all its duplicates
}

@@ -767,8 +767,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
KLocale::setMainCatalogue("tdelibs");
// force generating of KLocale object. if not, the database will get
// be translated
KGlobal::locale();
KGlobal::dirs()->addResourceType("app-reg", "share/application-registry" );
TDEGlobal::locale();
TDEGlobal::dirs()->addResourceType("app-reg", "share/application-registry" );

DCOPClient *dcopClient = new DCOPClient();

@@ -804,9 +804,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
if (incremental || !checkfiles)
{
KSycoca::self()->disableAutoRebuild(); // Prevent deadlock
TQString current_language = KGlobal::locale()->language();
TQString current_language = TDEGlobal::locale()->language();
TQString ksycoca_language = KSycoca::self()->language();
TQ_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
TQ_UINT32 current_update_sig = TDEGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
TQ_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature();

if ((current_update_sig != ksycoca_update_sig) ||
@@ -914,9 +914,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
// These directories may have been created with 0700 permission
// better delete them if they are empty
TQString applnkDir = KGlobal::dirs()->saveLocation("apps", TQString::null, false);
TQString applnkDir = TDEGlobal::dirs()->saveLocation("apps", TQString::null, false);
::rmdir(TQFile::encodeName(applnkDir));
TQString servicetypesDir = KGlobal::dirs()->saveLocation("servicetypes", TQString::null, false);
TQString servicetypesDir = TDEGlobal::dirs()->saveLocation("servicetypes", TQString::null, false);
::rmdir(TQFile::encodeName(servicetypesDir));
}
}


+ 1
- 1
kded/kde-menu.cpp View File

@@ -151,7 +151,7 @@ int main(int argc, char **argv)
if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid())
{
tqWarning("Can't talk to klauncher!");
command = KGlobal::dirs()->findExe(command);
command = TDEGlobal::dirs()->findExe(command);
command += " " + args.join(" ");
system(command.local8Bit());
}


+ 2
- 2
kded/kded.cpp View File

@@ -106,7 +106,7 @@ Kded::Kded(bool checkUpdates, bool new_startup)
TQCString cPath;
TQCString ksycoca_env = getenv("TDESYCOCA");
if (ksycoca_env.isEmpty())
cPath = TQFile::encodeName(KGlobal::dirs()->saveLocation("tmp")+"ksycoca");
cPath = TQFile::encodeName(TDEGlobal::dirs()->saveLocation("tmp")+"ksycoca");
else
cPath = ksycoca_env;
m_pTimer = new TQTimer(this);
@@ -665,7 +665,7 @@ KUpdateD::KUpdateD()
TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)),
this, TQT_SLOT(slotNewUpdateFile()));

TQStringList dirs = KGlobal::dirs()->findDirs("data", "kconf_update");
TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kconf_update");
for( TQStringList::ConstIterator it = dirs.begin();
it != dirs.end();
++it )


+ 12
- 12
kded/khostname.cpp View File

@@ -166,15 +166,15 @@ void KHostName::changeX()
// don't nuke the xauth when XAUTHLOCALHOSTNAME points to it
if (!xauthlocalhostname || oldNetId != xauthlocalhostname)
{
cmd = "xauth -n remove "+KProcess::quote(netId);
cmd = "xauth -n remove "+TDEProcess::quote(netId);
system(TQFile::encodeName(cmd));
}
cmd = "xauth -n add ";
cmd += KProcess::quote(newNetId);
cmd += TDEProcess::quote(newNetId);
cmd += " ";
cmd += KProcess::quote(authName);
cmd += TDEProcess::quote(authName);
cmd += " ";
cmd += KProcess::quote(authKey);
cmd += TDEProcess::quote(authKey);
system(TQFile::encodeName(cmd));
}
}
@@ -236,7 +236,7 @@ void KHostName::changeDcop()
::symlink(fname.data(), compatLink.data()); // Compatibility link

// Update .ICEauthority
TQString cmd = "iceauth list "+KProcess::quote("netid="+oldNetId);
TQString cmd = "iceauth list "+TDEProcess::quote("netid="+oldNetId);
FILE *iceFile = popen(TQFile::encodeName(cmd), "r");
if (!iceFile)
{
@@ -272,13 +272,13 @@ void KHostName::changeDcop()
continue;

cmd = "iceauth add ";
cmd += KProcess::quote(protName);
cmd += TDEProcess::quote(protName);
cmd += " '' ";
cmd += KProcess::quote(newNetId);
cmd += TDEProcess::quote(newNetId);
cmd += " ";
cmd += KProcess::quote(authName);
cmd += TDEProcess::quote(authName);
cmd += " ";
cmd += KProcess::quote(authKey);
cmd += TDEProcess::quote(authKey);
system(TQFile::encodeName(cmd));
}
}
@@ -288,7 +288,7 @@ void KHostName::changeDcop()
char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME");
if (!xauthlocalhostname || !oldNetId.contains(xauthlocalhostname))
{
TQString cmd = "iceauth remove "+KProcess::quote("netid="+oldNetId);
TQString cmd = "iceauth remove "+TDEProcess::quote("netid="+oldNetId);
system(TQFile::encodeName(cmd));
unlink(origFName.data());
origFName = DCOPClient::dcopServerFileOld(oldName); // Compatibility link
@@ -299,8 +299,8 @@ void KHostName::changeDcop()
void KHostName::changeStdDirs(const TQCString &type)
{
// We make links to the old dirs cause we can't delete the old dirs.
TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(oldName.data()));
TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(newName.data()));
TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(TDEGlobal::dirs()->localtdedir()).arg(type.data()).arg(oldName.data()));
TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(TDEGlobal::dirs()->localtdedir()).arg(type.data()).arg(newName.data()));

KDE_struct_stat st_buf;



+ 13
- 13
kded/vfolder_menu.cpp View File

@@ -441,10 +441,10 @@ VFolderMenu::absoluteDir(const TQString &_dir, const TQString &baseDir, bool kee

if (TQDir::isRelativePath(dir) && !keepRelativeToCfg)
{
dir = KGlobal::dirs()->findResource("xdgconf-menu", dir);
dir = TDEGlobal::dirs()->findResource("xdgconf-menu", dir);
}

dir = KGlobal::dirs()->realPath(dir);
dir = TDEGlobal::dirs()->realPath(dir);

return dir;
}
@@ -642,7 +642,7 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name)
else if( e.tagName() == "MergeDir") {
TQString dir = absoluteDir(e.text(), e.attribute("__BaseDir"), true);

TQStringList dirs = KGlobal::dirs()->findDirs("xdgconf-menu", dir);
TQStringList dirs = TDEGlobal::dirs()->findDirs("xdgconf-menu", dir);
for(TQStringList::ConstIterator it=dirs.begin();
it != dirs.end(); ++it)
{
@@ -653,12 +653,12 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name)
if (!TQDir::isRelativePath(dir))
{
// Absolute
fileList = KGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, false);
fileList = TDEGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, false);
}
else
{
// Relative
(void) KGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, true, fileList);
(void) TDEGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, true, fileList);
}

for(TQStringList::ConstIterator it=fileList.begin();
@@ -699,7 +699,7 @@ VFolderMenu::pushDocInfo(const TQString &fileName, const TQString &baseDir)
if (!baseDir.isEmpty())
{
if (!TQDir::isRelativePath(baseDir))
m_docInfo.baseDir = KGlobal::dirs()->relativeLocation("xdgconf-menu", baseDir);
m_docInfo.baseDir = TDEGlobal::dirs()->relativeLocation("xdgconf-menu", baseDir);
else
m_docInfo.baseDir = baseDir;
}
@@ -743,7 +743,7 @@ VFolderMenu::pushDocInfoParent(const TQString &basePath, const TQString &baseDir
m_docInfo.baseName = fileName.left( fileName.length() - 5 );
TQString baseName = TQDir::cleanDirPath(m_docInfo.baseDir + fileName);

TQStringList result = KGlobal::dirs()->findAllResources("xdgconf-menu", baseName);
TQStringList result = TDEGlobal::dirs()->findAllResources("xdgconf-menu", baseName);

while( !result.isEmpty() && (result[0] != basePath))
result.remove(result.begin());
@@ -830,13 +830,13 @@ VFolderMenu::locateDirectoryFile(const TQString &fileName)
void
VFolderMenu::initDirs()
{
m_defaultDataDirs = TQStringList::split(':', KGlobal::dirs()->kfsstnd_prefixes());
m_defaultDataDirs = TQStringList::split(':', TDEGlobal::dirs()->kfsstnd_prefixes());
TQString localDir = m_defaultDataDirs.first();
m_defaultDataDirs.remove(localDir); // Remove local dir

m_defaultAppDirs = KGlobal::dirs()->findDirs("xdgdata-apps", TQString::null);
m_defaultDirectoryDirs = KGlobal::dirs()->findDirs("xdgdata-dirs", TQString::null);
m_defaultLegacyDirs = KGlobal::dirs()->resourceDirs("apps");
m_defaultAppDirs = TDEGlobal::dirs()->findDirs("xdgdata-apps", TQString::null);
m_defaultDirectoryDirs = TDEGlobal::dirs()->findDirs("xdgdata-dirs", TQString::null);
m_defaultLegacyDirs = TDEGlobal::dirs()->resourceDirs("apps");
}

void
@@ -1038,7 +1038,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl;
TQRegExp files("\\.(desktop|kdelnk)$");
TQRegExp dirs("\\.directory$");

(void) KGlobal::dirs()->findAllResources( "apps",
(void) TDEGlobal::dirs()->findAllResources( "apps",
TQString::null,
true, // Recursive!
true, // uniq
@@ -1629,7 +1629,7 @@ VFolderMenu::parseMenu(const TQString &file, bool forceLegacyLoad)
m_legacyLoaded = false;
m_appsInfo = 0;

TQStringList dirs = KGlobal::dirs()->resourceDirs("xdgconf-menu");
TQStringList dirs = TDEGlobal::dirs()->resourceDirs("xdgconf-menu");
for(TQStringList::ConstIterator it=dirs.begin();
it != dirs.end(); ++it)
{


+ 2
- 2
kdoctools/kio_help.cpp View File

@@ -42,9 +42,9 @@ TQString HelpProtocol::langLookup(const TQString& fname)
TQStringList search;

// assemble the local search paths
const TQStringList localDoc = KGlobal::dirs()->resourceDirs("html") + KGlobal::dirs()->resourceDirs("html-bundle");
const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html") + TDEGlobal::dirs()->resourceDirs("html-bundle");

TQStringList langs = KGlobal::locale()->languageList();
TQStringList langs = TDEGlobal::locale()->languageList();
langs.append( "en" );
langs.remove( "C" );



+ 2
- 2
kdoctools/meinproc.cpp View File

@@ -100,7 +100,7 @@ int main(int argc, char **argv) {

KLocale::setMainCatalogue("kio_help");
TDEInstance ins("meinproc");
KGlobal::locale();
TDEGlobal::locale();


TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@@ -171,7 +171,7 @@ int main(int argc, char **argv) {
chdir( TQFile::encodeName( file.dirPath( true ) ) );
TQString cmd = exe;
cmd += " --catalogs --valid --noout ";
cmd += KProcess::quote(file.fileName());
cmd += TDEProcess::quote(file.fileName());
cmd += " 2>&1";
FILE *xmllint = popen( TQFile::encodeName( cmd ), "r");
char buf[ 512 ];


+ 1
- 1
khtml/css/cssstyleselector.cpp View File

@@ -2089,7 +2089,7 @@ static TQColor colorForCSSValue( int css_value )
TQColor c = pal.color( uicol->group, uicol->role );
#ifndef APPLE_CHANGES
if ( uicol->configEntry ) {
KConfig *globalConfig = KGlobal::config();
KConfig *globalConfig = TDEGlobal::config();
globalConfig->setGroup( uicol->configGroup );
c = globalConfig->readColorEntry( uicol->configEntry, &c );
}


+ 5
- 5
khtml/ecma/kjs_debugwin.cpp View File

@@ -77,11 +77,11 @@ using namespace khtml;

SourceDisplay::SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char *name)
: TQScrollView(parent,name), m_currentLine(-1), m_sourceFile(0), m_debugWin(debugWin),
m_font(KGlobalSettings::fixedFont())
m_font(TDEGlobalSettings::fixedFont())
{
verticalScrollBar()->setLineStep(TQFontMetrics(m_font).height());
viewport()->setBackgroundMode(TQt::NoBackground);
m_breakpointIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
m_breakpointIcon = TDEGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
}

SourceDisplay::~SourceDisplay()
@@ -296,7 +296,7 @@ KJSErrorDialog::KJSErrorDialog(TQWidget *parent, const TQString& errorMessage, b
setMainWidget(page);

TQLabel *iconLabel = new TQLabel("",page);
iconLabel->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_critical",
iconLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_critical",
KIcon::NoGroup,KIcon::SizeMedium,
KIcon::DefaultState,0,true));

@@ -361,7 +361,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
m_execsAlloc = 0;
m_steppingDepth = 0;

m_stopIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
m_stopIcon = TDEGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
m_emptyIcon = TQPixmap(m_stopIcon.width(),m_stopIcon.height());
TQBitmap emptyMask(m_stopIcon.width(),m_stopIcon.height(),true);
m_emptyIcon.setMask(emptyMask);
@@ -376,7 +376,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
// frame list & code
TQSplitter *hsplitter = new TQSplitter(Qt::Vertical,mainWidget);
TQSplitter *vsplitter = new TQSplitter(hsplitter);
TQFont font(KGlobalSettings::fixedFont());
TQFont font(TDEGlobalSettings::fixedFont());

TQWidget *contextContainer = new TQWidget(vsplitter);



+ 1
- 1
khtml/ecma/kjs_navigator.cpp View File

@@ -240,7 +240,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
case BrowserLanguage:
case Language:
case UserLanguage:
return String(KGlobal::locale()->language());
return String(TDEGlobal::locale()->language());
case UserAgent:
return String(userAgent);
case Platform:


+ 7
- 7
khtml/ecma/kjs_window.cpp View File

@@ -165,7 +165,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
KWinModule info(0, KWinModule::INFO_DESKTOP);
#endif
TQWidget *thisWidget = Window::retrieveActive(exec)->part()->widget();
TQRect sg = KGlobalSettings::desktopGeometry(thisWidget);
TQRect sg = TDEGlobalSettings::desktopGeometry(thisWidget);

switch( token ) {
case Height:
@@ -882,14 +882,14 @@ Value Window::get(ExecState *exec, const Identifier &p) const
case ScreenX: {
if (!part->view())
return Undefined();
TQRect sg = KGlobalSettings::desktopGeometry(part->view());
TQRect sg = TDEGlobalSettings::desktopGeometry(part->view());
return Number(part->view()->mapToGlobal(TQPoint(0,0)).x() + sg.x());
}
case ScreenTop:
case ScreenY: {
if (!part->view())
return Undefined();
TQRect sg = KGlobalSettings::desktopGeometry(part->view());
TQRect sg = TDEGlobalSettings::desktopGeometry(part->view());
return Number(part->view()->mapToGlobal(TQPoint(0,0)).y() + sg.y());
}
case ScrollX: {
@@ -1504,7 +1504,7 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height)
return;
}

TQRect sg = KGlobalSettings::desktopGeometry(tl);
TQRect sg = TDEGlobalSettings::desktopGeometry(tl);

if ( width > sg.width() || height > sg.height() ) {
kdDebug(6070) << "Window::resizeTo refused, window would be too big ("<<width<<","<<height<<")" << endl;
@@ -1622,7 +1622,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
if (pos >= 0) {
key = s.left(pos).stripWhiteSpace().lower();
val = s.mid(pos + 1).stripWhiteSpace().lower();
TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget());
TQRect screen = TDEGlobalSettings::desktopGeometry(widget->topLevelWidget());

if (key == "left" || key == "screenx") {
winargs.x = (int)val.toFloat() + screen.x();
@@ -1951,7 +1951,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
KParts::BrowserExtension *ext = part->browserExtension();
if (ext) {
TQWidget * tl = widget->topLevelWidget();
TQRect sg = KGlobalSettings::desktopGeometry(tl);
TQRect sg = TDEGlobalSettings::desktopGeometry(tl);

TQPoint dest = tl->pos() + TQPoint( args[0].toInt32(exec), args[1].toInt32(exec) );
// Security check (the spec talks about UniversalBrowserWrite to disable this check...)
@@ -1971,7 +1971,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
KParts::BrowserExtension *ext = part->browserExtension();
if (ext) {
TQWidget * tl = widget->topLevelWidget();
TQRect sg = KGlobalSettings::desktopGeometry(tl);
TQRect sg = TDEGlobalSettings::desktopGeometry(tl);

TQPoint dest( args[0].toInt32(exec)+sg.x(), args[1].toInt32(exec)+sg.y() );
// Security check (the spec talks about UniversalBrowserWrite to disable this check...)


+ 5
- 5
khtml/html/html_formimpl.cpp View File

@@ -238,7 +238,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
if(view && view->part())
enc = view->part()->encoding();
}
if((codec = KGlobal::charsets()->codecForName(enc.latin1())))
if((codec = TDEGlobal::charsets()->codecForName(enc.latin1())))
break;
}
}
@@ -305,8 +305,8 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
TQString val = static_cast<HTMLInputElementImpl*>(current)->value().string().stripWhiteSpace();
if (!val.isEmpty() &&
TQDir::isRelativePath(val) &&
TQFile::exists(KGlobalSettings::documentPath() + val)) {
path.setPath(KGlobalSettings::documentPath() + val);
TQFile::exists(TDEGlobalSettings::documentPath() + val)) {
path.setPath(TDEGlobalSettings::documentPath() + val);
} else {
path = KURL::fromPathOrURL(val);
}
@@ -1609,8 +1609,8 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
TQString val = value().string();
if (!val.isEmpty() &&
TQDir::isRelativePath(val) &&
TQFile::exists(KGlobalSettings::documentPath() + val)) {
fileurl.setPath(KGlobalSettings::documentPath() + val);
TQFile::exists(TDEGlobalSettings::documentPath() + val)) {
fileurl.setPath(TDEGlobalSettings::documentPath() + val);
} else {
fileurl = KURL::fromPathOrURL(val);
}


+ 2
- 2
khtml/html/htmltokenizer.cpp View File

@@ -129,7 +129,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view)
buffer = 0;
scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
charsets = KGlobal::charsets();
charsets = TDEGlobal::charsets();
parser = new KHTMLParser(_view, _doc);
m_executingScript = 0;
m_autoCloseTimer = 0;
@@ -144,7 +144,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, DOM::DocumentFragmentImpl
buffer = 0;
scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
charsets = KGlobal::charsets();
charsets = TDEGlobal::charsets();
parser = new KHTMLParser( i, _doc );
m_executingScript = 0;
m_autoCloseTimer = 0;


+ 10
- 10
khtml/java/kjavaprocess.cpp View File

@@ -46,20 +46,20 @@ private:
bool processKilled;
};

KJavaProcess::KJavaProcess() : KProcess()
KJavaProcess::KJavaProcess() : TDEProcess()
{
d = new KJavaProcessPrivate;
d->BufferList.setAutoDelete( true );
d->processKilled = false;

javaProcess = this; //new KProcess();
javaProcess = this; //new TDEProcess();

connect( javaProcess, TQT_SIGNAL( wroteStdin( KProcess * ) ),
connect( javaProcess, TQT_SIGNAL( wroteStdin( TDEProcess * ) ),
this, TQT_SLOT( slotWroteData() ) );
connect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ),
this, TQT_SLOT( slotReceivedData(int, int&) ) );
connect( javaProcess, TQT_SIGNAL( processExited (KProcess *) ),
this, TQT_SLOT( slotExited (KProcess *) ) );
connect( javaProcess, TQT_SIGNAL( processExited (TDEProcess *) ),
this, TQT_SLOT( slotExited (TDEProcess *) ) );

d->jvmPath = "java";
d->mainClass = "-help";
@@ -303,11 +303,11 @@ bool KJavaProcess::invokeJVM()
tqCopy( args.begin(), args.end(), TQTextOStreamIterator<TQCString>( stream, " " ) );
kdDebug(6100) << argStr << endl;

KProcess::Communication flags = (KProcess::Communication)
(KProcess::Stdin | KProcess::Stdout |
KProcess::NoRead);
TDEProcess::Communication flags = (TDEProcess::Communication)
(TDEProcess::Stdin | TDEProcess::Stdout |
TDEProcess::NoRead);

const bool rval = javaProcess->start( KProcess::NotifyOnExit, flags );
const bool rval = javaProcess->start( TDEProcess::NotifyOnExit, flags );
if( rval )
javaProcess->resume(); //start processing stdout on the java process
else
@@ -382,7 +382,7 @@ void KJavaProcess::slotReceivedData( int fd, int& len )
len = num_bytes + num_bytes_msg;
}

void KJavaProcess::slotExited( KProcess *process )
void KJavaProcess::slotExited( TDEProcess *process )
{
if (process == javaProcess) {
int status = -1;