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/ksharedpixmap.cpp | |
| 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/ksharedpixmap.cpp')
| -rw-r--r-- | tdeui/ksharedpixmap.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp index 6789e0a64..33eca17e4 100644 --- a/tdeui/ksharedpixmap.cpp +++ b/tdeui/ksharedpixmap.cpp @@ -22,7 +22,7 @@ #ifdef Q_WS_X11 -#include <kapplication.h> +#include <tdeapplication.h> #include <krootprop.h> #include <ksharedpixmap.h> #include <kdebug.h> @@ -49,10 +49,10 @@ #undef FocusOut /** - * KSharedPixmap + * TDESharedPixmap */ -class KSharedPixmapPrivate +class TDESharedPixmapPrivate { public: Atom pixmap; @@ -61,21 +61,21 @@ public: TQRect rect; }; -KSharedPixmap::KSharedPixmap() +TDESharedPixmap::TDESharedPixmap() : TQWidget(0L, "shpixmap comm window") { - d = new KSharedPixmapPrivate; + d = new TDESharedPixmapPrivate; init(); } -KSharedPixmap::~KSharedPixmap() +TDESharedPixmap::~TDESharedPixmap() { delete d; } -void KSharedPixmap::init() +void TDESharedPixmap::init() { d->pixmap = XInternAtom(tqt_xdisplay(), "PIXMAP", false); TQCString atom; @@ -85,7 +85,7 @@ void KSharedPixmap::init() } -bool KSharedPixmap::isAvailable(const TQString & name) const +bool TDESharedPixmap::isAvailable(const TQString & name) const { TQString str = TQString("KDESHPIXMAP:%1").arg(name); Atom sel = XInternAtom(tqt_xdisplay(), str.latin1(), true); @@ -95,7 +95,7 @@ bool KSharedPixmap::isAvailable(const TQString & name) const } -bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect) +bool TDESharedPixmap::loadFromShared(const TQString & name, const TQRect & rect) { d->rect = rect; if (d->selection != None) @@ -120,7 +120,7 @@ bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect) } -bool KSharedPixmap::x11Event(XEvent *event) +bool TDESharedPixmap::x11Event(XEvent *event) { if (event->type != SelectionNotify) return false; |