summaryrefslogtreecommitdiffstats
path: root/tdeui
diff options
context:
space:
mode:
Diffstat (limited to 'tdeui')
-rw-r--r--tdeui/kpanelapplet.cpp6
-rw-r--r--tdeui/kpanelapplet.h2
-rw-r--r--tdeui/krootpixmap.cpp6
-rw-r--r--tdeui/krootpixmap.h10
-rw-r--r--tdeui/ksharedpixmap.cpp18
-rw-r--r--tdeui/ksharedpixmap.h22
6 files changed, 32 insertions, 32 deletions
diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp
index d38f36980..02a098283 100644
--- a/tdeui/kpanelapplet.cpp
+++ b/tdeui/kpanelapplet.cpp
@@ -37,7 +37,7 @@ public:
{}
const TQPopupMenu* customMenu;
- KSharedConfig::Ptr sharedConfig;
+ TDESharedConfig::Ptr sharedConfig;
TQPtrList<TQObject> watchedForFocus;
bool hasFocus;
};
@@ -60,7 +60,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type,
}
setBackgroundOrigin( AncestorOrigin );
- d->sharedConfig = KSharedConfig::openConfig(configFile, kapp && kapp->config()->isImmutable());
+ d->sharedConfig = TDESharedConfig::openConfig(configFile, kapp && kapp->config()->isImmutable());
_config = d->sharedConfig;
}
@@ -188,7 +188,7 @@ bool KPanelApplet::eventFilter(TQObject *o, TQEvent * e)
return TQFrame::eventFilter(o, e);
}
-KSharedConfig::Ptr KPanelApplet::sharedConfig() const
+TDESharedConfig::Ptr KPanelApplet::sharedConfig() const
{
return d->sharedConfig;
}
diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h
index 43c7221aa..a8729e331 100644
--- a/tdeui/kpanelapplet.h
+++ b/tdeui/kpanelapplet.h
@@ -185,7 +185,7 @@ public:
* called \<appletname\>\<instanceid\>rc in the user's local %KDE directory.
**/
TDEConfig* config() const { return _config; }
- KSharedConfig::Ptr sharedConfig() const;
+ TDESharedConfig::Ptr sharedConfig() const;
/**
* @return Type indicating the applet's type.
diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp
index 3530b5d45..71b1d86ca 100644
--- a/tdeui/krootpixmap.cpp
+++ b/tdeui/krootpixmap.cpp
@@ -61,7 +61,7 @@ void KRootPixmap::init()
m_Fade = 0;
m_BlurRadius = 0;
m_BlurSigma = 0;
- m_pPixmap = new KSharedPixmap; //ordinary KPixmap on win32
+ m_pPixmap = new TDESharedPixmap; //ordinary KPixmap on win32
m_pTimer = new TQTimer( this );
m_bInit = false;
m_bActive = false;
@@ -238,7 +238,7 @@ void KRootPixmap::repaint(bool force)
m_Desk = currentDesktop();
}
- // KSharedPixmap will correctly generate a tile for us.
+ // TDESharedPixmap will correctly generate a tile for us.
m_pPixmap->loadFromShared(pixmapName(m_Desk), m_Rect);
#else
m_Desk = currentDesktop();
@@ -308,7 +308,7 @@ void KRootPixmap::slotDone(bool success)
updateBackground( m_pPixmap );
}
-void KRootPixmap::updateBackground( KSharedPixmap *spm )
+void KRootPixmap::updateBackground( TDESharedPixmap *spm )
{
TQPixmap pm = *spm;
diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h
index 776863c46..bc5518221 100644
--- a/tdeui/krootpixmap.h
+++ b/tdeui/krootpixmap.h
@@ -20,7 +20,7 @@
class TQRect;
class TQWidget;
class TQTimer;
-class KSharedPixmap;
+class TDESharedPixmap;
class KRootPixmapData;
/**
@@ -37,7 +37,7 @@ class KRootPixmapData;
* Instead of using the default behavior, you can ask KRootPixmap
* to emit a backgroundUpdated(const TQPixmap &) signal whenever
* the background needs updating by using setCustomPainting(bool).
- * Alternatively by reimplementing updateBackground(KSharedPixmap*)
+ * Alternatively by reimplementing updateBackground(TDESharedPixmap*)
* you can take complete control of the behavior.
*
* @author Geert Jansen <jansen@kde.org>
@@ -179,7 +179,7 @@ public slots:
void setCustomPainting( bool enable ) { m_bCustomPaint = enable; }
/**
- * Asks KDesktop to export the desktop background as a KSharedPixmap.
+ * Asks KDesktop to export the desktop background as a TDESharedPixmap.
* This method uses DCOP to call KBackgroundIface/setExport(int).
*/
void enableExports();
@@ -209,7 +209,7 @@ protected:
* applies the fade effect, then sets the target's background, or emits
* backgroundUpdated(const TQPixmap &) depending on the painting mode.
*/
- virtual void updateBackground( KSharedPixmap * );
+ virtual void updateBackground( TDESharedPixmap * );
private slots:
void slotBackgroundChanged(int);
@@ -229,7 +229,7 @@ private:
TQRect m_Rect;
TQWidget *m_pWidget;
TQTimer *m_pTimer;
- KSharedPixmap *m_pPixmap;
+ TDESharedPixmap *m_pPixmap;
KRootPixmapData *d;
void init();
diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp
index 6789e0a64..b9e0e69c4 100644
--- a/tdeui/ksharedpixmap.cpp
+++ b/tdeui/ksharedpixmap.cpp
@@ -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;
diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h
index 3295b38d1..7873be6e5 100644
--- a/tdeui/ksharedpixmap.h
+++ b/tdeui/ksharedpixmap.h
@@ -11,8 +11,8 @@
* version 2 of the License, or (at your option) any later version.
*/
-#ifndef __KSharedPixmap_h_Included__
-#define __KSharedPixmap_h_Included__
+#ifndef __TDESharedPixmap_h_Included__
+#define __TDESharedPixmap_h_Included__
#include <kpixmap.h>
@@ -26,7 +26,7 @@
#include <tqpixmap.h>
#include <tqwidget.h>
-class KSharedPixmapPrivate;
+class TDESharedPixmapPrivate;
/**
* Shared pixmap client.
@@ -35,7 +35,7 @@ class KSharedPixmapPrivate;
* by a global id string, and can be accessed by all X clients.
*
* This class is a client class to shared pixmaps in KDE. You can use it
- * to copy (a part of) a shared pixmap into. KSharedPixmap inherits KPixmap
+ * to copy (a part of) a shared pixmap into. TDESharedPixmap inherits KPixmap
* for that purpose.
*
* The server part of shared pixmaps is not implemented here.
@@ -44,7 +44,7 @@ class KSharedPixmapPrivate;
*
* An example: copy from a shared pixmap:
* \code
- * KSharedPixmap *pm = new KSharedPixmap;
+ * TDESharedPixmap *pm = new TDESharedPixmap;
* connect(pm, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
* pm->loadFromShared("My Pixmap");
* \endcode
@@ -53,7 +53,7 @@ class KSharedPixmapPrivate;
* @version $Id$
*
*/
-class TDEUI_EXPORT KSharedPixmap:
+class TDEUI_EXPORT TDESharedPixmap:
public TQWidget,
public KPixmap
{
@@ -65,12 +65,12 @@ public:
/**
* Construct an empty pixmap.
*/
- KSharedPixmap();
+ TDESharedPixmap();
/**
* Destroys the pixmap.
*/
- ~KSharedPixmap();
+ ~TDESharedPixmap();
/**
* Load from a shared pixmap reference. The signal done() is emitted
@@ -80,7 +80,7 @@ public:
* @param rect If you pass a nonzero rectangle, a tile is generated which
* is able to fill up the specified rectangle completely. This is solely
* for optimization: in some cases the tile will be much smaller than the
- * original pixmap. It reflects KSharedPixmap's original use: sharing
+ * original pixmap. It reflects TDESharedPixmap's original use: sharing
* of the desktop background to achieve pseudo transparency.
* @return True if the shared pixmap exists and loading has started
* successfully, false otherwise.
@@ -110,11 +110,11 @@ private:
bool copy(const TQString & id, const TQRect & rect);
void init();
- KSharedPixmapPrivate *d;
+ TDESharedPixmapPrivate *d;
};
#else // WIN32, Qt Embedded
// Let's simply assume KPixmap will do for now. Yes, I know that's broken.
-#define KSharedPixmap KPixmap
+#define TDESharedPixmap KPixmap
#endif
#endif
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 02:02:54 +0000