Browse Source

Rename KApplication to TDEApplication to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
8e7816b2f9
100 changed files with 202 additions and 202 deletions
  1. 5
    5
      DEBUG
  2. 11
    11
      KDE2PORTING.html
  3. 1
    1
      KDE3PORTING.html
  4. 3
    3
      TODO
  5. 1
    1
      arts/kde/kconverttest.cc
  6. 1
    1
      arts/kde/kiotest.cc
  7. 1
    1
      arts/kde/kiotestslow.cc
  8. 1
    1
      arts/knotify/knotifytest.cpp
  9. 1
    1
      arts/message/artsmessage.cc
  10. 10
    10
      dcop/HOWTO
  11. 5
    5
      dcop/Mainpage.dox
  12. 2
    2
      dcop/dcop_deadlock_test.cpp
  13. 5
    5
      dcop/dcopclient.h
  14. 1
    1
      dcop/tests/driver.cpp
  15. 1
    1
      dcop/tests/test.cpp
  16. 1
    1
      dnssd/domainbrowser.cpp
  17. 1
    1
      interfaces/kspeech/kspeech.h
  18. 1
    1
      interfaces/terminal/test/main.cc
  19. 2
    2
      kabc/address.cpp
  20. 1
    1
      kabc/kab2kabc.cpp
  21. 1
    1
      kabc/key.cpp
  22. 1
    1
      kabc/phonenumber.cpp
  23. 1
    1
      kabc/scripts/addressee.src.cpp
  24. 1
    1
      kabc/tests/bigread.cpp
  25. 1
    1
      kabc/tests/bigwrite.cpp
  26. 1
    1
      kabc/tests/kabcargl.cpp
  27. 1
    1
      kabc/tests/testaddressee.cpp
  28. 1
    1
      kabc/tests/testaddresseelist.cpp
  29. 1
    1
      kabc/tests/testaddressfmt.cpp
  30. 1
    1
      kabc/tests/testaddresslineedit.cpp
  31. 2
    2
      kabc/tests/testdb.cpp
  32. 1
    1
      kabc/tests/testdistlist.cpp
  33. 1
    1
      kabc/tests/testkabc.cpp
  34. 1
    1
      kabc/tests/testkabcdlg.cpp
  35. 2
    2
      kabc/tests/testldapclient.cpp
  36. 1
    1
      kabc/tests/testlock.cpp
  37. 1
    1
      kabc/vcard/testwrite.cpp
  38. 2
    2
      kabc/vcardparser/testread.cpp
  39. 1
    1
      kabc/vcardparser/testwrite.cpp
  40. 1
    1
      kate/ChangeLog
  41. 3
    3
      kate/part/kateschema.cpp
  42. 6
    6
      kate/part/kateviewinternal.cpp
  43. 1
    1
      kate/part/test_regression.cpp
  44. 2
    2
      kcmshell/main.h
  45. 3
    3
      kded/kbuildsycoca.cpp
  46. 3
    3
      kded/kde-menu.cpp
  47. 5
    5
      kded/kded.cpp
  48. 1
    1
      kded/khostname.cpp
  49. 1
    1
      kded/kmimelist.cpp
  50. 1
    1
      khtml/html/html_documentimpl.cpp
  51. 1
    1
      khtml/html/html_formimpl.cpp
  52. 1
    1
      khtml/java/tests/testkjavaappletserver.cpp
  53. 2
    2
      khtml/khtml_part.cpp
  54. 1
    1
      khtml/khtml_part.h
  55. 3
    3
      khtml/khtmlview.cpp
  56. 2
    2
      khtml/rendering/render_frames.cpp
  57. 1
    1
      khtml/rendering/render_image.cpp
  58. 1
    1
      khtml/test_regression.cpp
  59. 2
    2
      khtml/test_regression_fontoverload.cpp
  60. 1
    1
      khtml/testkhtml.cpp
  61. 4
    4
      kinit/README
  62. 1
    1
      kinit/kinit.cpp
  63. 2
    2
      kinit/klauncher.cpp
  64. 1
    1
      kinit/klauncher.h
  65. 2
    2
      kinit/klauncher_main.cpp
  66. 4
    4
      kinit/tests/klaunchertest.cpp
  67. 2
    2
      kio/kfile/kdiroperator.cpp
  68. 1
    1
      kio/kfile/kfileiconview.cpp
  69. 1
    1
      kio/kfile/knotifydialog.h
  70. 9
    9
      kio/kfile/kopenwith.cpp
  71. 2
    2
      kio/kfile/kopenwith.h
  72. 3
    3
      kio/kfile/kopenwith_p.h
  73. 13
    13
      kio/kfile/kpropertiesdialog.cpp
  74. 5
    5
      kio/kfile/kpropertiesdialog.h
  75. 1
    1
      kio/kfile/tests/kcustommenueditortest.cpp
  76. 1
    1
      kio/kfile/tests/kdirselectdialogtest.cpp
  77. 1
    1
      kio/kfile/tests/kfiletreeviewtest.cpp
  78. 1
    1
      kio/kfile/tests/kfstest.cpp
  79. 1
    1
      kio/kfile/tests/kicondialogtest.cpp
  80. 1
    1
      kio/kfile/tests/knotifytest.cpp
  81. 1
    1
      kio/kfile/tests/kopenwithtest.cpp
  82. 1
    1
      kio/kfile/tests/kurlrequestertest.cpp
  83. 1
    1
      kio/kio/jobclasses.h
  84. 2
    2
      kio/kio/kmessageboxwrapper.h
  85. 1
    1
      kio/kio/kmimetype.cpp
  86. 1
    1
      kio/kio/krun.cpp
  87. 1
    1
      kio/kio/observer.cpp
  88. 3
    3
      kio/kio/slave.cpp
  89. 1
    1
      kio/kio/slavebase.cpp
  90. 4
    4
      kio/kio/tcpslavebase.cpp
  91. 1
    1
      kio/kioexec/README
  92. 1
    1
      kio/kioexec/main.cpp
  93. 1
    1
      kio/misc/kfile/fileprops.cpp
  94. 1
    1
      kio/misc/kmailservice.cpp
  95. 2
    2
      kio/misc/kntlm/kntlm.cpp
  96. 1
    1
      kio/misc/ksendbugmail/main.cpp
  97. 1
    1
      kio/misc/ktelnetservice.cpp
  98. 2
    2
      kio/misc/kwalletd/kwalletd.cpp
  99. 1
    1
      kio/tests/getalltest.cpp
  100. 0
    0
      kio/tests/jobtest.cpp

+ 5
- 5
DEBUG View File

@@ -68,7 +68,7 @@ Current language: auto; currently c++
(gdb)

You can now set breakpoints everywhere. For example lets set a breakpoint
in the KApplication constructor. Unfortunately gdb is not very good in
in the TDEApplication constructor. Unfortunately gdb is not very good in
handling C++ names, so it is not really possible to specify the constructor
directly after the break command. Instead we look up a line of source
code where we want to place the breakpoint. An external editor is of great
@@ -79,11 +79,11 @@ are interested in and verify that we have found the correct source line:
215 parseCommandLine( argc, argv );
216 }
217
218 KApplication::KApplication( bool allowStyles, bool GUIenabled ) :
218 TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
219 QApplication( *KCmdLineArgs::tqt_argc(), *KCmdLineArgs::tqt_argv(),
220 GUIenabled ),
221 KInstance( KCmdLineArgs::about),
222 d (new KApplicationPrivate)
222 d (new TDEApplicationPrivate)
223 {
224 if (!GUIenabled)
(gdb) break 224
@@ -92,14 +92,14 @@ Breakpoint 2 at 0x4048aa7e: file kapp.cpp, line 224.

We can now continue the execution of kedit. Execution will stop when it hits
a breakpoint of when the program exits. In this case execution will stop
in the first line of the KApplication constructor:
in the first line of the TDEApplication constructor:

(gdb) continue
Continuing.
Qt: gdb: -nograb added to command-line options.
Use the -dograb option to enforce grabbing.
Breakpoint 2, KApplication::KApplication (this=0xbffff6a8, allowStyles=true,
Breakpoint 2, TDEApplication::TDEApplication (this=0xbffff6a8, allowStyles=true,
GUIenabled=true) at kapp.cpp:224
224 if (!GUIenabled)
(gdb)

+ 11
- 11
KDE2PORTING.html View File

@@ -19,7 +19,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<LI><A HREF="#gettingstarted">Getting Started</A></LI>
<LI><A HREF="#general">Global changes</A></LI>
<LI><A HREF="#automoc">automoc/am_edit, Makefile.am tags</A></LI>
<LI><A HREF="#KApplication">KApplication</A></LI>
<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>
@@ -107,7 +107,7 @@ 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="KApplication">KApplication</A></H3>
<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>
@@ -128,7 +128,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
KGlobal::dirs()-&gt;findResource.<P>

Use locateLocal to get the path of a writable file. For instance,
KApplication::localconfigdir()+filename is now locateLocal( "config", filename ),
TDEApplication::localconfigdir()+filename is now locateLocal( "config", filename ),
but for most cases, simply using KGlobal::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>
@@ -146,8 +146,8 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
appHelpActivated() have all been removed See section for KMainWindow
for more info.<P>

The KApplication constructor has changed. Command line arguments and
program name should no longer be passed to KApplication but to
The TDEApplication constructor has changed. Command line arguments and
program name should no longer be passed to TDEApplication but to
TDECmdLineArgs. TDECmdLineArgs performs command line parsing and a command
line help. See below for more info.<P>

@@ -166,7 +166,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
</UL>
TDECmdLineArgs itself will add the command line options supported by Qt
and KApplication.<P>
and TDEApplication.<P>

You can also use the KAboutData class to specify name, description and
version.<P>
@@ -183,7 +183,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>

i18n is no longer a macro<P>

KApplication::getApplication()-&gt;getLocale()-&gt;translate<P>
TDEApplication::getApplication()-&gt;getLocale()-&gt;translate<P>

but a function on its own. klocale is obsolete and replace every call
to klocale-&gt;translate with i18n.<P>
@@ -199,7 +199,7 @@ KGlobal 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
must have created a KApplication object before the methods can be used.<P>
must have created a TDEApplication object before the methods can be used.<P>
<TABLE BORDER="0">
<TR>
<TD COLSPAN="2">
@@ -271,7 +271,7 @@ mainViewGeometry() instead.<P>

<H3><A NAME="KHelpMenu">KHelpMenu</A></H3>

helpMenu() has been moved to KMainWindow from KApplication (kapp).<P>
helpMenu() has been moved to KMainWindow from TDEApplication (kapp).<P>

Both the "About KDE" and the "About &lt;Application&gt;" dialog boxes
are now modeless. "About KDE" is a completely new widget.<P>
@@ -281,7 +281,7 @@ If you used in the toplevel window (that is derived from KMainWindow)
you must now change this to "helpMenu( TQString )". The TQString defaults
to TQString::null so it is sufficient to write helpMenu().<P>

The old aboutKDE(), aboutApp() and appHelpActivated() of KApplication
The old aboutKDE(), aboutApp() and appHelpActivated() of TDEApplication
have all been removed. If you need direct access to these or need
access to a help menu in a class that is not derived from
KMainWindow then allocate an instance of the new class KHelpMenu.
@@ -792,7 +792,7 @@ Matthias Hoelzer-Kluepfel &lt;<A HREF="mailto:hoelzer@kde.org">hoelzer@kde.org</
The KWMModuleApplication has been removed. Instead, use the class
KWinModule in libtdecore. The API is a bit cleaner but very similar,
so you will feel comfortable immediately. One of the advantages of
KWinModule is that it doesn't require a special KApplication
KWinModule is that it doesn't require a special TDEApplication
subclass. This lead to many problems and misunderstandings in the
past. KWinModule is now just an object that emits fancy signals (and
provides some useful lists, like the list of all managed windows).

+ 1
- 1
KDE3PORTING.html View File

@@ -95,7 +95,7 @@ DCOPClient you do not need to change anything.
<p>
It is no longer possible to make calls to an application registered as
"<appid>-<pid>" with "<appid>" only. The full name can be obtained by using
either KApplication::startServiceBy...() or DCOPClient::findObject() or
either TDEApplication::startServiceBy...() or DCOPClient::findObject() or
their command line equivalents "dcopstart" and "dcopfind".

<H4>KLibFactory</H4>

+ 3
- 3
TODO View File

@@ -11,8 +11,8 @@ that we would like to make for the next binary incompatible release.
help prevent mistakes where developers forget to delete the pointer. Maybe make use of
Qt4 helper macros?

- Move all utility functions away from KApplication. TBD: Make KApplication
a very thin wrapper around QApplication. Ideally, KApplication should go
- Move all utility functions away from TDEApplication. TBD: Make TDEApplication
a very thin wrapper around QApplication. Ideally, TDEApplication should go
away completely. The kapp pointer references everywhere must die. Find a
way to make that possible

@@ -95,7 +95,7 @@ that we would like to make for the next binary incompatible release.
Keep source compatibility.

- Sort out reference counting of applications and KMainWindows: Add a setRefCountEnabled()
function to KApplication; deref()ing the last reference should only quit the application
function to TDEApplication; deref()ing the last reference should only quit the application
if reference counts are enabled, and the reference count should be disabled by default
so apps that don't use a KMainWindow mostly continue to work. Make the KMainWindow
constructor call setRefCountEnabled(true), and make each KMainWindow hold its own

+ 1
- 1
arts/kde/kconverttest.cc View File

@@ -59,7 +59,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
KApplication app;
TDEApplication app;

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();


+ 1
- 1
arts/kde/kiotest.cc View File

@@ -24,7 +24,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
KApplication app;
TDEApplication app;
QIOManager qiomanager;
Dispatcher dispatcher(&qiomanager);
KIOInputStream stream;

+ 1
- 1
arts/kde/kiotestslow.cc View File

@@ -92,7 +92,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
KApplication app;
TDEApplication app;
QIOManager qiomanager;
Dispatcher dispatcher(&qiomanager);
#ifndef USE_FILEINPUTSTREAM

+ 1
- 1
arts/knotify/knotifytest.cpp View File

@@ -5,7 +5,7 @@

int main(int argc, char **argv)
{
KApplication app(argc, argv, "knotifytest");
TDEApplication app(argc, argv, "knotifytest");

//
while (1) {

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

@@ -60,7 +60,7 @@ int main(int argc, char **argv) {
KGlobal::locale()->setMainCatalogue("tdelibs");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
KApplication app;
TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TQString msg;

+ 10
- 10
dcop/HOWTO View File

@@ -74,18 +74,18 @@ compiler later.
Establishing the Connection:
----------------------------

KApplication has gained a method called "KApplication::dcopClient()"
TDEApplication has gained a method called "TDEApplication::dcopClient()"
which returns a pointer to a DCOPClient instance. The first time this
method is called, the client class will be created. DCOPClients have
unique identifiers attached to them which are based on what
KApplication::name() returns. In fact, if there is only a single
TDEApplication::name() returns. In fact, if there is only a single
instance of the program running, the appId will be equal to
KApplication::name().
TDEApplication::name().

To actually enable DCOP communication to begin, you must use
DCOPClient::attach(). This will attempt to attach to the DCOP server.
If no server is found or there is any other type of error, attach()
will return false. KApplication will catch a dcop signal and display an
will return false. TDEApplication will catch a dcop signal and display an
appropriate error message box in that case.

After connecting with the server via DCOPClient::attach(), you need to
@@ -100,7 +100,7 @@ case:
*/
appId = client->registerAs(kApp->name());

If you never retrieve the DCOPClient pointer from KApplication, the
If you never retrieve the DCOPClient pointer from TDEApplication, the
object will not be created and thus there will be no memory overhead.

You may also detach from the server by calling DCOPClient::detach().
@@ -495,9 +495,9 @@ Code:

int main(int argc, char **argv)
{
KApplication *app;
TDEApplication *app;

app = new KApplication(argc, argv, "testit");
app = new TDEApplication(argc, argv, "testit");
return app->exec();
}

@@ -515,7 +515,7 @@ VmStk: 20 kB
VmExe: 4 kB
VmLib: 6588 kB

If I create the KApplication's DCOPClient, and call attach() and
If I create the TDEApplication's DCOPClient, and call attach() and
registerAs(), it changes to this:

VmSize: 8080 kB
@@ -531,8 +531,8 @@ resident, but no more data or stack. So this will be shared between all
processes, right? 100k to enable DCOP in all apps doesn't seem bad at
all. :)

OK now for some timings. Just creating a KApplication and then exiting
(i.e. removing the call to KApplication::exec) takes this much time:
OK now for some timings. Just creating a TDEApplication and then exiting
(i.e. removing the call to TDEApplication::exec) takes this much time:

0.28user 0.02system 0:00.32elapsed 92%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (1084major+62minor)pagefaults 0swaps

+ 5
- 5
dcop/Mainpage.dox View File

@@ -38,18 +38,18 @@ The manual method is covered first, followed by the automatic IDL method.

\section establish Establishing the Connection:

KApplication has gained a method called \p KApplication::dcopClient()
TDEApplication has gained a method called \p TDEApplication::dcopClient()
which returns a pointer to a DCOPClient instance. The first time this
method is called, the client class will be created. DCOPClients have
unique identifiers attached to them which are based on what
KApplication::name() returns. In fact, if there is only a single
TDEApplication::name() returns. In fact, if there is only a single
instance of the program running, the appId will be equal to
KApplication::name().
TDEApplication::name().

To actually enable DCOP communication to begin, you must use
\p DCOPClient::attach(). This will attempt to attach to the DCOP server.
If no server is found or there is any other type of error,
DCOPClient::attach() will return false. KApplication will catch a dcop
DCOPClient::attach() will return false. TDEApplication will catch a dcop
signal and display an appropriate error message box in that case.

After connecting with the server via DCOPClient::attach(), you need to
@@ -62,7 +62,7 @@ case:
appId = client->registerAs(kapp->name());
\endcode

If you never retrieve the DCOPClient pointer from KApplication, the
If you never retrieve the DCOPClient pointer from TDEApplication, the
object will not be created and thus there will be no memory overhead.

You may also detach from the server by calling DCOPClient::detach().

+ 2
- 2
dcop/dcop_deadlock_test.cpp View File

@@ -71,8 +71,8 @@ tqWarning("%s: Got result '%s' %d:%06d", name(), result.latin1(), tv.tv_sec % 10

int main(int argc, char **argv)
{
TQCString myName = KApplication::dcopClient()->registerAs("testdcop", false);
KApplication app(argc, argv, "testdcop");
TQCString myName = TDEApplication::dcopClient()->registerAs("testdcop", false);
TDEApplication app(argc, argv, "testdcop");

tqWarning("%d:I am '%s'", getpid(), app.dcopClient()->appId().data());

+ 5
- 5
dcop/dcopclient.h View File

@@ -41,7 +41,7 @@ typedef TQValueList<TQCString> QCStringList;
* for KDE applications.
*
* This class provides IPC and RPC for KDE applications. Usually you
* will not have to instantiate one yourself because KApplication
* will not have to instantiate one yourself because TDEApplication
* contains a method to return a pointer to a DCOPClient object which
* can be used for your whole application.
*
@@ -62,7 +62,7 @@ typedef TQValueList<TQCString> QCStringList;
* client->send("someApp", "someObject", "someFunction(TQString)", data);
* \endcode
*
* @see KApplication::dcopClient()
* @see TDEApplication::dcopClient()
* @author Preston Brown <pbrown@kde.org>, Matthias Ettrich <ettrich@kde.org>
*/
class DCOP_EXPORT DCOPClient : public TQObject
@@ -675,7 +675,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
* Returns the application's main dcop client. The main client can
* be used by objects that do not have any specific access to a dcop
* client. In KDE applications, the main client usually is the same
* as KApplication::dcopClient().
* as TDEApplication::dcopClient().
* @return the application's main dcop client
*/
static DCOPClient* mainClient();
@@ -684,7 +684,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
* Sets the application's main dcop client. The main client can
* be used by objects that do not have any specific access to a dcop
* client. In KDE applications, the main client usually is the same
* as KApplication::dcopClient().
* as TDEApplication::dcopClient().
* @param mainClient the new main dcop client
*/
static void setMainClient( DCOPClient* mainClient);
@@ -772,7 +772,7 @@ signals:
* synchronous call. In that case, it will enter a local event
* loop to keep the GUI updated until finally an answer arrives.
*
* In KDE, the KApplication object connects to this signal to be
* In KDE, the TDEApplication object connects to this signal to be
* able to block any user input (i.e. mouse and key events) while
* we are waiting for an answer. If we did not do this, the
* application might end up in an illegal state, as a keyboard

+ 1
- 1
dcop/tests/driver.cpp View File

@@ -54,7 +54,7 @@ int main(int argc, char** argv)
const char* appname = strdup( argv[ 1 ] );
argv[ 1 ] = 0; // sue me
TDECmdLineArgs::init( argc, argv, "TestAppDriver", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
KApplication app;
TDEApplication app;
app.dcopClient()->attach( );
app.dcopClient()->registerAs( "TestAppDriver" );
Driver * object = new Driver( appname );

+ 1
- 1
dcop/tests/test.cpp View File

@@ -32,7 +32,7 @@ int main(int argc, char** argv)
return 0;
}
TDECmdLineArgs::init( argc, argv, "TestApp", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
KApplication app;
TDEApplication app;
if(!app.dcopClient()->attach( ))
return 1;


+ 1
- 1
dnssd/domainbrowser.cpp View File

@@ -86,7 +86,7 @@ DomainBrowser::DomainBrowser(TQObject *parent) : TQObject(parent)
d->m_domains+="local.";
d->m_browseLAN=true;
}
connect(KApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this,
connect(TDEApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this,
TQT_SLOT(domainListChanged(int,int)));
}


+ 1
- 1
interfaces/kspeech/kspeech.h View File

@@ -219,7 +219,7 @@
client->attach();
if (!client->isApplicationRegistered("kttsd")) {
TQString error;
if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
cout << "Starting KTTSD failed with message " << error << endl;
}
@endverbatim

+ 1
- 1
interfaces/terminal/test/main.cc View File

@@ -35,7 +35,7 @@ int main( int argc, char** argv )
{
KAboutData* about = new KAboutData( "tetest", "TETest", "0.1" );
TDECmdLineArgs::init( argc, argv, about );
KApplication a;
TDEApplication a;
Win* win = new Win();
win->show();
return a.exec();

+ 2
- 2
kabc/address.cpp View File

@@ -37,13 +37,13 @@ static KStaticDeleter< TQMap<TQString, TQString> > isoMapDeleter;
Address::Address() :
mEmpty( true ), mType( 0 )
{
mId = KApplication::randomString( 10 );
mId = TDEApplication::randomString( 10 );
}

Address::Address( int type ) :
mEmpty( true ), mType( type )
{
mId = KApplication::randomString( 10 );
mId = TDEApplication::randomString( 10 );
}

bool Address::operator==( const Address &a ) const

+ 1
- 1
kabc/kab2kabc.cpp View File

@@ -438,7 +438,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );

KApplication app;
TDEApplication app;

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();


+ 1
- 1
kabc/key.cpp View File

@@ -28,7 +28,7 @@ using namespace KABC;
Key::Key( const TQString &text, int type )
: mTextData( text ), mIsBinary( false ), mType( type )
{
mId = KApplication::randomString(8);
mId = TDEApplication::randomString(8);
}

Key::~Key()

+ 1
- 1
kabc/phonenumber.cpp View File

@@ -45,7 +45,7 @@ PhoneNumber::~PhoneNumber()

void PhoneNumber::init()
{
mId = KApplication::randomString( 8 );
mId = TDEApplication::randomString( 8 );
}

void PhoneNumber::validateNumber( const TQString &number )

+ 1
- 1
kabc/scripts/addressee.src.cpp View File

@@ -105,7 +105,7 @@ void Addressee::detach()
mData->empty = true;
mData->changed = false;
mData->resource = 0;
mData->uid = KApplication::randomString( 10 );
mData->uid = TDEApplication::randomString( 10 );
return;
} else if ( mData.count() == 1 ) return;


+ 1
- 1
kabc/tests/bigread.cpp View File

@@ -20,7 +20,7 @@ int main(int argc,char **argv)
KAboutData aboutData("bigread","BigReadKabc","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);

KApplication app( false, false );
TDEApplication app( false, false );
AddressBook ab;

+ 1
- 1
kabc/tests/bigwrite.cpp View File

@@ -17,7 +17,7 @@ int main(int argc,char **argv)
KAboutData aboutData("bigwrite","BigWriteKabc","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);

KApplication app( false, false );
TDEApplication app( false, false );

AddressBook ab;
ResourceFile r( "my.kabc", "vcard" );

+ 1
- 1
kabc/tests/kabcargl.cpp View File

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

TDECmdLineArgs::init(argc,argv,&aboutData);

KApplication app;
TDEApplication app;

TQString filename = StdAddressBook::fileName();

+ 1
- 1
kabc/tests/testaddressee.cpp View File

@@ -26,7 +26,7 @@ int main(int argc,char **argv)
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);

KApplication app;
TDEApplication app;
TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();

kdDebug() << "Creating a" << endl;

+ 1
- 1
kabc/tests/testaddresseelist.cpp View File

@@ -23,7 +23,7 @@ int main(int /*argc*/,char /* **argv*/)
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);

KApplication app;
TDEApplication app;
TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); */

kdDebug() << "Creating addressees" << endl;

+ 1
- 1
kabc/tests/testaddressfmt.cpp View File

@@ -23,7 +23,7 @@ int main(int argc,char **argv)
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);

KApplication app;
TDEApplication app;

Address a;
a.setStreet("Lummerlandstr. 1");

+ 1
- 1
kabc/tests/testaddresslineedit.cpp View File

@@ -14,7 +14,7 @@ int main( int argc,char **argv )
I18N_NOOP( "Test Address LineEdit" ), "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData );

KApplication app;
TDEApplication app;

AddressLineEdit *lineEdit = new AddressLineEdit( 0 );


+ 2
- 2
kabc/tests/testdb.cpp View File

@@ -15,8 +15,8 @@ int main(int argc,char **argv)
KAboutData aboutData("testdb","TestKabcDB","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);

// KApplication app( false, false );
KApplication app;
// TDEApplication app( false, false );
TDEApplication app;

AddressBook ab;

+ 1
- 1
kabc/tests/testdistlist.cpp View File

@@ -26,7 +26,7 @@ int main(int argc,char **argv)
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options );

KApplication app;
TDEApplication app;

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("list")) {

+ 1
- 1
kabc/tests/testkabc.cpp View File

@@ -23,7 +23,7 @@ int main(int argc,char **argv)
KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
TDECmdLineArgs::init(argc, argv, &aboutData);

KApplication app( false, false );
TDEApplication app( false, false );
AddressBook *ab = StdAddressBook::self();

#define READ

+ 1
- 1
kabc/tests/testkabcdlg.cpp View File

@@ -22,7 +22,7 @@ int main(int argc,char **argv)
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options );

KApplication app;
TDEApplication app;

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("multiple")) {

+ 2
- 2
kabc/tests/testldapclient.cpp View File

@@ -29,9 +29,9 @@

int main(int argc, char *argv[])
{
KApplication::disableAutoDcopRegistration();
TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc,argv,"testldapclient", 0, 0, 0, 0);
KApplication app;
TDEApplication app;

TestLDAPClient test;
test.setup();

+ 1
- 1
kabc/tests/testlock.cpp View File

@@ -169,7 +169,7 @@ int main(int argc,char **argv)
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options );

KApplication app;
TDEApplication app;

TQString identifier;


+ 1
- 1
kabc/vcard/testwrite.cpp View File

@@ -11,7 +11,7 @@ int main(int argc,char **argv)
KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);

KApplication app;
TDEApplication app;
kdDebug() << "Test Write VCard" << endl;


+ 2
- 2
kabc/vcardparser/testread.cpp View File

@@ -42,7 +42,7 @@ static const KCmdLineOptions options[] =

int main( int argc, char **argv )
{
KApplication::disableAutoDcopRegistration();
TDEApplication::disableAutoDcopRegistration();

KAboutData aboutData( "testread", "vCard test reader", "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
@@ -50,7 +50,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );

KApplication app( false, false );
TDEApplication app( false, false );

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();


+ 1
- 1
kabc/vcardparser/testwrite.cpp View File

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

TDECmdLineArgs::init( argc, argv, &aboutData );

KApplication app( false, false );
TDEApplication app( false, false );

KABC::Addressee addressee;

+ 1
- 1
kate/ChangeLog View File

@@ -265,7 +265,7 @@
* QPopupMenu for filelist

2001-03-20 Christoph Cullmann <cullmann@kde.org>
* kate is now a normal KApplication
* kate is now a normal TDEApplication

2001-03-18 Christoph Cullmann <cullmann@kde.org>
* big location changes of source files

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

@@ -155,12 +155,12 @@ class KateStyleListCaption : public TQListViewItem
//BEGIN KateSchemaManager
TQString KateSchemaManager::normalSchema ()
{
return KApplication::kApplication()->aboutData()->appName () + TQString (" - Normal");
return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Normal");
}

TQString KateSchemaManager::printingSchema ()
{
return KApplication::kApplication()->aboutData()->appName () + TQString (" - Printing");
return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Printing");
}

KateSchemaManager::KateSchemaManager ()
@@ -865,7 +865,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
hbHl = new TQHBox( this );
layout->add (hbHl);
hbHl->setSpacing( KDialog::spacingHint() );
lHl = new TQLabel( i18n("&Default schema for %1:").arg(KApplication::kApplication()->aboutData()->programName ()), hbHl );
lHl = new TQLabel( i18n("&Default schema for %1:").arg(TDEApplication::kApplication()->aboutData()->programName ()), hbHl );
defaultSchemaCombo = new TQComboBox( false, hbHl );
lHl->setBuddy( defaultSchemaCombo );


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

@@ -2213,8 +2213,8 @@ void KateViewInternal::updateCursor( const KateTextCursor& newCursor, bool force

if (m_cursorTimer.isActive ())
{
if ( KApplication::cursorFlashTime() > 0 )
m_cursorTimer.start( KApplication::cursorFlashTime() / 2 );
if ( TDEApplication::cursorFlashTime() > 0 )
m_cursorTimer.start( TDEApplication::cursorFlashTime() / 2 );
m_view->renderer()->setDrawCaret(true);
}

@@ -3154,8 +3154,8 @@ void KateViewInternal::textHintTimeout ()

void KateViewInternal::focusInEvent (TQFocusEvent *)
{
if (KApplication::cursorFlashTime() > 0)
m_cursorTimer.start ( KApplication::cursorFlashTime() / 2 );
if (TDEApplication::cursorFlashTime() > 0)
m_cursorTimer.start ( TDEApplication::cursorFlashTime() / 2 );

if (m_textHintEnabled)
m_textHintTimer.start( m_textHintTimeout );
@@ -3480,8 +3480,8 @@ void KateViewInternal::imEndEvent( TQIMEvent *e )
if ( e->text().length() > 0 ) {
m_doc->insertText( cursor.line(), cursor.col(), e->text() );

if ( !m_cursorTimer.isActive() && KApplication::cursorFlashTime() > 0 )
m_cursorTimer.start ( KApplication::cursorFlashTime() / 2 );
if ( !m_cursorTimer.isActive() && TDEApplication::cursorFlashTime() > 0 )
m_cursorTimer.start ( TDEApplication::cursorFlashTime() / 2 );

updateView( true );
updateCursor( cursor, true );

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

@@ -461,7 +461,7 @@ int main(int argc, char *argv[])
}
}

KApplication a;
TDEApplication a;
a.disableAutoDcopRegistration();
a.setStyle("windows");
KSimpleConfig cfg( "testkateregressionrc" );

+ 2
- 2
kcmshell/main.h View File

@@ -28,9 +28,9 @@
#include <kcmultidialog.h>

/**
* The KApplication instance for kcmshell.
* The TDEApplication instance for kcmshell.
*/
class KCMShell : public KApplication
class KCMShell : public TDEApplication
{
Q_OBJECT


+ 3
- 3
kded/kbuildsycoca.cpp View File

@@ -736,11 +736,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
setenv("TDEROOTHOME", "-", 1);
}

KApplication::disableAutoDcopRegistration();
TDEApplication::disableAutoDcopRegistration();
#ifdef KBUILDSYCOCA_GUI
KApplication k;
TDEApplication k;
#else
KApplication k(false, false);
TDEApplication k(false, false);
#endif
k.disableSessionManagement();


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

@@ -121,8 +121,8 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &d);
TDECmdLineArgs::addCmdLineOptions(options);

// KApplication k(false, false);
KApplication k(false);
// TDEApplication k(false, false);
TDEApplication k(false);
k.disableSessionManagement();

// this program is in tdelibs so it uses tdelibs as catalog
@@ -147,7 +147,7 @@ int main(int argc, char **argv)
args.append("--incremental");
args.append("--checkstamps");
TQString command = "kbuildsycoca";
TQCString _launcher = KApplication::launcher();
TQCString _launcher = TDEApplication::launcher();
if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid())
{
tqWarning("Can't talk to klauncher!");

+ 5
- 5
kded/kded.cpp View File

@@ -73,19 +73,19 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
TQByteArray data;
TQDataStream dataStream( data, IO_WriteOnly );
dataStream << TQString("kbuildsycoca") << args;
TQCString _launcher = KApplication::launcher();
TQCString _launcher = TDEApplication::launcher();

kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
}
else
{
KApplication::tdeinitExecWait( "kbuildsycoca", args );
TDEApplication::tdeinitExecWait( "kbuildsycoca", args );
}
}

static void runKonfUpdate()
{
KApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ );
TDEApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ );
}

static void runDontChangeHostname(const TQCString &oldName, const TQCString &newName)
@@ -93,7 +93,7 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new
TQStringList args;
args.append(TQFile::decodeName(oldName));
args.append(TQFile::decodeName(newName));
KApplication::tdeinitExecWait( "kdontchangethehostname", args );
TDEApplication::tdeinitExecWait( "kdontchangethehostname", args );
}

Kded::Kded(bool checkUpdates, bool new_startup)
@@ -876,7 +876,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
"$Id$",
I18N_NOOP("TDE Daemon - triggers Sycoca database updates when needed"));

KApplication::installSigpipeHandler();
TDEApplication::installSigpipeHandler();

TDECmdLineArgs::init(argc, argv, &aboutData);


+ 1
- 1
kded/khostname.cpp View File

@@ -358,7 +358,7 @@ void KHostName::changeSessionManager()
delete client;
return;
}
TQCString launcher = KApplication::launcher();
TQCString launcher = TDEApplication::launcher();
client->send(launcher, launcher, "setLaunchEnv(TQCString,TQCString)", params);
delete client;
}

+ 1
- 1
kded/kmimelist.cpp View File

@@ -14,7 +14,7 @@

int main(int argc, char *argv[])
{
KApplication k(argc,argv,"blurb",false);
TDEApplication k(argc,argv,"blurb",false);

KMimeType::List mtl = KMimeType::allMimeTypes( );
assert( mtl.count() );

+ 1
- 1
khtml/html/html_documentimpl.cpp View File

@@ -155,7 +155,7 @@ void HTMLDocumentImpl::setCookie( const DOMString & value )
"addCookies(TQString,TQCString,long int)", params))
{
// Maybe it wasn't running (e.g. we're opening local html files)
KApplication::startServiceByDesktopName( "kcookiejar");
TDEApplication::startServiceByDesktopName( "kcookiejar");
if (!kapp->dcopClient()->send("kcookiejar", "kcookiejar",
"addCookies(TQString,TQCString,long int)", params))
kdWarning(6010) << "Can't communicate with cookiejar!" << endl;

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

@@ -83,7 +83,7 @@ HTMLFormElementImpl::HTMLFormElementImpl(DocumentImpl *doc, bool implicit)
m_doingsubmit = false;
m_inreset = false;
m_enctype = "application/x-www-form-urlencoded";
m_boundary = "----------" + KApplication::randomString( 42 + 13 );
m_boundary = "----------" + TDEApplication::randomString( 42 + 13 );
m_acceptcharset = "UNKNOWN";
m_malformed = false;
}

+ 1
- 1
khtml/java/tests/testkjavaappletserver.cpp View File

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

TDECmdLineArgs::addCmdLineOptions( options );

KApplication app;
TDEApplication app;

TQString path_to_tdelibs = "/build/wynnw/kde-src";


+ 2
- 2
khtml/khtml_part.cpp View File

@@ -1136,7 +1136,7 @@ void KHTMLPart::launchJSErrorDialog() {
void KHTMLPart::launchJSConfigDialog() {
TQStringList args;
args << "khtml_java_js";
KApplication::tdeinitExec( "kcmshell", args );
TDEApplication::tdeinitExec( "kcmshell", args );
}

TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script)
@@ -7299,7 +7299,7 @@ void KHTMLPart::launchWalletManager()
{
#ifndef KHTML_NO_WALLET
if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
KApplication::startServiceByDesktopName("kwalletmanager_show");
TDEApplication::startServiceByDesktopName("kwalletmanager_show");
} else {
DCOPRef r("kwalletmanager", "kwalletmanager-mainwindow#1");
r.send("show");

+ 1
- 1
khtml/khtml_part.h View File

@@ -450,7 +450,7 @@ public:
* Java and Plugins support. This might change in the future if the security model
* is becoming more sophisticated, so don't rely on this behaviour.
*
* ( default false - everything is loaded unless forbidden by KApplication::authorizeURLAction).
* ( default false - everything is loaded unless forbidden by TDEApplication::authorizeURLAction).
*/
void setOnlyLocalReferences( bool enable );


+ 3
- 3
khtml/khtmlview.cpp View File

@@ -637,7 +637,7 @@ void KHTMLView::viewportResizeEvent (TQResizeEvent* e)
}/*end if*/
#endif

KApplication::sendPostedEvents(viewport(), TQEvent::Paint);
TDEApplication::sendPostedEvents(viewport(), TQEvent::Paint);
}

// this is to get rid of a compiler virtual overload mismatch warning. do not remove
@@ -1730,7 +1730,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke)
if( d->scrollSuspendPreActivate && _ke->key() != Key_Shift )
d->scrollSuspendPreActivate = false;
if( _ke->key() == Key_Shift && d->scrollSuspendPreActivate && _ke->state() == TQt::ShiftButton
&& !(KApplication::keyboardMouseState() & TQt::ShiftButton))
&& !(TDEApplication::keyboardMouseState() & TQt::ShiftButton))
{
if (d->scrollTimerId)
{
@@ -1746,7 +1746,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke)
{
if (d->accessKeysPreActivate && _ke->key() != Key_Control)
d->accessKeysPreActivate=false;
if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(KApplication::keyboardMouseState() & TQt::ControlButton))
if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(TDEApplication::keyboardMouseState() & TQt::ControlButton))
{
displayAccessKeys();
m_part->setStatusBarText(i18n("Access Keys activated"),KHTMLPart::BarOverrideText);

+ 2
- 2
khtml/rendering/render_frames.cpp View File

@@ -509,7 +509,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
if(!m_resizing && evt->id() == EventImpl::MOUSEDOWN_EVENT)
{
setResizing(true);
KApplication::setOverrideCursor(TQCursor(m_cursor));
TDEApplication::setOverrideCursor(TQCursor(m_cursor));
m_vSplitPos = _x;
m_hSplitPos = _y;
m_oldpos = -1;
@@ -519,7 +519,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
if(m_resizing && evt->id() == EventImpl::MOUSEUP_EVENT)
{
setResizing(false);
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();

if(m_vSplit != -1 )
{

+ 1
- 1
khtml/rendering/render_image.cpp View File

@@ -266,7 +266,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
if ( !berrorPic ) {
//tqDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight);
qDrawShadePanel( paintInfo.p, _tx + leftBorder + leftPad, _ty + topBorder + topPad, cWidth, cHeight,
KApplication::palette().inactive(), true, 1 );
TDEApplication::palette().inactive(), true, 1 );
}
TQPixmap const* pix = i ? &i->pixmap() : 0;
if(berrorPic && pix && (cWidth >= pix->width()+4) && (cHeight >= pix->height()+4) )

+ 1
- 1
khtml/test_regression.cpp View File

@@ -511,7 +511,7 @@ int main(int argc, char *argv[])
setenv( "DISPLAY", ":47", 1 );
}

KApplication a;
TDEApplication a;
a.disableAutoDcopRegistration();
a.setStyle( "windows" );
KSimpleConfig sc1( "cryptodefaults" );

+ 2
- 2
khtml/test_regression_fontoverload.cpp View File

@@ -354,9 +354,9 @@ KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool ,
}

#include <kapplication.h>
void KApplication::dcopFailure( const TQString & )
void TDEApplication::dcopFailure( const TQString & )
{
tqDebug( "KApplication::dcopFailure" );
tqDebug( "TDEApplication::dcopFailure" );
}

#include <kparts/historyprovider.h>

+ 1
- 1
khtml/testkhtml.cpp View File

@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
"a basic web browser using the KHTML library", "1.0");
TDECmdLineArgs::addCmdLineOptions(options);

KApplication a;
TDEApplication a;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs( );
if ( args->count() == 0 ) {
TDECmdLineArgs::usage();

+ 4
- 4
kinit/README View File

@@ -33,7 +33,7 @@ Starting an application linked against libqt, libtdecore and libtdeui
in the conventional way takes approx. 150ms on a Pentium III - 500Mhz.
Starting the same application via tdeinit takes less than 10ms.

(application without KApplication constructor, the KApplication
(application without TDEApplication constructor, the TDEApplication
constructor requires an extra 100ms in both cases)

Memory Usage
@@ -43,16 +43,16 @@ An application linked against libqt, libtdecore and libtdeui started
in the conventional way requires about 498Kb memory.
(average of 10 instances) If the same application is started via
tdeinit it requires about 142Kb. A difference of 356Kb (application
without KApplication constructor)
without TDEApplication constructor)

If we take the KApplication constructor into account, an application
If we take the TDEApplication constructor into account, an application
started in the conventional way takes about 679Kb memory while the same
application started via tdeinit requires about 380Kb. Here the difference
is somewhat less, 299Kb. This seems to be caused by the fact that the
dynamic linker does "lazy linking". We can force the linker to link
everything at startup by specifying "LD_BIND_NOW=true". When tdeinit is
started with this option on, tdeinit is back to its full efficiency, an
application with a KApplication constructor now uses 338Kb of memory.
application with a TDEApplication constructor now uses 338Kb of memory.
A difference of 341Kb with the normal case.

Adapting programs to use tdeinit.

+ 1
- 1
kinit/kinit.cpp View File

@@ -1764,7 +1764,7 @@ int main(int argc, char **argv, char **envp)
// don't change envvars before tdeinit_initsetproctitle()
unsetenv("LD_BIND_NOW");
unsetenv("DYLD_BIND_AT_LAUNCH");
KApplication::loadedByKdeinit = true;
TDEApplication::loadedByKdeinit = true;

d.maxname = strlen(argv[0]);
d.launcher_pid = 0;

+ 2
- 2
kinit/klauncher.cpp View File

@@ -163,8 +163,8 @@ IdleSlave::age(time_t now)
}

KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
// : KApplication( false, false ), // No Styles, No GUI
: KApplication( false, true ), // TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
// : TDEApplication( false, false ), // No Styles, No GUI
: TDEApplication( false, true ), // TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
DCOPObject("klauncher"),
tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ),
dontBlockReading(false), newStartup( new_startup )

+ 1
- 1
kinit/klauncher.h View File

@@ -105,7 +105,7 @@ struct serviceResult
pid_t pid;
};

class KLauncher : public KApplication, public DCOPObject
class KLauncher : public TDEApplication, public DCOPObject
{
Q_OBJECT


+ 2
- 2
kinit/klauncher_main.cpp View File

@@ -60,7 +60,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
return 1;
}

TQCString cname = KApplication::launcher();
TQCString cname = TDEApplication::launcher();
char *name = cname.data();
TDECmdLineArgs::init(argc, argv, name, "KLauncher", "A service launcher.",
"v1.0");
@@ -79,7 +79,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
int maxTry = 3;
while(true)
{
TQCString dcopName = KApplication::dcopClient()->registerAs(name, false);
TQCString dcopName = TDEApplication::dcopClient()->registerAs(name, false);
if (dcopName.isEmpty())
{
kdWarning() << "[klauncher] DCOP communication problem!" << endl;

+ 4
- 4
kinit/tests/klaunchertest.cpp View File

@@ -28,9 +28,9 @@

int main(int argc, char *argv[])
{
KApplication::tdeinitExec("konsole");
TDEApplication::tdeinitExec("konsole");

KApplication k(argc, argv, "klaunchertest");
TDEApplication k(argc, argv, "klaunchertest");
kapp->dcopClient()->registerAs( kapp->name()) ;

@@ -38,13 +38,13 @@ int main(int argc, char *argv[])
TQString error;
TQCString dcopService;
int pid;
int result = KApplication::startServiceByDesktopName(
int result = TDEApplication::startServiceByDesktopName(
TQString::fromLatin1("konsole"), TQString::null, &error, &dcopService, &pid );

printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
result, error.ascii(), dcopService.data(), pid);

result = KApplication::startServiceByDesktopName(
result = TDEApplication::startServiceByDesktopName(
TQString::fromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid );

printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",

+ 2
- 2
kio/kfile/kdiroperator.cpp View File

@@ -1383,11 +1383,11 @@ void KDirOperator::setupMenu(int whichActions)
if (whichActions & FileActions)
{
actionMenu->insert( mkdirAction );
if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & TQt::ShiftButton))
if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton))
actionMenu->insert( myActionCollection->action( "trash" ) );
KConfig *globalconfig = KGlobal::config();
KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & TQt::ShiftButton) ||
if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) ||
globalconfig->readBoolEntry("ShowDeleteCommand", false))
actionMenu->insert( myActionCollection->action( "delete" ) );
actionMenu->insert( actionSeparator );

+ 1
- 1
kio/kfile/kfileiconview.cpp View File

@@ -362,7 +362,7 @@ void KFileIconView::slotActivate( TQIconViewItem *item )

void KFileIconView::selected( TQIconViewItem *item )
{
if ( !item || (KApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 )
if ( !item || (TDEApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 )
return;

if ( KGlobalSettings::singleClick() ) {

+ 1
- 1
kio/kfile/knotifydialog.h View File

@@ -96,7 +96,7 @@ public:
* KNotifyDialog can handle events for multiple applications (i.e. eventsrc files).
* Successive calls with a different @p appName will add them.
* @param appName The application's name, i.e. the name passed to the
* KApplication constructor or KAboutData.
* TDEApplication constructor or KAboutData.
* @see clearApplicationEvents()
*/
virtual void addApplicationEvents( const char *appName );

+ 9
- 9
kio/kfile/kopenwith.cpp View File

@@ -131,7 +131,7 @@ void KAppTreeListItem::activate()
void KAppTreeListItem::setOpen( bool o )
{
if( o && !parsed ) { // fill the children before opening
((KApplicationTree *) parent())->addDesktopGroup( path, this );
((TDEApplicationTree *) parent())->addDesktopGroup( path, this );
parsed = true;
}
TQListViewItem::setOpen( o );
@@ -144,7 +144,7 @@ bool KAppTreeListItem::isDirectory()

// ----------------------------------------------------------------------

KApplicationTree::KApplicationTree( TQWidget *parent )
TDEApplicationTree::TDEApplicationTree( TQWidget *parent )
: KListView( parent ), currentitem(0)
{
addColumn( i18n("Known Applications") );
@@ -161,7 +161,7 @@ KApplicationTree::KApplicationTree( TQWidget *parent )

// ----------------------------------------------------------------------

bool KApplicationTree::isDirSel()
bool TDEApplicationTree::isDirSel()
{
if (!currentitem) return false; // if currentitem isn't set
return currentitem->isDirectory();
@@ -182,7 +182,7 @@ static TQPixmap appIcon(const TQString &iconName)
return normal;
}

void KApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListItem *item)
void TDEApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListItem *item)
{
KServiceGroup::Ptr root = KServiceGroup::group(relPath);
if (!root || !root->isValid()) return;
@@ -244,7 +244,7 @@ void KApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListIte

// ----------------------------------------------------------------------

void KApplicationTree::slotItemHighlighted(TQListViewItem* i)
void TDEApplicationTree::slotItemHighlighted(TQListViewItem* i)
{
// i may be 0 (see documentation)
if(!i)
@@ -261,7 +261,7 @@ void KApplicationTree::slotItemHighlighted(TQListViewItem* i)

// ----------------------------------------------------------------------

void KApplicationTree::slotSelectionChanged(TQListViewItem* i)
void TDEApplicationTree::slotSelectionChanged(TQListViewItem* i)
{
// i may be 0 (see documentation)
if(!i)
@@ -277,7 +277,7 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i)

// ----------------------------------------------------------------------

void KApplicationTree::resizeEvent( TQResizeEvent * e)
void TDEApplicationTree::resizeEvent( TQResizeEvent * e)
{
setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent)
-2*TQApplication::style().pixelMetric(TQStyle::PM_DefaultFrameWidth));
@@ -285,7 +285,7 @@ void KApplicationTree::resizeEvent( TQResizeEvent * e)
}

// Prune empty directories from the tree
void KApplicationTree::cleanupTree()
void TDEApplicationTree::cleanupTree()
{
TQListViewItem *item=firstChild();
while(item!=0)
@@ -456,7 +456,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
connect ( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOK()) );
connect ( edit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged()) );

m_pTree = new KApplicationTree( this );
m_pTree = new TDEApplicationTree( this );
topLayout->addWidget(m_pTree);

connect( m_pTree, TQT_SIGNAL( selected( const TQString&, const TQString& ) ),

+ 2
- 2
kio/kfile/kopenwith.h View File

@@ -26,7 +26,7 @@
#include <krun.h>
#include <kservice.h>

class KApplicationTree;
class TDEApplicationTree;
class KURLRequester;

class TQWidget;
@@ -161,7 +161,7 @@ protected:
KURLRequester * edit;
TQString m_command;

KApplicationTree* m_pTree;
TDEApplicationTree* m_pTree;
TQLabel *label;

TQString qName, qServiceType;

+ 3
- 3
kio/kfile/kopenwith_p.h View File

@@ -61,7 +61,7 @@ protected:
virtual void activate();
virtual void setOpen( bool o );

friend class KApplicationTree;
friend class TDEApplicationTree;
};

/* ------------------------------------------------------------------------- */
@@ -69,11 +69,11 @@ protected:
/**
* @internal
*/
class KApplicationTree : public KListView
class TDEApplicationTree : public KListView
{
Q_OBJECT
public:
KApplicationTree( TQWidget *parent );
TDEApplicationTree( TQWidget *parent );

/**
* Add a group of .desktop/.kdelnk entries

+ 13
- 13
kio/kfile/kpropertiesdialog.cpp View File

@@ -3887,14 +3887,14 @@ void KExecPropsPlugin::slotBrowseExec()
execEdit->setText( path );
}

class KApplicationPropsPlugin::KApplicationPropsPluginPrivate
class TDEApplicationPropsPlugin::TDEApplicationPropsPluginPrivate
{
public:
KApplicationPropsPluginPrivate()
TDEApplicationPropsPluginPrivate()
{
m_kdesktopMode = TQCString(tqApp->name()) == "kdesktop"; // nasty heh?
}
~KApplicationPropsPluginPrivate()
~TDEApplicationPropsPluginPrivate()
{
}

@@ -3902,10 +3902,10 @@ public:
bool m_kdesktopMode;
};

KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props )
TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props )
: KPropsDlgPlugin( _props )
{
d = new KApplicationPropsPluginPrivate;
d = new TDEApplicationPropsPluginPrivate;
d->m_frame = properties->addPage(i18n("&Application"));
TQVBoxLayout *toplayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint());

@@ -4043,23 +4043,23 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props )
this, TQT_SIGNAL( changed() ) );
}

KApplicationPropsPlugin::~KApplicationPropsPlugin()
TDEApplicationPropsPlugin::~TDEApplicationPropsPlugin()
{
delete d;
}

// TQString KApplicationPropsPlugin::tabName () const
// TQString TDEApplicationPropsPlugin::tabName () const
// {
// return i18n ("&Application");
// }

void KApplicationPropsPlugin::updateButton()
void TDEApplicationPropsPlugin::updateButton()
{
addExtensionButton->setEnabled(availableExtensionsList->currentItem()>-1);
delExtensionButton->setEnabled(extensionsList->currentItem()>-1);
}

void KApplicationPropsPlugin::addMimeType( const TQString & name )
void TDEApplicationPropsPlugin::addMimeType( const TQString & name )
{
// Add a mimetype to the list of available mime types if not in the extensionsList

@@ -4076,13 +4076,13 @@ void KApplicationPropsPlugin::addMimeType( const TQString & name )
}
}

bool KApplicationPropsPlugin::supports( KFileItemList _items )
bool TDEApplicationPropsPlugin::supports( KFileItemList _items )
{
// same constraints as KExecPropsPlugin : desktop file with Type = Application
return KExecPropsPlugin::supports( _items );
}

void KApplicationPropsPlugin::applyChanges()
void TDEApplicationPropsPlugin::applyChanges()
{
TQString path = properties->kurl().path();

@@ -4121,7 +4121,7 @@ void KApplicationPropsPlugin::applyChanges()
config.sync();
}

void KApplicationPropsPlugin::slotAddExtension()
void TDEApplicationPropsPlugin::slotAddExtension()
{
TQListBoxItem *item = availableExtensionsList->firstItem();
TQListBoxItem *nextItem;
@@ -4143,7 +4143,7 @@ void KApplicationPropsPlugin::slotAddExtension()
updateButton();
}

void KApplicationPropsPlugin::slotDelExtension()
void TDEApplicationPropsPlugin::slotDelExtension()
{
TQListBoxItem *item = extensionsList->firstItem();
TQListBoxItem *nextItem;

+ 5
- 5
kio/kfile/kpropertiesdialog.h View File

@@ -878,15 +878,15 @@ private:
* @deprecated replaced with KDesktopPropsPlugin
*/
/// Remove in KDE4
class KIO_EXPORT_DEPRECATED KApplicationPropsPlugin : public KPropsDlgPlugin
class KIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin
{
Q_OBJECT
public:
/**
* Constructor
*/
KApplicationPropsPlugin( KPropertiesDialog *_props );
virtual ~KApplicationPropsPlugin();
TDEApplicationPropsPlugin( KPropertiesDialog *_props );
virtual ~TDEApplicationPropsPlugin();

virtual void applyChanges();

@@ -910,8 +910,8 @@ private:
TQPushButton *addExtensionButton;
TQPushButton *delExtensionButton;

class KApplicationPropsPluginPrivate;
KApplicationPropsPluginPrivate *d;
class TDEApplicationPropsPluginPrivate;
TDEApplicationPropsPluginPrivate *d;
};

#endif

+ 1
- 1
kio/kfile/tests/kcustommenueditortest.cpp View File

@@ -6,7 +6,7 @@
int main(int argc, char** argv)
{
KLocale::setMainCatalogue("tdelibs");
KApplication app(argc, argv, "KCustomMenuEditorTest");
TDEApplication app(argc, argv, "KCustomMenuEditorTest");
KCustomMenuEditor editor(0);
KConfig *cfg = new KConfig("kdesktop_custom_menu2");
editor.load(cfg);

+ 1
- 1
kio/kfile/tests/kdirselectdialogtest.cpp View File

@@ -5,7 +5,7 @@

int main( int argc, char **argv )
{
KApplication app(argc, argv, "kdirselectdialogtest");
TDEApplication app(argc, argv, "kdirselectdialogtest");

KURL u = KDirSelectDialog::selectDirectory( (argc >= 1) ? argv[1] : TQString::null );
if ( u.isValid() )

+ 1
- 1
kio/kfile/tests/kfiletreeviewtest.cpp View File

@@ -134,7 +134,7 @@ void testFrame::slotSetChildCount( KFileTreeViewItem *item, int c )

int main(int argc, char **argv)
{
KApplication a(argc, argv, "kfiletreeviewtest");
TDEApplication a(argc, argv, "kfiletreeviewtest");
TQString name1;
TQStringList names;


+ 1
- 1
kio/kfile/tests/kfstest.cpp View File

@@ -44,7 +44,7 @@

int main(int argc, char **argv)
{
KApplication a(argc, argv, "kfstest");
TDEApplication a(argc, argv, "kfstest");
TQString name1;
TQStringList names;


+ 1
- 1
kio/kfile/tests/kicondialogtest.cpp View File

@@ -3,7 +3,7 @@

int main( int argc, char **argv )
{
KApplication app( argc, argv, "kicondialogtest" );
TDEApplication app( argc, argv, "kicondialogtest" );

// KIconDialog::getIcon();


+ 1
- 1
kio/kfile/tests/knotifytest.cpp View File

@@ -3,7 +3,7 @@

int main( int argc, char **argv )
{
KApplication app( argc, argv, "knotifytest" );
TDEApplication app( argc, argv, "knotifytest" );
KNotifyDialog *dlg = new KNotifyDialog();
dlg->addApplicationEvents( "twin" );
return dlg->exec();

+ 1
- 1
kio/kfile/tests/kopenwithtest.cpp View File

@@ -28,7 +28,7 @@

int main(int argc, char **argv)
{
KApplication app(argc, argv, "kopenwithtest");
TDEApplication app(argc, argv, "kopenwithtest");
KURL::List list;

list += KURL("file:///tmp/testfile.txt");

+ 1
- 1
kio/kfile/tests/kurlrequestertest.cpp View File

@@ -5,7 +5,7 @@

int main( int argc, char **argv )
{
KApplication app( argc, argv, "kurlrequestertest" );
TDEApplication app( argc, argv, "kurlrequestertest" );
KURL url = KURLRequesterDlg::getURL( "ftp://ftp.kde.org" );
tqDebug( "Selected url: %s", url.url().latin1());


+ 1
- 1
kio/kio/jobclasses.h View File

@@ -230,7 +230,7 @@ namespace KIO {

/**
* Updates the last user action timestamp to the given time.
* See KApplication::updateUserTimestamp() .
* See TDEApplication::updateUserTimestamp() .
* @since 3.5.6
*/
void updateUserTimestamp( unsigned long time );

+ 2
- 2
kio/kio/kmessageboxwrapper.h View File

@@ -34,7 +34,7 @@ public:
const TQString &text,
const TQString &caption = TQString::null)
{
if (KApplication::guiEnabled()) {
if (TDEApplication::guiEnabled()) {
kapp->enableStyles();
KMessageBox::error( parent, text, caption );
} else
@@ -45,7 +45,7 @@ public:
const TQString &text,
const TQString &caption = TQString::null)
{
if (KApplication::guiEnabled()) {
if (TDEApplication::guiEnabled()) {
kapp->enableStyles();
KMessageBox::sorry( parent, text, caption );
} else

+ 1
- 1
kio/kio/kmimetype.cpp View File

@@ -900,7 +900,7 @@ pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const KSimpleConfig & )
args << url.path();

int pid;
if ( !KApplication::tdeinitExec("kfmclient", args, 0, &pid) )
if ( !TDEApplication::tdeinitExec("kfmclient", args, 0, &pid) )
return pid;

KProcess p;

+ 1
- 1
kio/kio/krun.cpp View File

@@ -818,7 +818,7 @@ pid_t KRun::run( const KService& _service, const KURL::List& _urls, TQWidget* wi
}
}

int i = KApplication::startServiceByDesktopPath(
int i = TDEApplication::startServiceByDesktopPath(
_service.desktopEntryPath(), urls.toStringList(), &error, 0L, &pid, myasn
);


+ 1
- 1
kio/kio/observer.cpp View File

@@ -61,7 +61,7 @@ Observer::Observer() : DCOPObject("KIO::Observer")
{
kdDebug(KDEBUG_OBSERVER) << "Starting kio_uiserver" << endl;
TQString error;
int ret = KApplication::startServiceByDesktopPath( "kio_uiserver.desktop",
int ret = TDEApplication::startServiceByDesktopPath( "kio_uiserver.desktop",
TQStringList(), &error );
if ( ret > 0 )
{

+ 3
- 3
kio/kio/slave.cpp View File

@@ -245,7 +245,7 @@ void Slave::hold(const KURL &url)
pid_t pid = m_pid;
stream << pid;

TQCString launcher = KApplication::launcher();
TQCString launcher = TDEApplication::launcher();
client->call(launcher, launcher, "waitForSlave(pid_t)",
params, replyType, reply);
}
@@ -431,7 +431,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
TQDataStream stream(params, IO_WriteOnly);
stream << protocol << url.host() << socketfile.name();

TQCString launcher = KApplication::launcher();
TQCString launcher = TDEApplication::launcher();
if (!client->call(launcher, launcher, "requestSlave(TQString,TQString,TQString)",
params, replyType, reply)) {
error_text = i18n("Cannot talk to klauncher");
@@ -491,7 +491,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
TQDataStream stream(params, IO_WriteOnly);
stream << url << socketfile.name();

TQCString launcher = KApplication::launcher();
TQCString launcher = TDEApplication::launcher();
if (!client->call(launcher, launcher, "requestHoldSlave(KURL,TQString)",
params, replyType, reply)) {
delete slave;

+ 1
- 1
kio/kio/slavebase.cpp View File

@@ -246,7 +246,7 @@ DCOPClient *SlaveBase::dcopClient()
{
if (!d->dcopClient)
{
d->dcopClient = KApplication::dcopClient();
d->dcopClient = TDEApplication::dcopClient();
if (!d->dcopClient->isAttached())
d->dcopClient->attach();
d->dcopClient->setDaemonMode( true );

+ 4
- 4
kio/kio/tcpslavebase.cpp View File

@@ -631,7 +631,7 @@ KSSLCertificateHome::KSSLAuthAction aa;
d->dcc = new DCOPClient;
d->dcc->attach();
if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
KApplication::startServiceByDesktopPath("kio_uiserver.desktop",
TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",
TQStringList() );
}
}
@@ -895,7 +895,7 @@ int TCPSlaveBase::verifyCertificate()
d->dcc = new DCOPClient;
d->dcc->attach();
if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
KApplication::startServiceByDesktopPath("kio_uiserver.desktop",
TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",
TQStringList() );
}

@@ -1023,7 +1023,7 @@ int TCPSlaveBase::verifyCertificate()
d->dcc = new DCOPClient;
d->dcc->attach();
if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
KApplication::startServiceByDesktopPath("kio_uiserver.desktop",
TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",
TQStringList() );
}
}
@@ -1107,7 +1107,7 @@ int TCPSlaveBase::verifyCertificate()
d->dcc = new DCOPClient;
d->dcc->attach();
if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
KApplication::startServiceByDesktopPath("kio_uiserver.desktop",
TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",
TQStringList() );
}
}

+ 1
- 1
kio/kioexec/README View File

@@ -14,7 +14,7 @@ so we have no way to know when the user finished editing the file...

Conclusion: if the application has network transparency built-in, it should
put "%u" in its desktop file - and kfmexec isn't used -. If it doesn't, either
it's a KApplication and kfmexec does its job, or it's a KUniqueApplication
it's a TDEApplication and kfmexec does its job, or it's a KUniqueApplication
and... kfmexec can't see modifications to the file. Be warned.

From Waldo: "The program doesn't return _at once_. It returns

+ 1
- 1
kio/kioexec/main.cpp View File

@@ -283,7 +283,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );

KApplication app;
TDEApplication app;

KIOExec exec;


+ 1
- 1
kio/misc/kfile/fileprops.cpp View File

@@ -423,7 +423,7 @@ int main( int argc, char **argv )
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
bool useGUI = args->isSet( "dialog" );

KApplication app( useGUI, useGUI );
TDEApplication app( useGUI, useGUI );

TQPtrList<FileProps> m_props;
m_props.setAutoDelete( true );

+ 1
- 1
kio/misc/kmailservice.cpp View File

@@ -32,7 +32,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, "kmailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" );
TDECmdLineArgs::addCmdLineOptions( options );

KApplication a( false, false );
TDEApplication a( false, false );

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();


+ 2
- 2
kio/misc/kntlm/kntlm.cpp View File

@@ -265,7 +265,7 @@ TQByteArray KNTLM::getLMv2Response( const TQString &target, const TQString &user
TQByteArray hash = ntlmv2Hash( target, user, password );
TQByteArray clientChallenge( 8 );
for ( uint i = 0; i<8; i++ ) {
clientChallenge.data()[i] = KApplication::random() % 0xff;
clientChallenge.data()[i] = TDEApplication::random() % 0xff;
}
return lmv2Response( hash, clientChallenge, challenge );
}
@@ -304,7 +304,7 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo )
now *= (TQ_UINT64)10000000;
bl->timestamp = KFromToLittleEndian( now );
for ( uint i = 0; i<8; i++ ) {
bl->challenge[i] = KApplication::random() % 0xff;
bl->challenge[i] = TDEApplication::random() % 0xff;
}
memcpy( blob.data() + sizeof(Blob), targetinfo.data(), targetinfo.size() );
return blob;

+ 1
- 1
kio/misc/ksendbugmail/main.cpp View File

@@ -68,7 +68,7 @@ int main(int argc, char **argv) {
TDECmdLineArgs::addCmdLineOptions(options);
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

KApplication a(false, false);
TDEApplication a(false, false);

TQCString recipient = args->getOption("recipient");
if (recipient.isEmpty())

+ 1
- 1
kio/misc/ktelnetservice.cpp View File

@@ -42,7 +42,7 @@ int main(int argc, char **argv)
I18N_NOOP("telnet protocol handler"), "unknown");
TDECmdLineArgs::addCmdLineOptions(options);

KApplication app;
TDEApplication app;

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

+ 2
- 2
kio/misc/kwalletd/kwalletd.cpp View File

@@ -95,7 +95,7 @@ KWalletD::KWalletD(const TQCString &name)
connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int)));
reconfigure();
KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
connect(KApplication::dcopClient(),
connect(TDEApplication::dcopClient(),
TQT_SIGNAL(applicationRemoved(const TQCString&)),
this,
TQT_SLOT(slotAppUnregistered(const TQCString&)));
@@ -526,7 +526,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
}
emitDCOPSignal("walletOpened(TQString)", data);
if (_wallets.count() == 1 && _launchManager) {
KApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
TDEApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
}
} else {
if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {

+ 1
- 1
kio/tests/getalltest.cpp View File

@@ -7,7 +7,7 @@

int main(int argc, char *argv[])
{
KApplication k(argc,argv,"getalltest",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
TDEApplication k(argc,argv,"getalltest",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption

//for (int i = 0 ; i < 2 ; ++i ) { // test twice to see if they got deleted
kdDebug() << "All services" << endl;

+ 0
- 0
kio/tests/jobtest.cpp View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save