summaryrefslogtreecommitdiffstats
path: root/superkaramba
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:52 -0600
commitbf280726d5d22f33d33e4f9e771220c725249407 (patch)
tree48b7496821910eb85179d543acee981cf5d16dd8 /superkaramba
parentc78266617c282543427d2c000b3b68fe2b6b6722 (diff)
downloadtdeutils-bf280726d5d22f33d33e4f9e771220c725249407.tar.gz
tdeutils-bf280726d5d22f33d33e4f9e771220c725249407.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'superkaramba')
-rw-r--r--superkaramba/examples/richtext/richtext.py4
-rwxr-xr-xsuperkaramba/examples/test_all.sh2
-rw-r--r--superkaramba/examples/unicode/unicode.py6
-rw-r--r--superkaramba/src/datesensor.cpp6
-rw-r--r--superkaramba/src/disksensor.cpp2
-rw-r--r--superkaramba/src/disksensor.h2
-rw-r--r--superkaramba/src/imagelabel_python.cpp2
-rw-r--r--superkaramba/src/input.cpp8
-rw-r--r--superkaramba/src/input_python.cpp2
-rw-r--r--superkaramba/src/karamba.cpp16
-rw-r--r--superkaramba/src/karamba_python.cpp6
-rw-r--r--superkaramba/src/karambaapp.cpp2
-rw-r--r--superkaramba/src/karambainterface.cpp4
-rw-r--r--superkaramba/src/karambasessionmanaged.cpp2
-rw-r--r--superkaramba/src/memsensor.cpp2
-rw-r--r--superkaramba/src/programsensor.h2
-rw-r--r--superkaramba/src/richtextlabel.cpp4
-rw-r--r--superkaramba/src/rsssensor.h2
-rw-r--r--superkaramba/src/sensorsensor.h2
-rw-r--r--superkaramba/src/sklineedit.cpp4
-rw-r--r--superkaramba/src/systemtray.cpp4
-rw-r--r--superkaramba/src/textfield.cpp24
-rw-r--r--superkaramba/src/textfield.h6
-rw-r--r--superkaramba/src/textfilesensor.h4
-rw-r--r--superkaramba/src/textlabel.cpp22
-rw-r--r--superkaramba/src/textlabel.h4
-rw-r--r--superkaramba/src/textlabel_python.cpp2
-rw-r--r--superkaramba/src/themefile.cpp6
-rw-r--r--superkaramba/src/themelocale.cpp2
-rw-r--r--superkaramba/src/themes_layout.ui10
-rw-r--r--superkaramba/src/themesdlg.cpp12
-rw-r--r--superkaramba/src/themesdlg.h2
-rw-r--r--superkaramba/src/themewidget.cpp10
-rw-r--r--superkaramba/src/themewidget_layout.ui8
-rw-r--r--superkaramba/src/uptimesensor.h2
-rw-r--r--superkaramba/src/widget_python.cpp2
-rw-r--r--superkaramba/src/xmmssensor.cpp4
-rw-r--r--superkaramba/src/xmmssensor.h2
38 files changed, 103 insertions, 103 deletions
diff --git a/superkaramba/examples/richtext/richtext.py b/superkaramba/examples/richtext/richtext.py
index 11fe9d7..518aa65 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.tqunicode.org/charts/
+#For Symbol Tables look at www.unicode.org/charts/
hidden = 0
@@ -35,7 +35,7 @@ is used to encode the formatting commands.</p>
<li>Hyperlinks: <a href="kfmclient openURL http://netdragon.sourceforge.net"> Superkaramba Homepage</a></li>
<li>Links can also <a href="#trigger">trigger</a> actions in the script</li>
<li><i>Various</i> <b>different</b> <u>caracter</u> <s>styles</s></li>
-<li><a href="kfmclient openURL http://www.tqunicode.org">Unicode</a>: \u03B6 \u03B3 \u03BB \u03A3 \u03A9 </li>
+<li><a href="kfmclient openURL http://www.unicode.org">Unicode</a>: \u03B6 \u03B3 \u03BB \u03A3 \u03A9 </li>
<li>Simple Tables:
<table bgcolor="darkgray" border="1" width="80%">
<tr><th colspan="3">Header</th></tr>
diff --git a/superkaramba/examples/test_all.sh b/superkaramba/examples/test_all.sh
index cdf192d..5e95063 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"
- "tqunicode/tqunicode.theme"
+ "unicode/unicode.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 1a15f83..13d1136 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.tqunicode.org/charts/
+#For Symbol Tables look at www.unicode.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
<p>
-For a complete reference on tqunicode caracter codes look at:
-<center><a href="kfmclient openURL http://www.tqunicode.org/charts/">www.tqunicode.org/charts/</a></center>
+For a complete reference on unicode caracter codes look at:
+<center><a href="kfmclient openURL http://www.unicode.org/charts/">www.unicode.org/charts/</a></center>
</p>
"""
karamba.resizeWidget(widget, 400, 400)
diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp
index 56c9d31..ca5e6e6 100644
--- a/superkaramba/src/datesensor.cpp
+++ b/superkaramba/src/datesensor.cpp
@@ -20,7 +20,7 @@ DateSensor::~DateSensor()
void DateSensor::update()
{
- TQDateTime qdt = TQDateTime::tqcurrentDateTime();
+ TQDateTime qdt = TQDateTime::currentDateTime();
TQString format;
SensorParams *sp;
Meter *meter;
@@ -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->tqsizeHint().width();
- int h = cal->tqsizeHint().height();
+ int w = cal->sizeHint().width();
+ int h = cal->sizeHint().height();
// make calendar fully visible
TQRect deskR = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(c));
diff --git a/superkaramba/src/disksensor.cpp b/superkaramba/src/disksensor.cpp
index b53c6e3..ea33c7c 100644
--- a/superkaramba/src/disksensor.cpp
+++ b/superkaramba/src/disksensor.cpp
@@ -10,7 +10,7 @@
#include "disksensor.h"
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstring.h>
#include <tqregexp.h>
#include <kprocess.h>
diff --git a/superkaramba/src/disksensor.h b/superkaramba/src/disksensor.h
index 0fb2023..f73500e 100644
--- a/superkaramba/src/disksensor.h
+++ b/superkaramba/src/disksensor.h
@@ -12,7 +12,7 @@
#include "sensor.h"
#include <tqmap.h>
#include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqregexp.h>
#include <tqstringlist.h>
#include <kprocess.h>
diff --git a/superkaramba/src/imagelabel_python.cpp b/superkaramba/src/imagelabel_python.cpp
index 9379201..7cf6d73 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->tqrepaint(true);
+ theme->kroot->repaint(true);
return tmp;
}
diff --git a/superkaramba/src/input.cpp b/superkaramba/src/input.cpp
index 63290cc..eae8780 100644
--- a/superkaramba/src/input.cpp
+++ b/superkaramba/src/input.cpp
@@ -35,7 +35,7 @@ Input::~Input()
void Input::mUpdate(TQPainter*)
{
- edit->tqrepaint();
+ edit->repaint();
}
void Input::setValue(TQString text)
@@ -131,7 +131,7 @@ void Input::setFontColor(TQColor fontColor)
TQColor Input::getFontColor() const
{
- const TQColorGroup &color = edit->tqcolorGroup();
+ const TQColorGroup &color = edit->colorGroup();
return color.text();
}
@@ -144,7 +144,7 @@ void Input::setSelectionColor(TQColor selectionColor)
TQColor Input::getSelectionColor() const
{
- const TQColorGroup &color = edit->tqcolorGroup();
+ const TQColorGroup &color = edit->colorGroup();
return color.highlight();
}
@@ -157,7 +157,7 @@ void Input::setSelectedTextColor(TQColor selectedTextColor)
TQColor Input::getSelectedTextColor() const
{
- const TQColorGroup &color = edit->tqcolorGroup();
+ const TQColorGroup &color = edit->colorGroup();
return color.highlightedText();
}
diff --git a/superkaramba/src/input_python.cpp b/superkaramba/src/input_python.cpp
index 82ed00f..fb451bd 100644
--- a/superkaramba/src/input_python.cpp
+++ b/superkaramba/src/input_python.cpp
@@ -346,7 +346,7 @@ 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)->tqfocusWidget();
+ TQWidget *obj = ((karamba*)widget)->focusWidget();
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());
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index 90c58c0..a7bdfba 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -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").tqarg(m_theme.name()).tqarg(m_instance);
+ prettyName = TQString("%1 - %2").arg(m_theme.name()).arg(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").tqarg(m_instance);
+ instanceString = TQString("-%1").arg(m_instance);
TQString cfg = TQDir::home().absPath() + "/.superkaramba/"
+ m_theme.id() + instanceString + ".rc";
kdDebug() << cfg << endl;
@@ -622,7 +622,7 @@ bool karamba::parseConfig()
TQColor("white")));
defaultTextField->setFont(lineParser.getString("FONT", "Helvetica"));
defaultTextField->setFontSize(lineParser.getInt("FONTSIZE", 12));
- defaultTextField->tqsetAlignment(lineParser.getString("ALIGN",
+ defaultTextField->setAlignment(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->tqsetAlignment(lineParser.getString("ALIGN",
+ tmpText->setAlignment(lineParser.getString("ALIGN",
defTxt.getAlignmentAsString()));
tmpText->setFixedPitch(lineParser.getInt("FIXEDPITCH",
defTxt.getFixedPitch()));
@@ -1619,13 +1619,13 @@ void karamba::updateBackground(KSharedPixmap* kpm)
{
systray->updateBackgroundPixmap(buffer2);
}
- tqrepaint();
+ repaint();
}
void karamba::currentDesktopChanged( int i )
{
//qDebug("karamba::currentDesktopChanged");
- kroot->tqrepaint( true );
+ kroot->repaint( 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->tqrepaint( true );
+ kroot->repaint( true );
if (pythonIface && pythonIface->isExtensionLoaded())
pythonIface->wallpaperChanged(this, i);
}
@@ -1660,7 +1660,7 @@ void karamba::externalStep()
p.end();
bitBlt(&pm,0,0,&buffer,0,TQt::CopyROP);
- tqrepaint();
+ repaint();
}
}
diff --git a/superkaramba/src/karamba_python.cpp b/superkaramba/src/karamba_python.cpp
index 1538672..9f09f79 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 tqalignment."},
- {(char*)"setTextAlign", py_setTextAlign, METH_VARARGS, (char*)"Set Text tqalignment."},
+ {(char*)"getTextAlign", py_getTextAlign, METH_VARARGS, (char*)"Get Text alignment."},
+ {(char*)"setTextAlign", py_setTextAlign, METH_VARARGS, (char*)"Set Text alignment."},
{(char*)"setTextScroll", py_setTextScroll, METH_VARARGS, (char*)"Set Text scroll."},
// RichTextLabel - richtextlabel_python.cpp
@@ -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 tqlayout"},
+ {(char*)"updateSystrayLayout", py_update_systray_layout, METH_VARARGS, (char*)"Update Systray layout"},
// Misc - misc_python.cpp
{(char*)"getThemePath", py_get_theme_path, METH_VARARGS, (char*)"Get the file path of the theme"},
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index 87f6e60..f3231b2 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -76,7 +76,7 @@ TQString KarambaApplication::getMainKaramba()
bool KarambaApplication::themeExists(TQString pretty_name)
{
- TQWidgetList *list = TQApplication::tqallWidgets();
+ TQWidgetList *list = TQApplication::allWidgets();
TQWidgetListIt it( *list ); // iterate over the widgets
TQWidget * w;
while ( (w=it.current()) != 0 ) // for each widget...
diff --git a/superkaramba/src/karambainterface.cpp b/superkaramba/src/karambainterface.cpp
index 659370a..5d33f68 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::tqallWidgets();
+ TQWidgetList *list = TQApplication::allWidgets();
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::tqallWidgets();
+ TQWidgetList *list = TQApplication::allWidgets();
TQWidgetListIt it( *list ); // iterate over the widgets
TQWidget* w;
ThemesDlg* result = 0;
diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp
index 74ce4ed..a6cd2c3 100644
--- a/superkaramba/src/karambasessionmanaged.cpp
+++ b/superkaramba/src/karambasessionmanaged.cpp
@@ -34,7 +34,7 @@ bool KarambaSessionManaged::saveState(TQSessionManager&)
TQString openThemes="";
- TQWidgetList *list = TQApplication::tqallWidgets();
+ TQWidgetList *list = TQApplication::allWidgets();
TQWidgetListIt it( *list ); // iterate over the widgets
TQWidget * w;
while ( (w=it.current()) != 0 ) // for each widget...
diff --git a/superkaramba/src/memsensor.cpp b/superkaramba/src/memsensor.cpp
index dda7983..bbf2edf 100644
--- a/superkaramba/src/memsensor.cpp
+++ b/superkaramba/src/memsensor.cpp
@@ -10,7 +10,7 @@
#include "memsensor.h"
#include <tqfile.h>
#include <tqglobal.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstring.h>
#include <tqregexp.h>
diff --git a/superkaramba/src/programsensor.h b/superkaramba/src/programsensor.h
index 93e1c9e..85c7e88 100644
--- a/superkaramba/src/programsensor.h
+++ b/superkaramba/src/programsensor.h
@@ -15,7 +15,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqvaluevector.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
class ProgramSensor : public Sensor
{
Q_OBJECT
diff --git a/superkaramba/src/richtextlabel.cpp b/superkaramba/src/richtextlabel.cpp
index 5044161..999fe0f 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->tqcolorGroup()),
+ colorGrp(k->colorGroup()),
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->tqcolorGroup()),
+ colorGrp(k->colorGroup()),
underlineLinks(false)
{
kdDebug() << k_funcinfo << x << ", " << y << ", " << w << ", " << h << endl;
diff --git a/superkaramba/src/rsssensor.h b/superkaramba/src/rsssensor.h
index 4e2322b..48f08e4 100644
--- a/superkaramba/src/rsssensor.h
+++ b/superkaramba/src/rsssensor.h
@@ -13,7 +13,7 @@
#include <sensor.h>
#include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
/**
*
diff --git a/superkaramba/src/sensorsensor.h b/superkaramba/src/sensorsensor.h
index 217cefb..83a89ab 100644
--- a/superkaramba/src/sensorsensor.h
+++ b/superkaramba/src/sensorsensor.h
@@ -3,7 +3,7 @@
#define SENSORSENSOR_H
#include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqmap.h>
#include <tqstringlist.h>
#include <tqregexp.h>
diff --git a/superkaramba/src/sklineedit.cpp b/superkaramba/src/sklineedit.cpp
index 40b6d3e..57b9db0 100644
--- a/superkaramba/src/sklineedit.cpp
+++ b/superkaramba/src/sklineedit.cpp
@@ -46,13 +46,13 @@ void SKLineEdit::drawContents(TQPainter *p)
void SKLineEdit::setFrameColor(TQColor c)
{
frameColor = c;
- tqrepaint();
+ repaint();
}
void SKLineEdit::setBackgroundColor(TQColor c)
{
TQLineEdit::setBackgroundColor(c);
- tqrepaint();
+ repaint();
}
TQColor SKLineEdit::getFrameColor() const
diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp
index 3e0d4ba..bf3cf81 100644
--- a/superkaramba/src/systemtray.cpp
+++ b/superkaramba/src/systemtray.cpp
@@ -29,7 +29,7 @@
#include <tqpopupmenu.h>
#include <tqdragobject.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqstringlist.h>
#include <tqpixmap.h>
@@ -190,7 +190,7 @@ void Systemtray::layoutSystray()
}
count++;
- emb->tqrepaint();
+ emb->repaint();
}
}
diff --git a/superkaramba/src/textfield.cpp b/superkaramba/src/textfield.cpp
index a3be722..4b1cee2 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");
- tqsetAlignment(TQt::AlignLeft);
+ setAlignment(TQt::AlignLeft);
setFixedPitch(false);
setShadow(0);
}
@@ -35,7 +35,7 @@ TextField::TextField( const TextField& def )
setBGColor(def.getBGColor());
setFont( def.getFont() );
- tqsetAlignment( def.getAlignment() );
+ setAlignment( def.getAlignment() );
setFixedPitch( def.getFixedPitch() );
setShadow( def.getShadow() );
}
@@ -51,7 +51,7 @@ TextField& TextField::operator=(const TextField& rhs)
setBGColor(rhs.getBGColor());
setFont( rhs.getFont() );
- tqsetAlignment( rhs.getAlignment() );
+ setAlignment( rhs.getAlignment() );
setFixedPitch( rhs.getFixedPitch() );
setShadow( rhs.getShadow() );
@@ -102,32 +102,32 @@ int TextField::getFontSize() const
return font.pointSize();
}
-void TextField::tqsetAlignment( const TQString &align )
+void TextField::setAlignment( const TQString &align )
{
TQString a = align.upper();
if( a == "LEFT" || a.isEmpty() )
- tqalignment = TQt::AlignLeft;
+ alignment = TQt::AlignLeft;
if( a == "RIGHT" )
- tqalignment = TQt::AlignRight;
+ alignment = TQt::AlignRight;
if( a == "CENTER" )
- tqalignment = TQt::AlignHCenter;
+ alignment = TQt::AlignHCenter;
}
-void TextField::tqsetAlignment( int af )
+void TextField::setAlignment( int af )
{
- tqalignment = af;
+ alignment = af;
}
int TextField::getAlignment() const
{
- return tqalignment;
+ return alignment;
}
TQString TextField::getAlignmentAsString() const
{
- if( tqalignment == TQt::AlignHCenter )
+ if( alignment == TQt::AlignHCenter )
return "CENTER";
- else if( tqalignment == TQt::AlignRight )
+ else if( alignment == TQt::AlignRight )
return "RIGHT";
else
return "LEFT";
diff --git a/superkaramba/src/textfield.h b/superkaramba/src/textfield.h
index 34f17c3..13177b7 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 tqsetAlignment( int );
- void tqsetAlignment( const TQString& );
+ void setAlignment( int );
+ void setAlignment( const TQString& );
void setFixedPitch( bool );
void setShadow( int );
@@ -47,7 +47,7 @@ public:
int getLineHeight() const;
protected:
- int tqalignment;
+ int alignment;
TQFont font;
TQColor color;
TQColor bgColor;
diff --git a/superkaramba/src/textfilesensor.h b/superkaramba/src/textfilesensor.h
index adf521e..3d35211 100644
--- a/superkaramba/src/textfilesensor.h
+++ b/superkaramba/src/textfilesensor.h
@@ -25,9 +25,9 @@
#include <sensor.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqvaluevector.h>
/**
*
diff --git a/superkaramba/src/textlabel.cpp b/superkaramba/src/textlabel.cpp
index 0cf8891..09b8f98 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), tqalignment(TQt::AlignLeft), clip(0), bgColor(0, 0, 0),
+ Meter(k, x,y,w,h), alignment(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)
{
@@ -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), tqalignment(TQt::AlignLeft), clip(0), bgColor(0, 0, 0),
+ Meter(k, 0, 0, 0, 0), alignment(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();
- tqalignment = t->getAlignment();
+ alignment = t->getAlignment();
setFontSize(t->getFontSize());
setFont(t->getFont());
@@ -131,22 +131,22 @@ int TextLabel::getFontSize() const
return font.pixelSize();
}
-void TextLabel::tqsetAlignment( TQString align )
+void TextLabel::setAlignment( TQString align )
{
TQString a = align.upper();
if( a == "LEFT" || a.isEmpty() )
- tqalignment = TQt::AlignLeft;
+ alignment = TQt::AlignLeft;
if( a == "RIGHT" )
- tqalignment = TQt::AlignRight;
+ alignment = TQt::AlignRight;
if( a == "CENTER" )
- tqalignment = TQt::AlignHCenter;
+ alignment = TQt::AlignHCenter;
}
TQString TextLabel::getAlignment() const
{
- if( tqalignment == TQt::AlignHCenter )
+ if( alignment == TQt::AlignHCenter )
return "CENTER";
- else if( tqalignment == TQt::AlignRight )
+ else if( alignment == 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,
- tqalignment | clip | TQt::ExpandTabs, text);
+ alignment | clip | TQt::ExpandTabs, text);
}
p->setPen(getColor());
- p->drawText(x, y, width, height, tqalignment | clip | TQt::ExpandTabs, text);
+ p->drawText(x, y, width, height, alignment | clip | TQt::ExpandTabs, text);
return 0;
}
diff --git a/superkaramba/src/textlabel.h b/superkaramba/src/textlabel.h
index b29c44e..72fcbc9 100644
--- a/superkaramba/src/textlabel.h
+++ b/superkaramba/src/textlabel.h
@@ -40,7 +40,7 @@ public:
void setFontSize( int );
void setBGColor(TQColor clr);
void setFont( TQString );
- void tqsetAlignment( TQString );
+ void setAlignment( TQString );
void setFixedPitch( bool );
void setShadow( int );
void mUpdate( TQPainter * );
@@ -62,7 +62,7 @@ public:
virtual bool click(TQMouseEvent*);
private:
- int tqalignment;
+ int alignment;
int clip;
TQStringList value;
TQFont font;
diff --git a/superkaramba/src/textlabel_python.cpp b/superkaramba/src/textlabel_python.cpp
index e7d2498..3cf6e3e 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)->tqsetAlignment( text );
+ ((TextLabel*)textSensor)->setAlignment( text );
return Py_BuildValue((char*)"l", 1);
}
diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp
index 0e420d2..acff61f 100644
--- a/superkaramba/src/themefile.cpp
+++ b/superkaramba/src/themefile.cpp
@@ -32,7 +32,7 @@
#include <kstandarddirs.h>
#include <klocale.h>
#include <kio/netaccess.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfileinfo.h>
#include <tqdom.h>
#include <tqdir.h>
@@ -213,7 +213,7 @@ bool ThemeFile::set(const KURL &url)
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")
- .tqarg(url.prettyURL()))
+ .arg(url.prettyURL()))
== KMessageBox::Cancel)
{
return false;
@@ -226,7 +226,7 @@ bool ThemeFile::set(const KURL &url)
{
if(KMessageBox::warningContinueCancel(TQT_TQWIDGET(kapp->activeWindow()),
i18n("%1 already exists. Do you want to overwrite it?")
- .tqarg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite"))
+ .arg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite"))
== KMessageBox::Cancel)
{
return false;
diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp
index bc388c2..37c72b7 100644
--- a/superkaramba/src/themelocale.cpp
+++ b/superkaramba/src/themelocale.cpp
@@ -157,7 +157,7 @@ void ThemeLocale::setLanguage(const TQStringList &languages)
++it)
{
TQString file =
- TQString("locale/%1/LC_MESSAGES/%2.mo").tqarg(*it).tqarg(m_theme->mo());
+ TQString("locale/%1/LC_MESSAGES/%2.mo").arg(*it).arg(m_theme->mo());
if(m_theme->fileExists(file))
{
diff --git a/superkaramba/src/themes_layout.ui b/superkaramba/src/themes_layout.ui
index b3ee3a1..8b76e0b 100644
--- a/superkaramba/src/themes_layout.ui
+++ b/superkaramba/src/themes_layout.ui
@@ -12,7 +12,7 @@
<height>517</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -122,7 +122,7 @@
<property name="name">
<cstring>buttonAddToDesktop</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -139,7 +139,7 @@
<property name="name">
<cstring>buttonClose</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index f7749cc..f483a04 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -220,9 +220,9 @@ void ThemesDlg::getNewStuff()
KConfig* config = KGlobal::config();
config->setGroup("KNewStuff");
config->writePathEntry("ProvidersUrl",
- TQString::tqfromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
+ TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
config->sync();
- m_newStufftqStatus = config->entryMap("KNewStuffStatus").keys();
+ m_newStuffStatus = config->entryMap("KNewStuffStatus").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();
@@ -304,8 +304,8 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file)
KConfig* config = KGlobal::config();
TQStringList keys = config->entryMap("KNewStuffStatus").keys();
- for(TQStringList::Iterator it = m_newStufftqStatus.begin();
- it != m_newStufftqStatus.end(); ++it)
+ for(TQStringList::Iterator it = m_newStuffStatus.begin();
+ it != m_newStuffStatus.end(); ++it)
{
keys.remove(*it);
}
@@ -477,7 +477,7 @@ void ThemesDlg::uninstall()
tableThemes->removeItem( twPtr );
}
#ifdef HAVE_KNEWSTUFF
- // Remove theme from KNewStufftqStatus
+ // Remove theme from KNewStuffStatus
KConfig* config = KGlobal::config();
config->setGroup("KNewStuffNames");
TQString name = config->readEntry(tempPath);
@@ -507,7 +507,7 @@ void ThemesDlg::uninstall()
}
tableThemes->removeItem(w);
#ifdef HAVE_KNEWSTUFF
- // Remove theme from KNewStufftqStatus
+ // Remove theme from KNewStuffStatus
KConfig* config = KGlobal::config();
config->setGroup("KNewStuffNames");
TQString name = config->readEntry(theme.path());
diff --git a/superkaramba/src/themesdlg.h b/superkaramba/src/themesdlg.h
index bf4fab5..b75c820 100644
--- a/superkaramba/src/themesdlg.h
+++ b/superkaramba/src/themesdlg.h
@@ -74,7 +74,7 @@ class ThemesDlg : public ThemesLayout
#ifdef HAVE_KNEWSTUFF
private:
SKNewStuff *mNewStuff;
- TQStringList m_newStufftqStatus;
+ TQStringList m_newStuffStatus;
#endif
};
diff --git a/superkaramba/src/themewidget.cpp b/superkaramba/src/themewidget.cpp
index 3addd2a..75a9a0d 100644
--- a/superkaramba/src/themewidget.cpp
+++ b/superkaramba/src/themewidget.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
ThemeWidget::ThemeWidget(TQWidget *parent, const char *name)
: ThemeWidgetLayout(parent, name), m_themeFile(0)
@@ -75,7 +75,7 @@ void ThemeWidget::updateRunning()
{
int i = instances();
if(i > 0)
- running->setText(i18n("<p align=\"center\">%1 running</p>").tqarg(i));
+ running->setText(i18n("<p align=\"center\">%1 running</p>").arg(i));
else
running->setText("");
}
@@ -101,12 +101,12 @@ void ThemeWidget::showButton(bool show)
void ThemeWidget::setDescriptionMaxHeight()
{
- if(layoutText->tqgeometry().height() <= 0)
+ if(layoutText->geometry().height() <= 0)
return;
- int height = layoutText->tqgeometry().height() - themeName->height() -
+ int height = layoutText->geometry().height() - themeName->height() -
layoutText->spacing();
if(buttonGo->isVisible())
- height -= layoutButton->tqgeometry().height() + layoutText->spacing();
+ height -= layoutButton->geometry().height() + layoutText->spacing();
description->setMaximumHeight(height);
}
diff --git a/superkaramba/src/themewidget_layout.ui b/superkaramba/src/themewidget_layout.ui
index 5ab1b70..6e07e26 100644
--- a/superkaramba/src/themewidget_layout.ui
+++ b/superkaramba/src/themewidget_layout.ui
@@ -35,7 +35,7 @@
<property name="name">
<cstring>icon</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>76</width>
<height>0</height>
@@ -47,7 +47,7 @@
<property name="pixmap">
<pixmap>image0</pixmap>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -121,7 +121,7 @@
<property name="text">
<string>Description</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -143,7 +143,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/superkaramba/src/uptimesensor.h b/superkaramba/src/uptimesensor.h
index 5459956..7cef09b 100644
--- a/superkaramba/src/uptimesensor.h
+++ b/superkaramba/src/uptimesensor.h
@@ -12,7 +12,7 @@
#include "sensor.h"
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstring.h>
#include <tqregexp.h>
#include <tqdatetime.h>
diff --git a/superkaramba/src/widget_python.cpp b/superkaramba/src/widget_python.cpp
index 564b4b4..0948e39 100644
--- a/superkaramba/src/widget_python.cpp
+++ b/superkaramba/src/widget_python.cpp
@@ -101,7 +101,7 @@ PyObject* py_create_widget_mask(PyObject *, PyObject *args)
long redrawWidgetBackground(long widget)
{
karamba* currTheme = (karamba*)widget;
- currTheme->kroot->tqrepaint(true);
+ currTheme->kroot->repaint(true);
return 1;
}
diff --git a/superkaramba/src/xmmssensor.cpp b/superkaramba/src/xmmssensor.cpp
index d78d119..268700b 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("tqunicode start");
+ qDebug("unicode start");
title = codec->toUnicode( TQCString( xmms->getPlaylistTitle( 0, pos ) ) );
- qDebug("tqunicode end");
+ qDebug("unicode end");
if( title.isEmpty() )
title = "XMMS";
diff --git a/superkaramba/src/xmmssensor.h b/superkaramba/src/xmmssensor.h
index bd254fb..4612d5f 100644
--- a/superkaramba/src/xmmssensor.h
+++ b/superkaramba/src/xmmssensor.h
@@ -16,7 +16,7 @@
#include <tqdatetime.h>
#include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include "sensor.h"