summaryrefslogtreecommitdiffstats
path: root/kpager
diff options
context:
space:
mode:
Diffstat (limited to 'kpager')
-rw-r--r--kpager/config.cpp18
-rw-r--r--kpager/config.h2
-rw-r--r--kpager/desktop.cpp34
-rw-r--r--kpager/desktop.h2
-rw-r--r--kpager/kpager.cpp66
-rw-r--r--kpager/kpager.h4
-rw-r--r--kpager/main.cpp12
-rw-r--r--kpager/windowdrag.cpp4
8 files changed, 71 insertions, 71 deletions
diff --git a/kpager/config.cpp b/kpager/config.cpp
index 0c022d4bb..5be814af7 100644
--- a/kpager/config.cpp
+++ b/kpager/config.cpp
@@ -48,20 +48,20 @@ KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent)
TQVBox *box = new TQVBox( this );
m_chkWindowDragging=new TQCheckBox(i18n("Enable window dragging"),box,0);
(void ) new KSeparator( box );
- connect(m_chkWindowDragging, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableWindowDragging(bool)));
+ connect(m_chkWindowDragging, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableWindowDragging(bool)));
TQHBox *page = new TQHBox( box );
TQVBox *lpage = new TQVBox( page );
setMainWidget(box);
m_chkShowName=new TQCheckBox(i18n("Show name"),lpage,0);
- connect(m_chkShowName, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowName(bool)));
+ connect(m_chkShowName, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowName(bool)));
m_chkShowNumber=new TQCheckBox(i18n("Show number"),lpage,0);
- connect(m_chkShowNumber, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowNumber(bool)));
+ connect(m_chkShowNumber, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowNumber(bool)));
m_chkShowBackground=new TQCheckBox(i18n("Show background"),lpage,0);
- connect(m_chkShowBackground, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowBackground(bool)));
+ connect(m_chkShowBackground, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowBackground(bool)));
m_chkShowWindows=new TQCheckBox(i18n("Show windows"),lpage,0);
- connect(m_chkShowWindows, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowWindows(bool)));
+ connect(m_chkShowWindows, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowWindows(bool)));
m_grpWindowDrawMode=new TQButtonGroup(i18n("Type of Window"),page);
m_grpWindowDrawMode->setExclusive(true);
@@ -75,7 +75,7 @@ KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent)
// rbpix->setEnabled(false);
vbox->addWidget(rbpix);
- connect(m_grpWindowDrawMode, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setWindowDrawMode(int)));
+ connect(m_grpWindowDrawMode, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(setWindowDrawMode(int)));
m_grpLayoutType=new TQButtonGroup(i18n("Layout"),page);
m_grpLayoutType->setExclusive(true);
@@ -85,8 +85,8 @@ KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent)
vbox->addWidget(new TQRadioButton(i18n("Horizontal"),m_grpLayoutType));
vbox->addWidget(new TQRadioButton(i18n("Vertical"),m_grpLayoutType));
- connect(m_grpLayoutType, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setLayout(int)));
- connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotOk()));
+ connect(m_grpLayoutType, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(setLayout(int)));
+ connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotOk()));
loadConfiguration();
setMinimumSize(360, 160);
}
@@ -146,7 +146,7 @@ void KPagerConfigDialog::loadConfiguration()
void KPagerConfigDialog::initConfiguration(void)
{
- TDEConfig *cfg= kapp->config();
+ TDEConfig *cfg= tdeApp->config();
cfg->setGroup("KPager");
m_windowDrawMode=cfg->readNumEntry("windowDrawMode", Desktop::c_defWindowDrawMode);
diff --git a/kpager/config.h b/kpager/config.h
index 2b8b095d3..e3e172808 100644
--- a/kpager/config.h
+++ b/kpager/config.h
@@ -30,7 +30,7 @@ class TQButtonGroup;
class KPagerConfigDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KPagerConfigDialog(TQWidget *parent);
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp
index 74ead587f..ba75663f9 100644
--- a/kpager/desktop.cpp
+++ b/kpager/desktop.cpp
@@ -58,7 +58,7 @@ Desktop::Desktop( int desk, TQString desktopName, TQWidget *parent, const char *
m_bgPixmap = 0L;
m_bgDirty=true;
m_grabWindows=false;
- setAcceptDrops(TRUE);
+ setAcceptDrops(true);
setBackgroundMode(NoBackground);
if (m_desk==1) Desktop::m_windowPixmaps.setAutoDelete(true);
@@ -78,7 +78,7 @@ void Desktop::mouseMoveEvent( TQMouseEvent *ev )
{
if ( !KPagerConfigDialog::m_windowDragging )
return;
- if ( (ev->state() & Qt::LeftButton) == 0 )
+ if ( (ev->state() & TQt::LeftButton) == 0 )
return;
TQPoint p( ev->pos() - pressPos );
if ( p.manhattanLength() >= tqApp->startDragDistance() )
@@ -88,12 +88,12 @@ void Desktop::mouseMoveEvent( TQMouseEvent *ev )
void Desktop::mousePressEvent( TQMouseEvent * ev)
{
bool showWindows= KPagerConfigDialog::m_showWindows;
- if (ev->button()==Qt::LeftButton){
+ if (ev->button()==TQt::LeftButton){
pressPos = ev->pos();
}
- else if ((ev->button()==Qt::MidButton)&&(showWindows))
+ else if ((ev->button()==TQt::MidButton)&&(showWindows))
startDrag(ev->pos());
- else if (ev->button()==Qt::RightButton) {
+ else if (ev->button()==TQt::RightButton) {
TQPoint pos;
KWin::WindowInfo *info = windowAtPosition(ev->pos(), &pos);
if ( info && showWindows )
@@ -107,7 +107,7 @@ void Desktop::mouseReleaseEvent( TQMouseEvent *ev )
{
/** Note that mouseReleaseEvent is not called when releasing the mouse
to drop a window in this desktop */
- if (ev->button()==Qt::LeftButton)
+ if (ev->button()==TQt::LeftButton)
{
bool showWindows= KPagerConfigDialog::m_showWindows;
TQPoint pos;
@@ -160,16 +160,16 @@ KWin::WindowInfo *Desktop::windowAtPosition(const TQPoint &p, TQPoint *internalp
void Desktop::convertRectS2P(TQRect &r)
{
TQRect tmp(r);
- r.setRect(deskX()+tmp.x()*deskWidth()/kapp->desktop()->width(),
- deskY()+tmp.y()*deskHeight()/kapp->desktop()->height(),
- tmp.width()*deskWidth()/kapp->desktop()->width(),
- tmp.height()*deskHeight()/kapp->desktop()->height());
+ r.setRect(deskX()+tmp.x()*deskWidth()/tdeApp->desktop()->width(),
+ deskY()+tmp.y()*deskHeight()/tdeApp->desktop()->height(),
+ tmp.width()*deskWidth()/tdeApp->desktop()->width(),
+ tmp.height()*deskHeight()/tdeApp->desktop()->height());
}
void Desktop::convertCoordP2S(int &x, int &y)
{
- x=(x-deskX())*(kapp->desktop()->width())/deskWidth();
- y=(y-deskY())*(kapp->desktop()->height())/deskHeight();
+ x=(x-deskX())*(tdeApp->desktop()->width())/deskWidth();
+ y=(y-deskY())*(tdeApp->desktop()->height())/deskHeight();
}
TQPixmap scalePixmap(const TQPixmap &pixmap, int width, int height)
@@ -201,7 +201,7 @@ void Desktop::loadBgPixmap(void)
bool retval;
// if (!m_bgDirty) return;
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
if (!client->isAttached())
client->attach();
TQByteArray data, data2, replyData;
@@ -257,7 +257,7 @@ void Desktop::loadBgPixmap(void)
if (!m_bgPixmap)
{
m_bgPixmap = new TDESharedPixmap;
- connect(m_bgPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(backgroundLoaded(bool)));
+ connect(m_bgPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(backgroundLoaded(bool)));
}
retval = m_bgPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_isCommon?1:m_desk));
@@ -426,7 +426,7 @@ void Desktop::paintEvent( TQPaintEvent * )
p.begin(&pixmap);
// p.setFont(font());
// p.fillRect(rect(), colorGroup().brush(TQColorGroup::Dark));
-// p.setPen(Qt::black);
+// p.setPen(TQt::black);
// p.drawRect(rect());
if (KPagerConfigDialog::m_showBackground )
@@ -447,7 +447,7 @@ void Desktop::paintEvent( TQPaintEvent * )
p.drawPixmap(0,0,tmp);
}
- else pixmap.fill(Qt::gray);
+ else pixmap.fill(TQt::gray);
}
else
p.fillRect(rect(), colorGroup().brush(TQColorGroup::Mid));
@@ -528,7 +528,7 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool
if ( m_transparentMode==AllWindows
|| (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) )
- brush.setStyle(Qt::Dense4Pattern);
+ brush.setStyle(TQt::Dense4Pattern);
if ( isActive )
{
diff --git a/kpager/desktop.h b/kpager/desktop.h
index cff05594a..1954c45fb 100644
--- a/kpager/desktop.h
+++ b/kpager/desktop.h
@@ -37,7 +37,7 @@ class TQPoint;
class Desktop : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
Desktop( int desk, TQString desktopName, TQWidget *parent=0,
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index 4775576ee..95f4ec61c 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -67,7 +67,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
m_pPager = new KPager(this, 0);
setCentralWidget(m_pPager);
- TDEConfig *cfg = kapp->config();
+ TDEConfig *cfg = tdeApp->config();
cfg->setGroup("KPager");
// Update the last used geometry
@@ -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(tdeApp->desktop()->width()-m_pPager->sizeHint().width()-5,tdeApp->desktop()->height()-m_pPager->sizeHint().height()-25);
}
// Set the wm flags to this window
@@ -111,7 +111,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
XFree(reinterpret_cast<char *>(hints));
timeout=new TQTimer(this,"timeoutToQuit");
- connect(timeout,TQT_SIGNAL(timeout()),this, TQT_SLOT(reallyClose()));
+ connect(timeout,TQ_SIGNAL(timeout()),this, TQ_SLOT(reallyClose()));
}
KPagerMainWindow::~KPagerMainWindow()
@@ -158,9 +158,9 @@ void KPagerMainWindow::showAt(int x, int y)
// Just in case we lost the sticky bit... (as when a window is hidden)
KWin::setOnAllDesktops( winId(), true);
- if (x>kapp->desktop()->width()/2) // Right
+ if (x>tdeApp->desktop()->width()/2) // Right
x-=m_pPager->width()+5;
- if (y>kapp->desktop()->height()/2) // Bottom
+ if (y>tdeApp->desktop()->height()/2) // Bottom
y-=m_pPager->height()+25;
move(x,y);
show();
@@ -187,15 +187,15 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
m_windows.setAutoDelete(true); // delete windows info after removal
setBackgroundColor( black );
- m_winmodule=new KWinModule(TQT_TQOBJECT(this));
+ m_winmodule=new KWinModule(this);
m_currentDesktop=m_winmodule->currentDesktop();
m_grabWinTimer=new TQTimer(this,"grabWinTimer");
- connect(m_grabWinTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotGrabWindows()));
+ connect(m_grabWinTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotGrabWindows()));
KPagerConfigDialog::initConfiguration();
- TDEConfig *cfg = kapp->config();
+ TDEConfig *cfg = tdeApp->config();
cfg->setGroup("KPager");
m_showStickyOption=cfg->readBoolEntry("ShowStickyOption",false);
@@ -208,31 +208,31 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
m_layoutType=static_cast<enum KPager::LayoutTypes>( KPagerConfigDialog::m_layoutType );
- connect( m_winmodule, TQT_SIGNAL( activeWindowChanged(WId)),
- TQT_SLOT(slotActiveWindowChanged(WId)));
- connect( m_winmodule, TQT_SIGNAL( windowAdded(WId) ),
- TQT_SLOT( slotWindowAdded(WId) ) );
- connect( m_winmodule, TQT_SIGNAL( windowRemoved(WId) ),
- TQT_SLOT( slotWindowRemoved(WId) ) );
- connect( m_winmodule, TQT_SIGNAL( windowChanged(WId,unsigned int) ),
- TQT_SLOT( slotWindowChanged(WId,unsigned int) ) );
- connect( m_winmodule, TQT_SIGNAL( stackingOrderChanged() ),
- TQT_SLOT( slotStackingOrderChanged() ) );
- connect( m_winmodule, TQT_SIGNAL( desktopNamesChanged() ),
- TQT_SLOT( slotDesktopNamesChanged() ) );
- connect( m_winmodule, TQT_SIGNAL( numberOfDesktopsChanged(int) ),
- TQT_SLOT( slotNumberOfDesktopsChanged(int) ) );
- connect( m_winmodule, TQT_SIGNAL( currentDesktopChanged(int)),
- TQT_SLOT( slotCurrentDesktopChanged(int) ) );
- connect(kapp, TQT_SIGNAL(backgroundChanged(int)),
- TQT_SLOT(slotBackgroundChanged(int)));
+ connect( m_winmodule, TQ_SIGNAL( activeWindowChanged(WId)),
+ TQ_SLOT(slotActiveWindowChanged(WId)));
+ connect( m_winmodule, TQ_SIGNAL( windowAdded(WId) ),
+ TQ_SLOT( slotWindowAdded(WId) ) );
+ connect( m_winmodule, TQ_SIGNAL( windowRemoved(WId) ),
+ TQ_SLOT( slotWindowRemoved(WId) ) );
+ connect( m_winmodule, TQ_SIGNAL( windowChanged(WId,unsigned int) ),
+ TQ_SLOT( slotWindowChanged(WId,unsigned int) ) );
+ connect( m_winmodule, TQ_SIGNAL( stackingOrderChanged() ),
+ TQ_SLOT( slotStackingOrderChanged() ) );
+ connect( m_winmodule, TQ_SIGNAL( desktopNamesChanged() ),
+ TQ_SLOT( slotDesktopNamesChanged() ) );
+ connect( m_winmodule, TQ_SIGNAL( numberOfDesktopsChanged(int) ),
+ TQ_SLOT( slotNumberOfDesktopsChanged(int) ) );
+ connect( m_winmodule, TQ_SIGNAL( currentDesktopChanged(int)),
+ TQ_SLOT( slotCurrentDesktopChanged(int) ) );
+ connect(tdeApp, TQ_SIGNAL(backgroundChanged(int)),
+ TQ_SLOT(slotBackgroundChanged(int)));
TQFont defFont(TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold);
defFont = cfg->readFontEntry("Font", &defFont);
setFont(defFont);
- m_prefs_action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configureDialog()), parent->actionCollection());
- m_quit_action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), parent->actionCollection());
+ m_prefs_action = KStdAction::preferences(this, TQ_SLOT(configureDialog()), parent->actionCollection());
+ m_quit_action = KStdAction::quit(tdeApp, TQ_SLOT(quit()), parent->actionCollection());
updateLayout();
}
@@ -323,13 +323,13 @@ void KPager::showPopupMenu( WId wid, TQPoint pos)
m_mnu->insertTitle( TQString::fromUtf8("KPager"), 1);
m_mnu->setCheckable(true);
- connect(m_mnu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(clientPopupAboutToShow()));
- connect(m_mnu, TQT_SIGNAL(activated(int)), TQT_SLOT(clientPopupActivated(int)));
+ connect(m_mnu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(clientPopupAboutToShow()));
+ connect(m_mnu, TQ_SIGNAL(activated(int)), TQ_SLOT(clientPopupActivated(int)));
m_dmnu = new TQPopupMenu(m_mnu);
m_dmnu->setCheckable(true);
- connect(m_dmnu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(desktopPopupAboutToShow()));
- connect(m_dmnu, TQT_SIGNAL(activated(int)), TQT_SLOT(sendToDesktop(int)));
+ connect(m_dmnu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(desktopPopupAboutToShow()));
+ connect(m_dmnu, TQ_SIGNAL(activated(int)), TQ_SLOT(sendToDesktop(int)));
m_mnu->insertItem( i18n("Mi&nimize"), IconifyOp );
m_mnu->insertItem( i18n("Ma&ximize"), MaximizeOp );
@@ -600,7 +600,7 @@ void KPager::desktopPopupAboutToShow()
id = m_dmnu->insertItem( TQString("&")+TQString::number(i )+TQString(" ")
+ m_winmodule->desktopName(i), i );
if ( m_winfo.desktop() == i )
- m_dmnu->setItemChecked( id, TRUE );
+ m_dmnu->setItemChecked( id, true );
}
}
diff --git a/kpager/kpager.h b/kpager/kpager.h
index 4a3d2ef8f..7fdd7d573 100644
--- a/kpager/kpager.h
+++ b/kpager/kpager.h
@@ -36,7 +36,7 @@ class TQPopupMenu;
class KPagerMainWindow : public TDEMainWindow, public virtual KPagerIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
KPagerMainWindow(TQWidget *parent=0, const char *name=0);
@@ -59,7 +59,7 @@ protected:
class KPager : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
friend class KPagerMainWindow;
diff --git a/kpager/main.cpp b/kpager/main.cpp
index 20c8e268d..10c4b2780 100644
--- a/kpager/main.cpp
+++ b/kpager/main.cpp
@@ -21,7 +21,7 @@
***************************************************************************/
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
@@ -40,10 +40,10 @@ static TDECmdLineOptions pagerOpts[] =
bool closed_by_sm = false;
-class KPagerApplication : public KUniqueApplication
+class KPagerApplication : public TDEUniqueApplication
{
public:
- KPagerApplication() : KUniqueApplication() {}
+ KPagerApplication() : TDEUniqueApplication() {}
void commitData(TQSessionManager& sm) {
if (mainWidget()->isHidden()) {
@@ -51,7 +51,7 @@ public:
return;
}
closed_by_sm = true;
- KUniqueApplication::commitData( sm );
+ TDEUniqueApplication::commitData( sm );
closed_by_sm = false;
}
@@ -78,9 +78,9 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, aboutdata);
TDECmdLineArgs::addCmdLineOptions(pagerOpts);
- KUniqueApplication::addCmdLineOptions();
+ TDEUniqueApplication::addCmdLineOptions();
- if (!KUniqueApplication::start())
+ if (!TDEUniqueApplication::start())
{
kdError() << "kpager is already running!" << endl;
return 0;
diff --git a/kpager/windowdrag.cpp b/kpager/windowdrag.cpp
index fc854b8a9..bcfd9e77d 100644
--- a/kpager/windowdrag.cpp
+++ b/kpager/windowdrag.cpp
@@ -54,7 +54,7 @@ bool PagerWindowDrag::decode( TQDropEvent *e, WId &w,int &deltax,int &deltay,int
char *tmp=data.data();
sscanf(tmp,"%lu %d %d %d", &w, &deltax, &deltay, &origdesk);
e->accept();
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 12:06:48 +0000