From a2277b6bc715464e83882b90c2a058139b8a6b54 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 23 Jun 2011 01:42:07 +0000 Subject: TQt4 port kdeutils This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1238125 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- superkaramba/doc/faq/faq.dat | 2 +- superkaramba/doc/faq/faq.html | 4 +- superkaramba/doc/faq/faq.txt | 4 +- superkaramba/doc/python_api/make_api_doc.sh | 2 +- superkaramba/examples/api.html | 6 +- .../examples/globalMouse/extension/xcursor.c | 4 +- superkaramba/examples/globalMouse/eyes.py | 2 +- superkaramba/examples/globalMouse/eyes.theme | 2 +- superkaramba/examples/richtext/richtext.py | 4 +- superkaramba/examples/taskBar/cleanbar/cleanbar.py | 4 +- superkaramba/examples/test_all.sh | 2 +- superkaramba/examples/unicode/unicode.py | 6 +- superkaramba/src/bar.h | 1 + superkaramba/src/clickarea.cpp | 4 +- superkaramba/src/clickarea.h | 1 + superkaramba/src/clickmap.cpp | 6 +- superkaramba/src/clickmap.h | 1 + superkaramba/src/config_python.cpp | 2 +- superkaramba/src/cpusensor.cpp | 12 +-- superkaramba/src/cpusensor.h | 1 + superkaramba/src/datesensor.cpp | 16 ++-- superkaramba/src/datesensor.h | 3 +- superkaramba/src/disksensor.cpp | 28 +++---- superkaramba/src/disksensor.h | 1 + superkaramba/src/graph.h | 1 + superkaramba/src/imagelabel.cpp | 16 ++-- superkaramba/src/imagelabel.h | 4 +- superkaramba/src/imagelabel_python.cpp | 2 +- superkaramba/src/input.cpp | 8 +- superkaramba/src/input.h | 1 + superkaramba/src/input_python.cpp | 4 +- superkaramba/src/karamba.cpp | 88 +++++++++++----------- superkaramba/src/karamba.h | 17 +++-- superkaramba/src/karamba_python.cpp | 10 +-- superkaramba/src/karambaapp.cpp | 14 ++-- superkaramba/src/karambaapp.h | 7 +- superkaramba/src/karambainterface.cpp | 4 +- superkaramba/src/karambalistboxitem.h | 2 +- superkaramba/src/karambasessionmanaged.cpp | 6 +- superkaramba/src/karambasessionmanaged.h | 4 +- superkaramba/src/kwidgetlistbox.cpp | 6 +- superkaramba/src/kwidgetlistbox.h | 5 +- superkaramba/src/lineparser.h | 2 +- superkaramba/src/main.cpp | 6 +- superkaramba/src/memsensor.cpp | 16 ++-- superkaramba/src/memsensor.h | 1 + superkaramba/src/menu_python.cpp | 6 +- superkaramba/src/meter.cpp | 2 +- superkaramba/src/meter.h | 5 +- superkaramba/src/meter_python.cpp | 12 +-- superkaramba/src/meter_python.h | 2 +- superkaramba/src/misc_python.cpp | 8 +- superkaramba/src/misc_python.h | 2 +- superkaramba/src/networksensor.cpp | 14 ++-- superkaramba/src/networksensor.h | 1 + superkaramba/src/noatunsensor.cpp | 16 ++-- superkaramba/src/programsensor.h | 1 + superkaramba/src/richtextlabel.cpp | 8 +- superkaramba/src/richtextlabel.h | 1 + superkaramba/src/rsssensor.cpp | 4 +- superkaramba/src/rsssensor.h | 3 +- superkaramba/src/sensor.h | 3 +- superkaramba/src/sensorparams.h | 2 +- superkaramba/src/sensorsensor.cpp | 4 +- superkaramba/src/sensorsensor.h | 1 + superkaramba/src/showdesktop.h | 3 +- superkaramba/src/sklineedit.cpp | 10 +-- superkaramba/src/sklineedit.h | 2 +- superkaramba/src/systemtray.cpp | 16 ++-- superkaramba/src/systemtray.h | 7 +- superkaramba/src/systray_python.cpp | 4 +- superkaramba/src/taskbartest.cpp | 2 +- superkaramba/src/taskmanager.cpp | 34 ++++----- superkaramba/src/taskmanager.h | 65 ++++++++-------- superkaramba/src/textfield.cpp | 24 +++--- superkaramba/src/textfield.h | 6 +- superkaramba/src/textfilesensor.h | 3 +- superkaramba/src/textlabel.cpp | 26 +++---- superkaramba/src/textlabel.h | 5 +- superkaramba/src/textlabel_python.cpp | 2 +- superkaramba/src/themefile.cpp | 8 +- superkaramba/src/themelocale.cpp | 8 +- superkaramba/src/themes_layout.ui | 34 ++++----- superkaramba/src/themesdlg.cpp | 32 ++++---- superkaramba/src/themesdlg.h | 5 +- superkaramba/src/themewidget.cpp | 16 ++-- superkaramba/src/themewidget.h | 3 +- superkaramba/src/themewidget_layout.ui | 34 ++++----- superkaramba/src/uptimesensor.cpp | 14 ++-- superkaramba/src/widget_python.cpp | 10 +-- superkaramba/src/widget_python.h | 6 +- superkaramba/src/xmmssensor.cpp | 14 ++-- superkaramba/src/xmmssensor.h | 3 +- 93 files changed, 431 insertions(+), 402 deletions(-) (limited to 'superkaramba') diff --git a/superkaramba/doc/faq/faq.dat b/superkaramba/doc/faq/faq.dat index c54194d..20ee7e7 100644 --- a/superkaramba/doc/faq/faq.dat +++ b/superkaramba/doc/faq/faq.dat @@ -7,7 +7,7 @@ You will need to install the python-devel package. Once that package is installed you can ./configure and make again. Installation -When I try to compile, I get this error: "cannot find -lselinux" +When I try to compile, I get this error: "cannot tqfind -lselinux" You will need to install the libselinux-devel package. Once that package is installed you can ./configure and make again. Installation diff --git a/superkaramba/doc/faq/faq.html b/superkaramba/doc/faq/faq.html index 1e68240..5a2d830 100644 --- a/superkaramba/doc/faq/faq.html +++ b/superkaramba/doc/faq/faq.html @@ -17,7 +17,7 @@ SuperKaramba Frequently Asked Questions
2. General
@@ -46,7 +46,7 @@ SuperKaramba Frequently Asked Questions
The SuperKaramba web site (http://netdragon.sourceforge.net) has a list of user-submitted RPMs for several distributions. Other user-submitted RPMs have been posted to kde-look.org and to the SuperKaramba Help forum.

1.2. When I try to compile, I get this error: "Python.h: No such file or directory"
You will need to install the python-devel package. Once that package is installed you can ./configure and make again.

-
1.3. When I try to compile, I get this error: "cannot find -lselinux"
+
1.3. When I try to compile, I get this error: "cannot tqfind -lselinux"
You will need to install the libselinux-devel package. Once that package is installed you can ./configure and make again.

1.4. After running ./configure,make, and make install, the superkaramba executable is not where I expected it to be. When I try to run superkaramba from the command line it says "command not found".
In some distributions ./configure points to different path than you might expect. For example, in Mandrake the default ./configure prefix is /usr/local/kde and the executable is installed in /usr/local/kde/bin. There are a few things you can do to fix this. You could run ./configure --prefix=/usr to specify the prefix that you prefer and then try make and make install again. Or you could create a symbolic link in your preferred directory that links to the executable. Or you could add the install directory to your $PATH.

diff --git a/superkaramba/doc/faq/faq.txt b/superkaramba/doc/faq/faq.txt index 9de445e..490696b 100644 --- a/superkaramba/doc/faq/faq.txt +++ b/superkaramba/doc/faq/faq.txt @@ -13,7 +13,7 @@ Table of Contents 1.1. Where can I find SuperKaramba RPMs? 1.2. When I try to compile, I get this error: "Python.h: No such file or directory" -1.3. When I try to compile, I get this error: "cannot find -lselinux" +1.3. When I try to compile, I get this error: "cannot tqfind -lselinux" 1.4. After running ./configure,make, and make install, the superkaramba executable is not where I expected it to be. When I try to run superkaramba from the command line it says "command not found". @@ -51,7 +51,7 @@ The SuperKaramba web site (http://netdragon.sourceforge.net) has a list of user- You will need to install the python-devel package. Once that package is installed you can ./configure and make again. -1.3. When I try to compile, I get this error: "cannot find -lselinux" +1.3. When I try to compile, I get this error: "cannot tqfind -lselinux" You will need to install the libselinux-devel package. Once that package is installed you can ./configure and make again. diff --git a/superkaramba/doc/python_api/make_api_doc.sh b/superkaramba/doc/python_api/make_api_doc.sh index 866c534..719d05e 100755 --- a/superkaramba/doc/python_api/make_api_doc.sh +++ b/superkaramba/doc/python_api/make_api_doc.sh @@ -25,7 +25,7 @@ function replaceComments() } -FOO=`find $SRCDIR -type f -name "*_python.h"` +FOO=`tqfind $SRCDIR -type f -name "*_python.h"` for FILE in $FOO do diff --git a/superkaramba/examples/api.html b/superkaramba/examples/api.html index 132544a..14c2263 100644 --- a/superkaramba/examples/api.html +++ b/superkaramba/examples/api.html @@ -165,7 +165,7 @@ Widget/createWidgetMask

[top]

SYNOPSIS

-

long createWidgetMask(widget, mask) +

long createWidgetMask(widget, tqmask)

DESCRIPTION

This function doesn't work currently due to a bug in KDE. Please use @@ -174,7 +174,7 @@ Widget/createWidgetMask

ARGUMENTS

  • long widget -- karamba
    • -
  • string mask -- The name of the widget mask file. +
  • string tqmask -- The name of the widget tqmask file.

@@ -2096,7 +2096,7 @@ Misc/translateAll

DESCRIPTION

Moves all widgets within a theme in a particular direction relative from - the previous spot without moving the parent theme widget. + the previous spot without moving the tqparent theme widget.

ARGUMENTS

  • long widget -- karamba diff --git a/superkaramba/examples/globalMouse/extension/xcursor.c b/superkaramba/examples/globalMouse/extension/xcursor.c index 8dad240..3de7ae3 100644 --- a/superkaramba/examples/globalMouse/extension/xcursor.c +++ b/superkaramba/examples/globalMouse/extension/xcursor.c @@ -47,7 +47,7 @@ static PyObject* xcursor_position(self, args) char* display_name; int root_x_return, root_y_return; int win_x_return, win_y_return; - unsigned int mask_return; + unsigned int tqmask_return; if (! (display_name = getenv("DISPLAY")) ) { @@ -83,7 +83,7 @@ static PyObject* xcursor_position(self, args) XQueryPointer(display, root, &root_return, &child_return, &root_x_return, &root_y_return, &win_x_return, &win_y_return, - &mask_return); + &tqmask_return); /* return Python Object */ return Py_BuildValue("(i,i)", root_x_return, root_y_return); diff --git a/superkaramba/examples/globalMouse/eyes.py b/superkaramba/examples/globalMouse/eyes.py index b95f86d..64bc3e0 100644 --- a/superkaramba/examples/globalMouse/eyes.py +++ b/superkaramba/examples/globalMouse/eyes.py @@ -108,7 +108,7 @@ def widgetUpdated(widget): #f.close() - #karamba.createWidgetMask(widget, theme_path + "pics/mask.png") + #karamba.createWidgetMask(widget, theme_path + "pics/tqmask.png") linkePupille = karamba.createImage(widget, 15, 30, theme_path + "pics/pupille.png") rechtePupille = karamba.createImage(widget, 100, 30, theme_path + "pics/pupille.png") diff --git a/superkaramba/examples/globalMouse/eyes.theme b/superkaramba/examples/globalMouse/eyes.theme index 4f2417b..ffdff73 100644 --- a/superkaramba/examples/globalMouse/eyes.theme +++ b/superkaramba/examples/globalMouse/eyes.theme @@ -1,3 +1,3 @@ -KARAMBA X=5 Y=850 W=167 H=111 MASK="pics/mask.png" LOCKED=false INTERVAL=100 +KARAMBA X=5 Y=850 W=167 H=111 MASK="pics/tqmask.png" LOCKED=false INTERVAL=100 IMAGE X=0 Y=0 PATH="pics/eyes.png" diff --git a/superkaramba/examples/richtext/richtext.py b/superkaramba/examples/richtext/richtext.py index 518aa65..11fe9d7 100644 --- a/superkaramba/examples/richtext/richtext.py +++ b/superkaramba/examples/richtext/richtext.py @@ -1,6 +1,6 @@ #Unicode Example -#For Symbol Tables look at www.unicode.org/charts/ +#For Symbol Tables look at www.tqunicode.org/charts/ hidden = 0 @@ -35,7 +35,7 @@ is used to encode the formatting commands.

  • Hyperlinks: Superkaramba Homepage
  • Links can also trigger actions in the script
  • Various different caracter styles
    • -
  • Unicode: \u03B6 \u03B3 \u03BB \u03A3 \u03A9
    • +
  • Unicode: \u03B6 \u03B3 \u03BB \u03A3 \u03A9
  • Simple Tables: diff --git a/superkaramba/examples/taskBar/cleanbar/cleanbar.py b/superkaramba/examples/taskBar/cleanbar/cleanbar.py index c0da2a2..40478c0 100644 --- a/superkaramba/examples/taskBar/cleanbar/cleanbar.py +++ b/superkaramba/examples/taskBar/cleanbar/cleanbar.py @@ -43,9 +43,9 @@ i = 0 for x in output: param = x.split() if (len(param) > 1): - if param[0].find("Width:") != -1: + if param[0].tqfind("Width:") != -1: resX = int(param[1]) - if param[0].find("Height:") != -1: + if param[0].tqfind("Height:") != -1: resY = int(param[1]) diff --git a/superkaramba/examples/test_all.sh b/superkaramba/examples/test_all.sh index 5e95063..cdf192d 100755 --- a/superkaramba/examples/test_all.sh +++ b/superkaramba/examples/test_all.sh @@ -10,7 +10,7 @@ themes=( "richtext/richtext.theme" "richtext/rtext.theme" "globalMouse/eyes.theme" - "unicode/unicode.theme" + "tqunicode/tqunicode.theme" "mouseDrag/karmix/karmix.theme" "input_api/input_api.theme" "input_example/input_example.theme" diff --git a/superkaramba/examples/unicode/unicode.py b/superkaramba/examples/unicode/unicode.py index 13d1136..1a15f83 100644 --- a/superkaramba/examples/unicode/unicode.py +++ b/superkaramba/examples/unicode/unicode.py @@ -1,6 +1,6 @@ #Unicode Example -#For Symbol Tables look at www.unicode.org/charts/ +#For Symbol Tables look at www.tqunicode.org/charts/ #this import statement allows access to the karamba functions @@ -31,8 +31,8 @@ def initWidget(widget): \u0631\u0632\u0633\u0634\u0635\u0636\u0637\u0638\u0639\u063A\u0641\u0642\u0643\u0644\u0645\u0646 \u0647\u0648\u064A

    -For a complete reference on unicode caracter codes look at: -

    www.unicode.org/charts/
    +For a complete reference on tqunicode caracter codes look at: +
    www.tqunicode.org/charts/

    """ karamba.resizeWidget(widget, 400, 400) diff --git a/superkaramba/src/bar.h b/superkaramba/src/bar.h index eb4b831..78f9ff3 100644 --- a/superkaramba/src/bar.h +++ b/superkaramba/src/bar.h @@ -18,6 +18,7 @@ class Bar : public Meter { Q_OBJECT + TQ_OBJECT public: Bar(karamba* k,int ix,int iy,int iw,int ih ); ~Bar(); diff --git a/superkaramba/src/clickarea.cpp b/superkaramba/src/clickarea.cpp index c2ca63e..986ae4b 100644 --- a/superkaramba/src/clickarea.cpp +++ b/superkaramba/src/clickarea.cpp @@ -27,7 +27,7 @@ ClickArea::~ClickArea() bool ClickArea::click( TQMouseEvent *e ) { - if( rect.contains( e->x(), e->y() ) ) + if( rect.tqcontains( e->x(), e->y() ) ) { //qDebug(TQString::number(e->type())); //KShellProcess ksp; @@ -44,7 +44,7 @@ bool ClickArea::click( TQMouseEvent *e ) { TQString program; program = onClick; - program.replace( TQRegExp("%v", false), value ); + program.tqreplace( TQRegExp("%v", false), value ); if( !program.isEmpty() ) { diff --git a/superkaramba/src/clickarea.h b/superkaramba/src/clickarea.h index 6719794..3df44b8 100644 --- a/superkaramba/src/clickarea.h +++ b/superkaramba/src/clickarea.h @@ -40,6 +40,7 @@ class ClickArea : public Meter { Q_OBJECT + TQ_OBJECT public: ClickArea(karamba* k, int x, int y, int w, int h ); diff --git a/superkaramba/src/clickmap.cpp b/superkaramba/src/clickmap.cpp index 2189916..34f74e9 100644 --- a/superkaramba/src/clickmap.cpp +++ b/superkaramba/src/clickmap.cpp @@ -19,7 +19,7 @@ ClickMap::ClickMap(karamba* k, int x, int y, int w, int h ) if( h != 0 || w != 0) clip = 0; else - clip = Qt::DontClip; + clip = TQt::DontClip; */ if( h == 0 || w == 0) @@ -41,7 +41,7 @@ void ClickMap::setTextProps( TextField *t ) bool ClickMap::click( TQMouseEvent *e ) { //Don't load the web page if the click isn't for us - if (boundingBox.contains(e->x(), e->y())) { + if (boundingBox.tqcontains(e->x(), e->y())) { int index = ((e -> y() - getY()) / text.getLineHeight()) + 1; if (index >= 1 && index <= (int)displays.count()) { @@ -63,7 +63,7 @@ void ClickMap::mUpdate( TQPainter *p ) while( it != displays.end() && (row <= getHeight() || getHeight() == -1 ) ) { p->setPen( text.getColor() ); - // p->drawText(x,y+i,width,height, Qt::AlignCenter | Qt::ExpandTabs, *it); + // p->drawText(x,y+i,width,height, TQt::AlignCenter | TQt::ExpandTabs, *it); p->drawText(getX(), getY() + i + text.getLineHeight(), *it); i += text.getLineHeight(); it++; diff --git a/superkaramba/src/clickmap.h b/superkaramba/src/clickmap.h index ee802f7..fecb2a0 100644 --- a/superkaramba/src/clickmap.h +++ b/superkaramba/src/clickmap.h @@ -23,6 +23,7 @@ class ClickMap : public Meter { Q_OBJECT + TQ_OBJECT public: ClickMap(karamba* k, int x, int y, int w, int h); ~ClickMap(); diff --git a/superkaramba/src/config_python.cpp b/superkaramba/src/config_python.cpp index 1a094eb..0b9b34b 100644 --- a/superkaramba/src/config_python.cpp +++ b/superkaramba/src/config_python.cpp @@ -172,7 +172,7 @@ PyObject* py_read_config_entry(PyObject *, PyObject *args) return Py_BuildValue((char*)"l", i); } - if (type == "TQString") + if (type == TQSTRING_OBJECT_NAME_STRING) { return Py_BuildValue((char*)"s", entry.toString().ascii()); } diff --git a/superkaramba/src/cpusensor.cpp b/superkaramba/src/cpusensor.cpp index 1cf9a06..164572c 100644 --- a/superkaramba/src/cpusensor.cpp +++ b/superkaramba/src/cpusensor.cpp @@ -145,12 +145,12 @@ void CPUSensor::update() { format = "%v"; } - format.replace( TQRegExp("%load", false), TQString::number( load ) ); - format.replace( TQRegExp("%user", false), TQString::number( user ) ); - format.replace( TQRegExp("%nice", false), TQString::number( nice ) ); - format.replace( TQRegExp("%idle", false), TQString::number( idle ) ); - format.replace( TQRegExp("%system", false), TQString::number( system ) ); - format.replace( TQRegExp("%v", false), TQString::number( load ) ); + format.tqreplace( TQRegExp("%load", false), TQString::number( load ) ); + format.tqreplace( TQRegExp("%user", false), TQString::number( user ) ); + format.tqreplace( TQRegExp("%nice", false), TQString::number( nice ) ); + format.tqreplace( TQRegExp("%idle", false), TQString::number( idle ) ); + format.tqreplace( TQRegExp("%system", false), TQString::number( system ) ); + format.tqreplace( TQRegExp("%v", false), TQString::number( load ) ); meter->setValue( format ); ++it; diff --git a/superkaramba/src/cpusensor.h b/superkaramba/src/cpusensor.h index ce9840b..70e06dd 100644 --- a/superkaramba/src/cpusensor.h +++ b/superkaramba/src/cpusensor.h @@ -17,6 +17,7 @@ class CPUSensor : public Sensor { Q_OBJECT + TQ_OBJECT public: CPUSensor( TQString cpuNbr, int interval ); ~CPUSensor(); diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp index 6ca4e20..24e3156 100644 --- a/superkaramba/src/datesensor.cpp +++ b/superkaramba/src/datesensor.cpp @@ -20,7 +20,7 @@ DateSensor::~DateSensor() void DateSensor::update() { - TQDateTime qdt = TQDateTime::currentDateTime(); + TQDateTime qdt = TQDateTime::tqcurrentDateTime(); TQString format; SensorParams *sp; Meter *meter; @@ -48,8 +48,8 @@ void DateSensor::slotCalendarDeleted() } -DatePicker::DatePicker(TQWidget *parent) - : TQVBox( parent, 0, WType_TopLevel | WDestructiveClose | +DatePicker::DatePicker(TQWidget *tqparent) + : TQVBox( tqparent, 0, WType_TopLevel | WDestructiveClose | WStyle_Customize | WStyle_StaysOnTop | WStyle_NoBorder ) { setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); @@ -65,7 +65,7 @@ DatePicker::DatePicker(TQWidget *parent) void DatePicker::keyReleaseEvent(TQKeyEvent *e) { TQVBox::keyReleaseEvent(e); - if (e->key() == Qt::Key_Escape) + if (e->key() == TQt::Key_Escape) close(); } @@ -80,7 +80,7 @@ void DateSensor::toggleCalendar(TQMouseEvent *ev) TQString height = sp->getParam("CALHEIGHT"); TQRect rect(meter->getX(),meter->getY(),width.toInt(), height.toInt()); - if (rect.contains( ev->x(), ev->y() )) + if (rect.tqcontains( ev->x(), ev->y() )) { if (hidden) { @@ -90,8 +90,8 @@ void DateSensor::toggleCalendar(TQMouseEvent *ev) connect(cal, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted())); TQPoint c = (TQPoint(ev->x(), ev->y())); - int w = cal->sizeHint().width(); - int h = cal->sizeHint().height(); + int w = cal->tqsizeHint().width(); + int h = cal->tqsizeHint().height(); // make calendar fully visible TQRect deskR = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(c)); @@ -117,7 +117,7 @@ void DateSensor::mousePressEvent(TQMouseEvent *ev) { switch (ev->button()) { - case TQMouseEvent::LeftButton: + case Qt::LeftButton: toggleCalendar(ev); break; default: diff --git a/superkaramba/src/datesensor.h b/superkaramba/src/datesensor.h index a761d6b..24d74d6 100644 --- a/superkaramba/src/datesensor.h +++ b/superkaramba/src/datesensor.h @@ -15,7 +15,7 @@ #include #include -class DatePicker : public QVBox +class DatePicker : public TQVBox { public: DatePicker(TQWidget*); @@ -27,6 +27,7 @@ private: class DateSensor : public Sensor { Q_OBJECT + TQ_OBJECT public: DateSensor( int interval ); ~DateSensor(); diff --git a/superkaramba/src/disksensor.cpp b/superkaramba/src/disksensor.cpp index b53c6e3..a896ebe 100644 --- a/superkaramba/src/disksensor.cpp +++ b/superkaramba/src/disksensor.cpp @@ -114,31 +114,31 @@ void DiskSensor::processExited(KProcess *) { format = "%u"; } - format.replace( TQRegExp("%fp", false),TQString::number(getPercentFree(mntPt))); - format.replace( TQRegExp("%fg",false), + format.tqreplace( TQRegExp("%fp", false),TQString::number(getPercentFree(mntPt))); + format.tqreplace( TQRegExp("%fg",false), TQString::number(getFreeSpace(mntPt)/(1024*1024))); - format.replace( TQRegExp("%fkb",false), + format.tqreplace( TQRegExp("%fkb",false), TQString::number(getFreeSpace(mntPt)*8) ); - format.replace( TQRegExp("%fk",false), + format.tqreplace( TQRegExp("%fk",false), TQString::number(getFreeSpace(mntPt)) ); - format.replace( TQRegExp("%f", false),TQString::number(getFreeSpace(mntPt)/1024)); + format.tqreplace( TQRegExp("%f", false),TQString::number(getFreeSpace(mntPt)/1024)); - format.replace( TQRegExp("%up", false),TQString::number(getPercentUsed(mntPt))); - format.replace( TQRegExp("%ug",false), + format.tqreplace( TQRegExp("%up", false),TQString::number(getPercentUsed(mntPt))); + format.tqreplace( TQRegExp("%ug",false), TQString::number(getUsedSpace(mntPt)/(1024*1024))); - format.replace( TQRegExp("%ukb",false), + format.tqreplace( TQRegExp("%ukb",false), TQString::number(getUsedSpace(mntPt)*8) ); - format.replace( TQRegExp("%uk",false), + format.tqreplace( TQRegExp("%uk",false), TQString::number(getUsedSpace(mntPt)) ); - format.replace( TQRegExp("%u", false),TQString::number(getUsedSpace(mntPt)/1024)); + format.tqreplace( TQRegExp("%u", false),TQString::number(getUsedSpace(mntPt)/1024)); - format.replace( TQRegExp("%tg",false), + format.tqreplace( TQRegExp("%tg",false), TQString::number(getTotalSpace(mntPt)/(1024*1024))); - format.replace( TQRegExp("%tkb",false), + format.tqreplace( TQRegExp("%tkb",false), TQString::number(getTotalSpace(mntPt)*8)); - format.replace( TQRegExp("%tk",false), + format.tqreplace( TQRegExp("%tk",false), TQString::number(getTotalSpace(mntPt))); - format.replace( TQRegExp("%t", false),TQString::number(getTotalSpace(mntPt)/1024)); + format.tqreplace( TQRegExp("%t", false),TQString::number(getTotalSpace(mntPt)/1024)); meter->setValue(format); ++lit; } diff --git a/superkaramba/src/disksensor.h b/superkaramba/src/disksensor.h index d42c9ef..0fb2023 100644 --- a/superkaramba/src/disksensor.h +++ b/superkaramba/src/disksensor.h @@ -19,6 +19,7 @@ class DiskSensor : public Sensor { Q_OBJECT + TQ_OBJECT public: DiskSensor(int msec ); ~DiskSensor(); diff --git a/superkaramba/src/graph.h b/superkaramba/src/graph.h index a2c164f..6e89c57 100644 --- a/superkaramba/src/graph.h +++ b/superkaramba/src/graph.h @@ -18,6 +18,7 @@ class Graph : public Meter { Q_OBJECT + TQ_OBJECT public: Graph(karamba* k, int ix, int iy, int iw, int ih, int nbrPoints); diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp index ef38ec0..9c5705c 100644 --- a/superkaramba/src/imagelabel.cpp +++ b/superkaramba/src/imagelabel.cpp @@ -86,15 +86,15 @@ ChannelIntensity::ChannelIntensity(ImageLabel* img, float r, TQString c, ratio = (ratio < -1) ? -1 : ratio; channel = 0; - if (c.find("red", 0 , false)) + if (c.tqfind("red", 0 , false)) { channel = 0; } - else if (c.find("green", 0, false)) + else if (c.tqfind("green", 0, false)) { channel = 1; } - else if (c.find("blue", 0, false)) + else if (c.tqfind("blue", 0, false)) { channel = 2; } @@ -384,7 +384,7 @@ void ImageLabel::mUpdate(TQPainter* p) bool ImageLabel::click(TQMouseEvent* e) { - if (getBoundingBox().contains(e -> x(), e -> y()) && isEnabled()) + if (getBoundingBox().tqcontains(e -> x(), e -> y()) && isEnabled()) { TQString program; if (e -> button() == Qt::LeftButton) @@ -446,7 +446,7 @@ void ImageLabel::parseImages(TQString fn, TQString fn_roll, int _xoff, { TQString tmpFile; #if defined(KDE_3_2) - if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow())) + if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->tqparentWindow())) #else if(KIO::NetAccess::download(KURL(path), tmpFile)) #endif @@ -494,7 +494,7 @@ void ImageLabel::parseImages(TQString fn, TQString fn_roll, int _xoff, { TQString tmpFile; #if defined(KDE_3_2) - if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow())) + if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->tqparentWindow())) #else if(KIO::NetAccess::download(KURL(path), tmpFile)) #endif @@ -530,7 +530,7 @@ void ImageLabel::rolloverImage(TQMouseEvent *e) if (zoomed) { - if (!rect_off.contains(e->pos())) + if (!rect_off.tqcontains(e->pos())) { // rollover the image to the zoomed image //setValue(fn_roll); @@ -545,7 +545,7 @@ void ImageLabel::rolloverImage(TQMouseEvent *e) } else { - if (rect_off.contains(e->pos())) + if (rect_off.tqcontains(e->pos())) { // rollover the image to the zoomed image //setValue(fn_roll); diff --git a/superkaramba/src/imagelabel.h b/superkaramba/src/imagelabel.h index ebe417d..f27ed24 100644 --- a/superkaramba/src/imagelabel.h +++ b/superkaramba/src/imagelabel.h @@ -41,10 +41,11 @@ class ImageLabel; class KIO::CopyJob; // Abstract Effects Baseclass -class Effect : public QObject +class Effect : public TQObject { Q_OBJECT + TQ_OBJECT public: Effect(ImageLabel*, int millisec); @@ -100,6 +101,7 @@ class ImageLabel : public Meter { Q_OBJECT + TQ_OBJECT public: ImageLabel(karamba* k, int ix,int iy,int iw,int ih ); diff --git a/superkaramba/src/imagelabel_python.cpp b/superkaramba/src/imagelabel_python.cpp index 7cf6d73..9379201 100644 --- a/superkaramba/src/imagelabel_python.cpp +++ b/superkaramba/src/imagelabel_python.cpp @@ -61,7 +61,7 @@ ImageLabel* createImageLabel(karamba *theme, long x, long y, theme->meterList->append (tmp); theme->imageList->append (tmp); if(bg) - theme->kroot->repaint(true); + theme->kroot->tqrepaint(true); return tmp; } diff --git a/superkaramba/src/input.cpp b/superkaramba/src/input.cpp index eae8780..63290cc 100644 --- a/superkaramba/src/input.cpp +++ b/superkaramba/src/input.cpp @@ -35,7 +35,7 @@ Input::~Input() void Input::mUpdate(TQPainter*) { - edit->repaint(); + edit->tqrepaint(); } void Input::setValue(TQString text) @@ -131,7 +131,7 @@ void Input::setFontColor(TQColor fontColor) TQColor Input::getFontColor() const { - const TQColorGroup &color = edit->colorGroup(); + const TQColorGroup &color = edit->tqcolorGroup(); return color.text(); } @@ -144,7 +144,7 @@ void Input::setSelectionColor(TQColor selectionColor) TQColor Input::getSelectionColor() const { - const TQColorGroup &color = edit->colorGroup(); + const TQColorGroup &color = edit->tqcolorGroup(); return color.highlight(); } @@ -157,7 +157,7 @@ void Input::setSelectedTextColor(TQColor selectedTextColor) TQColor Input::getSelectedTextColor() const { - const TQColorGroup &color = edit->colorGroup(); + const TQColorGroup &color = edit->tqcolorGroup(); return color.highlightedText(); } diff --git a/superkaramba/src/input.h b/superkaramba/src/input.h index 0c9ad71..509b66d 100644 --- a/superkaramba/src/input.h +++ b/superkaramba/src/input.h @@ -36,6 +36,7 @@ class Input : public Meter { Q_OBJECT + TQ_OBJECT public: Input(karamba* k, int ix, int iy, int iw, int ih); Input(); diff --git a/superkaramba/src/input_python.cpp b/superkaramba/src/input_python.cpp index d839536..82ed00f 100644 --- a/superkaramba/src/input_python.cpp +++ b/superkaramba/src/input_python.cpp @@ -346,9 +346,9 @@ PyObject* py_getInputFocus(PyObject *, PyObject *args) // FocusWidget() returns the currently focused line edit, // but unfortunately we need an 'Input' object here. // - TQWidget *obj = ((karamba*)widget)->focusWidget(); + TQWidget *obj = ((karamba*)widget)->tqfocusWidget(); - if(obj->isA(TQLINEEDIT_OBJECT_NAME_STRING)) // SKLineEdit is no Q_Object, but TQLineEdit can only be here as a SKLineEdit + if(obj->isA(TQLINEEDIT_OBJECT_NAME_STRING)) // SKLineEdit is no TQ_Object, but TQLineEdit can only be here as a SKLineEdit return Py_BuildValue((char*)"l", ((SKLineEdit*)obj)->getInput()); return Py_BuildValue((char*)"l", 0); diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index fb90a45..6717b85 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -51,7 +51,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, bool sub_theme): - TQWidget(0,"karamba", Qt::WGroupLeader | WStyle_Customize | + TQWidget(0,"karamba", TQt::WGroupLeader | WStyle_Customize | WRepaintNoErase| WStyle_NoBorder | WDestructiveClose ), meterList(0), imageList(0), clickList(0), kpop(0), widgetMask(0), config(0), kWinModule(0), tempUnit('C'), m_instance(instance), @@ -70,7 +70,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, KURL url; - if(fn.find('/') == -1) + if(fn.tqfind('/') == -1) url.setFileName(fn); else url = fn; @@ -85,7 +85,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, karambaApp->addKaramba(this, reloading); if(prettyName.isEmpty()) - prettyName = TQString("%1 - %2").arg(m_theme.name()).arg(m_instance); + prettyName = TQString("%1 - %2").tqarg(m_theme.name()).tqarg(m_instance); kdDebug() << "Starting theme: " << m_theme.name() << " pretty name: " << prettyName << endl; @@ -111,7 +111,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, // Creates KConfig Object TQString instanceString; if(m_instance > 1) - instanceString = TQString("-%1").arg(m_instance); + instanceString = TQString("-%1").tqarg(m_instance); TQString cfg = TQDir::home().absPath() + "/.superkaramba/" + m_theme.id() + instanceString + ".rc"; kdDebug() << cfg << endl; @@ -170,7 +170,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, toDesktopMenu = new KPopupMenu (this); toDesktopMenu -> setCheckable(true); mid = toDesktopMenu -> insertItem (i18n("&All Desktops"), - dslot = new DesktopChangeSlot(this,0), + dslot = new DesktopChangeSlot(TQT_TQOBJECT(this),0), TQT_SLOT(receive())); dslot->setMenuId(mid); @@ -181,7 +181,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, name += ('0' + ndesktop); mid = toDesktopMenu -> insertItem (name, - dslot = new DesktopChangeSlot(this, ndesktop), TQT_SLOT(receive())); + dslot = new DesktopChangeSlot(TQT_TQOBJECT(this), ndesktop), TQT_SLOT(receive())); dslot->setMenuId(mid); } @@ -196,7 +196,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, TQT_SLOT(updateSensors()), Key_F5 ); toggleLocked = new KToggleAction ( i18n("Toggle &Locked Position"), SmallIconSet("locked"), - CTRL+Key_L, this, + CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotToggleLocked() ), accColl, "Locked position" ); accColl->insert(toggleLocked); @@ -205,7 +205,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, toggleLocked->plug(kpop); toggleFastTransforms = new KToggleAction(i18n("Use &Fast Image Scaling"), - CTRL+Key_F, this, + CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT( slotToggleFastTransforms() ), accColl, "Fast transformations"); @@ -252,7 +252,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, client = kapp->dcopClient(); if (!client->isAttached()) client->attach(); - appId = client->registerAs(qApp->name()); + appId = client->registerAs(tqApp->name()); setBackgroundMode( NoBackground); @@ -314,7 +314,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, this->setMouseTracking(true); - setFocusPolicy(TQWidget::StrongFocus); + setFocusPolicy(TQ_StrongFocus); } karamba::~karamba() @@ -442,7 +442,7 @@ bool karamba::parseConfig() if(lineParser.getBoolean("MANAGED")) { managed = true; - reparent(0, Qt::WType_Dialog | WStyle_Customize | WStyle_NormalBorder + reparent(0, TQt::WType_Dialog | WStyle_Customize | WStyle_NormalBorder | WRepaintNoErase | WDestructiveClose, pos()); } else @@ -622,7 +622,7 @@ bool karamba::parseConfig() TQColor("white"))); defaultTextField->setFont(lineParser.getString("FONT", "Helvetica")); defaultTextField->setFontSize(lineParser.getInt("FONTSIZE", 12)); - defaultTextField->setAlignment(lineParser.getString("ALIGN", + defaultTextField->tqsetAlignment(lineParser.getString("ALIGN", "LEFT")); defaultTextField->setFixedPitch(lineParser.getBoolean("FIXEDPITCH", false)); @@ -647,7 +647,7 @@ bool karamba::parseConfig() tmpText->setFont(lineParser.getString("FONT", defTxt.getFont())); tmpText->setFontSize(lineParser.getInt("FONTSIZE", defTxt.getFontSize())); - tmpText->setAlignment(lineParser.getString("ALIGN", + tmpText->tqsetAlignment(lineParser.getString("ALIGN", defTxt.getAlignmentAsString())); tmpText->setFixedPitch(lineParser.getInt("FIXEDPITCH", defTxt.getFixedPitch())); @@ -1240,7 +1240,7 @@ void karamba::passMenuOptionChanged(TQString key, bool value) void karamba::setIncomingData(TQString theme, TQString obj) { - KarambaApplication* app = (KarambaApplication*)qApp; + KarambaApplication* app = (KarambaApplication*)tqApp; kdDebug() << "karamba::setIncomingData " << theme << obj << endl; //TQByteArray data; @@ -1260,7 +1260,7 @@ void karamba::setIncomingData(TQString theme, TQString obj) void karamba::callTheme(TQString theme, TQString txt) { - KarambaApplication* app = (KarambaApplication*)qApp; + KarambaApplication* app = (KarambaApplication*)tqApp; kdDebug() << "karamba::callTheme " << theme << txt << endl; //qWarning("karamba::callTheme"); //TQByteArray data; @@ -1338,7 +1338,7 @@ void karamba::passClick(TQMouseEvent *e) { Meter* meter = (Meter*)(*it); // Check if meter is still in list - if (clickList->containsRef(meter) && meter->click(e)) + if (clickList->tqcontainsRef(meter) && meter->click(e)) { // callback meterClicked(e, meter); @@ -1388,7 +1388,7 @@ void karamba::passWheelClick( TQWheelEvent *e ) { Meter* meter = (Meter*)(*it); // Check if meter is still in list - if (clickList->containsRef(meter) && meter->click(&fakeEvent)) + if (clickList->tqcontainsRef(meter) && meter->click(&fakeEvent)) { if (RichTextLabel* richText = dynamic_cast(meter)) { @@ -1416,7 +1416,7 @@ void karamba::management_popup( void ) void karamba::mousePressEvent( TQMouseEvent *e ) { //qDebug("karamba::mousePressEvent"); - if( e->button() == RightButton && !want_right_button ) + if( e->button() == Qt::RightButton && !want_right_button ) { management_popup(); } @@ -1513,13 +1513,13 @@ void karamba::mouseMoveEvent( TQMouseEvent *e ) // This will work now, but only when you move at least // one pixel in any direction with your mouse. //if( e->button() == Qt::LeftButton ) - if( e->state() == LeftButton) + if( e->state() == Qt::LeftButton) button = 1; //else if( e->button() == Qt::MidButton ) - else if( e->state() == MidButton ) + else if( e->state() == Qt::MidButton ) button = 2; //else if( e->button() == Qt::RightButton ) - else if( e->state() == RightButton ) + else if( e->state() == Qt::RightButton ) button = 3; pythonIface->widgetMouseMoved(this, e->x(), e->y(), button); @@ -1548,7 +1548,7 @@ void karamba::paintEvent ( TQPaintEvent *e) } } TQRect rect = e->rect(); - bitBlt(this,rect.topLeft(),&pm,rect,Qt::CopyROP); + bitBlt(this,rect.topLeft(),&pm,rect,TQt::CopyROP); } void karamba::updateSensors() @@ -1579,11 +1579,11 @@ void karamba::updateBackground(KSharedPixmap* kpm) TQPixmap buffer = TQPixmap(size()); pm = TQPixmap(size()); - buffer.fill(Qt::black); + buffer.fill(TQt::black); TQObjectListIt it( *imageList ); // iterate over meters p.begin(&buffer); - bitBlt(&buffer,0,0,&background,0,Qt::CopyROP); + bitBlt(&buffer,0,0,&background,0,TQt::CopyROP); while ( it != 0 ) { @@ -1595,17 +1595,17 @@ void karamba::updateBackground(KSharedPixmap* kpm) } p.end(); - bitBlt(&pm,0,0,&buffer,0,Qt::CopyROP); + bitBlt(&pm,0,0,&buffer,0,TQt::CopyROP); background = pm; TQPixmap buffer2 = TQPixmap(size()); pm = TQPixmap(size()); - buffer2.fill(Qt::black); + buffer2.fill(TQt::black); TQObjectListIt it2( *meterList ); // iterate over meters p.begin(&buffer2); - bitBlt(&buffer2,0,0,&background,0,Qt::CopyROP); + bitBlt(&buffer2,0,0,&background,0,TQt::CopyROP); while ( it2 != 0 ) { @@ -1614,18 +1614,18 @@ void karamba::updateBackground(KSharedPixmap* kpm) } p.end(); - bitBlt(&pm,0,0,&buffer2,0,Qt::CopyROP); + bitBlt(&pm,0,0,&buffer2,0,TQt::CopyROP); if (systray != 0) { systray->updateBackgroundPixmap(buffer2); } - repaint(); + tqrepaint(); } void karamba::currentDesktopChanged( int i ) { //qDebug("karamba::currentDesktopChanged"); - kroot->repaint( true ); + kroot->tqrepaint( true ); if (pythonIface && pythonIface->isExtensionLoaded()) pythonIface->desktopChanged(this, i); } @@ -1633,7 +1633,7 @@ void karamba::currentDesktopChanged( int i ) void karamba::currentWallpaperChanged(int i ) { //qDebug("karamba::currentWallpaperChanged"); - kroot->repaint( true ); + kroot->tqrepaint( true ); if (pythonIface && pythonIface->isExtensionLoaded()) pythonIface->wallpaperChanged(this, i); } @@ -1646,11 +1646,11 @@ void karamba::externalStep() TQPixmap buffer = TQPixmap(size()); pm = TQPixmap(size()); - buffer.fill(Qt::black); + buffer.fill(TQt::black); TQObjectListIt it( *meterList ); // iterate over meters p.begin(&buffer); - bitBlt(&buffer,0,0,&background,0,Qt::CopyROP); + bitBlt(&buffer,0,0,&background,0,TQt::CopyROP); while ( it != 0 ) { @@ -1659,8 +1659,8 @@ void karamba::externalStep() } p.end(); - bitBlt(&pm,0,0,&buffer,0,Qt::CopyROP); - repaint(); + bitBlt(&pm,0,0,&buffer,0,TQt::CopyROP); + tqrepaint(); } } @@ -1671,12 +1671,12 @@ void karamba::step() { pm = TQPixmap(size()); TQPixmap buffer = TQPixmap(size()); - buffer.fill(Qt::black); + buffer.fill(TQt::black); TQObjectListIt it( *meterList ); // iterate over meters p.begin(&buffer); - bitBlt(&buffer,0,0,&background,0,Qt::CopyROP); + bitBlt(&buffer,0,0,&background,0,TQt::CopyROP); while (it != 0) { @@ -1685,7 +1685,7 @@ void karamba::step() } p.end(); - bitBlt(&pm,0,0,&buffer,0,Qt::CopyROP); + bitBlt(&pm,0,0,&buffer,0,TQt::CopyROP); update(); } @@ -1779,7 +1779,7 @@ void karamba::addMenuConfigOption(TQString key, TQString name) //qDebug("karamba::addMenuConfigOption"); kpop -> setItemEnabled(THEMECONF, true); - SignalBridge* action = new SignalBridge(this, key, menuAccColl); + SignalBridge* action = new SignalBridge(TQT_TQOBJECT(this), key, menuAccColl); KToggleAction* confItem = new KToggleAction (name, KShortcut::null(), action, TQT_SLOT(receive()), menuAccColl, key.ascii()); @@ -1992,8 +1992,8 @@ void karamba::toggleWidgetUpdate( bool b) widgetUpdate = b; } -SignalBridge::SignalBridge(TQObject* parent, TQString name, KActionCollection* ac) - : TQObject(parent, name.ascii()), collection(ac) +SignalBridge::SignalBridge(TQObject* tqparent, TQString name, KActionCollection* ac) + : TQObject(tqparent, name.ascii()), collection(ac) { setName(name.ascii()); } @@ -2004,15 +2004,15 @@ void SignalBridge::receive() isChecked()); } -DesktopChangeSlot::DesktopChangeSlot(TQObject *parent, int id) - : TQObject(parent, "") +DesktopChangeSlot::DesktopChangeSlot(TQObject *tqparent, int id) + : TQObject(tqparent, "") { desktopid = id; } void DesktopChangeSlot::receive() { - karamba *k = (karamba *)parent(); + karamba *k = (karamba *)tqparent(); // XXX - check type cast diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h index d3e6e4a..cc02030 100644 --- a/superkaramba/src/karamba.h +++ b/superkaramba/src/karamba.h @@ -109,9 +109,10 @@ class KarambaPython; class LineParser; -class karamba : public QWidget +class karamba : public TQWidget { Q_OBJECT + TQ_OBJECT public: karamba(TQString fn, TQString name, bool reloading = false, @@ -141,7 +142,7 @@ public: void changeInterval(int interval); void setWidgetUpdate(bool wu) { widgetUpdate = wu; }; bool getWidgetUpdate() { return widgetUpdate; }; - bool hasMeter(Meter* meter) { return meterList->containsRef(meter) > 0; }; + bool hasMeter(Meter* meter) { return meterList->tqcontainsRef(meter) > 0; }; char getTempUnit() { return tempUnit; }; void addMenuConfigOption(TQString key, TQString name); bool setMenuConfigOption(TQString key, bool value); @@ -196,7 +197,7 @@ protected: private: bool widgetUpdate; - bool repaintInProgress; + bool tqrepaintInProgress; //bool reloading; bool want_right_button; bool want_meter_wheel_event; @@ -323,12 +324,13 @@ private slots: * Slot to receive the event of moving the karamba object * to a new desktop. Generated by karamba::toDesktopMenu items */ -class DesktopChangeSlot : public QObject +class DesktopChangeSlot : public TQObject { Q_OBJECT + TQ_OBJECT public: - DesktopChangeSlot(TQObject *parent, int desktop_id); + DesktopChangeSlot(TQObject *tqparent, int desktop_id); /* Parent should be the karamba object * desktop id of 0 indicates all desktops */ void setMenuId(int id); @@ -343,12 +345,13 @@ class DesktopChangeSlot : public QObject }; /** SignalBridge is an ungulate that lives in the forests of wild Wisconsin. */ -class SignalBridge : public QObject +class SignalBridge : public TQObject { Q_OBJECT + TQ_OBJECT public: - SignalBridge(TQObject* parent, TQString, KActionCollection*); + SignalBridge(TQObject* tqparent, TQString, KActionCollection*); signals: void enabled(TQString, bool); diff --git a/superkaramba/src/karamba_python.cpp b/superkaramba/src/karamba_python.cpp index 746c890..7f865d9 100644 --- a/superkaramba/src/karamba_python.cpp +++ b/superkaramba/src/karamba_python.cpp @@ -125,8 +125,8 @@ static PyMethodDef karamba_methods[] = { {(char*)"getTextColor", py_getTextColor, METH_VARARGS, (char*)"Get a Text Sensor's Color"}, {(char*)"changeTextSize", py_setTextFontSize, METH_VARARGS, (char*)"Change a Text Sensor's Font Size"}, {(char*)"getTextFontSize", py_getTextFontSize, METH_VARARGS, (char*)"Get a Text Sensor's Font Size"}, - {(char*)"getTextAlign", py_getTextAlign, METH_VARARGS, (char*)"Get Text alignment."}, - {(char*)"setTextAlign", py_setTextAlign, METH_VARARGS, (char*)"Set Text alignment."}, + {(char*)"getTextAlign", py_getTextAlign, METH_VARARGS, (char*)"Get Text tqalignment."}, + {(char*)"setTextAlign", py_setTextAlign, METH_VARARGS, (char*)"Set Text tqalignment."}, {(char*)"setTextScroll", py_setTextScroll, METH_VARARGS, (char*)"Set Text scroll."}, // RichTextLabel - richtextlabel_python.cpp @@ -194,7 +194,7 @@ static PyMethodDef karamba_methods[] = { // Widget - widget_python.cpp {(char*)"moveWidget", py_move_widget, METH_VARARGS, (char*)"Move Widget to x,y"}, {(char*)"resizeWidget", py_resize_widget, METH_VARARGS, (char*)"Resize Widget to width,height"}, - {(char*)"createWidgetMask", py_create_widget_mask, METH_VARARGS, (char*)"Create a clipping mask for this widget"}, + {(char*)"createWidgetMask", py_create_widget_tqmask, METH_VARARGS, (char*)"Create a clipping tqmask for this widget"}, {(char*)"redrawWidget", py_redraw_widget, METH_VARARGS, (char*)"Update Widget to reflect your changes"}, {(char*)"redrawWidgetBackground", py_redraw_widget_background, METH_VARARGS, (char*)"Update Widget to reflect background image changes"}, {(char*)"getWidgetPosition", py_get_widget_position, METH_VARARGS, (char*)"Get Widget Position"}, @@ -214,7 +214,7 @@ static PyMethodDef karamba_methods[] = { {(char*)"showSystray", py_show_systray, METH_VARARGS, (char*)"Show the Systray"}, {(char*)"moveSystray", py_move_systray, METH_VARARGS, (char*)"Move the Systray"}, {(char*)"getCurrentWindowCount", py_get_current_window_count, METH_VARARGS, (char*)"Get current Window count"}, - {(char*)"updateSystrayLayout", py_update_systray_layout, METH_VARARGS, (char*)"Update Systray layout"}, + {(char*)"updateSystrayLayout", py_update_systray_layout, METH_VARARGS, (char*)"Update Systray tqlayout"}, // Misc - misc_python.cpp {(char*)"getThemePath", py_get_theme_path, METH_VARARGS, (char*)"Get the file path of the theme"}, @@ -601,7 +601,7 @@ bool KarambaPython::commandFinished(karamba* k, int pid) bool KarambaPython::itemDropped(karamba* k, TQString text, int x, int y) { - PyObject* pArgs = Py_BuildValue((char*)"(lOii)", k, QString2PyString(text), x, y); + PyObject* pArgs = Py_BuildValue((char*)"(lOii)", k, TQString2PyString(text), x, y); return callObject("itemDropped", pArgs); } diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp index 141b2e9..063ac1f 100644 --- a/superkaramba/src/karambaapp.cpp +++ b/superkaramba/src/karambaapp.cpp @@ -71,12 +71,12 @@ TQString KarambaApplication::getMainKaramba() if (dcop.isMainKaramba()) return *it; } - return TQString::null; + return TQString(); } bool KarambaApplication::themeExists(TQString pretty_name) { - TQWidgetList *list = TQApplication::allWidgets(); + TQWidgetList *list = TQApplication::tqallWidgets(); TQWidgetListIt it( *list ); // iterate over the widgets TQWidget * w; while ( (w=it.current()) != 0 ) // for each widget... @@ -296,7 +296,7 @@ void KarambaApplication::addKaramba(karamba* k, bool reloading) karambaApp->dcopClient()->appId(), k->theme().file()); k->setInstance(instance); } - karambaList->append(k); + karambaList->append(TQT_TQOBJECT(k)); } void KarambaApplication::deleteKaramba(karamba* k, bool reloading) @@ -304,12 +304,12 @@ void KarambaApplication::deleteKaramba(karamba* k, bool reloading) if(!reloading && karambaApp->dcopStub()) karambaApp->dcopStub()->themeClosed( karambaApp->dcopClient()->appId(), k->theme().file(), k->instance()); - karambaList->removeRef(k); + karambaList->removeRef(TQT_TQOBJECT(k)); } bool KarambaApplication::hasKaramba(karamba* k) { - return karambaList->containsRef(k) > 0; + return karambaList->tqcontainsRef(TQT_TQOBJECT(k)) > 0; } // XXX: I guess this should be made with mutex/semaphores @@ -380,8 +380,8 @@ void KarambaApplication::quitSuperKaramba() { if(themeListWindow) themeListWindow->saveUserAddedThemes(); - qApp->closeAllWindows(); - qApp->quit(); + tqApp->closeAllWindows(); + tqApp->quit(); } void KarambaApplication::globalQuitSuperKaramba() diff --git a/superkaramba/src/karambaapp.h b/superkaramba/src/karambaapp.h index 9a22adc..9d0f1bb 100644 --- a/superkaramba/src/karambaapp.h +++ b/superkaramba/src/karambaapp.h @@ -26,7 +26,7 @@ #endif #endif -#define karambaApp ((KarambaApplication*)qApp) +#define karambaApp ((KarambaApplication*)tqApp) class karamba; class KarambaIface; @@ -39,6 +39,7 @@ class KAboutData; class KarambaApplication : public KApplication { Q_OBJECT + TQ_OBJECT friend class KarambaIface; @@ -47,7 +48,7 @@ class KarambaApplication : public KApplication KHelpMenu* m_helpMenu; void showKarambaMenuExtension(bool show = true); - void setToolTip(const TQString &tip = TQString::null); + void setToolTip(const TQString &tip = TQString()); protected: KarambaIface* iface; @@ -70,7 +71,7 @@ class KarambaApplication : public KApplication bool startThemes(TQStringList &lst); KarambaIface* dcopIface() { return iface; }; dcopIface_stub* dcopStub() { return dcopIfaceStub; }; - TQWidget* parentWindow() { return (TQWidget*)themeListWindow; }; + TQWidget* tqparentWindow() { return (TQWidget*)themeListWindow; }; void addKaramba(karamba* k, bool reloading = false); void deleteKaramba(karamba* k, bool reloading = false); diff --git a/superkaramba/src/karambainterface.cpp b/superkaramba/src/karambainterface.cpp index 5d33f68..659370a 100644 --- a/superkaramba/src/karambainterface.cpp +++ b/superkaramba/src/karambainterface.cpp @@ -24,7 +24,7 @@ KarambaIface::~KarambaIface() karamba* KarambaIface::getKaramba(TQString name) { - TQWidgetList *list = TQApplication::allWidgets(); + TQWidgetList *list = TQApplication::tqallWidgets(); TQWidgetListIt it(*list); // iterate over the widgets TQWidget* w; karamba* result = 0; @@ -49,7 +49,7 @@ karamba* KarambaIface::getKaramba(TQString name) ThemesDlg* KarambaIface::getThemeWnd() { - TQWidgetList *list = TQApplication::allWidgets(); + TQWidgetList *list = TQApplication::tqallWidgets(); TQWidgetListIt it( *list ); // iterate over the widgets TQWidget* w; ThemesDlg* result = 0; diff --git a/superkaramba/src/karambalistboxitem.h b/superkaramba/src/karambalistboxitem.h index 782daea..2d0bb5e 100644 --- a/superkaramba/src/karambalistboxitem.h +++ b/superkaramba/src/karambalistboxitem.h @@ -26,6 +26,6 @@ class KarambaListBoxItem : public TQListBoxText public: TQString appId; - KarambaListBoxItem( TQListBox* listbox, const TQString & text=TQString::null ); + KarambaListBoxItem( TQListBox* listbox, const TQString & text=TQString() ); }; diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp index 952fb7d..74ce4ed 100644 --- a/superkaramba/src/karambasessionmanaged.cpp +++ b/superkaramba/src/karambasessionmanaged.cpp @@ -26,7 +26,7 @@ #include "karamba.h" #include "tqwidgetlist.h" -bool KarambaSessionManaged::saveState(QSessionManager&) +bool KarambaSessionManaged::saveState(TQSessionManager&) { KConfig* config = kapp->sessionConfig(); @@ -34,7 +34,7 @@ bool KarambaSessionManaged::saveState(QSessionManager&) TQString openThemes=""; - TQWidgetList *list = TQApplication::allWidgets(); + TQWidgetList *list = TQApplication::tqallWidgets(); TQWidgetListIt it( *list ); // iterate over the widgets TQWidget * w; while ( (w=it.current()) != 0 ) // for each widget... @@ -57,7 +57,7 @@ bool KarambaSessionManaged::saveState(QSessionManager&) return true; } -bool KarambaSessionManaged::commitData(QSessionManager&) +bool KarambaSessionManaged::commitData(TQSessionManager&) { return true; } diff --git a/superkaramba/src/karambasessionmanaged.h b/superkaramba/src/karambasessionmanaged.h index 9024549..5e1c479 100644 --- a/superkaramba/src/karambasessionmanaged.h +++ b/superkaramba/src/karambasessionmanaged.h @@ -25,6 +25,6 @@ class KarambaSessionManaged : public KSessionManaged public: KarambaSessionManaged() {}; - virtual bool commitData( QSessionManager& ); - virtual bool saveState( QSessionManager& ); + virtual bool commitData( TQSessionManager& ); + virtual bool saveState( TQSessionManager& ); }; diff --git a/superkaramba/src/kwidgetlistbox.cpp b/superkaramba/src/kwidgetlistbox.cpp index d22d3c8..2294b93 100644 --- a/superkaramba/src/kwidgetlistbox.cpp +++ b/superkaramba/src/kwidgetlistbox.cpp @@ -21,8 +21,8 @@ #include #include -KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name) - : TQTable(parent, name) +KWidgetListbox::KWidgetListbox(TQWidget *tqparent, const char *name) + : TQTable(tqparent, name) { setNumRows(0); setNumCols(1); @@ -188,7 +188,7 @@ void KWidgetListbox::showItems(show_callback func, void* data) void KWidgetListbox::showEvent(TQShowEvent*) { //kdDebug() << k_funcinfo << endl; - repaintContents(false); + tqrepaintContents(false); } void KWidgetListbox::paintCell(TQPainter*, int, int, const TQRect&, diff --git a/superkaramba/src/kwidgetlistbox.h b/superkaramba/src/kwidgetlistbox.h index ead6989..78f899e 100644 --- a/superkaramba/src/kwidgetlistbox.h +++ b/superkaramba/src/kwidgetlistbox.h @@ -28,12 +28,13 @@ typedef bool (*show_callback) (int index, TQWidget* widget, void* data); -class KWidgetListbox : public QTable +class KWidgetListbox : public TQTable { Q_OBJECT + TQ_OBJECT public: - KWidgetListbox(TQWidget *parent = 0, const char *name = 0); + KWidgetListbox(TQWidget *tqparent = 0, const char *name = 0); ~KWidgetListbox(); int insertItem(TQWidget* item, int index = -1); diff --git a/superkaramba/src/lineparser.h b/superkaramba/src/lineparser.h index b92385d..09a2a6f 100644 --- a/superkaramba/src/lineparser.h +++ b/superkaramba/src/lineparser.h @@ -33,7 +33,7 @@ class LineParser { public: - LineParser(const TQString& line = TQString::null); + LineParser(const TQString& line = TQString()); ~LineParser(); void set(const TQString& line); diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp index 4b7976f..1ead4e1 100644 --- a/superkaramba/src/main.cpp +++ b/superkaramba/src/main.cpp @@ -58,7 +58,7 @@ static KCmdLineOptions options[] = #ifdef KARAMBA_LOG -void karambaMessageOutput(QtMsgType type, const char *msg) +void karambaMessageOutput(TQtMsgType type, const char *msg) { FILE* fp = fopen("/tmp/karamba.log", "a"); if(fp) @@ -87,7 +87,7 @@ void karambaMessageOutput(QtMsgType type, const char *msg) int main(int argc, char **argv) { #ifdef KARAMBA_LOG - qInstallMsgHandler(karambaMessageOutput); + tqInstallMsgHandler(karambaMessageOutput); #endif KAboutData about("superkaramba", I18N_NOOP("SuperKaramba"), version, description, @@ -128,7 +128,7 @@ int main(int argc, char **argv) KarambaApplication::unlockKaramba(); - app.connect(qApp,TQT_SIGNAL(lastWindowClosed()),qApp,TQT_SLOT(quit())); + app.connect(tqApp,TQT_SIGNAL(lastWindowClosed()),tqApp,TQT_SLOT(quit())); // Try to restore a previous session if applicable. app.checkPreviousSession(app, lst); diff --git a/superkaramba/src/memsensor.cpp b/superkaramba/src/memsensor.cpp index dda7983..842889b 100644 --- a/superkaramba/src/memsensor.cpp +++ b/superkaramba/src/memsensor.cpp @@ -318,17 +318,17 @@ void MemSensor::update() format = "%um"; } - format.replace( TQRegExp("%fmb", false), TQString::number( (int)(( totalMem - usedMemNoBuffers)/1024.0+0.5))); - format.replace( TQRegExp("%fm", false), TQString::number( (int)( ( totalMem - usedMem )/1024.0+0.5) )); + format.tqreplace( TQRegExp("%fmb", false), TQString::number( (int)(( totalMem - usedMemNoBuffers)/1024.0+0.5))); + format.tqreplace( TQRegExp("%fm", false), TQString::number( (int)( ( totalMem - usedMem )/1024.0+0.5) )); - format.replace( TQRegExp("%umb", false), TQString::number( (int)((usedMemNoBuffers)/1024.0+0.5))); - format.replace( TQRegExp("%um", false), TQString::number( (int)((usedMem)/1024.0+0.5 ))); + format.tqreplace( TQRegExp("%umb", false), TQString::number( (int)((usedMemNoBuffers)/1024.0+0.5))); + format.tqreplace( TQRegExp("%um", false), TQString::number( (int)((usedMem)/1024.0+0.5 ))); - format.replace( TQRegExp("%tm", false), TQString::number( (int)( (totalMem)/1024.0+0.5))); + format.tqreplace( TQRegExp("%tm", false), TQString::number( (int)( (totalMem)/1024.0+0.5))); - format.replace( TQRegExp("%fs", false), TQString::number( (int)((totalSwap - usedSwap)/1024.0+0.5))); - format.replace( TQRegExp("%us", false), TQString::number( (int)(usedSwap/1024.0+0.5))); - format.replace( TQRegExp("%ts", false), TQString::number( (int)(totalSwap/1024.0+0.5))); + format.tqreplace( TQRegExp("%fs", false), TQString::number( (int)((totalSwap - usedSwap)/1024.0+0.5))); + format.tqreplace( TQRegExp("%us", false), TQString::number( (int)(usedSwap/1024.0+0.5))); + format.tqreplace( TQRegExp("%ts", false), TQString::number( (int)(totalSwap/1024.0+0.5))); meter->setValue(format); ++it; diff --git a/superkaramba/src/memsensor.h b/superkaramba/src/memsensor.h index 4a1f0e0..4caa164 100644 --- a/superkaramba/src/memsensor.h +++ b/superkaramba/src/memsensor.h @@ -24,6 +24,7 @@ class MemSensor : public Sensor { Q_OBJECT + TQ_OBJECT public: MemSensor( int interval ); diff --git a/superkaramba/src/menu_python.cpp b/superkaramba/src/menu_python.cpp index 11e5a15..e32a2bb 100644 --- a/superkaramba/src/menu_python.cpp +++ b/superkaramba/src/menu_python.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2003 Hans Karlsson * Copyright (C) 2003-2004 Adam Geitgey -* Copyright (c) 2004 Petri Damstén +* Copyright (c) 2004 Petri Damst�n * * This file is part of SuperKaramba. * @@ -38,7 +38,7 @@ long createMenu(long widget) karamba* currTheme = (karamba*)widget; KPopupMenu* tmp = new KPopupMenu(currTheme); - currTheme->menuList->append (tmp ); + currTheme->menuList->append( TQT_TQOBJECT(tmp) ); currTheme->connect(tmp, TQT_SIGNAL(activated(int)), currTheme, TQT_SLOT(passMenuItemClicked(int))); @@ -86,7 +86,7 @@ long deleteMenu(long widget, long menu) karamba* currTheme = (karamba*)widget; KPopupMenu* tmp = (KPopupMenu*)menu; - currTheme->menuList->removeRef(tmp); + currTheme->menuList->removeRef(TQT_TQOBJECT(tmp)); return 1; } diff --git a/superkaramba/src/meter.cpp b/superkaramba/src/meter.cpp index e9030e6..8374bbf 100644 --- a/superkaramba/src/meter.cpp +++ b/superkaramba/src/meter.cpp @@ -105,7 +105,7 @@ bool Meter::isEnabled() bool Meter::insideActiveArea(int x, int y) { - return boundingBox.contains(x, y) && clickable; + return boundingBox.tqcontains(x, y) && clickable; } #include "meter.moc" diff --git a/superkaramba/src/meter.h b/superkaramba/src/meter.h index ecd84e6..689bdd5 100644 --- a/superkaramba/src/meter.h +++ b/superkaramba/src/meter.h @@ -20,9 +20,10 @@ class karamba; -class Meter : public QObject +class Meter : public TQObject { Q_OBJECT + TQ_OBJECT public: Meter(karamba* k, int ix,int iy,int iw,int ih); @@ -51,7 +52,7 @@ public: virtual void setValue(long) {}; virtual long getValue() { return -1; }; virtual void setValue(TQString) {}; - virtual TQString getStringValue() const { return TQString::null; }; + virtual TQString getStringValue() const { return TQString(); }; virtual void recalculateValue() {}; virtual void setColor(TQColor clr) { color = clr; }; diff --git a/superkaramba/src/meter_python.cpp b/superkaramba/src/meter_python.cpp index b8e1153..12c3a7e 100644 --- a/superkaramba/src/meter_python.cpp +++ b/superkaramba/src/meter_python.cpp @@ -78,12 +78,12 @@ bool checkKarambaAndMeter(long widget, long meter, const char* type) // This just throws awya extra bytes. // I guess there is a better way to do this... -TQString fromUcs4(Q_UINT32* ucs4) +TQString fromUcs4(TQ_UINT32* ucs4) { TQString result = ""; while(*ucs4 != 0) { - result += TQChar((Q_UINT16)*ucs4); + result += TQChar((TQ_UINT16)*ucs4); ++ucs4; } return result; @@ -102,9 +102,9 @@ TQString PyString2TQString(PyObject* text) { Py_UNICODE* t = PyUnicode_AsUnicode(text); if(sizeof(Py_UNICODE) == 4) - qtext = fromUcs4((Q_UINT32*)t); + qtext = fromUcs4((TQ_UINT32*)t); else - qtext = TQString::fromUcs2((Q_UINT16*)t); + qtext = TQString::fromUcs2((TQ_UINT16*)t); } else { @@ -114,7 +114,7 @@ TQString PyString2TQString(PyObject* text) } // Converts a TQString to a Python String with Unicode support -PyObject* QString2PyString(TQString string) +PyObject* TQString2PyString(TQString string) { PyObject *pyString; @@ -283,7 +283,7 @@ PyObject* py_getStringValue(PyObject *, PyObject *args, TQString type) if (!checkKarambaAndMeter(widget, meter, type.ascii())) return NULL; return Py_BuildValue((char*)"O", - QString2PyString(((Meter*)meter)->getStringValue())); + TQString2PyString(((Meter*)meter)->getStringValue())); } PyObject* py_setStringValue(PyObject *, PyObject *args, TQString type) diff --git a/superkaramba/src/meter_python.h b/superkaramba/src/meter_python.h index 0773ee3..c2247db 100644 --- a/superkaramba/src/meter_python.h +++ b/superkaramba/src/meter_python.h @@ -20,7 +20,7 @@ bool checkMeter(long widget, long meter, const char* type); bool checkKarambaAndMeter(long widget, long meter, const char* type); TQString PyString2TQString(PyObject* text); -PyObject* QString2PyString(TQString string); +PyObject* TQString2PyString(TQString string); PyObject* py_getThemeMeter(PyObject *self, PyObject *args, TQString type); PyObject* py_getSize(PyObject *self, PyObject *args, TQString type); diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp index 891d53f..933147c 100644 --- a/superkaramba/src/misc_python.cpp +++ b/superkaramba/src/misc_python.cpp @@ -167,7 +167,7 @@ long attachClickArea(long widget, long meter, TQString LeftButton, TQString Midd Meter* currMeter = (Meter*) meter; // Look if currMeter has an ClickArea attached. - bool meterAlreadyClickable = currTheme->clickList->containsRef(currMeter); + bool meterAlreadyClickable = currTheme->clickList->tqcontainsRef(currMeter); // if currMeter is of type ImageLabel* if (ImageLabel* image = dynamic_cast(currMeter)) @@ -471,7 +471,7 @@ long openNamedTheme(char* path, char *name, bool is_sub_theme) { if( file.exists() ) { TQCString prettyName(name); - KarambaApplication* app = (KarambaApplication*)qApp; + KarambaApplication* app = (KarambaApplication*)tqApp; if (!app->themeExists(prettyName)) { currTheme = new karamba( filename, prettyName, false , @@ -507,7 +507,7 @@ PyObject* py_get_incoming_data(PyObject *, PyObject *args) long widget; if (!PyArg_ParseTuple(args, (char*)"l:getIncomingData", &widget)) return NULL; - return Py_BuildValue((char*)"O", QString2PyString(getIncomingData(widget))); + return Py_BuildValue((char*)"O", TQString2PyString(getIncomingData(widget))); } PyObject* py_set_incoming_data(PyObject *, PyObject *args) @@ -778,7 +778,7 @@ PyObject* py_get_ip(PyObject *, PyObject *args) return NULL; if (!checkKaramba(widget)) return NULL; - return Py_BuildValue((char*)"O", QString2PyString(getIp(interface))); + return Py_BuildValue((char*)"O", TQString2PyString(getIp(interface))); } static void management_popup(long widget) diff --git a/superkaramba/src/misc_python.h b/superkaramba/src/misc_python.h index 46c0988..9b89f60 100644 --- a/superkaramba/src/misc_python.h +++ b/superkaramba/src/misc_python.h @@ -316,7 +316,7 @@ PyObject* py_get_number_of_desktops(PyObject *self, PyObject *args); * long translateAll(widget, relative_x, relative_y) * DESCRIPTION * Moves all widgets within a theme in a particular direction relative to -* the previous spot without moving the parent theme widget. +* the previous spot without moving the tqparent theme widget. * ARGUMENTS * * long widget -- karamba * * long translate_x -- move horizontally diff --git a/superkaramba/src/networksensor.cpp b/superkaramba/src/networksensor.cpp index 09de816..10138b4 100644 --- a/superkaramba/src/networksensor.cpp +++ b/superkaramba/src/networksensor.cpp @@ -102,11 +102,11 @@ void NetworkSensor::getInOutBytes ( unsigned long &in,unsigned long &out) const { TQTextStream t( &file ); // use a text stream line = t.readLine(); - while(line !=0 && !line.contains(device)) + while(line !=0 && !line.tqcontains(device)) { line = t.readLine(); } - if ( line.contains( device ) ) + if ( line.tqcontains( device ) ) { TQRegExp rx( "\\W+"+device+":\\D*(\\d+)(?:\\D+\\d+){7}\\D+(\\d+)", false); rx.search(line); @@ -115,7 +115,7 @@ void NetworkSensor::getInOutBytes ( unsigned long &in,unsigned long &out) const } else { - qDebug("Network sensor: can not find %s", device.ascii()); + qDebug("Network sensor: can not tqfind %s", device.ascii()); in = 0; out = 0; } @@ -148,11 +148,11 @@ void NetworkSensor::update() format = "%in"; } - format.replace( TQRegExp("%inkb", false), TQString::number( ((inB - receivedBytes)*8)/delay, 'f', decimals ) ); - format.replace( TQRegExp("%in", false), TQString::number( (inB - receivedBytes)/delay, 'f', decimals ) ); + format.tqreplace( TQRegExp("%inkb", false), TQString::number( ((inB - receivedBytes)*8)/delay, 'f', decimals ) ); + format.tqreplace( TQRegExp("%in", false), TQString::number( (inB - receivedBytes)/delay, 'f', decimals ) ); - format.replace( TQRegExp("%outkb", false), TQString::number( ((outB - transmittedBytes)*8)/delay, 'f', decimals ) ); - format.replace( TQRegExp("%out", false), TQString::number( (outB - transmittedBytes)/delay, 'f', decimals ) ); + format.tqreplace( TQRegExp("%outkb", false), TQString::number( ((outB - transmittedBytes)*8)/delay, 'f', decimals ) ); + format.tqreplace( TQRegExp("%out", false), TQString::number( (outB - transmittedBytes)/delay, 'f', decimals ) ); meter->setValue( format ); ++it; diff --git a/superkaramba/src/networksensor.h b/superkaramba/src/networksensor.h index 90878a8..77fdf08 100644 --- a/superkaramba/src/networksensor.h +++ b/superkaramba/src/networksensor.h @@ -25,6 +25,7 @@ class NetworkSensor : public Sensor { Q_OBJECT + TQ_OBJECT public: NetworkSensor( TQString device, int interval ); ~NetworkSensor(); diff --git a/superkaramba/src/noatunsensor.cpp b/superkaramba/src/noatunsensor.cpp index 57f25f1..d948bc9 100644 --- a/superkaramba/src/noatunsensor.cpp +++ b/superkaramba/src/noatunsensor.cpp @@ -77,17 +77,17 @@ void NoatunSensor::update() else { - format.replace( TQRegExp("%title", false), title ); - format.replace( TQRegExp("%id", false), noatunID ); + format.tqreplace( TQRegExp("%title", false), title ); + format.tqreplace( TQRegExp("%id", false), noatunID ); - format.replace( TQRegExp("%length", false), TQTime( 0,0,0 ). + format.tqreplace( TQRegExp("%length", false), TQTime( 0,0,0 ). addMSecs( songLength ) .toString( "h:mm:ss" ) ); - format.replace( TQRegExp("%time", false), TQTime( 0,0,0 ). + format.tqreplace( TQRegExp("%time", false), TQTime( 0,0,0 ). addMSecs( currentTime ) .toString( "h:mm:ss" ) ); - format.replace( TQRegExp("%remain", false), TQTime( 0,0,0 ). + format.tqreplace( TQRegExp("%remain", false), TQTime( 0,0,0 ). addMSecs( songLength ) .addMSecs(-currentTime ) .toString( "h:mm:ss" ) ); @@ -144,11 +144,11 @@ TQString NoatunSensor::getTitle() else { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) { reply >> result; - result.replace( TQRegExp("_")," " ); - result.replace( TQRegExp(".mp3$"),"" ); + result.tqreplace( TQRegExp("_")," " ); + result.tqreplace( TQRegExp(".mp3$"),"" ); } else diff --git a/superkaramba/src/programsensor.h b/superkaramba/src/programsensor.h index d016a81..93e1c9e 100644 --- a/superkaramba/src/programsensor.h +++ b/superkaramba/src/programsensor.h @@ -19,6 +19,7 @@ class ProgramSensor : public Sensor { Q_OBJECT + TQ_OBJECT public: ProgramSensor(const TQString &programName, int msec=1000, TQString encoding="" ); ~ProgramSensor(); diff --git a/superkaramba/src/richtextlabel.cpp b/superkaramba/src/richtextlabel.cpp index ba7ab11..5044161 100644 --- a/superkaramba/src/richtextlabel.cpp +++ b/superkaramba/src/richtextlabel.cpp @@ -17,7 +17,7 @@ RichTextLabel::RichTextLabel(karamba* k) : Meter(k, 0, 0, 100, 100), text(0), source(""), - colorGrp(k->colorGroup()), + colorGrp(k->tqcolorGroup()), underlineLinks(false) { originalSize = TQSize(0, 0); @@ -27,7 +27,7 @@ RichTextLabel::RichTextLabel(karamba* k, int x, int y, int w, int h) : Meter(k, x, y, w, h), text(0), source(""), - colorGrp(k->colorGroup()), + colorGrp(k->tqcolorGroup()), underlineLinks(false) { kdDebug() << k_funcinfo << x << ", " << y << ", " << w << ", " << h << endl; @@ -60,9 +60,9 @@ void RichTextLabel::setText(TQString t, bool linkUnderline) text = new TQSimpleRichText(t, font, m_karamba->theme().path(), 0, // default TQStyleSheet* - 0, // default QMimeSourceFactory + 0, // default TQMimeSourceFactory -1, // no pageBreak - Qt::blue, // (has no effect) link Color + TQt::blue, // (has no effect) link Color underlineLinks); // set the text to a reasonable size diff --git a/superkaramba/src/richtextlabel.h b/superkaramba/src/richtextlabel.h index 4a6eb69..5ea5a94 100644 --- a/superkaramba/src/richtextlabel.h +++ b/superkaramba/src/richtextlabel.h @@ -24,6 +24,7 @@ class RichTextLabel : public Meter { Q_OBJECT + TQ_OBJECT public: RichTextLabel(karamba*); RichTextLabel(karamba* k, int x, int y, int w, int h); diff --git a/superkaramba/src/rsssensor.cpp b/superkaramba/src/rsssensor.cpp index 5a999ec..3640636 100644 --- a/superkaramba/src/rsssensor.cpp +++ b/superkaramba/src/rsssensor.cpp @@ -48,7 +48,7 @@ void RssSensor::update() bool OK = false; #if defined(KDE_3_3) - if(KIO::NetAccess::download(KURL(source), tmpFile, karambaApp->parentWindow())) + if(KIO::NetAccess::download(KURL(source), tmpFile, karambaApp->tqparentWindow())) #else if(KIO::NetAccess::download(KURL(source), tmpFile)) #endif @@ -95,7 +95,7 @@ void RssSensor::update() { TQDomNodeList links = docElem.elementsByTagName( "link" ); TQDomNodeList displays; - if ( format.contains( "%d", false ) > 0 ) + if ( format.tqcontains( "%d", false ) > 0 ) { displays = docElem.elementsByTagName( "description" ); } diff --git a/superkaramba/src/rsssensor.h b/superkaramba/src/rsssensor.h index f567c0d..4e2322b 100644 --- a/superkaramba/src/rsssensor.h +++ b/superkaramba/src/rsssensor.h @@ -22,8 +22,9 @@ class RssSensor : public Sensor { Q_OBJECT + TQ_OBJECT public: - RssSensor( const TQString &source, int interval, const TQString &format, const TQString &encoding=TQString::null ); + RssSensor( const TQString &source, int interval, const TQString &format, const TQString &encoding=TQString() ); ~RssSensor(); diff --git a/superkaramba/src/sensor.h b/superkaramba/src/sensor.h index ee48c98..dd9b567 100644 --- a/superkaramba/src/sensor.h +++ b/superkaramba/src/sensor.h @@ -18,9 +18,10 @@ #include "sensorparams.h" -class Sensor : public QObject +class Sensor : public TQObject { Q_OBJECT + TQ_OBJECT public: Sensor( int msec = 1000 ); diff --git a/superkaramba/src/sensorparams.h b/superkaramba/src/sensorparams.h index 1de515a..0f611b6 100644 --- a/superkaramba/src/sensorparams.h +++ b/superkaramba/src/sensorparams.h @@ -28,7 +28,7 @@ * * Hans Karlsson **/ -class SensorParams : public QObject +class SensorParams : public TQObject { public: SensorParams( Meter* ); diff --git a/superkaramba/src/sensorsensor.cpp b/superkaramba/src/sensorsensor.cpp index ed6934e..3232665 100644 --- a/superkaramba/src/sensorsensor.cpp +++ b/superkaramba/src/sensorsensor.cpp @@ -91,9 +91,9 @@ void SensorSensor::processExited(KProcess *) } #if defined __FreeBSD__ || defined(Q_OS_NETBSD) - format.replace( TQRegExp("%v", false), sensorMap[sensorMapBSD[type]]); + format.tqreplace( TQRegExp("%v", false), sensorMap[sensorMapBSD[type]]); #else - format.replace( TQRegExp("%v", false), sensorMap[type]); + format.tqreplace( TQRegExp("%v", false), sensorMap[type]); #endif meter->setValue(format); ++lit; diff --git a/superkaramba/src/sensorsensor.h b/superkaramba/src/sensorsensor.h index 6201660..217cefb 100644 --- a/superkaramba/src/sensorsensor.h +++ b/superkaramba/src/sensorsensor.h @@ -20,6 +20,7 @@ class SensorSensor : public Sensor { Q_OBJECT + TQ_OBJECT public: SensorSensor(int interval, char tempUnit); diff --git a/superkaramba/src/showdesktop.h b/superkaramba/src/showdesktop.h index 6f46688..bcf67d9 100644 --- a/superkaramba/src/showdesktop.h +++ b/superkaramba/src/showdesktop.h @@ -27,9 +27,10 @@ class KWinModule; /** * Singleton class that handles desktop access (minimizing all windows) */ -class ShowDesktop : public QObject +class ShowDesktop : public TQObject { Q_OBJECT + TQ_OBJECT public: static ShowDesktop* the(); diff --git a/superkaramba/src/sklineedit.cpp b/superkaramba/src/sklineedit.cpp index 7047dde..f923fef 100644 --- a/superkaramba/src/sklineedit.cpp +++ b/superkaramba/src/sklineedit.cpp @@ -24,8 +24,8 @@ SKLineEdit::SKLineEdit(TQWidget *w, Input *i) : TQLineEdit(w), m_input(i) { - frameColor = Qt::gray; - setBackgroundColor(Qt::white); + frameColor = TQt::gray; + setBackgroundColor(TQt::white); } SKLineEdit::~SKLineEdit() @@ -46,13 +46,13 @@ void SKLineEdit::drawContents(TQPainter *p) void SKLineEdit::setFrameColor(TQColor c) { frameColor = c; - repaint(); + tqrepaint(); } void SKLineEdit::setBackgroundColor(TQColor c) { TQLineEdit::setBackgroundColor(c); - repaint(); + tqrepaint(); } TQColor SKLineEdit::getFrameColor() const @@ -66,7 +66,7 @@ void SKLineEdit::keyPressEvent(TQKeyEvent* e) if(!e->text().isEmpty()) { - karamba* k = static_cast(parent()); + karamba* k = static_cast(TQT_TQWIDGET(tqparent())); k->keyPressed(e->text(), m_input); } } diff --git a/superkaramba/src/sklineedit.h b/superkaramba/src/sklineedit.h index 2d56793..8314309 100644 --- a/superkaramba/src/sklineedit.h +++ b/superkaramba/src/sklineedit.h @@ -29,7 +29,7 @@ class Input; -class SKLineEdit : public QLineEdit +class SKLineEdit : public TQLineEdit { public: SKLineEdit(TQWidget *w, Input *i); diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp index ed85ab8..17c38b6 100644 --- a/superkaramba/src/systemtray.cpp +++ b/superkaramba/src/systemtray.cpp @@ -35,8 +35,8 @@ #include -Systemtray::Systemtray(TQWidget* parent) - : TQWidget(parent,0,0) +Systemtray::Systemtray(TQWidget* tqparent) + : TQWidget(tqparent,0,0) { setBackgroundOrigin(ParentOrigin); setBackgroundMode(FixedPixmap); @@ -62,7 +62,7 @@ void Systemtray::updateBackgroundPixmap ( const TQPixmap & pixmap) { //Stupid stupid stupid work around for annoying bug //QXEmbed ignores setBackgroundOrigin(AncestorOrigin).... TQPixmap bug = TQPixmap(emb->size()); - bitBlt(&bug, 0, 0, &pixmap, emb->parentWidget()->x()+emb->x(), emb->parentWidget()->y()+emb->y(), emb->width(), emb->height(),Qt::CopyROP, false); + bitBlt(TQT_TQPAINTDEVICE(&bug), 0, 0, TQT_TQPAINTDEVICE(const_cast(&pixmap)), emb->tqparentWidget()->x()+emb->x(), emb->tqparentWidget()->y()+emb->y(), emb->width(), emb->height(),TQt::CopyROP, false); emb->setPaletteBackgroundPixmap (bug); } @@ -153,14 +153,14 @@ void Systemtray::updateTrayWindows( void ) while ((emb = m_Wins.current()) != 0L) { WId wid = emb->embeddedWinId(); - if ((wid == 0) || !kwin_module->systemTrayWindows().contains(wid) ) + if ((wid == 0) || !kwin_module->systemTrayWindows().tqcontains(wid) ) m_Wins.remove(emb); else m_Wins.next(); } - layoutSystray(); + tqlayoutSystray(); } -void Systemtray::layoutSystray() +void Systemtray::tqlayoutSystray() { int i = 0, a = 0; @@ -190,7 +190,7 @@ void Systemtray::layoutSystray() } count++; - emb->repaint(); + emb->tqrepaint(); } } @@ -213,7 +213,7 @@ void Systemtray::systemTrayWindowAdded( WId w ) emb->resize(24, 24); emb->show(); - layoutSystray(); + tqlayoutSystray(); } void Systemtray::systemTrayWindowRemoved(WId) diff --git a/superkaramba/src/systemtray.h b/superkaramba/src/systemtray.h index 51f1d56..4411355 100644 --- a/superkaramba/src/systemtray.h +++ b/superkaramba/src/systemtray.h @@ -31,11 +31,12 @@ class KWinModule; typedef long unsigned int Atom; -class Systemtray : public QWidget +class Systemtray : public TQWidget { Q_OBJECT + TQ_OBJECT public: - Systemtray(TQWidget* parent); + Systemtray(TQWidget* tqparent); ~Systemtray(); void updateBackgroundPixmap ( const TQPixmap & ); @@ -49,7 +50,7 @@ public slots: int getTraySize(); void systemTrayWindowAdded( WId w ); void systemTrayWindowRemoved( WId w ); - void layoutSystray(); + void tqlayoutSystray(); signals: void updated(); diff --git a/superkaramba/src/systray_python.cpp b/superkaramba/src/systray_python.cpp index c953fdb..1d2e53d 100644 --- a/superkaramba/src/systray_python.cpp +++ b/superkaramba/src/systray_python.cpp @@ -40,7 +40,7 @@ long moveSystray(long widget, long x, long y, long w, long h) if (currTheme->systray != 0) { currTheme->systray->move((int)x,(int)y); currTheme->systray->setMinimumSize((int)w,(int)h); - currTheme->systray->layoutSystray(); + currTheme->systray->tqlayoutSystray(); currTheme->systray->show(); } return 1; @@ -161,7 +161,7 @@ long updateSystrayLayout(long widget) if (currTheme->systray != 0) { - currTheme->systray->layoutSystray(); + currTheme->systray->tqlayoutSystray(); } return 1; } diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp index 95b66a2..46d445d 100644 --- a/superkaramba/src/taskbartest.cpp +++ b/superkaramba/src/taskbartest.cpp @@ -126,7 +126,7 @@ int main(int argc, char **argv) // else // { // TQStringList fileNames; -// fileNames = KFileDialog::getOpenFileNames(TQString::null, "*.theme", 0, "Open configurations"); +// fileNames = KFileDialog::getOpenFileNames(TQString(), "*.theme", 0, "Open configurations"); // for ( TQStringList::Iterator it = fileNames.begin(); it != fileNames.end(); ++it ) // { // TQFileInfo file( *it ); diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index e12fc6a..7f091ce 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. template class TQPtrList; -// Hack: create a global KWinModule without a parent. We +// Hack: create a global KWinModule without a tqparent. We // can't make it a child of TaskManager because more than one // TaskManager might be created. We can't make it a class // variable without changing Task, which also uses it. @@ -48,8 +48,8 @@ template class TQPtrList; // The real problem is that KWinModule should be a singleton. KWinModule* kwin_module = 0; -TaskManager::TaskManager(TQObject *parent, const char *name) - : TQObject(parent, name), _active(0), _startup_info( NULL ) +TaskManager::TaskManager(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), _active(0), _startup_info( NULL ) { kwin_module = new KWinModule(); @@ -138,7 +138,7 @@ void TaskManager::windowAdded(WId w ) WId transient_for = (WId) transient_for_tmp; // check if it's transient for a skiptaskbar window - if (_skiptaskbar_windows.contains(transient_for)) + if (_skiptaskbar_windows.tqcontains(transient_for)) return; // lets see if this is a transient for an existing task @@ -328,8 +328,8 @@ bool TaskManager::isOnTop(const Task* task) } -Task::Task(WId win, TaskManager * parent, const char *name) : - TQObject(parent, name), +Task::Task(WId win, TaskManager * tqparent, const char *name) : + TQObject(tqparent, name), _active(false), _win(win), _lastWidth(0), _lastHeight(0), _lastResize(false), _lastIcon(), _thumbSize(0.2), _thumb(), _grab() @@ -464,9 +464,9 @@ bool Task::isModified() const { static TQString modStr = TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]"); #ifdef KDE_3_2 - int modStrPos = _info.visibleName().find(modStr); + int modStrPos = _info.visibleName().tqfind(modStr); #else - int modStrPos = _info.visibleName.find(modStr); + int modStrPos = _info.visibleName.tqfind(modStr); #endif return ( modStrPos != -1 ); @@ -492,7 +492,7 @@ TQString Task::className() XFree( hint.res_class ); return nh; } - return TQString::null; + return TQString(); } TQString Task::classClass() @@ -504,7 +504,7 @@ TQString Task::classClass() XFree( hint.res_class ); return ch; } - return TQString::null; + return TQString(); } TQPixmap Task::icon( int width, int height, bool allowResize ) @@ -608,10 +608,10 @@ bool Task::idMatch( const TQString& id1, const TQString& id2 ) if ( id1.isEmpty() || id2.isEmpty() ) return false; - if ( id1.contains( id2 ) > 0 ) + if ( id1.tqcontains( id2 ) > 0 ) return true; - if ( id2.contains( id1 ) > 0 ) + if ( id2.tqcontains( id1 ) > 0 ) return true; return false; @@ -773,12 +773,8 @@ void Task::updateThumbnail() // by the thumbnail generation. This makes things much smoother // on slower machines. // - TQWidget *rootWin = qApp->desktop(); -#ifdef KDE_3_2 + TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop()); TQRect geom = _info.geometry(); -#else - TQRect geom = _info.geometry; -#endif _grab = TQPixmap::grabWindow( rootWin->winId(), geom.x(), geom.y(), geom.width(), geom.height() ); @@ -807,8 +803,8 @@ void Task::generateThumbnail() } Startup::Startup( const KStartupInfoId& id, const KStartupInfoData& data, - TQObject * parent, const char *name) - : TQObject(parent, name), _id( id ), _data( data ) + TQObject * tqparent, const char *name) + : TQObject(tqparent, name), _id( id ), _data( data ) { } diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h index be05cb7..8172287 100644 --- a/superkaramba/src/taskmanager.h +++ b/superkaramba/src/taskmanager.h @@ -46,33 +46,34 @@ class TaskManager; * @see TaskManager * @see KWinModule */ -class Task: public QObject +class Task: public TQObject { Q_OBJECT - Q_PROPERTY( TQString name READ name ) - Q_PROPERTY( TQString visibleName READ visibleName ) - Q_PROPERTY( TQString visibleNameWithState READ visibleNameWithState ) - Q_PROPERTY( TQString iconName READ iconName ) - Q_PROPERTY( TQString visibleIconName READ visibleIconName ) - Q_PROPERTY( TQPixmap pixmap READ pixmap ) - Q_PROPERTY( bool maximized READ isMaximized ) - Q_PROPERTY( bool iconified READ isIconified ) - Q_PROPERTY( bool shaded READ isShaded WRITE setShaded ) - Q_PROPERTY( bool active READ isActive ) - Q_PROPERTY( bool onCurrentDesktop READ isOnCurrentDesktop ) - Q_PROPERTY( bool onAllDesktops READ isOnAllDesktops ) - Q_PROPERTY( bool alwaysOnTop READ isAlwaysOnTop WRITE setAlwaysOnTop ) - Q_PROPERTY( bool modified READ isModified ) - Q_PROPERTY( int desktop READ desktop ) - Q_PROPERTY( double thumbnailSize READ thumbnailSize WRITE setThumbnailSize ) - Q_PROPERTY( bool hasThumbnail READ hasThumbnail ) - Q_PROPERTY( TQPixmap thumbnail READ thumbnail ) + TQ_OBJECT + TQ_PROPERTY( TQString name READ name ) + TQ_PROPERTY( TQString visibleName READ visibleName ) + TQ_PROPERTY( TQString visibleNameWithState READ visibleNameWithState ) + TQ_PROPERTY( TQString iconName READ iconName ) + TQ_PROPERTY( TQString visibleIconName READ visibleIconName ) + TQ_PROPERTY( TQPixmap pixmap READ pixmap ) + TQ_PROPERTY( bool maximized READ isMaximized ) + TQ_PROPERTY( bool iconified READ isIconified ) + TQ_PROPERTY( bool shaded READ isShaded WRITE setShaded ) + TQ_PROPERTY( bool active READ isActive ) + TQ_PROPERTY( bool onCurrentDesktop READ isOnCurrentDesktop ) + TQ_PROPERTY( bool onAllDesktops READ isOnAllDesktops ) + TQ_PROPERTY( bool alwaysOnTop READ isAlwaysOnTop WRITE setAlwaysOnTop ) + TQ_PROPERTY( bool modified READ isModified ) + TQ_PROPERTY( int desktop READ desktop ) + TQ_PROPERTY( double thumbnailSize READ thumbnailSize WRITE setThumbnailSize ) + TQ_PROPERTY( bool hasThumbnail READ hasThumbnail ) + TQ_PROPERTY( TQPixmap thumbnail READ thumbnail ) public: - Task( WId win, TaskManager * parent, const char *name = 0 ); + Task( WId win, TaskManager * tqparent, const char *name = 0 ); virtual ~Task(); - TaskManager* taskManager() const { return (TaskManager*) parent(); } + TaskManager* taskManager() const { return (TaskManager*) tqparent(); } WId window() const { return _win; } #ifdef KDE_3_2 @@ -203,7 +204,7 @@ public: //* @internal void removeTransient( WId w ) { _transients.remove( w ); } //* @internal - bool hasTransient( WId w ) const { return _transients.contains( w ); } + bool hasTransient( WId w ) const { return _transients.tqcontains( w ); } //* @internal void setActive(bool a); @@ -372,15 +373,16 @@ private: * * @see TaskManager */ -class Startup: public QObject +class Startup: public TQObject { Q_OBJECT - Q_PROPERTY( TQString text READ text ) - Q_PROPERTY( TQString bin READ bin ) - Q_PROPERTY( TQString icon READ icon ) + TQ_OBJECT + TQ_PROPERTY( TQString text READ text ) + TQ_PROPERTY( TQString bin READ bin ) + TQ_PROPERTY( TQString icon READ icon ) public: - Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * parent, + Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * tqparent, const char *name = 0); virtual ~Startup(); @@ -427,14 +429,15 @@ typedef TQPtrList StartupList; * @see KWinModule * @version $Id: taskmanager.h,v 1.2 2004/11/17 10:16:47 kodaaja Exp $ */ -class TaskManager : public QObject +class TaskManager : public TQObject { Q_OBJECT - Q_PROPERTY( int currentDesktop READ currentDesktop ) - Q_PROPERTY( int numberOfDesktops READ numberOfDesktops ) + TQ_OBJECT + TQ_PROPERTY( int currentDesktop READ currentDesktop ) + TQ_PROPERTY( int numberOfDesktops READ numberOfDesktops ) public: - TaskManager( TQObject *parent = 0, const char *name = 0 ); + TaskManager( TQObject *tqparent = 0, const char *name = 0 ); virtual ~TaskManager(); /** diff --git a/superkaramba/src/textfield.cpp b/superkaramba/src/textfield.cpp index d2d0c6b..a3be722 100644 --- a/superkaramba/src/textfield.cpp +++ b/superkaramba/src/textfield.cpp @@ -18,7 +18,7 @@ TextField::TextField( ) setColor(TQColor(192, 192, 192)); setBGColor(TQColor(0, 0, 0)); setFont("Helvetica"); - setAlignment(Qt::AlignLeft); + tqsetAlignment(TQt::AlignLeft); setFixedPitch(false); setShadow(0); } @@ -35,7 +35,7 @@ TextField::TextField( const TextField& def ) setBGColor(def.getBGColor()); setFont( def.getFont() ); - setAlignment( def.getAlignment() ); + tqsetAlignment( def.getAlignment() ); setFixedPitch( def.getFixedPitch() ); setShadow( def.getShadow() ); } @@ -51,7 +51,7 @@ TextField& TextField::operator=(const TextField& rhs) setBGColor(rhs.getBGColor()); setFont( rhs.getFont() ); - setAlignment( rhs.getAlignment() ); + tqsetAlignment( rhs.getAlignment() ); setFixedPitch( rhs.getFixedPitch() ); setShadow( rhs.getShadow() ); @@ -102,32 +102,32 @@ int TextField::getFontSize() const return font.pointSize(); } -void TextField::setAlignment( const TQString &align ) +void TextField::tqsetAlignment( const TQString &align ) { TQString a = align.upper(); if( a == "LEFT" || a.isEmpty() ) - alignment = Qt::AlignLeft; + tqalignment = TQt::AlignLeft; if( a == "RIGHT" ) - alignment = Qt::AlignRight; + tqalignment = TQt::AlignRight; if( a == "CENTER" ) - alignment = Qt::AlignHCenter; + tqalignment = TQt::AlignHCenter; } -void TextField::setAlignment( int af ) +void TextField::tqsetAlignment( int af ) { - alignment = af; + tqalignment = af; } int TextField::getAlignment() const { - return alignment; + return tqalignment; } TQString TextField::getAlignmentAsString() const { - if( alignment == Qt::AlignHCenter ) + if( tqalignment == TQt::AlignHCenter ) return "CENTER"; - else if( alignment == Qt::AlignRight ) + else if( tqalignment == TQt::AlignRight ) return "RIGHT"; else return "LEFT"; diff --git a/superkaramba/src/textfield.h b/superkaramba/src/textfield.h index 13177b7..34f17c3 100644 --- a/superkaramba/src/textfield.h +++ b/superkaramba/src/textfield.h @@ -31,8 +31,8 @@ public: void setColor(TQColor clr); void setBGColor(TQColor clr); void setFont( const TQString& ); - void setAlignment( int ); - void setAlignment( const TQString& ); + void tqsetAlignment( int ); + void tqsetAlignment( const TQString& ); void setFixedPitch( bool ); void setShadow( int ); @@ -47,7 +47,7 @@ public: int getLineHeight() const; protected: - int alignment; + int tqalignment; TQFont font; TQColor color; TQColor bgColor; diff --git a/superkaramba/src/textfilesensor.h b/superkaramba/src/textfilesensor.h index 39a464d..adf521e 100644 --- a/superkaramba/src/textfilesensor.h +++ b/superkaramba/src/textfilesensor.h @@ -37,8 +37,9 @@ class TextFileSensor : public Sensor { Q_OBJECT + TQ_OBJECT public: - TextFileSensor( const TQString &fileName, bool rdf, int interval, const TQString &encoding=TQString::null ); + TextFileSensor( const TQString &fileName, bool rdf, int interval, const TQString &encoding=TQString() ); ~TextFileSensor(); diff --git a/superkaramba/src/textlabel.cpp b/superkaramba/src/textlabel.cpp index 509aea8..376f226 100644 --- a/superkaramba/src/textlabel.cpp +++ b/superkaramba/src/textlabel.cpp @@ -13,7 +13,7 @@ #include "textlabel.h" TextLabel::TextLabel(karamba *k, int x,int y,int w,int h): - Meter(k, x,y,w,h), alignment(Qt::AlignLeft), clip(0), bgColor(0, 0, 0), + Meter(k, x,y,w,h), tqalignment(TQt::AlignLeft), clip(0), bgColor(0, 0, 0), lineHeight(0), shadow(0), scrollSpeed(0, 0), scrollPos(0, 0), scrollGap(0), scrollPause(0), pauseCounter(0), scrollType(ScrollNone) { @@ -21,7 +21,7 @@ TextLabel::TextLabel(karamba *k, int x,int y,int w,int h): if( h != 0 || w != 0) clip = 0; else - clip = Qt::DontClip; + clip = TQt::DontClip; if( h == 0 || w == 0) { @@ -31,7 +31,7 @@ TextLabel::TextLabel(karamba *k, int x,int y,int w,int h): } TextLabel::TextLabel(karamba *k): - Meter(k, 0, 0, 0, 0), alignment(Qt::AlignLeft), clip(0), bgColor(0, 0, 0), + Meter(k, 0, 0, 0, 0), tqalignment(TQt::AlignLeft), clip(0), bgColor(0, 0, 0), lineHeight(0), shadow(0), scrollSpeed(0, 0), scrollPos(0, 0), scrollGap(0), scrollPause(0), pauseCounter(0), scrollType(ScrollNone) { @@ -60,7 +60,7 @@ void TextLabel::setTextProps( TextField* t ) text = *t; //lineHeight = t->getLineHeight(); shadow = t->getShadow(); - alignment = t->getAlignment(); + tqalignment = t->getAlignment(); setFontSize(t->getFontSize()); setFont(t->getFont()); @@ -131,22 +131,22 @@ int TextLabel::getFontSize() const return font.pixelSize(); } -void TextLabel::setAlignment( TQString align ) +void TextLabel::tqsetAlignment( TQString align ) { TQString a = align.upper(); if( a == "LEFT" || a.isEmpty() ) - alignment = Qt::AlignLeft; + tqalignment = TQt::AlignLeft; if( a == "RIGHT" ) - alignment = Qt::AlignRight; + tqalignment = TQt::AlignRight; if( a == "CENTER" ) - alignment = Qt::AlignHCenter; + tqalignment = TQt::AlignHCenter; } TQString TextLabel::getAlignment() const { - if( alignment == Qt::AlignHCenter ) + if( tqalignment == TQt::AlignHCenter ) return "CENTER"; - else if( alignment == Qt::AlignRight ) + else if( tqalignment == TQt::AlignRight ) return "RIGHT"; else return "LEFT"; @@ -228,10 +228,10 @@ int TextLabel::drawText(TQPainter *p, int x, int y, int width, int height, { p->setPen(getBGColor()); p->drawText(x + shadow, y + shadow, width, height, - alignment | clip | Qt::ExpandTabs, text); + tqalignment | clip | TQt::ExpandTabs, text); } p->setPen(getColor()); - p->drawText(x, y, width, height, alignment | clip | Qt::ExpandTabs, text); + p->drawText(x, y, width, height, tqalignment | clip | TQt::ExpandTabs, text); return 0; } @@ -339,7 +339,7 @@ void TextLabel::mUpdate(TQPainter *p) bool TextLabel::click(TQMouseEvent* e) { - if (getBoundingBox().contains(e -> x(), e -> y()) && isEnabled()) + if (getBoundingBox().tqcontains(e -> x(), e -> y()) && isEnabled()) { TQString program; if (e -> button() == Qt::LeftButton) diff --git a/superkaramba/src/textlabel.h b/superkaramba/src/textlabel.h index f3774e6..b29c44e 100644 --- a/superkaramba/src/textlabel.h +++ b/superkaramba/src/textlabel.h @@ -23,6 +23,7 @@ class TextLabel : public Meter { Q_OBJECT + TQ_OBJECT public: enum ScrollType { ScrollNone, ScrollNormal, ScrollBackAndForth, ScrollOnePass }; @@ -39,7 +40,7 @@ public: void setFontSize( int ); void setBGColor(TQColor clr); void setFont( TQString ); - void setAlignment( TQString ); + void tqsetAlignment( TQString ); void setFixedPitch( bool ); void setShadow( int ); void mUpdate( TQPainter * ); @@ -61,7 +62,7 @@ public: virtual bool click(TQMouseEvent*); private: - int alignment; + int tqalignment; int clip; TQStringList value; TQFont font; diff --git a/superkaramba/src/textlabel_python.cpp b/superkaramba/src/textlabel_python.cpp index 3cf6e3e..e7d2498 100644 --- a/superkaramba/src/textlabel_python.cpp +++ b/superkaramba/src/textlabel_python.cpp @@ -206,7 +206,7 @@ PyObject* py_setTextAlign(PyObject *, PyObject *args) return NULL; if (!checkKarambaAndMeter(widget, textSensor, "TextLabel")) return NULL; - ((TextLabel*)textSensor)->setAlignment( text ); + ((TextLabel*)textSensor)->tqsetAlignment( text ); return Py_BuildValue((char*)"l", 1); } diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp index 1147357..0e420d2 100644 --- a/superkaramba/src/themefile.cpp +++ b/superkaramba/src/themefile.cpp @@ -209,11 +209,11 @@ bool ThemeFile::set(const KURL &url) { if(!url.isLocalFile() && !url.protocol().isEmpty()) { - if(KMessageBox::warningContinueCancel(kapp->activeWindow(), + if(KMessageBox::warningContinueCancel(TQT_TQWIDGET(kapp->activeWindow()), i18n("You are about to install and run %1 SuperKaramba theme. Since " "themes can contain executable code you should only install themes " "from sources that you trust. Continue?"), i18n("Executable Code Warning"), i18n("Install") - .arg(url.prettyURL())) + .tqarg(url.prettyURL())) == KMessageBox::Cancel) { return false; @@ -224,9 +224,9 @@ bool ThemeFile::set(const KURL &url) if(localFile.exists()) { - if(KMessageBox::warningContinueCancel(kapp->activeWindow(), + if(KMessageBox::warningContinueCancel(TQT_TQWIDGET(kapp->activeWindow()), i18n("%1 already exists. Do you want to overwrite it?") - .arg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite")) + .tqarg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite")) == KMessageBox::Cancel) { return false; diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp index 32886f6..bc388c2 100644 --- a/superkaramba/src/themelocale.cpp +++ b/superkaramba/src/themelocale.cpp @@ -46,7 +46,7 @@ # define W(flag, data) ((flag) ? SWAP (data) : (data)) #endif -typedef Q_UINT32 nls_uint32; +typedef TQ_UINT32 nls_uint32; struct loaded_domain { @@ -137,7 +137,7 @@ void ThemeLocale::unload() TQString ThemeLocale::translate(TQString text) const { if(text == 0) - return TQString::null; + return TQString(); if(m_domain.data) { TQString result = TQString::fromUtf8(tl_nl_find_msg(&m_domain, text.ascii())); @@ -157,12 +157,12 @@ void ThemeLocale::setLanguage(const TQStringList &languages) ++it) { TQString file = - TQString("locale/%1/LC_MESSAGES/%2.mo").arg(*it).arg(m_theme->mo()); + TQString("locale/%1/LC_MESSAGES/%2.mo").tqarg(*it).tqarg(m_theme->mo()); if(m_theme->fileExists(file)) { TQBuffer buffer(m_theme->readThemeFile(file)); - tl_nl_load_domain(&buffer, buffer.size(), &m_domain); + tl_nl_load_domain(TQT_TQIODEVICE(&buffer), buffer.size(), &m_domain); m_language = *it; return; } diff --git a/superkaramba/src/themes_layout.ui b/superkaramba/src/themes_layout.ui index d7d3ba5..daec764 100644 --- a/superkaramba/src/themes_layout.ui +++ b/superkaramba/src/themes_layout.ui @@ -1,6 +1,6 @@ ThemesLayout - + ThemesLayout @@ -12,7 +12,7 @@ 517 - + 0 0 @@ -25,15 +25,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + labelSearch @@ -44,12 +44,12 @@ editSearch - + editSearch - + labelShow @@ -60,7 +60,7 @@ comboShow - + All @@ -93,9 +93,9 @@ StrongFocus - + - layoutButtons + tqlayoutButtons @@ -111,7 +111,7 @@ Expanding - + 40 20 @@ -122,7 +122,7 @@ buttonAddToDesktop - + 0 0 @@ -139,7 +139,7 @@ buttonClose - + 0 0 @@ -226,13 +226,13 @@ buttonAddToDesktop buttonClose - + addToDesktop() selectionChanged(int) search(const QString&) - - - + + + kwidgetlistbox.h kpushbutton.h diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp index f483a04..1a996cd 100644 --- a/superkaramba/src/themesdlg.cpp +++ b/superkaramba/src/themesdlg.cpp @@ -51,8 +51,8 @@ #include #include -ThemesDlg::ThemesDlg(TQWidget *parent, const char *name) - : ThemesLayout(parent, name) +ThemesDlg::ThemesDlg(TQWidget *tqparent, const char *name) + : ThemesLayout(tqparent, name) { populateListbox(); #ifdef HAVE_KNEWSTUFF @@ -220,9 +220,9 @@ void ThemesDlg::getNewStuff() KConfig* config = KGlobal::config(); config->setGroup("KNewStuff"); config->writePathEntry("ProvidersUrl", - TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml")); + TQString::tqfromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml")); config->sync(); - m_newStuffStatus = config->entryMap("KNewStuffStatus").keys(); + m_newStufftqStatus = config->entryMap("KNewStufftqStatus").keys(); //This check is b/c KNewStuff will download, throw an error, //and still have the entry in the config that it was successful configSanityCheck(); @@ -302,10 +302,10 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file) { #ifdef HAVE_KNEWSTUFF KConfig* config = KGlobal::config(); - TQStringList keys = config->entryMap("KNewStuffStatus").keys(); + TQStringList keys = config->entryMap("KNewStufftqStatus").keys(); - for(TQStringList::Iterator it = m_newStuffStatus.begin(); - it != m_newStuffStatus.end(); ++it) + for(TQStringList::Iterator it = m_newStufftqStatus.begin(); + it != m_newStufftqStatus.end(); ++it) { keys.remove(*it); } @@ -322,7 +322,7 @@ void ThemesDlg::configSanityCheck() { #ifdef HAVE_KNEWSTUFF KConfig* config = KGlobal::config(); - TQStringList statusKeys = config->entryMap("KNewStuffStatus").keys(); + TQStringList statusKeys = config->entryMap("KNewStufftqStatus").keys(); TQStringList nameKeys = config->entryMap("KNewStuffNames").keys(); TQStringList removeList; @@ -345,7 +345,7 @@ void ThemesDlg::configSanityCheck() if( removeKey ) { kdDebug() << "sanityCheck() deleting entry " << keyName << endl; - config->setGroup("KNewStuffStatus"); + config->setGroup("KNewStufftqStatus"); config->deleteEntry( keyName ); } } @@ -416,9 +416,9 @@ bool ThemesDlg::filter(int index, TQWidget* widget, void* data) } else { - if(w->themeName->text().lower().contains(searchText)) + if(w->themeName->text().lower().tqcontains(searchText)) return true; - if(w->description->text().lower().contains(searchText)) + if(w->description->text().lower().tqcontains(searchText)) return true; } return false; @@ -477,7 +477,7 @@ void ThemesDlg::uninstall() tableThemes->removeItem( twPtr ); } #ifdef HAVE_KNEWSTUFF - // Remove theme from KNewStuffStatus + // Remove theme from KNewStufftqStatus KConfig* config = KGlobal::config(); config->setGroup("KNewStuffNames"); TQString name = config->readEntry(tempPath); @@ -486,8 +486,8 @@ void ThemesDlg::uninstall() kdDebug() << "removing " << tempPath << " under KNewStuffNames from superkarambarc" << endl; kapp->config()->deleteEntry(tempPath); - config->setGroup("KNewStuffStatus"); - kdDebug() << "removing " << name << " under KNewStuffStatus from superkarambarc" + config->setGroup("KNewStufftqStatus"); + kdDebug() << "removing " << name << " under KNewStufftqStatus from superkarambarc" << endl; kapp->config()->deleteEntry(name); kapp->config()->sync(); @@ -507,7 +507,7 @@ void ThemesDlg::uninstall() } tableThemes->removeItem(w); #ifdef HAVE_KNEWSTUFF - // Remove theme from KNewStuffStatus + // Remove theme from KNewStufftqStatus KConfig* config = KGlobal::config(); config->setGroup("KNewStuffNames"); TQString name = config->readEntry(theme.path()); @@ -515,7 +515,7 @@ void ThemesDlg::uninstall() { kdDebug() << "removing " << theme.path() << " from superkarambarc" << endl; kapp->config()->deleteEntry(theme.path()); - config->setGroup("KNewStuffStatus"); + config->setGroup("KNewStufftqStatus"); kdDebug() << "removing " << name << " from superkarambarc" << endl; kapp->config()->deleteEntry(name); kapp->config()->sync(); diff --git a/superkaramba/src/themesdlg.h b/superkaramba/src/themesdlg.h index 2c9976f..200dca2 100644 --- a/superkaramba/src/themesdlg.h +++ b/superkaramba/src/themesdlg.h @@ -40,9 +40,10 @@ class KArchiveDirectory; class ThemesDlg : public ThemesLayout { Q_OBJECT + TQ_OBJECT public: - ThemesDlg(TQWidget *parent = 0, const char *name = 0); + ThemesDlg(TQWidget *tqparent = 0, const char *name = 0); ~ThemesDlg(); int addTheme(const TQString &appId, const TQString &file); @@ -73,7 +74,7 @@ class ThemesDlg : public ThemesLayout #ifdef HAVE_KNEWSTUFF private: SKNewStuff *mNewStuff; - TQStringList m_newStuffStatus; + TQStringList m_newStufftqStatus; #endif }; diff --git a/superkaramba/src/themewidget.cpp b/superkaramba/src/themewidget.cpp index cad020c..e286bc4 100644 --- a/superkaramba/src/themewidget.cpp +++ b/superkaramba/src/themewidget.cpp @@ -25,8 +25,8 @@ #include #include -ThemeWidget::ThemeWidget(TQWidget *parent, const char *name) - : ThemeWidgetLayout(parent, name), m_themeFile(0) +ThemeWidget::ThemeWidget(TQWidget *tqparent, const char *name) + : ThemeWidgetLayout(tqparent, name), m_themeFile(0) { running->setText(""); setDescriptionMaxHeight(); @@ -58,7 +58,7 @@ ThemeWidget::~ThemeWidget() int ThemeWidget::addInstance() { int i = 1; - while(m_instancePool.find(i) != m_instancePool.end()) + while(m_instancePool.tqfind(i) != m_instancePool.end()) ++i; m_instancePool.append(i); updateRunning(); @@ -75,7 +75,7 @@ void ThemeWidget::updateRunning() { int i = instances(); if(i > 0) - running->setText(i18n("

    %1 running

    ").arg(i)); + running->setText(i18n("

    %1 running

    ").tqarg(i)); else running->setText(""); } @@ -101,12 +101,12 @@ void ThemeWidget::showButton(bool show) void ThemeWidget::setDescriptionMaxHeight() { - if(layoutText->geometry().height() <= 0) + if(tqlayoutText->tqgeometry().height() <= 0) return; - int height = layoutText->geometry().height() - themeName->height() - - layoutText->spacing(); + int height = tqlayoutText->tqgeometry().height() - themeName->height() - + tqlayoutText->spacing(); if(buttonGo->isVisible()) - height -= layoutButton->geometry().height() + layoutText->spacing(); + height -= tqlayoutButton->tqgeometry().height() + tqlayoutText->spacing(); description->setMaximumHeight(height); } diff --git a/superkaramba/src/themewidget.h b/superkaramba/src/themewidget.h index 011bbe9..10e557d 100644 --- a/superkaramba/src/themewidget.h +++ b/superkaramba/src/themewidget.h @@ -30,8 +30,9 @@ class ThemeWidget : public ThemeWidgetLayout { Q_OBJECT + TQ_OBJECT public: - ThemeWidget(TQWidget *parent = 0, const char *name = 0); + ThemeWidget(TQWidget *tqparent = 0, const char *name = 0); ThemeWidget(ThemeFile* tf); ~ThemeWidget(); diff --git a/superkaramba/src/themewidget_layout.ui b/superkaramba/src/themewidget_layout.ui index eb91f0a..5ea381d 100644 --- a/superkaramba/src/themewidget_layout.ui +++ b/superkaramba/src/themewidget_layout.ui @@ -1,6 +1,6 @@ ThemeWidgetLayout - + ThemeWidgetLayout @@ -23,19 +23,19 @@ unnamed - + - layoutIcon + tqlayoutIcon unnamed - + icon - + 76 0 @@ -47,11 +47,11 @@ image0 - + AlignCenter - + running @@ -77,15 +77,15 @@ - + - layoutText + tqlayoutText unnamed - + themeName @@ -106,7 +106,7 @@ Header     - + description @@ -121,13 +121,13 @@ Description - + WordBreak|AlignTop - + - layoutButton + tqlayoutButton @@ -143,7 +143,7 @@ Expanding - + 40 20 @@ -174,8 +174,8 @@ 89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000136349444154789ccd9b79701cd59dc73fdd3d3da76634b22559b66ccbb66c832f81011f9804dbc460ee04024b4ced5661b2542559425249259b4a422d816443b612925425454208098b03213e30068c39623026061bdf3696e54bb264dd1a5d73f774f7db3fbae7d0686449beb2bfaae77e6f34d3fdbedff7bbfaf79ee112486a2ddf32d7d32b36205efa16f30137205d8a679f4d8410c817f301fa3a569beb697028fc42f2058a0116cfe4274039e038eb6f5f26a8bdc4fed80b1cfcd1bd5401ce8b31c78b42406a2dcbf5756c53649e939cae2a662d81950f40692553cab9e5f1552c038a18420bf497099a26ef23b8429198f7d51b79e77feee76ac035d46fce552ee8cde22f335555f89522732700d58b60d61250652005d16e787b0d6dbd1c1eff2077038d4032f71e03c02f5a8d103ada872f90d289fced63bef4d0b3bc07c40171bef3bd60262036104cade5d76e95538acc9d8c9f032bbf0d353781eac49aab006f114c9a494590b9bf79885b003f395a3810fc9791a72d44a9be0af5ba7b90a1e88bd7f0d797becadd80970ba4bde7a501620341dde05b8acc23924431a53360d64d503a09d0725aca6aa60e89286c7d996858eb28ba9f65403d9048fd95a01069f00f214f5b88b5d009208e196a24ba690d4622c99e53fc60c5cff90d1001cc739efff96880be8ed542b0dfa1f0a8e42b2d66f1d7e0b3df80d26964563cbf09010e2754cdc6e7a6fcb5eff300103cfc14634566e5bf823c6d49963452808e3c760cde3bee06878bf993f8c9e647780408709e9a306a0d48ad65b92cf32b59a206d507b3ee86eacf6199b296732da001866eb5440cb66d408b6bd1ef3ecfbd4fdecfcf149979caa2af214f5b4ceeca5b57bb090d118bd0f7caeba43aba69ed65d3154ff020d007e8a3c52284183901b683fbb322733d00b35641f5cda03a86016f13207208307444d371cc831fa3a5883a247ccaa287ed958fe7b41cf024c14881ae21a2517a5e7d1badb397961e5ebffa49be0c748f9684119980d840505fc7f3b683bb9ec92b61e5f370f99740f590557133af9f3bce31012120a521a21184090e099f34e506e469d73350edb3ea0f3a08c3f221a681e45028b9e57adcd593a8f0737bed0ff9f0df1650cd39e40a432623690727048f2832c5945e05355f87e22aac954e16005e88883478fbbe674e601eda85d03484d38b88c7314e6c452a9b8e327dc160e0e9be69806137534772c80497cc43a40c8c632d33bef7395e8f697c61fd018e63a9dd88a47022b28ed5b2c42f258962bc9570f5e3503a2f0778aecae78e0b99810da8a311b1fb7dcc6818213b90a7cd46ae9c027bde23d11dc3481a38a62fc675fdbd0c527d53035d03dd320152a901fdf0e10642bb4e11d7687bb78e071fd9c87b392b34a414f401a9b52c77286c450d40cda330f9f63ca0f94d2b70cd697d2d70701b664733480ea8988c5c3915dc1e70a8b0771b0289785b1f465cc731e36a3ccbefc882279907dc26229543889e2272ac958e1d0da474221b0f71fff7b6f0778649988672828abe8e7ac51598c4ca6da0ba86216008f0b14ea8dd068d9f629a2005c7214d9c0a5ebf053cddf66f0749420848b48749764791c78cc37fd7bd482ec95afd0cd8c1c073c7d1d321da3e6a261937a3b5edfcf89e17f92d1065885c612827288eb7f228a97ea8fd15598796df8688f5a9181c7d1fb63e078d9f223c7ee4e957204dbd0c3c3e5094bce600878ae474e2995c865ae227d5d14edfba971189986df376336c5f60eab63f1838f655f898f8d909a8aaec9b5dca4f5fbc67f85c61a830e8e95bc3b6809705acdc02ded26156deee9fdc0ab5ef402a014e0f944f027fc9c015cf6f077780248124832c8324116fed2372a21da9c84ff0d6e53882fec2663084592442315a76f510ebd1a9efe67777fe95ef03fd8031120d00481e6fe5bf0138f8b3b3acbc3d6e3d006f3d01075fb3c25569254cba0c7cc5202b676fb606e050adbea2e2995c867fd624f4de305d6bb7906aefb2f3876c28cc8e8d6c84b0fbee2289aa6b8b70fb65aa027ce5ed553c0f945020ea0d458079cd77d8d21be55d5adf83aedd79a06de05db5b0fde7f0f13390e805ff18a8980a81b105547d889601ee0087dd1415f7a43282d74c47e8069debb7123d529f170a8d3c22069a85a2184cbe4ac534a1d4c31dd7543017f00d2220b596e5bd6b5801a87984685bf6f15d006aff3070e5631db0e769d8fe2474d581db076593a1b8cccaf5875bf5821a600147b1fb0e15776529a54be7220c41d7dff71139d298e7038c214831301206f53b358409af1ee38fbbdbc0c638c0ec1d0e85adc55e101b20aef1514ae74022c5c1a62edebbe63bd42d9bcb9f2ad8b79ad60fa07436d43e0f273759bf565de00b82cb6d0338cb4a0f458043cdf101f655b27c01b28c5aeaa4eca62be9da7e94cead874975575152337ef0eae78c8da4ce89ed0962bd828d753cf7f83f781de8c28aad03c2a2d4fa1c5fab08f2db827620e88f2638eaf7b010b5c8fa3015b156cde5039727c7a139cfeeec0a35c5094777679c5f067c86882c31a666d2f2ea6e12edfdf8ab4b19b77862c15068c4344e6c8b10eb31d3e05f034e61155ffac90989e93cc0f7d1937c73f14c7e8c1a84c52f40aa1dfaf643e747d0b567202baa7b2070e53c08903d70fc93b36a402e31a6a6d3b2690fd1862e8a2606a858548e221919f0f1ae048d3ba3c47a0c5ea9e3b927ce023e970019086cfe210facb8821fabee808fc54f43e95c200644a1ef309c78051ab7596aeb0b5a959e0180464980e202fc50bf63e06a6780cb0588b1aeadafeda5775f03ce6217539697a14806f1ae3827b6f6a127c588c0a709506c9bd0fef201472a4a38706555f276a56983135f19144f04e2e076c384b9106b83de26cbd63c45034257c6938fa8a920798022089fb1fd41da8738ac7eda412a4aded8817ff6248c844effd176c267e2385c50bfbd7f54e0011e7bec31943419406af31e1a2797b16f5e1577286d1f38f18d81e2f164decf275c06520ad17e12924970fb905cae8cd71e3101b2cb028f1fa20d03812ab9440c4d4cd1e513514bfc847635d0d390c4d4a13b4653733f47af9b406cf51c9caf9ea4966cf2529080fc4c50023c8fddc7c26fdec1b3c55eaaa95e093577dbe66011214eefc6dcf926020565f254a4a2c0e81c9f540414034168df52c0de076686854c43eb89d2be791fa18f8e234c102698f65598565048f77583a694419330e94dea1cbafd2d1e07924208a3502a2c019efbae63c6335f655dc0cb74262f84abef22b74a639e3a84fef17b0849419d713972a078e48e8f0056621684d0a651f90023a1d3f5fe61dadfd88b69826f6280aa9ba6e0f442b23b86d61d43e829fa1b6308dd20d2a913e93488f70984092983c88d5b58009c1142440a154404107ff91f1c753ab8eba9d5bc50dab8eb4ad0a066a9954a981af2c4a9a8cbbc24b7bd4db2b60e75da341c13270e13ff1d58bb62de6c53d4821ebf905684de3f4cfbe63de8510d57b99fca15d329aaf45a6130a5e10aa8b8bc1e482904ca65123d09e23d7a06fc893eb63f778c172ddbb3d2e2e16a824ea0fcd4d33c5355ca2d225086b2f44e2b6ed80f35439d243edc8ea9a570cd99833aa56a08d55741f6e5acbedd222f0eab01bdbb8ed1be79375a5718b5d84bf9b2cb1853332e3307eba528dbf46892964f7a68de1b251517b445a97bfe386b3637710868079a810e21447224455175fb13dc79ed4cd6992610188b7add8d1675f6c3cd5088d8ee7d18b104eeb97370cdbaac00016e9bf8205082de7286f8ee0d988933046ebe19c9ed1e940cc54eb4d2b1f91322c75a905d4ec67ee632c6dd707961e076bf635f17a7dee9241537896884d61ce7d9174fb00be804dab032c208a00b21c488aac2cdcf7053999fb72459c6d04cf097a0d65c85ecf5661e2ee231229f1c22d517c3396d0a454b97e4393e1f508c193688ef7e9764ddf6ccfd95b163295aba0ca5b40c2499544f84b60d1fd27fe014c284b14be751bef20a14074302ef3edc49fde626e23d1a118dd0fbcd6cfcd97ede024240ab4d4018eb1d5ec028cae29dcfb222e0e11d87cf8d3004c9fe24c82aee050b903deecc24443c4effbee3a4fa1338675613b87169c6f109cd49e2e03ee2bbdf29f80cc9e5c277e36d843ea8a577672da609c185f328bb7501ce31ae82a04969f41feba4e9ed7afa4ef691d489edede4dddf1ce2d586304d58eade01f4dac00b6682c34ac73316016ab008d9e9408fa64884a208d98177fe3c148f3333219188133ed141bc3d825a399ee0ddb7933cfc2989437b11c944c1fb0b13623d10ebb6de6b3cd5d594ddb214df8c0a200e2269e7fd59e0c98e3ecebc514bc7ae168409ad11eabebd83a74e873983a5ea1d408f7583a14b6267dda34f8b69c7586407389c388a9d783c2ea28dbd8477ecc333b30a576911e829244c0255018496227aba95f65fff0167c032ef4292ec8768c8c2e6089632e1ae2fe2af9949767324ed0c2540c288eb9cd97488d6bf5bf1df1b940977999ceee7e8e9300d581960bbfde361374a464400c22af408c501aaf54aada84e7c5355fa8f771239729ad4f8121c2e07aa5746910d8a27bac0300877e824bac15d62f9b6b4a4e210e9b0804b4e1fe3573d40f1c2456413aef46b8a051c49a2f9b503b4bd7d845444c33fcec1a4f92e840907374591ad72572f595b1f918c8880744665bdf9a5375f2414bf13ffe52ae1139dc49a7ab2df93241c2e19a75be00940a41b226d566931adeea918484e3f636fbc87314b6f43f6c85805dc34e82cf8aeed47695ebf93644718d5a750bdd44fd94c17007d67aca207028145c2a8768b4767028ac3deefcfb941c049c9554508c344eb89a1f52749866224fb12c47acd01696ab8ddb2716182525cc9d89b1ea268de221b7c6c10f8f0d1469ad6bc49b4a11d599599bc2448458d37edc3adc551cc4c0a7c2e32320d48e7d5e9f255aeef94ac7f24155ce3ddb82658d11e24b4de045a6f9c78479464778c4457dc224380d1d54ccb9ac7329397dd3e5c13aa10c2c03d713cb1d34df41f39893061c282122aaef0a338e50cf00c09b261cded1ccf8b8cd2041c59139032ffd8e3c15ece59eac45916a06886fd41d9e7c15489edfd1d08413c94c0489a180983586702113e4db8294adfa77556fcbfbc98098bc6e20ad8d314e9ba245902143db340e722a38c02ea201328ecdea51c6e72fe9e3c09c904deca6200bc95e965cb6e9e66fb69a0394b2b067f5fc8294b8b4602a4808c4a03b226401e7069c065d020ddcd94bfed7b14043a4a32949105b2a164f42630400386039ea71d99dabf7d702a175c2ef0416414d202bb7f290830856d02bac7ceebed3fe4fb81b4e4034f8f151514ddd6803c5b8673d3824ba901b1fa668acbc643516af0aa0fe2a1c0670e07188eb31090db1f21199782804f5b3830bf9223c6e986d9424804af5d044506280c033ccf0fa4eb7d691f7036702335894b41c0e77f4be8cb4bf8c2c34bf963d9a9facfea099d319f59825ce6c8dee1ac0ed01ecb794e1018bcaab9fd1168817c7e048cf48c9df9c71d9c9eff53563585d81c3bdd44fbe67730bb015db5de0f327b03f6fe80eab4f70ef2f60bd28e7444fb09cea1bf23bb40f342d27b490800eb7dbae3da5ff260730f6f243abb69d9f8267a4b0c34dbb3abb9c07340a43fcb0d8343821d8614c90909177abbcca98d751cf8fd3f00e84ad0c9594ae043c9b91c957500635e58c5c3d74ee65149755279d7adb8aaca61ac2befb6f9b9c278d0c260368d2cd9c95c84158afa4c880b5a3f6ee0d4e64f8987a2c474421f74b0f11747d808d4014d58a5eb6165540725f3c40114bfb88affb87a023f92542793eebe1df794f150e6cf039d7b2d07a317c4993cb085faf6d810d09f8288414f5d07475ed8453c14453789ede862d313077905eb90648bdd86dc09ca97f32100ec3dc517efe3eb73cbf94f057c13562c23387f2e549659657060a01694029d205ab20087d20243405f02fa347a8eb6736af3117a8e77a09bc4f6f7f0eeef8ef1eae9282d58d59f76ace3b20946f13a7cbe04804dc2f7af67c5bfcce1cf32f826aef81c2557d540e5f89cac31fd98127bbe6d30e0a80dd9be61424f0c7a62243a23d4addf4fe7c166004e84d9f1a713acdd15e218d97a5fbaec35e0fccf48e44210001609bec79672c31d33f98b22f095cebf92ca1b96c39469d679c0cc63025805daf6f4141840426f183afbd0fbe31c7b652f2d3beb01e84850b7e6146bde6cc9d4f5dbb0d43ec6391c924ecb852200ecedb4af5ccdc2fb67f1accf41f598d9739872eb6d30712a148fb1bfe2c5da930831007c4f2fb487d0fba2346e3f4ae30775e8718d3e8da6f58dfce5a5063ea1405d9f737f09042e2c01609370d35466fc6031eb3c0ad383d53398b6f25694993530763cd67ff969c6d25a01a12e686b034da375f749ea5efb043daee57af62d5880d3c007d4f5cf572e34016091e0bc751a33be319f178a55aef4948e63f67dff8a63ea1ca89c053441b8099a9b2012a6f34803c75edf49bc2792efe09ac896b7fb2850d73f5fb91804a4c50994afbf8d672a3cdce22dade0f2bbeec33d6536e82d106ea5a7a185faad7be83ed50ac0a7bdbcf3542d7f6b8cd2cc6007774181a7e5621200d63ef2d8f537f36cb99bdb64d54dcdaa0771b8921c7f7b2b1db5f50813cec4d8f7741dffbb2bc449b20e2e0dfc9c1ddc48e462130076d6f8fc727e52e5e3df15d58d164f204c688f51f77a331b5eaacf6c5cb66279c7281719785a2e0501609110fce5221eae29e1bfa21a5d6f34f1d2ef8fb30d0b783b590797e20239b891c8a52200acca41e0de292c5cdb808195b474d82dedd92f8a9d9f4d2e250160254c5eacd35106562c4ff24f009e1671ae9b09e721b97b5eff74114220fd3358f8ff24ff07d25c4baf04fdecaa0000000049454e44ae426082 - - + + kpushbutton.h diff --git a/superkaramba/src/uptimesensor.cpp b/superkaramba/src/uptimesensor.cpp index 1dcc280..4025f3a 100644 --- a/superkaramba/src/uptimesensor.cpp +++ b/superkaramba/src/uptimesensor.cpp @@ -101,13 +101,13 @@ void UptimeSensor::update() { format = "%dd %h:%M"; } - format.replace( TQRegExp("%d"), TQString::number(days)); - format.replace( TQRegExp("%H"), TQString::number(hours).rightJustify(2,'0')); - format.replace( TQRegExp("%M"), TQString::number(mins).rightJustify(2,'0')); - format.replace( TQRegExp("%S"), TQString::number(secs).rightJustify(2,'0')); - format.replace( TQRegExp("%h"), TQString::number(hours)); - format.replace( TQRegExp("%m"), TQString::number(mins)); - format.replace( TQRegExp("%s"), TQString::number(secs)); + format.tqreplace( TQRegExp("%d"), TQString::number(days)); + format.tqreplace( TQRegExp("%H"), TQString::number(hours).rightJustify(2,'0')); + format.tqreplace( TQRegExp("%M"), TQString::number(mins).rightJustify(2,'0')); + format.tqreplace( TQRegExp("%S"), TQString::number(secs).rightJustify(2,'0')); + format.tqreplace( TQRegExp("%h"), TQString::number(hours)); + format.tqreplace( TQRegExp("%m"), TQString::number(mins)); + format.tqreplace( TQRegExp("%s"), TQString::number(secs)); meter->setValue(format); ++it; diff --git a/superkaramba/src/widget_python.cpp b/superkaramba/src/widget_python.cpp index 0948e39..bfc4b27 100644 --- a/superkaramba/src/widget_python.cpp +++ b/superkaramba/src/widget_python.cpp @@ -63,14 +63,14 @@ long createWidgetMask(long widget, char* path) { karamba* currTheme = (karamba*)widget; TQBitmap bm; - TQString maskpath; + TQString tqmaskpath; TQString rootPath; rootPath.setAscii(currTheme->theme().path().ascii()); currTheme->clearMask(); - maskpath.setAscii(path); - rootPath.append(maskpath.ascii()); + tqmaskpath.setAscii(path); + rootPath.append(tqmaskpath.ascii()); if(currTheme->theme().isZipTheme()) { @@ -86,7 +86,7 @@ long createWidgetMask(long widget, char* path) return (long)currTheme->widgetMask; } -PyObject* py_create_widget_mask(PyObject *, PyObject *args) +PyObject* py_create_widget_tqmask(PyObject *, PyObject *args) { long widget; char *text; @@ -101,7 +101,7 @@ PyObject* py_create_widget_mask(PyObject *, PyObject *args) long redrawWidgetBackground(long widget) { karamba* currTheme = (karamba*)widget; - currTheme->kroot->repaint(true); + currTheme->kroot->tqrepaint(true); return 1; } diff --git a/superkaramba/src/widget_python.h b/superkaramba/src/widget_python.h index 97cc263..e54c31d 100644 --- a/superkaramba/src/widget_python.h +++ b/superkaramba/src/widget_python.h @@ -42,17 +42,17 @@ PyObject* py_get_widget_position(PyObject *self, PyObject *args); /** Widget/createWidgetMask * * SYNOPSIS -* long createWidgetMask(widget, mask) +* long createWidgetMask(widget, tqmask) * DESCRIPTION * This function doesn't work currently due to a bug in KDE. Please use * MASK= in your .theme file for the time being. * ARGUMENTS * * long widget -- karamba -* * string mask -- The name of the widget mask file. +* * string tqmask -- The name of the widget tqmask file. * RETURN VALUE * 1 if successful */ -PyObject* py_create_widget_mask(PyObject *self, PyObject *args); +PyObject* py_create_widget_tqmask(PyObject *self, PyObject *args); /** Widget/redrawWidgetBackground * diff --git a/superkaramba/src/xmmssensor.cpp b/superkaramba/src/xmmssensor.cpp index 268700b..60c7455 100644 --- a/superkaramba/src/xmmssensor.cpp +++ b/superkaramba/src/xmmssensor.cpp @@ -164,9 +164,9 @@ void XMMSSensor::update() { isPlaying = xmms->isPlaying(0); pos = xmms->getPlaylistPos(0); - qDebug("unicode start"); + qDebug("tqunicode start"); title = codec->toUnicode( TQCString( xmms->getPlaylistTitle( 0, pos ) ) ); - qDebug("unicode end"); + qDebug("tqunicode end"); if( title.isEmpty() ) title = "XMMS"; @@ -210,19 +210,19 @@ void XMMSSensor::update() { - format.replace( TQRegExp("%title", false), title ); + format.tqreplace( TQRegExp("%title", false), title ); - format.replace( TQRegExp("%length", false), TQTime( 0,0,0 ). + format.tqreplace( TQRegExp("%length", false), TQTime( 0,0,0 ). addMSecs( songLength ) .toString( "h:mm:ss" ) ); - format.replace( TQRegExp("%time", false), TQTime( 0,0,0 ). + format.tqreplace( TQRegExp("%time", false), TQTime( 0,0,0 ). addMSecs( currentTime ) .toString( "h:mm:ss" ) ); if( isPlaying ) { - format.replace( TQRegExp("%remain", false), TQTime( 0,0,0 ). + format.tqreplace( TQRegExp("%remain", false), TQTime( 0,0,0 ). addMSecs( songLength ) .addMSecs(-currentTime ) .toString( "h:mm:ss" ) ); @@ -230,7 +230,7 @@ void XMMSSensor::update() else { - format.replace( TQRegExp("%remain", false), TQTime( 0,0,0 ).toString("h:mm:ss" ) ); + format.tqreplace( TQRegExp("%remain", false), TQTime( 0,0,0 ).toString("h:mm:ss" ) ); } meter->setValue(format); } diff --git a/superkaramba/src/xmmssensor.h b/superkaramba/src/xmmssensor.h index bda6b88..bd254fb 100644 --- a/superkaramba/src/xmmssensor.h +++ b/superkaramba/src/xmmssensor.h @@ -23,8 +23,9 @@ class XMMSSensor : public Sensor { Q_OBJECT + TQ_OBJECT public: - XMMSSensor( int interval, const TQString &encoding=TQString::null ); + XMMSSensor( int interval, const TQString &encoding=TQString() ); ~XMMSSensor(); void update(); void setMaxValue( SensorParams *); -- cgit v1.2.1
    Header