Rename old tq methods that no longer need a unique name

(cherry picked from commit ed6f377136)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 989d5c01c9
commit a08bdb6215

@ -64,7 +64,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -253,7 +253,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -305,7 +305,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>10</width> <width>10</width>
<height>20</height> <height>20</height>
@ -357,7 +357,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>10</width> <width>10</width>
<height>20</height> <height>20</height>
@ -497,7 +497,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>0</height> <height>0</height>
@ -580,7 +580,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1300,7 +1300,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -1429,7 +1429,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>50</height> <height>50</height>
@ -1588,7 +1588,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -1697,7 +1697,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1889,13 +1889,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>30</height> <height>30</height>
@ -1939,7 +1939,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>
@ -2080,7 +2080,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

@ -54,13 +54,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>20</height> <height>20</height>
@ -158,13 +158,13 @@ You may look for the most recent version at kde-look.org:</string>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>20</height> <height>20</height>

@ -62,7 +62,7 @@ void CrystalButton::setBitmap(ButtonImage *newimage)
tqrepaint(false); tqrepaint(false);
} }
TQSize CrystalButton::tqsizeHint() const TQSize CrystalButton::sizeHint() const
{ {
return TQSize(buttonSizeH(),buttonSizeV()); return TQSize(buttonSizeH(),buttonSizeV());
} }
@ -177,7 +177,7 @@ void CrystalButton::drawButton(TQPainter *painter)
pufferPainter.drawPixmap(TQPoint(0,0),*background,r); pufferPainter.drawPixmap(TQPoint(0,0),*background,r);
}else{ }else{
group = client_->options()->tqcolorGroup(KDecoration::ColorTitleBar, client_->isActive()); group = client_->options()->colorGroup(KDecoration::ColorTitleBar, client_->isActive());
pufferPainter.fillRect(rect(), group.background()); pufferPainter.fillRect(rect(), group.background());
} }

@ -41,7 +41,7 @@ public:
virtual ~CrystalButton(); virtual ~CrystalButton();
void setBitmap(ButtonImage *newimage); void setBitmap(ButtonImage *newimage);
TQSize tqsizeHint() const; TQSize sizeHint() const;
int lastMousePress() const { return lastmouse_; } int lastMousePress() const { return lastmouse_; }
void reset() { tqrepaint(false); } void reset() { tqrepaint(false); }
void setFirstLast(bool vfirst,bool vlast) { first|=vfirst; last|=vlast; } void setFirstLast(bool vfirst,bool vlast) { first|=vfirst; last|=vlast; }

@ -1095,9 +1095,9 @@ void CrystalClient::resize(const TQSize &size)
widget()->resize(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 KDecoration::Position CrystalClient::mousePosition(const TQPoint &point) const
@ -1260,7 +1260,7 @@ void CrystalClient::paintEvent(TQPaintEvent*)
TQPainter painter(widget()); TQPainter painter(widget());
// draw the titlebar // draw the titlebar
group = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()); group = options()->colorGroup(KDecoration::ColorTitleBar, isActive());
WND_CONFIG* wndcfg=(isActive()?&::factory->active:&::factory->inactive); WND_CONFIG* wndcfg=(isActive()?&::factory->active:&::factory->inactive);
if (::factory->transparency && ::factory->trackdesktop) if (::factory->transparency && ::factory->trackdesktop)

@ -161,7 +161,7 @@ public:
virtual void borders(int &l, int &r, int &t, int &b) const; virtual void borders(int &l, int &r, int &t, int &b) const;
virtual void resize(const TQSize &size); virtual void resize(const TQSize &size);
virtual TQSize tqminimumSize() const; virtual TQSize minimumSize() const;
virtual Position mousePosition(const TQPoint &point) const; virtual Position mousePosition(const TQPoint &point) const;
void ClientWindows(Window* frame,Window* wrapper,Window* client); void ClientWindows(Window* frame,Window* wrapper,Window* client);

@ -63,12 +63,12 @@ void QImageHolder::setUserdefinedPictures( TQImage act,TQImage inact)
if (!act.isNull()) if (!act.isNull())
{ {
act=act.smoothScale(w,h); 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; }else img_active=NULL;
if (!inact.isNull()) if (!inact.isNull())
{ {
inact=inact.smoothScale(w,h); 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; }else img_inactive=NULL;
userdefinedActive=(img_active!=NULL); userdefinedActive=(img_active!=NULL);
@ -160,11 +160,11 @@ void QImageHolder::BackgroundUpdated(const TQImage *src)
TQImage tmp=src->copy(); TQImage tmp=src->copy();
if (!userdefinedInactive) 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(); tmp=src->copy();
if (!userdefinedActive) 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(); emit repaintNeeded();

@ -59,7 +59,7 @@ void KMyRootPixmap::init()
connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
// connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(tqrepaint())); // connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(tqrepaint()));
// d->toplevel = m_pWidget->tqtopLevelWidget(); // d->toplevel = m_pWidget->topLevelWidget();
// d->toplevel->installEventFilter(this); // d->toplevel->installEventFilter(this);
} }

@ -64,7 +64,7 @@ private:
nVIDIAEmbedder::nVIDIAEmbedder() nVIDIAEmbedder::nVIDIAEmbedder()
{ {
TQDateTime date( TQDateTime::tqcurrentDateTime() ); TQDateTime date( TQDateTime::currentDateTime() );
TQString datestring( date.toString() ); TQString datestring( date.toString() );
// file = new TQFile( "tiles.h" ); // file = new TQFile( "tiles.h" );

Loading…
Cancel
Save