summaryrefslogtreecommitdiffstats
path: root/kicker/libkicker
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/libkicker')
-rw-r--r--kicker/libkicker/global.cpp14
-rw-r--r--kicker/libkicker/kickerSettings.kcfg2
-rw-r--r--kicker/libkicker/kickertip.cpp10
-rw-r--r--kicker/libkicker/menuinfo.cpp2
-rw-r--r--kicker/libkicker/panelbutton.cpp30
-rw-r--r--kicker/libkicker/paneldrag.cpp10
-rw-r--r--kicker/libkicker/paneldrag.h4
-rw-r--r--kicker/libkicker/panner.cpp10
-rw-r--r--kicker/libkicker/panner.h2
-rw-r--r--kicker/libkicker/simplebutton.cpp18
-rw-r--r--kicker/libkicker/simplebutton.h6
11 files changed, 54 insertions, 54 deletions
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index d4735c2ba..3265c428c 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::fromLatin1( "kickerrc" ));
+ KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::tqfromLatin1( "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->topLevelWidget()->x() );
- r.setWidth( source->topLevelWidget()->width() );
+ r.setLeft( source->tqtopLevelWidget()->x() );
+ r.setWidth( source->tqtopLevelWidget()->width() );
break;
case KPanelApplet::Up:
case KPanelApplet::Down:
- r.setTop( source->topLevelWidget()->y() );
- r.setHeight( source->topLevelWidget()->height() );
+ r.setTop( source->tqtopLevelWidget()->y() );
+ r.setHeight( source->tqtopLevelWidget()->height() );
break;
}
}
@@ -328,7 +328,7 @@ void colorize(TQImage& image)
{
KConfig *config = KGlobal::config();
config->setGroup("WM");
- TQColor color = TQApplication::palette().active().highlight();
+ TQColor color = TQApplication::tqpalette().active().highlight();
TQColor activeTitle = config->readColorEntry("activeBackground", &color);
TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color);
@@ -336,7 +336,7 @@ void colorize(TQImage& image)
int h1, s1, v1, h2, s2, v2, h3, s3, v3;
activeTitle.hsv(&h1, &s1, &v1);
inactiveTitle.hsv(&h2, &s2, &v2);
- TQApplication::palette().active().background().hsv(&h3, &s3, &v3);
+ TQApplication::tqpalette().active().background().hsv(&h3, &s3, &v3);
if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) &&
((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1))
diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg
index 7e1e26651..635d9c646 100644
--- a/kicker/libkicker/kickerSettings.kcfg
+++ b/kicker/libkicker/kickerSettings.kcfg
@@ -81,7 +81,7 @@
<entry name="TintColor" type="Color" >
<label>The tint color used to colorize transparent panels</label>
- <default code="true">(TQApplication::palette().active().mid())</default>
+ <default code="true">(TQApplication::tqpalette().active().mid())</default>
<whatsthis>This option sets the color to use when tinting transparent panels</whatsthis>
</entry>
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 490f5bbfe..e1975a693 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(colorGroup().foreground());
- bufferPainter.setBrush(colorGroup().background());
+ bufferPainter.setPen(tqcolorGroup().foreground());
+ bufferPainter.setBrush(tqcolorGroup().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 = colorGroup();
+ TQColorGroup cg = tqcolorGroup();
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 = colorGroup();
+ cg = tqcolorGroup();
m_richText->draw(&bufferPainter, textX, textY, rect(), cg);
}
}
@@ -458,7 +458,7 @@ void KickerTip::tipperDestroyed(TQObject* o)
void KickerTip::internalUpdate()
{
m_dirty = true;
- repaint(false);
+ tqrepaint(false);
}
void KickerTip::enableTipping(bool tip)
diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp
index 5c3e960cd..8d2e6acdb 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::fromLatin1("kicker/menuext/%1").arg(desktopFile)));
+ KSimpleConfig df(locate("data", TQString::tqfromLatin1("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 1502e4943..4d60068a8 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqpainter.h>
#include <tqpopupmenu.h>
#include <tqstyle.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
#include <tqtooltip.h>
#include <tqpixmap.h>
@@ -438,7 +438,7 @@ void PanelButton::enterEvent(TQEvent* e)
if (!m_highlight && m_disableHighlighting == FALSE)
{
m_highlight = true;
- repaint(false);
+ tqrepaint(false);
}
TQButton::enterEvent(e);
@@ -449,7 +449,7 @@ void PanelButton::leaveEvent(TQEvent* e)
if (m_highlight)
{
m_highlight = false;
- repaint(false);
+ tqrepaint(false);
}
TQButton::leaveEvent(e);
@@ -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(), colorGroup());
+ tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup());
}
else if (paletteBackgroundPixmap())
{
@@ -558,8 +558,8 @@ void PanelButton::drawButton(TQPainter *p)
}
else if (isDown() || isOn())
{
- // Draw shapes to indicate the down state.
- tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
+ // Draw tqshapes to indicate the down state.
+ tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup(), 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, colorGroup(),
- TQStyle::Style_Default, colorGroup().button());
+ tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(),
+ TQStyle::Style_Default, tqcolorGroup().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(), colorGroup());
+ tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup());
}
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, colorGroup(), TQStyle::Style_Down);
+ tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, tqcolorGroup(), TQStyle::Style_Down);
}
else {
- tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
+ tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, tqcolorGroup(), 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, colorGroup(),
- TQStyle::Style_Default, colorGroup().button());
+ tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(),
+ TQStyle::Style_Default, tqcolorGroup().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().pixelMetric(TQStyle::PM_MenuButtonIndicator);
+ int arrowSize = tqstyle().tqpixelMetric(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, colorGroup(), flags);
+ tqstyle().tqdrawPrimitive(e, p, r, tqcolorGroup(), flags);
}
}
diff --git a/kicker/libkicker/paneldrag.cpp b/kicker/libkicker/paneldrag.cpp
index 1fb6b9ce6..28721d3f7 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->encodedData("application/basecontainerptr");
+ TQByteArray a = e->tqencodedData("application/basecontainerptr");
if (a.size() != PANELDRAG_BUFSIZE)
{
@@ -73,7 +73,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e)
return false;
}
- TQByteArray a = e->encodedData("application/basecontainerptr");
+ TQByteArray a = e->tqencodedData("application/basecontainerptr");
if (a.size() != PANELDRAG_BUFSIZE)
{
return false;
@@ -91,7 +91,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e)
return true;
}
-TQByteArray PanelDrag::encodedData(const char * mimeType) const
+TQByteArray PanelDrag::tqencodedData(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::encodedData(const char* mimeType) const
+TQByteArray AppletInfoDrag::tqencodedData(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->encodedData("application/appletinfo");
+ TQByteArray a = e->tqencodedData("application/appletinfo");
if (a.isEmpty())
{
diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h
index 6684c32c6..7388f4dbc 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 encodedData(const char *) const;
+ virtual TQByteArray tqencodedData(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 encodedData(const char *) const;
+ virtual TQByteArray tqencodedData(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 317fb6351..1dc592bbd 100644
--- a/kicker/libkicker/panner.cpp
+++ b/kicker/libkicker/panner.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqtimer.h>
#include <tqpainter.h>
@@ -103,8 +103,8 @@ void Panner::setupButtons()
{
_luSB->setArrowType(Qt::LeftArrow);
_rdSB->setArrowType(Qt::RightArrow);
- _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
- _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+ _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+ _rdSB->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
- _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+ _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+ _rdSB->tqsetSizePolicy(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 7ae68d096..2f09d76f1 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 minimumSizeHint() const { return TQWidget::minimumSizeHint(); }
+ TQSize tqminimumSizeHint() const { return TQWidget::tqminimumSizeHint(); }
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 f809c2127..4aa0b9ff3 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -71,22 +71,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation)
update();
}
-TQSize SimpleButton::sizeHint() const
+TQSize SimpleButton::tqsizeHint() const
{
const TQPixmap* pm = pixmap();
if (!pm)
- return TQButton::sizeHint();
+ return TQButton::tqsizeHint();
else
return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN);
}
-TQSize SimpleButton::minimumSizeHint() const
+TQSize SimpleButton::tqminimumSizeHint() const
{
const TQPixmap* pm = pixmap();
if (!pm)
- return TQButton::minimumSizeHint();
+ return TQButton::tqminimumSizeHint();
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, colorGroup(), flags);
+ tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, tqcolorGroup(), flags);
}
}
@@ -202,7 +202,7 @@ void SimpleButton::enterEvent( TQEvent *e )
if (KickerSettings::showMouseOverEffects())
m_highlight = true;
- repaint( false );
+ tqrepaint( false );
TQButton::enterEvent( e );
}
@@ -210,7 +210,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
{
m_highlight = false;
- repaint( false );
+ tqrepaint( false );
TQButton::enterEvent( e );
}
@@ -229,7 +229,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, cons
_inside = false;
}
-TQSize SimpleArrowButton::sizeHint() const
+TQSize SimpleArrowButton::tqsizeHint() 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, colorGroup(), flags);
+ tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags);
if (m_forceStandardCursor) {
SimpleButton::drawButton(p);
diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h
index bbfcbd79d..8e4c13896 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 sizeHint() const;
- TQSize minimumSizeHint() const;
+ TQSize tqsizeHint() const;
+ TQSize tqminimumSizeHint() 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 sizeHint() const;
+ TQSize tqsizeHint() const;
protected:
virtual void enterEvent( TQEvent *e );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-12 18:41:01 +0000