summaryrefslogtreecommitdiffstats
path: root/kpager
diff options
context:
space:
mode:
Diffstat (limited to 'kpager')
-rw-r--r--kpager/config.cpp2
-rw-r--r--kpager/desktop.cpp16
-rw-r--r--kpager/desktop.h2
-rw-r--r--kpager/kpager.cpp40
-rw-r--r--kpager/kpager.h2
5 files changed, 31 insertions, 31 deletions
diff --git a/kpager/config.cpp b/kpager/config.cpp
index ee8d263e2..5ff0d3def 100644
--- a/kpager/config.cpp
+++ b/kpager/config.cpp
@@ -27,7 +27,7 @@
#include <tqwidget.h>
#include <tqvbox.h>
#include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kdialogbase.h>
#include <klocale.h>
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp
index f155d7050..c03fd044f 100644
--- a/kpager/desktop.cpp
+++ b/kpager/desktop.cpp
@@ -295,7 +295,7 @@ TQPixmap *Desktop::paintNewWindow(const KWin::WindowInfo *info)
p.begin(pixmap);
p.setFont(font());
- p.fillRect( r, colorGroup().brush(TQColorGroup::Dark));
+ p.fillRect( r, tqcolorGroup().brush(TQColorGroup::Dark));
paintWindow(p, info, false);
p.end();
@@ -425,7 +425,7 @@ void Desktop::paintEvent( TQPaintEvent * )
p.begin(&pixmap);
// p.setFont(font());
-// p.fillRect(rect(), colorGroup().brush(TQColorGroup::Dark));
+// p.fillRect(rect(), tqcolorGroup().brush(TQColorGroup::Dark));
// p.setPen(Qt::black);
// p.drawRect(rect());
@@ -450,7 +450,7 @@ void Desktop::paintEvent( TQPaintEvent * )
else pixmap.fill(Qt::gray);
}
else
- p.fillRect(rect(), colorGroup().brush(TQColorGroup::Mid));
+ p.fillRect(rect(), tqcolorGroup().brush(TQColorGroup::Mid));
// set in/active pen
if (isCurrent())
@@ -523,8 +523,8 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool
TQBrush brush;
- if ( isActive ) brush=colorGroup().brush( TQColorGroup::Highlight );
- else brush=colorGroup().brush( TQColorGroup::Button );
+ if ( isActive ) brush=tqcolorGroup().brush( TQColorGroup::Highlight );
+ else brush=tqcolorGroup().brush( TQColorGroup::Button );
if ( m_transparentMode==AllWindows
|| (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) )
@@ -532,12 +532,12 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool
if ( isActive )
{
- qDrawShadeRect( &p, r, colorGroup(), false, 1, 0, &brush );
+ qDrawShadeRect( &p, r, tqcolorGroup(), false, 1, 0, &brush );
}
else
{
p.fillRect( r, brush );
- qDrawShadeRect( &p, r, colorGroup(), true, 1, 0 );
+ qDrawShadeRect( &p, r, tqcolorGroup(), true, 1, 0 );
}
}
@@ -669,7 +669,7 @@ void Desktop::backgroundLoaded(bool b)
} else kdDebug() << "Error getting the background\n";
}
-TQSize Desktop::sizeHint() const
+TQSize Desktop::tqsizeHint() const
{
return TQSize(67,50);
}
diff --git a/kpager/desktop.h b/kpager/desktop.h
index 9fc9942ae..56429342c 100644
--- a/kpager/desktop.h
+++ b/kpager/desktop.h
@@ -74,7 +74,7 @@ public:
static void removeCachedPixmap(int nWin) { m_windowPixmaps.remove(nWin); };
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
/**
* active is a bool that specifies if the frame is the active
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index b089c1c35..57a960bb7 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -38,7 +38,7 @@
#include <tqintdict.h>
#include <tqptrlist.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqtimer.h>
@@ -76,7 +76,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
if (w > 0 && h > 0)
resize(w,h);
else
- resize(m_pPager->sizeHint());
+ resize(m_pPager->tqsizeHint());
// resize(cfg->readNumEntry(lWidth(),200),cfg->readNumEntry(lHeight(),90));
int xpos=cfg->readNumEntry("xPos",-1);
@@ -91,7 +91,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
// rect.pos.y+rect.size.height-m_pPager->height());
// antonio:The above lines don't work. I should look at them when I have
// more time
- move(kapp->desktop()->width()-m_pPager->sizeHint().width()-5,kapp->desktop()->height()-m_pPager->sizeHint().height()-25);
+ move(kapp->desktop()->width()-m_pPager->tqsizeHint().width()-5,kapp->desktop()->height()-m_pPager->tqsizeHint().height()-25);
}
// Set the wm flags to this window
@@ -374,7 +374,7 @@ void KPager::configureDialog()
updateLayout();
for( TQValueList <Desktop *>::Iterator it = m_desktops.begin(); it != m_desktops.end(); ++it )
- (*it)->repaint();
+ (*it)->tqrepaint();
}
}
@@ -409,7 +409,7 @@ void KPager::slotActiveWindowChanged( WId win )
{
if ( (inf1 && inf1->isOnDesktop(i))
|| (inf2 && inf2->isOnDesktop(i) ) )
- m_desktops[i-1]->repaint(false);
+ m_desktops[i-1]->tqrepaint(false);
}
}
@@ -422,7 +422,7 @@ void KPager::slotWindowAdded( WId win)
for ( int i=1; i <= (int) m_desktops.count(); ++i)
{
if ( inf->isOnDesktop( i ))
- m_desktops[i-1]->repaint(false);
+ m_desktops[i-1]->tqrepaint(false);
}
}
@@ -438,14 +438,14 @@ void KPager::slotWindowRemoved( WId win )
for (int i = 1; i <= (int) m_desktops.count(); ++i)
{
if (onAllDesktops || desktop == i)
- m_desktops[i-1]->repaint(false);
+ m_desktops[i-1]->tqrepaint(false);
}
}
}
void KPager::slotWindowChanged( WId win , unsigned int prop)
{
- bool repaint=false;
+ bool tqrepaint=false;
KWin::WindowInfo* inf = m_windows[win];
if (!inf)
@@ -453,7 +453,7 @@ void KPager::slotWindowChanged( WId win , unsigned int prop)
inf=info(win);
prop=0; // info already calls KWin::info, so there's no need
// to update anything else.
- repaint=true;
+ tqrepaint=true;
};
bool onAllDesktops = inf ? inf->onAllDesktops() : false;
@@ -466,15 +466,15 @@ void KPager::slotWindowChanged( WId win , unsigned int prop)
}
if((prop & ~( NET::WMName | NET::WMVisibleName )) != 0 )
- repaint = true;
+ tqrepaint = true;
- if (repaint)
+ if (tqrepaint)
for ( int i=1; i <= (int) m_desktops.count(); ++i)
{
if ((inf && (inf->isOnDesktop(i)))
|| onAllDesktops || desktop == i )
{
- m_desktops[i-1]->repaint(false);
+ m_desktops[i-1]->tqrepaint(false);
}
}
// redrawDesktops();
@@ -485,9 +485,9 @@ void KPager::slotStackingOrderChanged()
m_desktops[m_currentDesktop-1]->m_grabWindows=true;
for ( int i=1; i <= (int) m_desktops.count(); ++i)
{
- m_desktops[i-1]->repaint(false);
+ m_desktops[i-1]->tqrepaint(false);
}
-// repaint(true);
+// tqrepaint(true);
}
void KPager::slotDesktopNamesChanged()
@@ -547,8 +547,8 @@ void KPager::slotCurrentDesktopChanged(int desk)
m_desktops[m_currentDesktop-1]->update();
m_desktops[desk-1]->paintFrame( true );
m_desktops[desk-1]->update();
-// m_desktops[m_currentDesktop-1]->repaint();
-// m_desktops[desk-1]->repaint();
+// m_desktops[m_currentDesktop-1]->tqrepaint();
+// m_desktops[desk-1]->tqrepaint();
m_currentDesktop=desk;
@@ -643,21 +643,21 @@ void KPager::redrawDesktops()
{
TQValueList <Desktop *>::Iterator it;
for( it = m_desktops.begin(); it != m_desktops.end(); ++it )
- (*it)->repaint();
+ (*it)->tqrepaint();
}
void KPager::slotGrabWindows()
{
m_desktops[m_currentDesktop-1]->m_grabWindows=true;
- m_desktops[m_currentDesktop-1]->repaint();
+ m_desktops[m_currentDesktop-1]->tqrepaint();
}
-TQSize KPager::sizeHint() const
+TQSize KPager::tqsizeHint() const
{
int n=m_desktops.count();
int w=-1,h=-1;
- TQSize size=m_desktops[0]->sizeHint();
+ TQSize size=m_desktops[0]->tqsizeHint();
int wDsk=size.width();
int hDsk=size.height();
switch (m_layoutType)
diff --git a/kpager/kpager.h b/kpager/kpager.h
index aa194b4df..e88c2904f 100644
--- a/kpager/kpager.h
+++ b/kpager/kpager.h
@@ -76,7 +76,7 @@ public:
KWin::WindowInfo* info( WId win );
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
enum LayoutTypes { Classical=0, Horizontal, Vertical };
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-09 19:58:53 +0000