From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:21:02 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- tdecore/kapplication_win.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tdecore/kapplication_win.cpp') diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp index abf0694b4..e5b19a28c 100644 --- a/tdecore/kapplication_win.cpp +++ b/tdecore/kapplication_win.cpp @@ -32,7 +32,7 @@ #include "shellapi.h" /** - * MS Windows-related actions for KApplication startup. + * MS Windows-related actions for TDEApplication startup. * * - Use Qt translation which will be usable for TQFileDialog * and other Qt-only GUIs. The "qt_.qm" file should be stored @@ -40,7 +40,7 @@ * * @internal */ -void KApplication_init_windows(bool /*GUIenabled*/) +void TDEApplication_init_windows(bool /*GUIenabled*/) { TQString qt_transl_file = ::locate( "locale", KGlobal::locale()->language() + "/LC_MESSAGES/qt_" + KGlobal::locale()->language() + ".qm" ); @@ -54,11 +54,11 @@ void KApplication_init_windows(bool /*GUIenabled*/) //unsafe; create kapplication_p.h instead! typedef void* IceIOErrorHandler; -class KApplicationPrivate +class TDEApplicationPrivate { public: - KApplicationPrivate(); - ~KApplicationPrivate(); + TDEApplicationPrivate(); + ~TDEApplicationPrivate(); bool actionRestrictions : 1; bool guiEnabled : 1; @@ -74,7 +74,7 @@ public: QAssistantClient* qassistantclient; }; -void KApplication::invokeHelp( const TQString& anchor, +void TDEApplication::invokeHelp( const TQString& anchor, const TQString& _appname, const TQCString& startup_id ) const { if (!d->qassistantclient) { @@ -90,14 +90,14 @@ void KApplication::invokeHelp( const TQString& anchor, // on win32, for invoking browser we're using win32 API // see kapplication_win.cpp -void KApplication::invokeBrowser( const TQString &url, const TQCString& startup_id ) +void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startup_id ) { TQCString s = url.latin1(); const unsigned short *l = (const unsigned short *)s.data(); ShellExecuteA(0, "open", s.data(), 0, 0, SW_NORMAL); } -void KApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc, +void TDEApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc, const TQString &subject, const TQString &body, const TQString & /*messageFile TODO*/, const TQStringList &attachURLs, const TQCString& startup_id ) -- cgit v1.2.1