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 /tdeui/kdetrayproxy | |
| 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 'tdeui/kdetrayproxy')
| -rw-r--r-- | tdeui/kdetrayproxy/kdetrayproxy.cpp | 8 | ||||
| -rw-r--r-- | tdeui/kdetrayproxy/kdetrayproxy.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp index c6302a3cc..d0e7a84cf 100644 --- a/tdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp @@ -19,7 +19,7 @@ #include "kdetrayproxy.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <netwm.h> #include <X11/Xlib.h> @@ -182,11 +182,11 @@ void KDETrayProxy::withdrawWindow( Window w ) #include "kdetrayproxy.moc" #if 0 -#include <kcmdlineargs.h> +#include <tdecmdlineargs.h> int main( int argc, char* argv[] ) { - KCmdLineArgs::init( argc, argv, "a", "b", "c", "d" ); - KApplication app( false ); // no styles + TDECmdLineArgs::init( argc, argv, "a", "b", "c", "d" ); + TDEApplication app( false ); // no styles app.disableSessionManagement(); KDETrayProxy proxy; return app.exec(); diff --git a/tdeui/kdetrayproxy/kdetrayproxy.h b/tdeui/kdetrayproxy/kdetrayproxy.h index 640ae322b..9331aad5c 100644 --- a/tdeui/kdetrayproxy/kdetrayproxy.h +++ b/tdeui/kdetrayproxy/kdetrayproxy.h @@ -40,7 +40,7 @@ class KDETrayProxy void dockWindow( Window w, Window owner ); void withdrawWindow( Window w ); static Atom makeSelectionAtom(); - KSelectionWatcher selection; + TDESelectionWatcher selection; KWinModule module; TQValueList< Window > pending_windows; TQValueList< Window > tray_windows; |