diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
tree | c76702a7f6310fbe9d437e347535422e836e94e9 /networkstatus | |
parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'networkstatus')
-rw-r--r-- | networkstatus/connectionmanager.cpp | 6 | ||||
-rw-r--r-- | networkstatus/networkstatus.cpp | 2 | ||||
-rw-r--r-- | networkstatus/networkstatusindicator.cpp | 2 | ||||
-rw-r--r-- | networkstatus/testservice.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/networkstatus/connectionmanager.cpp b/networkstatus/connectionmanager.cpp index 29174e773..f36220886 100644 --- a/networkstatus/connectionmanager.cpp +++ b/networkstatus/connectionmanager.cpp @@ -19,9 +19,9 @@ Boston, MA 02110-1301, USA. */ -#include <kapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeapplication.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstaticdeleter.h> #include "clientiface_stub.h" diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp index ed7c402f3..41bff9edb 100644 --- a/networkstatus/networkstatus.cpp +++ b/networkstatus/networkstatus.cpp @@ -26,7 +26,7 @@ #include <tqvaluelist.h> #include <dcopclient.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include "clientifaceimpl.h" diff --git a/networkstatus/networkstatusindicator.cpp b/networkstatus/networkstatusindicator.cpp index 957d6f739..a77f1c1fd 100644 --- a/networkstatus/networkstatusindicator.cpp +++ b/networkstatus/networkstatusindicator.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqtooltip.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "connectionmanager.h" diff --git a/networkstatus/testservice.cpp b/networkstatus/testservice.cpp index 44211c696..809d9cd0b 100644 --- a/networkstatus/testservice.cpp +++ b/networkstatus/testservice.cpp @@ -21,7 +21,7 @@ #include <tqtimer.h> #include <dcopclient.h> -#include <kapplication.h> +#include <tdeapplication.h> #include "provideriface.h" #include "testservice.h" @@ -92,7 +92,7 @@ void TestService::slotStatusChange() int main( int argc, char** argv ) { - KApplication app(argc, argv, "testdcop"); + TDEApplication app(argc, argv, "testdcop"); TestService * test = new TestService; Q_UNUSED( test ); return app.exec(); |