summaryrefslogtreecommitdiffstats
path: root/kicker/libkicker
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:29:23 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:29:23 -0600
commit628043be55ddd2f534411d028e4f68c8fe4eaabb (patch)
tree29459652112ab6d5dfbf27ac0bbf5b86b7c83bca /kicker/libkicker
parent2c01fd64ddde84a6d78b632f7f3b7c3560dc288c (diff)
downloadtdebase-628043be55ddd2f534411d028e4f68c8fe4eaabb.tar.gz
tdebase-628043be55ddd2f534411d028e4f68c8fe4eaabb.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kicker/libkicker')
-rw-r--r--kicker/libkicker/global.cpp10
-rw-r--r--kicker/libkicker/kickertip.cpp8
-rw-r--r--kicker/libkicker/menuinfo.cpp2
-rw-r--r--kicker/libkicker/panelbutton.cpp22
-rw-r--r--kicker/libkicker/paneldrag.cpp10
-rw-r--r--kicker/libkicker/paneldrag.h4
-rw-r--r--kicker/libkicker/panner.cpp8
-rw-r--r--kicker/libkicker/panner.h2
-rw-r--r--kicker/libkicker/simplebutton.cpp14
-rw-r--r--kicker/libkicker/simplebutton.h6
10 files changed, 43 insertions, 43 deletions
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 3265c428c..6f6f3a7fb 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -161,7 +161,7 @@ int maxButtonDim()
int maxDim;
//return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge;
- KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" ));
+ KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
kickerconfig->setGroup("General");
maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);;
delete kickerconfig;
@@ -236,13 +236,13 @@ TQPoint popupPosition(KPanelApplet::Direction d,
{
case KPanelApplet::Left:
case KPanelApplet::Right:
- r.setLeft( source->tqtopLevelWidget()->x() );
- r.setWidth( source->tqtopLevelWidget()->width() );
+ r.setLeft( source->topLevelWidget()->x() );
+ r.setWidth( source->topLevelWidget()->width() );
break;
case KPanelApplet::Up:
case KPanelApplet::Down:
- r.setTop( source->tqtopLevelWidget()->y() );
- r.setHeight( source->tqtopLevelWidget()->height() );
+ r.setTop( source->topLevelWidget()->y() );
+ r.setHeight( source->topLevelWidget()->height() );
break;
}
}
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index e1975a693..97df6918d 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -392,8 +392,8 @@ void KickerTip::displayInternal()
// draw background
TQPainter bufferPainter(&m_pixmap);
- bufferPainter.setPen(tqcolorGroup().foreground());
- bufferPainter.setBrush(tqcolorGroup().background());
+ bufferPainter.setPen(colorGroup().foreground());
+ bufferPainter.setBrush(colorGroup().background());
//bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height);
drawRoundRect(bufferPainter, TQRect(0, 0, width, height));
@@ -409,13 +409,13 @@ void KickerTip::displayInternal()
if (KickerSettings::mouseOversShowText())
{
// draw text shadow
- TQColorGroup cg = tqcolorGroup();
+ TQColorGroup cg = colorGroup();
cg.setColor(TQColorGroup::Text, cg.background().dark(115));
int shadowOffset = TQApplication::reverseLayout() ? -1 : 1;
m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg);
// draw text
- cg = tqcolorGroup();
+ cg = colorGroup();
m_richText->draw(&bufferPainter, textX, textY, rect(), cg);
}
}
diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp
index 8d2e6acdb..5c3e960cd 100644
--- a/kicker/libkicker/menuinfo.cpp
+++ b/kicker/libkicker/menuinfo.cpp
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
MenuInfo::MenuInfo(const TQString& desktopFile)
{
- KSimpleConfig df(locate("data", TQString::tqfromLatin1("kicker/menuext/%1").arg(desktopFile)));
+ KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile)));
df.setGroup("Desktop Entry");
TQStringList list = df.readListEntry("X-KDE-AuthorizeAction");
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 4d60068a8..6d628a7e9 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -539,7 +539,7 @@ void PanelButton::drawButton(TQPainter *p)
if (m_tileColor.isValid())
{
p->fillRect(rect(), m_tileColor);
- tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup());
+ tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
}
else if (paletteBackgroundPixmap())
{
@@ -559,7 +559,7 @@ void PanelButton::drawButton(TQPainter *p)
else if (isDown() || isOn())
{
// Draw tqshapes to indicate the down state.
- tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup(), TQStyle::Style_Sunken);
+ tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
}
drawButtonLabel(p);
@@ -569,8 +569,8 @@ void PanelButton::drawButton(TQPainter *p)
int x1, y1, x2, y2;
TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(),
- TQStyle::Style_Default, tqcolorGroup().button());
+ tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
+ TQStyle::Style_Default, colorGroup().button());
}
}
@@ -581,7 +581,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
if (m_tileColor.isValid())
{
p->fillRect(rect(), m_tileColor);
- tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup());
+ tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
}
else if (paletteBackgroundPixmap())
{
@@ -595,10 +595,10 @@ void PanelButton::drawDeepButton(TQPainter *p)
TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2);
if (isDown() || isOn()) {
- tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, tqcolorGroup(), TQStyle::Style_Down);
+ tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down);
}
else {
- tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, tqcolorGroup(), TQStyle::Style_Raised);
+ tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
}
drawButtonLabel(p,0,FALSE);
@@ -608,8 +608,8 @@ void PanelButton::drawDeepButton(TQPainter *p)
int x1, y1, x2, y2;
TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(),
- TQStyle::Style_Default, tqcolorGroup().button());
+ tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
+ TQStyle::Style_Default, colorGroup().button());
}
}
@@ -718,7 +718,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
if (m_drawArrow && (m_highlight || active) && drawArrow)
{
TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp;
- int arrowSize = tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator);
+ int arrowSize = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator);
TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize);
switch (m_arrowDirection)
@@ -762,7 +762,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
{
flags |= TQStyle::Style_Down;
}
- tqstyle().tqdrawPrimitive(e, p, r, tqcolorGroup(), flags);
+ tqstyle().tqdrawPrimitive(e, p, r, colorGroup(), flags);
}
}
diff --git a/kicker/libkicker/paneldrag.cpp b/kicker/libkicker/paneldrag.cpp
index 28721d3f7..1fb6b9ce6 100644
--- a/kicker/libkicker/paneldrag.cpp
+++ b/kicker/libkicker/paneldrag.cpp
@@ -46,7 +46,7 @@ PanelDrag::~PanelDrag()
bool PanelDrag::decode(const TQMimeSource* e, BaseContainer** container)
{
- TQByteArray a = e->tqencodedData("application/basecontainerptr");
+ TQByteArray a = e->encodedData("application/basecontainerptr");
if (a.size() != PANELDRAG_BUFSIZE)
{
@@ -73,7 +73,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e)
return false;
}
- TQByteArray a = e->tqencodedData("application/basecontainerptr");
+ TQByteArray a = e->encodedData("application/basecontainerptr");
if (a.size() != PANELDRAG_BUFSIZE)
{
return false;
@@ -91,7 +91,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e)
return true;
}
-TQByteArray PanelDrag::tqencodedData(const char * mimeType) const
+TQByteArray PanelDrag::encodedData(const char * mimeType) const
{
if (TQString("application/basecontainerptr") == mimeType &&
a.size() == PANELDRAG_BUFSIZE)
@@ -136,7 +136,7 @@ const char * AppletInfoDrag::format(int i) const
return 0;
}
-TQByteArray AppletInfoDrag::tqencodedData(const char* mimeType) const
+TQByteArray AppletInfoDrag::encodedData(const char* mimeType) const
{
if (TQString("application/appletinfo") == mimeType)
{
@@ -158,7 +158,7 @@ bool AppletInfoDrag::canDecode(const TQMimeSource * e)
bool AppletInfoDrag::decode(const TQMimeSource* e, AppletInfo& container)
{
- TQByteArray a = e->tqencodedData("application/appletinfo");
+ TQByteArray a = e->encodedData("application/appletinfo");
if (a.isEmpty())
{
diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h
index 7388f4dbc..6684c32c6 100644
--- a/kicker/libkicker/paneldrag.h
+++ b/kicker/libkicker/paneldrag.h
@@ -39,7 +39,7 @@ class KDE_EXPORT PanelDrag : public TQDragObject
~PanelDrag();
virtual const char * format(int i = 0) const;
- virtual TQByteArray tqencodedData(const char *) const;
+ virtual TQByteArray encodedData(const char *) const;
static bool canDecode(const TQMimeSource * e);
static bool decode(const TQMimeSource* e, BaseContainer** container);
@@ -55,7 +55,7 @@ class KDE_EXPORT AppletInfoDrag : public TQDragObject
~AppletInfoDrag();
virtual const char * format(int i = 0) const;
- virtual TQByteArray tqencodedData(const char *) const;
+ virtual TQByteArray encodedData(const char *) const;
static bool canDecode(const TQMimeSource * e);
static bool decode(const TQMimeSource* e, AppletInfo& container);
diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp
index 1dc592bbd..ddb990d8d 100644
--- a/kicker/libkicker/panner.cpp
+++ b/kicker/libkicker/panner.cpp
@@ -103,8 +103,8 @@ void Panner::setupButtons()
{
_luSB->setArrowType(Qt::LeftArrow);
_rdSB->setArrowType(Qt::RightArrow);
- _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
- _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+ _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+ _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
TQToolTip::add(_luSB, i18n("Scroll left"));
TQToolTip::add(_rdSB, i18n("Scroll right"));
setMinimumSize(24, 0);
@@ -117,8 +117,8 @@ void Panner::setupButtons()
{
_luSB->setArrowType(Qt::UpArrow);
_rdSB->setArrowType(Qt::DownArrow);
- _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
- _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+ _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+ _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
TQToolTip::add(_luSB, i18n("Scroll up"));
TQToolTip::add(_rdSB, i18n("Scroll down"));
setMinimumSize(0, 24);
diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h
index 2f09d76f1..7ae68d096 100644
--- a/kicker/libkicker/panner.h
+++ b/kicker/libkicker/panner.h
@@ -39,7 +39,7 @@ public:
Panner( TQWidget* parent, const char* name = 0 );
~Panner();
- TQSize tqminimumSizeHint() const { return TQWidget::tqminimumSizeHint(); }
+ TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); }
Qt::Orientation orientation() const { return _orient; }
virtual void setOrientation(Qt::Orientation orientation);
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 4aa0b9ff3..bc85c4521 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -71,22 +71,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation)
update();
}
-TQSize SimpleButton::tqsizeHint() const
+TQSize SimpleButton::sizeHint() const
{
const TQPixmap* pm = pixmap();
if (!pm)
- return TQButton::tqsizeHint();
+ return TQButton::sizeHint();
else
return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN);
}
-TQSize SimpleButton::tqminimumSizeHint() const
+TQSize SimpleButton::minimumSizeHint() const
{
const TQPixmap* pm = pixmap();
if (!pm)
- return TQButton::tqminimumSizeHint();
+ return TQButton::minimumSizeHint();
else
return TQSize(pm->width(), pm->height());
}
@@ -99,7 +99,7 @@ void SimpleButton::drawButton( TQPainter *p )
if (m_highlight || isDown() || isOn()) {
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
if (isDown() || isOn()) flags |= TQStyle::Style_Down;
- tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, tqcolorGroup(), flags);
+ tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags);
}
}
@@ -229,7 +229,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, cons
_inside = false;
}
-TQSize SimpleArrowButton::tqsizeHint() const
+TQSize SimpleArrowButton::sizeHint() const
{
return TQSize( 12, 12 );
}
@@ -263,7 +263,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
if (isDown() || isOn()) flags |= TQStyle::Style_Down;
- tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags);
+ tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
if (m_forceStandardCursor) {
SimpleButton::drawButton(p);
diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h
index 8e4c13896..bbfcbd79d 100644
--- a/kicker/libkicker/simplebutton.h
+++ b/kicker/libkicker/simplebutton.h
@@ -34,8 +34,8 @@ class KDE_EXPORT SimpleButton : public TQButton
SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE);
void setPixmap(const TQPixmap &pix);
void setOrientation(Qt::Orientation orientaton);
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
protected:
void drawButton( TQPainter *p );
@@ -68,7 +68,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
public:
SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE);
virtual ~SimpleArrowButton() {};
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
protected:
virtual void enterEvent( TQEvent *e );