summaryrefslogtreecommitdiffstats
path: root/kicker/applets/minipager/pagerapplet.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kicker/applets/minipager/pagerapplet.cpp
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/applets/minipager/pagerapplet.cpp')
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index dc2431e15..6975af0c0 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
setFont( KGlobalSettings::taskbarFont() );
- m_kwin = new KWinModule(this);
+ m_kwin = new KWinModule(TQT_TQOBJECT(this));
m_activeWindow = m_kwin->activeWindow();
m_curDesk = m_kwin->currentDesktop();
@@ -365,8 +365,8 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
if( m_desktopLayoutOwner == NULL )
{ // must own manager selection before setting global desktop layout
int screen = DefaultScreen( qt_xdisplay());
- m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
- screen, this );
+ m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).tqarg( screen ).latin1(),
+ screen, TQT_TQOBJECT(this) );
if( !m_desktopLayoutOwner->claim( false ))
{
delete m_desktopLayoutOwner;
@@ -381,7 +381,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
void KMiniPager::resizeEvent(TQResizeEvent*)
{
- bool horiz = orientation() == Horizontal;
+ bool horiz = orientation() == Qt::Horizontal;
int deskNum = m_desktops.count();
int rowNum = m_settings->numberOfRows();
@@ -723,7 +723,7 @@ void KMiniPager::aboutToShowContextMenu()
rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset);
rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset);
connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
- showMenu->insertItem((orientation()==Horizontal) ? i18n("&Rows"):
+ showMenu->insertItem((orientation()==Qt::Horizontal) ? i18n("&Rows"):
i18n("&Columns"),
rowMenu);
@@ -865,7 +865,7 @@ void KMiniPager::slotDesktopNamesChanged()
{
TQString name = m_kwin->desktopName(i);
(*it)->setDesktopName(name);
- (*it)->repaint();
+ (*it)->tqrepaint();
TQToolTip::remove((*it));
TQToolTip::add((*it), name);
}