summaryrefslogtreecommitdiffstats
path: root/ksplashml
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-23 09:33:56 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-23 09:33:56 +0000
commitd53bf360906757a36588588fb0286d3b4784ffcb (patch)
treee231cb658b614b66ee2ff922cf92c2927de44962 /ksplashml
parent0406f543f8c9f30455199e0f3956da41f126b2fb (diff)
downloadtdebase-d53bf360906757a36588588fb0286d3b4784ffcb.tar.gz
tdebase-d53bf360906757a36588588fb0286d3b4784ffcb.zip
Minor compilation enhancements
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1216418 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksplashml')
-rw-r--r--ksplashml/kcmksplash/installer.cpp4
-rw-r--r--ksplashml/kcmksplash/installer.h2
-rw-r--r--ksplashml/wndmain.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index 172ab8520..7cffb906c 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -56,7 +56,7 @@ void ThemeListBox::dropEvent(TQDropEvent* event)
void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &p)
{
- if ((button & LeftButton) == 0) return;
+ if ((button & Qt::LeftButton) == 0) return;
mOldPos = p;
mDragFile = TQString::null;
int cur = index(item);
@@ -66,7 +66,7 @@ void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const
void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
{
- if (((e->state() & LeftButton) != 0) && !mDragFile.isEmpty())
+ if (((e->state() & Qt::LeftButton) != 0) && !mDragFile.isEmpty())
{
int delay = KGlobalSettings::dndEventDelay();
TQPoint newPos = e->globalPos();
diff --git a/ksplashml/kcmksplash/installer.h b/ksplashml/kcmksplash/installer.h
index 22485d75c..ee3af491b 100644
--- a/ksplashml/kcmksplash/installer.h
+++ b/ksplashml/kcmksplash/installer.h
@@ -22,7 +22,7 @@ class TQTextEdit;
class TQPushButton;
class ThemeListBox;
-class SplashInstaller : public QWidget
+class SplashInstaller : public TQWidget
{
Q_OBJECT
public:
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index 091d70e9e..f382ba7a6 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -38,7 +38,7 @@
// KSplash::KSplash(): This is a hidden object. Its sole purpose
// is to manage the other objects, which are presented on the screen.
KSplash::KSplash(const char *name)
- : DCOPObject( name ), TQWidget( 0, name, WStyle_Customize|WStyle_NoBorder|WX11BypassWM ),
+ : DCOPObject( name ), TQWidget( 0, name, (WFlags)(WStyle_Customize|WStyle_NoBorder|WX11BypassWM) ),
mState( 0 ), mMaxProgress( 0 ), mStep( 0 )
{
hide(); // We never show this object.
@@ -381,7 +381,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri
{
TQStringList themeTitle;
themeTitle << theme;
- return static_cast<ThemeEngine *>(factory->create(this, "theme", objName.latin1(), themeTitle));
+ return static_cast<ThemeEngine *>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "theme", objName.latin1(), themeTitle)));
}
else
return 0L;
@@ -416,7 +416,7 @@ TQPtrList<Action> KSplash::actionList()
bool KSplash::eventFilter( TQObject *o, TQEvent *e )
{
- if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) )
+ if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mThemeEngine) ) )
{
TQTimer::singleShot( 0, this, TQT_SLOT(close()));
return TRUE;