diff --git a/client/config/configdialog.ui b/client/config/configdialog.ui
index f14443d..990701d 100644
--- a/client/config/configdialog.ui
+++ b/client/config/configdialog.ui
@@ -64,7 +64,7 @@
Expanding
-
+
20
16
@@ -253,7 +253,7 @@
Expanding
-
+
20
20
@@ -305,7 +305,7 @@
Preferred
-
+
10
20
@@ -357,7 +357,7 @@
Preferred
-
+
10
20
@@ -497,7 +497,7 @@
0
-
+
80
0
@@ -580,7 +580,7 @@
Expanding
-
+
20
20
@@ -1300,7 +1300,7 @@
Expanding
-
+
20
16
@@ -1429,7 +1429,7 @@
Expanding
-
+
20
50
@@ -1588,7 +1588,7 @@
Expanding
-
+
20
16
@@ -1697,7 +1697,7 @@
Expanding
-
+
20
20
@@ -1889,13 +1889,13 @@
0
-
+
30
30
-
+
30
30
@@ -1939,7 +1939,7 @@
Expanding
-
+
20
30
@@ -2080,7 +2080,7 @@
Expanding
-
+
20
40
diff --git a/client/config/infodialog.ui b/client/config/infodialog.ui
index f654f4d..b68a87e 100644
--- a/client/config/infodialog.ui
+++ b/client/config/infodialog.ui
@@ -54,13 +54,13 @@
0
-
+
0
20
-
+
32767
20
@@ -158,13 +158,13 @@ You may look for the most recent version at kde-look.org:
0
-
+
0
20
-
+
32767
20
diff --git a/client/crystalbutton.cpp b/client/crystalbutton.cpp
index 51d366e..0834954 100644
--- a/client/crystalbutton.cpp
+++ b/client/crystalbutton.cpp
@@ -62,7 +62,7 @@ void CrystalButton::setBitmap(ButtonImage *newimage)
tqrepaint(false);
}
-TQSize CrystalButton::tqsizeHint() const
+TQSize CrystalButton::sizeHint() const
{
return TQSize(buttonSizeH(),buttonSizeV());
}
@@ -177,7 +177,7 @@ void CrystalButton::drawButton(TQPainter *painter)
pufferPainter.drawPixmap(TQPoint(0,0),*background,r);
}else{
- group = client_->options()->tqcolorGroup(KDecoration::ColorTitleBar, client_->isActive());
+ group = client_->options()->colorGroup(KDecoration::ColorTitleBar, client_->isActive());
pufferPainter.fillRect(rect(), group.background());
}
diff --git a/client/crystalbutton.h b/client/crystalbutton.h
index 84f967e..0338688 100644
--- a/client/crystalbutton.h
+++ b/client/crystalbutton.h
@@ -41,7 +41,7 @@ public:
virtual ~CrystalButton();
void setBitmap(ButtonImage *newimage);
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
int lastMousePress() const { return lastmouse_; }
void reset() { tqrepaint(false); }
void setFirstLast(bool vfirst,bool vlast) { first|=vfirst; last|=vlast; }
diff --git a/client/crystalclient.cc b/client/crystalclient.cc
index 2263b3c..cb81c69 100644
--- a/client/crystalclient.cc
+++ b/client/crystalclient.cc
@@ -1095,9 +1095,9 @@ void CrystalClient::resize(const TQSize &size)
widget()->resize(size);
}
-TQSize CrystalClient::tqminimumSize() const
+TQSize CrystalClient::minimumSize() const
{
- return widget()->tqminimumSize();
+ return widget()->minimumSize();
}
KDecoration::Position CrystalClient::mousePosition(const TQPoint &point) const
@@ -1260,7 +1260,7 @@ void CrystalClient::paintEvent(TQPaintEvent*)
TQPainter painter(widget());
// draw the titlebar
- group = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive());
+ group = options()->colorGroup(KDecoration::ColorTitleBar, isActive());
WND_CONFIG* wndcfg=(isActive()?&::factory->active:&::factory->inactive);
if (::factory->transparency && ::factory->trackdesktop)
diff --git a/client/crystalclient.h b/client/crystalclient.h
index 672a743..27c3629 100644
--- a/client/crystalclient.h
+++ b/client/crystalclient.h
@@ -161,7 +161,7 @@ public:
virtual void borders(int &l, int &r, int &t, int &b) const;
virtual void resize(const TQSize &size);
- virtual TQSize tqminimumSize() const;
+ virtual TQSize minimumSize() const;
virtual Position mousePosition(const TQPoint &point) const;
void ClientWindows(Window* frame,Window* wrapper,Window* client);
diff --git a/client/imageholder.cpp b/client/imageholder.cpp
index 4d026cf..b963204 100644
--- a/client/imageholder.cpp
+++ b/client/imageholder.cpp
@@ -63,12 +63,12 @@ void QImageHolder::setUserdefinedPictures( TQImage act,TQImage inact)
if (!act.isNull())
{
act=act.smoothScale(w,h);
- img_active=ApplyEffect(act,&::factory->active,factory->options()->tqcolorGroup(KDecoration::ColorTitleBar, true));
+ img_active=ApplyEffect(act,&::factory->active,factory->options()->colorGroup(KDecoration::ColorTitleBar, true));
}else img_active=NULL;
if (!inact.isNull())
{
inact=inact.smoothScale(w,h);
- img_inactive=ApplyEffect(inact,&::factory->inactive,factory->options()->tqcolorGroup(KDecoration::ColorTitleBar, false));
+ img_inactive=ApplyEffect(inact,&::factory->inactive,factory->options()->colorGroup(KDecoration::ColorTitleBar, false));
}else img_inactive=NULL;
userdefinedActive=(img_active!=NULL);
@@ -160,11 +160,11 @@ void QImageHolder::BackgroundUpdated(const TQImage *src)
TQImage tmp=src->copy();
if (!userdefinedInactive)
- img_inactive=ApplyEffect(tmp,&::factory->inactive,factory->options()->tqcolorGroup(KDecoration::ColorTitleBar, false));
+ img_inactive=ApplyEffect(tmp,&::factory->inactive,factory->options()->colorGroup(KDecoration::ColorTitleBar, false));
tmp=src->copy();
if (!userdefinedActive)
- img_active=ApplyEffect(tmp,&::factory->active,factory->options()->tqcolorGroup(KDecoration::ColorTitleBar, true));
+ img_active=ApplyEffect(tmp,&::factory->active,factory->options()->colorGroup(KDecoration::ColorTitleBar, true));
}
emit repaintNeeded();
diff --git a/client/myrootpixmap.cc b/client/myrootpixmap.cc
index 2a39145..195711e 100644
--- a/client/myrootpixmap.cc
+++ b/client/myrootpixmap.cc
@@ -59,7 +59,7 @@ void KMyRootPixmap::init()
connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
// connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(tqrepaint()));
-// d->toplevel = m_pWidget->tqtopLevelWidget();
+// d->toplevel = m_pWidget->topLevelWidget();
// d->toplevel->installEventFilter(this);
}
diff --git a/pics/embedtool.cpp b/pics/embedtool.cpp
index c1712b9..9466dce 100644
--- a/pics/embedtool.cpp
+++ b/pics/embedtool.cpp
@@ -64,7 +64,7 @@ private:
nVIDIAEmbedder::nVIDIAEmbedder()
{
- TQDateTime date( TQDateTime::tqcurrentDateTime() );
+ TQDateTime date( TQDateTime::currentDateTime() );
TQString datestring( date.toString() );
// file = new TQFile( "tiles.h" );