diff options
Diffstat (limited to 'kicker/libkicker')
| -rw-r--r-- | kicker/libkicker/appletinfo.cpp | 6 | ||||
| -rw-r--r-- | kicker/libkicker/appletinfo.h | 4 | ||||
| -rw-r--r-- | kicker/libkicker/global.cpp | 6 | ||||
| -rw-r--r-- | kicker/libkicker/global.h | 30 | ||||
| -rw-r--r-- | kicker/libkicker/kickerSettings.kcfg | 12 | ||||
| -rw-r--r-- | kicker/libkicker/kickerSettings.kcfgc | 2 | ||||
| -rw-r--r-- | kicker/libkicker/kickertip.cpp | 24 | ||||
| -rw-r--r-- | kicker/libkicker/kickertip.h | 4 | ||||
| -rw-r--r-- | kicker/libkicker/kshadowengine.h | 6 | ||||
| -rw-r--r-- | kicker/libkicker/kshadowsettings.h | 4 | ||||
| -rw-r--r-- | kicker/libkicker/menuinfo.cpp | 10 | ||||
| -rw-r--r-- | kicker/libkicker/menuinfo.h | 4 | ||||
| -rw-r--r-- | kicker/libkicker/panelbutton.cpp | 40 | ||||
| -rw-r--r-- | kicker/libkicker/panelbutton.h | 8 | ||||
| -rw-r--r-- | kicker/libkicker/paneldrag.h | 6 | ||||
| -rw-r--r-- | kicker/libkicker/panner.cpp | 14 | ||||
| -rw-r--r-- | kicker/libkicker/panner.h | 2 | ||||
| -rw-r--r-- | kicker/libkicker/simplebutton.cpp | 24 | ||||
| -rw-r--r-- | kicker/libkicker/simplebutton.h | 10 |
19 files changed, 112 insertions, 104 deletions
diff --git a/kicker/libkicker/appletinfo.cpp b/kicker/libkicker/appletinfo.cpp index 4a851df55..0e8b70994 100644 --- a/kicker/libkicker/appletinfo.cpp +++ b/kicker/libkicker/appletinfo.cpp @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include <tqfileinfo.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeapplication.h> #include "appletinfo.h" @@ -53,7 +53,7 @@ AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, co break; } - KDesktopFile df(m_desktopFile, true, resource); + TDEDesktopFile df(m_desktopFile, true, resource); // set the appletssimple attributes setName(df.readName()); @@ -81,7 +81,7 @@ AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, co else { m_configFile.append("_") - .append(kapp->randomString(20).lower()) + .append(tdeApp->randomString(20).lower()) .append("_rc"); } } diff --git a/kicker/libkicker/appletinfo.h b/kicker/libkicker/appletinfo.h index f89bb6aea..343c8eae5 100644 --- a/kicker/libkicker/appletinfo.h +++ b/kicker/libkicker/appletinfo.h @@ -29,9 +29,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqstring.h> #include <tqvaluevector.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT AppletInfo +class TDE_EXPORT AppletInfo { public: typedef TQValueVector<AppletInfo> List; diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 224cf427a..b9c7a6960 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -31,9 +31,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kiconeffect.h> #include <kiconloader.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservice.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include "global.h" #include "kickerSettings.h" @@ -161,7 +161,7 @@ int maxButtonDim() int maxDim; //return (2 * KickerSettings::iconMargin()) + TDEIcon::SizeLarge; - KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); + TDESimpleConfig *kickerconfig = new TDESimpleConfig( TQString::fromLatin1( "kickerrc" )); kickerconfig->setGroup("General"); maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);; delete kickerconfig; diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h index 61ba2f0ea..6520d55c8 100644 --- a/kicker/libkicker/global.h +++ b/kicker/libkicker/global.h @@ -37,38 +37,38 @@ namespace KickerLib /* * Functions to convert between various enums */ -KDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d); -KDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d); -KDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p); -KDE_EXPORT KPanelApplet::Direction arrowToDirection(TQt::ArrowType p); -KDE_EXPORT int sizeValue(KPanelExtension::Size s); +TDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d); +TDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d); +TDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p); +TDE_EXPORT KPanelApplet::Direction arrowToDirection(TQt::ArrowType p); +TDE_EXPORT int sizeValue(KPanelExtension::Size s); /** * Pixel sizes for but sizes and margins */ -KDE_EXPORT int maxButtonDim(); +TDE_EXPORT int maxButtonDim(); /** * Tint the image to reflect the current color scheme * Used, for instance, by KMenu side bar */ -KDE_EXPORT void colorize(TQImage& image); +TDE_EXPORT void colorize(TQImage& image); /** * Blend a color rectangle on a painter */ -KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40); +TDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40); /** * Blend two colours together to get a colour halfway in between */ -KDE_EXPORT TQColor blendColors(const TQColor& c1, const TQColor& c2); +TDE_EXPORT TQColor blendColors(const TQColor& c1, const TQColor& c2); /** * Create or copy .desktop files for use in kicker safely and easily */ -KDE_EXPORT TQString copyDesktopFile(const KURL&url); -KDE_EXPORT TQString newDesktopFile(const KURL&url); +TDE_EXPORT TQString copyDesktopFile(const KURL&url); +TDE_EXPORT TQString newDesktopFile(const KURL&url); /** @@ -80,7 +80,7 @@ KDE_EXPORT TQString newDesktopFile(const KURL&url); * This function checks whether that is the case and returns either the * original menu or the sub-menu when appropriate. */ -KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *); +TDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *); /** @@ -88,7 +88,7 @@ KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *); * direction, the size of the menu, the widget geometry, and a optional * point in the local coordinates of the widget. */ -KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d, +TDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d, const TQWidget* popup, const TQWidget* source, const TQPoint& offset = TQPoint(0, 0)); @@ -97,7 +97,7 @@ KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d, * Calculate an acceptable inverse of the given color wich will be used * as the shadow color. */ -KDE_EXPORT TQColor shadowColor(const TQColor& c); +TDE_EXPORT TQColor shadowColor(const TQColor& c); /** * Get an appropriate for a menu in Plasma. As the user may set this size @@ -105,7 +105,7 @@ KDE_EXPORT TQColor shadowColor(const TQColor& c); * @param icon the name of icon requested * @return the icon set for the requested icon */ -KDE_EXPORT TQIconSet menuIconSet(const TQString& icon); +TDE_EXPORT TQIconSet menuIconSet(const TQString& icon); } diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg index 9951fe9e1..9c38534c5 100644 --- a/kicker/libkicker/kickerSettings.kcfg +++ b/kicker/libkicker/kickerSettings.kcfg @@ -44,8 +44,8 @@ </entry> <entry name="MenubarPanelBlurred" type="Bool" > - <label>Enable blurring for menubar panel</label> - <whatsthis>When this option is enabled, the panel containing the menubar will blur pseudo-transparent image</whatsthis> + <label>Enable blurring for menubar panel (deprecated)</label> + <whatsthis>This option is deprecated, use MenubarPanelBlur</whatsthis> <default>false</default> </entry> @@ -79,6 +79,14 @@ <max>100</max> </entry> +<entry name="BlurValue" type="Int" > + <label>Blur strength</label> + <whatsthis>Set blur effect strenght for the panel. Set to 0 to disable blur.</whatsthis> + <default>0</default> + <min>0</min> + <max>10</max> + </entry> + <entry name="TintColor" type="Color" > <label>The tint color used to colorize transparent panels</label> <default code="true">(TQApplication::palette().active().mid())</default> diff --git a/kicker/libkicker/kickerSettings.kcfgc b/kicker/libkicker/kickerSettings.kcfgc index 8e0b42d93..1ac8fa567 100644 --- a/kicker/libkicker/kickerSettings.kcfgc +++ b/kicker/libkicker/kickerSettings.kcfgc @@ -2,7 +2,7 @@ File=kickerSettings.kcfg Singleton=true ClassName=KickerSettings Mutators=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT IncludeFiles=tqapplication.h GlobalEnums=true MemberVariables=dpointer diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index a491aae27..d0aab24de 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -80,9 +80,9 @@ KickerTip::KickerTip(TQWidget * parent) setBackgroundMode(NoBackground); resize(0, 0); hide(); - connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate())); + connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate())); // // FIXME: The settingsChanged(SettingsCategory) signal is not available under Trinity; where was it originally supposed to come from? -// connect(kapp, TQT_SIGNAL(settingsChanged(SettingsCategory)), TQT_SLOT(slotSettingsChanged())); +// connect(tdeApp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged())); } KickerTip::~KickerTip() @@ -176,8 +176,8 @@ void KickerTip::display() // close the message window after given mS if (data.duration > 0) { - disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide())); + disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide())); m_timer.start(data.duration, true); } else @@ -424,16 +424,16 @@ void KickerTip::tipFor(const TQWidget* w) { if (m_tippingFor) { - disconnect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(tipperDestroyed(TQObject*))); + disconnect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(tipperDestroyed(TQObject*))); } m_tippingFor = w; if (m_tippingFor) { - connect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(tipperDestroyed(TQObject*))); + connect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(tipperDestroyed(TQObject*))); } } @@ -526,8 +526,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) tipFor(widget); m_timer.stop(); - disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(display())); + disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(display())); // delay to avoid false starts // e.g. when the user quickly zooms their mouse over @@ -547,8 +547,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) if (isTippingFor(widget) && isVisible()) { - disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide())); + disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide())); m_timer.start(KickerSettings::mouseOversHideDelay(), true); } diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h index 7295b4efa..bcc956eee 100644 --- a/kicker/libkicker/kickertip.h +++ b/kicker/libkicker/kickertip.h @@ -38,7 +38,7 @@ class TQPaintEvent; class TQSimpleRichText; class TQTimer; -class KDE_EXPORT KickerTip : public TQWidget +class TDE_EXPORT KickerTip : public TQWidget { TQ_OBJECT @@ -58,7 +58,7 @@ public: TQMimeSourceFactory* mimeFactory; }; - class KDE_EXPORT Client + class TDE_EXPORT Client { public: virtual void updateKickerTip(KickerTip::Data&) = 0; diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h index 1ddc093ff..ae423d0bc 100644 --- a/kicker/libkicker/kshadowengine.h +++ b/kicker/libkicker/kshadowengine.h @@ -28,7 +28,7 @@ #include <tqimage.h> #include <tqcolor.h> -#include <kdemacros.h> +#include <tdemacros.h> class KShadowSettings; @@ -40,7 +40,7 @@ class KShadowSettings; * @author laur.ivan@corvil.com * @since 3.2 */ -class KDE_EXPORT KShadowEngine +class TDE_EXPORT KShadowEngine { public: /// Creates a new shadow engine. @@ -112,7 +112,7 @@ private: void *d; }; -class KDE_EXPORT KTextShadowEngine : public KShadowEngine +class TDE_EXPORT KTextShadowEngine : public KShadowEngine { public: KTextShadowEngine(); diff --git a/kicker/libkicker/kshadowsettings.h b/kicker/libkicker/kshadowsettings.h index e222b964d..a328fd8bd 100644 --- a/kicker/libkicker/kshadowsettings.h +++ b/kicker/libkicker/kshadowsettings.h @@ -22,7 +22,7 @@ #ifndef __FX_DATA #define __FX_DATA -#include <kdemacros.h> +#include <tdemacros.h> #define SHADOW_CONFIG_ENTRY TQString("ShadowParameters") #define SHADOW_TEXT_COLOR TQString("ShadowTextColor") @@ -41,7 +41,7 @@ * @author laur.ivan@corvil.com * @since 3.2 */ -class KDE_EXPORT KShadowSettings +class TDE_EXPORT KShadowSettings { public: /** diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index 8cdc4c664..9e275f90c 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/kicker/libkicker/menuinfo.cpp @@ -27,25 +27,25 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqwidget.h> #include <tdeapplication.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <klibloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kpanelmenu.h> #include <tdeparts/componentfactory.h> MenuInfo::MenuInfo(const TQString& desktopFile) { - KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile))); + TDESimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile))); df.setGroup("Desktop Entry"); TQStringList list = df.readListEntry("X-TDE-AuthorizeAction"); - if (kapp && !list.isEmpty()) + if (tdeApp && !list.isEmpty()) { for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (!kapp->authorize((*it).stripWhiteSpace())) + if (!tdeApp->authorize((*it).stripWhiteSpace())) return; } } diff --git a/kicker/libkicker/menuinfo.h b/kicker/libkicker/menuinfo.h index 5925d4826..8b5917992 100644 --- a/kicker/libkicker/menuinfo.h +++ b/kicker/libkicker/menuinfo.h @@ -26,12 +26,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> class KPanelMenu; class TQWidget; -class KDE_EXPORT MenuInfo +class TDE_EXPORT MenuInfo { public: MenuInfo(const TQString& desktopFile); diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index aef83bbb3..42e5286e2 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kicontheme.h> #include <kiconeffect.h> #include <kipc.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> @@ -89,12 +89,12 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard updateSettings(TDEApplication::SETTINGS_MOUSE); - kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged); + tdeApp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged); installEventFilter(KickerTip::the()); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(updateSettings(int))); - connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(updateIcon(int))); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int))); + connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int))); } void PanelButton::configure() @@ -225,10 +225,10 @@ void PanelButton::updateSettings(int category) return; } - if (m_forceStandardCursor == FALSE) + if (!m_forceStandardCursor) m_changeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); else - m_changeCursorOverItem = FALSE; + m_changeCursorOverItem = false; if (m_changeCursorOverItem) { @@ -245,7 +245,7 @@ void PanelButton::checkForDeletion(const TQString& path) if (path == m_backingFile) { setEnabled(false); - TQTimer::singleShot(1000, this, TQT_SLOT(scheduleForRemoval())); + TQTimer::singleShot(1000, this, TQ_SLOT(scheduleForRemoval())); } } @@ -278,7 +278,7 @@ void PanelButton::scheduleForRemoval() } timelapse *= 2; - TQTimer::singleShot(timelapse, this, TQT_SLOT(scheduleForRemoval())); + TQTimer::singleShot(timelapse, this, TQ_SLOT(scheduleForRemoval())); } } @@ -436,7 +436,7 @@ void PanelButton::startDrag() void PanelButton::enterEvent(TQEvent* e) { - if (!m_highlight && m_disableHighlighting == FALSE) + if (!m_highlight && !m_disableHighlighting) { m_highlight = true; repaint(false); @@ -602,7 +602,7 @@ void PanelButton::drawDeepButton(TQPainter *p) style().drawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised); } - drawButtonLabel(p,0,FALSE); + drawButtonLabel(p,0,false); if (hasFocus() || m_hasAcceptedDrag) { @@ -616,7 +616,7 @@ void PanelButton::drawDeepButton(TQPainter *p) void PanelButton::drawButtonLabel(TQPainter *p) { - drawButtonLabel(p,0,TRUE); + drawButtonLabel(p,0,true); } void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) @@ -833,16 +833,16 @@ void PanelButton::backedByFile(const TQString& localFilePath) } // avoid multiple connections - disconnect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(checkForDeletion(const TQString&))); + disconnect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(checkForDeletion(const TQString&))); if (!KDirWatch::self()->contains(m_backingFile)) { KDirWatch::self()->addFile(m_backingFile); } - connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(checkForDeletion(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(checkForDeletion(const TQString&))); } @@ -966,7 +966,7 @@ PanelPopupButton::PanelPopupButton(TQWidget *parent, const char *name, bool forc m_pressedDuringPopup(false), m_initialized(false) { - connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotExecMenu())); + connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotExecMenu())); } void PanelPopupButton::setPopup(TQWidget *popup) @@ -974,7 +974,7 @@ void PanelPopupButton::setPopup(TQWidget *popup) if (m_popup) { m_popup->removeEventFilter(this); - disconnect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide())); + disconnect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide())); } m_popup = popup; @@ -983,7 +983,7 @@ void PanelPopupButton::setPopup(TQWidget *popup) if (m_popup) { m_popup->installEventFilter(this); - connect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide())); + connect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide())); } } @@ -1057,8 +1057,8 @@ void PanelPopupButton::slotExecMenu() m_pressedDuringPopup = false; KickerTip::enableTipping(false); - kapp->syncX(); - kapp->processEvents(); + tdeApp->syncX(); + tdeApp->processEvents(); if (!m_initialized) { diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h index cea132680..dda35d398 100644 --- a/kicker/libkicker/panelbutton.h +++ b/kicker/libkicker/panelbutton.h @@ -43,7 +43,7 @@ class KShadowEngine; * placed in Kicker's panels. It inherits TQButton, and * KickerTip::Client. */ -class KDE_EXPORT PanelButton: public TQButton, public KickerTip::Client +class TDE_EXPORT PanelButton: public TQButton, public KickerTip::Client { TQ_OBJECT @@ -53,7 +53,7 @@ public: * @param parent the parent widget * @param name the widget's name */ - PanelButton( TQWidget* parent, const char* name, bool forceStandardCursor = FALSE ); + PanelButton( TQWidget* parent, const char* name, bool forceStandardCursor = false ); /** * Configures this button according to the user's preferences for @@ -420,7 +420,7 @@ private: /** * Base class for panelbuttons which popup a menu */ -class KDE_EXPORT PanelPopupButton : public PanelButton +class TDE_EXPORT PanelPopupButton : public PanelButton { TQ_OBJECT @@ -430,7 +430,7 @@ public: * @param parent the parent widget * @param name the widget's name */ - PanelPopupButton(TQWidget *parent=0, const char *name=0, bool forceStandardCursor = FALSE); + PanelPopupButton(TQWidget *parent=0, const char *name=0, bool forceStandardCursor = false); /** * Sets the button's popup menu. diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h index 6684c32c6..21bb879d3 100644 --- a/kicker/libkicker/paneldrag.h +++ b/kicker/libkicker/paneldrag.h @@ -26,13 +26,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqdragobject.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "appletinfo.h" class BaseContainer; -class KDE_EXPORT PanelDrag : public TQDragObject +class TDE_EXPORT PanelDrag : public TQDragObject { public: PanelDrag(BaseContainer* container, TQWidget *dragSource); @@ -48,7 +48,7 @@ class KDE_EXPORT PanelDrag : public TQDragObject TQByteArray a; }; -class KDE_EXPORT AppletInfoDrag : public TQDragObject +class TDE_EXPORT AppletInfoDrag : public TQDragObject { public: AppletInfoDrag(const AppletInfo& container, TQWidget *dragSource); diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp index a868747fb..0401cfcdc 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -46,7 +46,7 @@ Panner::Panner( TQWidget* parent, const char* name ) setBackgroundOrigin( AncestorOrigin ); _updateScrollButtonsTimer = new TQTimer(this); - connect(_updateScrollButtonsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reallyUpdateScrollButtons())); + connect(_updateScrollButtonsTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reallyUpdateScrollButtons())); _clipper = new TQWidget(this); _clipper->setBackgroundOrigin(AncestorOrigin); @@ -78,8 +78,8 @@ void Panner::createScrollButtons() _luSB->setMinimumSize(12, 12); _luSB->hide(); _layout->addWidget(_luSB); - connect(_luSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollLeftUp())); - connect(_luSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); + connect(_luSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollLeftUp())); + connect(_luSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll())); // right/down scroll button _rdSB = new SimpleArrowButton(this); @@ -88,8 +88,8 @@ void Panner::createScrollButtons() _rdSB->setMinimumSize(12, 12); _rdSB->hide(); _layout->addWidget(_rdSB); - connect(_rdSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollRightDown())); - connect(_rdSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); + connect(_rdSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollRightDown())); + connect(_rdSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll())); // set up the buttons setupButtons(); @@ -170,7 +170,7 @@ void Panner::scrollLeftUp() void Panner::startScrollRightDown() { _scrollTimer = new TQTimer(this); - connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollRightDown())); + connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollRightDown())); _scrollTimer->start(50); _step = 8; scrollRightDown(); @@ -179,7 +179,7 @@ void Panner::startScrollRightDown() void Panner::startScrollLeftUp() { _scrollTimer = new TQTimer(this); - connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollLeftUp())); + connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollLeftUp())); _scrollTimer->start(50); _step = 8; scrollLeftUp(); diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h index 36305bb0c..6d73ba5a8 100644 --- a/kicker/libkicker/panner.h +++ b/kicker/libkicker/panner.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class TQBoxLayout; class TQTimer; -class KDE_EXPORT Panner : public TQWidget +class TDE_EXPORT Panner : public TQWidget { TQ_OBJECT diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index c53d6ce5a..6836e06eb 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -30,7 +30,7 @@ #include <kiconeffect.h> #include <kicontheme.h> #include <kipc.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kickerSettings.h" @@ -47,13 +47,13 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, TQT_SIGNAL( settingsChanged( int ) ), - TQT_SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, TQT_SIGNAL( iconChanged( int ) ), - TQT_SLOT( slotIconChanged( int ) ) ); + connect( tdeApp, TQ_SIGNAL( settingsChanged( int ) ), + TQ_SLOT( slotSettingsChanged( int ) ) ); + connect( tdeApp, TQ_SIGNAL( iconChanged( int ) ), + TQ_SLOT( slotIconChanged( int ) ) ); - kapp->addKipcEventMask( KIPC::SettingsChanged ); - kapp->addKipcEventMask( KIPC::IconChanged ); + tdeApp->addKipcEventMask( KIPC::SettingsChanged ); + tdeApp->addKipcEventMask( KIPC::IconChanged ); slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); } @@ -95,7 +95,7 @@ void SimpleButton::drawButton( TQPainter *p ) { TQRect r(0, 0, width(), height()); - if (m_disableHighlighting == TRUE) { + if (m_disableHighlighting) { if (m_highlight || isDown() || isOn()) { int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; @@ -115,13 +115,13 @@ void SimpleButton::drawButtonLabel( TQPainter *p ) TQPixmap pix = isEnabled() ? ((m_highlight&&(!m_disableHighlighting))? m_activeIcon : m_normalIcon) : m_disabledIcon; - if ((isOn() || isDown()) && (m_disableHighlighting == FALSE)) + if ((isOn() || isDown()) && !m_disableHighlighting) { pix = TQImage(pix.convertToImage()).smoothScale(pix.width() - 2, pix.height() - 2); } - if (m_disableHighlighting == TRUE) { + if (m_disableHighlighting) { pix = TQImage(pix.convertToImage()).smoothScale(pix.width() - 4, pix.height() - 4); } @@ -171,10 +171,10 @@ void SimpleButton::slotSettingsChanged(int category) } bool changeCursor; - if (m_forceStandardCursor == FALSE) + if (!m_forceStandardCursor) changeCursor = TDEGlobalSettings::changeCursorOverIcon(); else - changeCursor = FALSE; + changeCursor = false; if (changeCursor) { diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index 7f1718273..9a7dce4e8 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -24,14 +24,14 @@ #include <tqbutton.h> #include <tqpixmap.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT SimpleButton : public TQButton +class TDE_EXPORT SimpleButton : public TQButton { TQ_OBJECT public: - SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE); + SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = false); void setPixmap(const TQPixmap &pix); void setOrientation(TQt::Orientation orientaton); TQSize sizeHint() const; @@ -61,12 +61,12 @@ class KDE_EXPORT SimpleButton : public TQButton SimpleButtonPrivate* d; }; -class KDE_EXPORT SimpleArrowButton: public SimpleButton +class TDE_EXPORT SimpleArrowButton: public SimpleButton { TQ_OBJECT public: - SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE); + SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0, bool forceStandardCursor = false); virtual ~SimpleArrowButton() {}; TQSize sizeHint() const; |