summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:28:11 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:28:11 -0600
commitb88830e9111dc4375bc1461c3f7b3e7b3e73f733 (patch)
treee34a67443df8a12d634aa419364d0698b53c1451
parent6b45a7b7b2a804ccb2d522eb9ba6423fedb59b8f (diff)
downloadtdeaddons-b88830e9111dc4375bc1461c3f7b3e7b3e73f733.tar.gz
tdeaddons-b88830e9111dc4375bc1461c3f7b3e7b3e73f733.zip
Rename old tq methods that no longer need a unique name
-rw-r--r--atlantikdesigner/designer/designer.cpp4
-rw-r--r--atlantikdesigner/designer/group.cpp14
-rw-r--r--atlantikdesigner/designer/group.h2
-rw-r--r--kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp12
-rw-r--r--kate/filelistloader/katefll_initplugin.cpp2
-rw-r--r--kate/insertcommand/plugin_kateinsertcommand.cpp2
-rw-r--r--kate/kpybrowser/kpybrowser.cpp2
-rw-r--r--kate/make/plugin_katemake.cpp24
-rw-r--r--kate/snippets/CWidgetSnippetsBase.ui2
-rw-r--r--kate/snippets/plugin_katesnippets.cpp2
-rw-r--r--kate/xmltools/plugin_katexmltools.cpp2
-rw-r--r--kicker-applets/kbinaryclock/kbinaryclock.cpp10
-rw-r--r--kicker-applets/kbinaryclock/settings.ui22
-rw-r--r--kicker-applets/kolourpicker/simplebutton.cpp12
-rw-r--r--kicker-applets/kolourpicker/simplebutton.h6
-rw-r--r--kicker-applets/ktimemon/timemon.cc8
-rw-r--r--kicker-applets/math/mathapplet.cpp10
-rw-r--r--kicker-applets/mediacontrol/amarokInterface.cpp4
-rw-r--r--kicker-applets/mediacontrol/amarokInterface.h2
-rw-r--r--kicker-applets/mediacontrol/jukInterface.cpp4
-rw-r--r--kicker-applets/mediacontrol/jukInterface.h2
-rw-r--r--kicker-applets/mediacontrol/kscdInterface.cpp4
-rw-r--r--kicker-applets/mediacontrol/kscdInterface.h2
-rw-r--r--kicker-applets/mediacontrol/mediacontrol.cpp20
-rw-r--r--kicker-applets/mediacontrol/mediacontrol.h2
-rw-r--r--kicker-applets/mediacontrol/mediacontrolconfigwidget.ui24
-rw-r--r--kicker-applets/mediacontrol/mpdInterface.cpp30
-rw-r--r--kicker-applets/mediacontrol/mpdInterface.h2
-rw-r--r--kicker-applets/mediacontrol/noatunInterface.cpp4
-rw-r--r--kicker-applets/mediacontrol/noatunInterface.h2
-rw-r--r--kicker-applets/mediacontrol/playerInterface.h4
-rw-r--r--kicker-applets/mediacontrol/simplebutton.cpp12
-rw-r--r--kicker-applets/mediacontrol/simplebutton.h6
-rw-r--r--kicker-applets/mediacontrol/xmmsInterface.cpp4
-rw-r--r--kicker-applets/mediacontrol/xmmsInterface.h2
-rw-r--r--konq-plugins/adblock/adblock.cpp2
-rw-r--r--konq-plugins/akregator/konqfeedicon.cpp2
-rw-r--r--konq-plugins/domtreeviewer/attributeeditdialog.ui2
-rw-r--r--konq-plugins/domtreeviewer/domtreeviewbase.ui8
-rw-r--r--konq-plugins/domtreeviewer/domtreewindow.cpp2
-rw-r--r--konq-plugins/domtreeviewer/elementeditdialog.ui2
-rw-r--r--konq-plugins/domtreeviewer/messagedialog.ui2
-rw-r--r--konq-plugins/domtreeviewer/texteditdialog.ui2
-rw-r--r--konq-plugins/fsview/inode.cpp2
-rw-r--r--konq-plugins/fsview/treemap.cpp40
-rw-r--r--konq-plugins/fsview/treemap.h2
-rwxr-xr-xkonq-plugins/imagerotation/exif.py2
-rw-r--r--konq-plugins/kimgalleryplugin/imgalleryplugin.cpp16
-rw-r--r--konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui4
-rw-r--r--konq-plugins/microformat/konqmficon.cpp2
-rw-r--r--konq-plugins/minitools/minitoolsplugin.cpp4
-rw-r--r--konq-plugins/searchbar/searchbar.cpp6
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui20
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui20
-rw-r--r--konq-plugins/sidebar/metabar/src/configdialog.cpp22
-rw-r--r--konq-plugins/sidebar/metabar/src/defaultplugin.cpp4
-rw-r--r--konq-plugins/sidebar/metabar/src/httpplugin.cpp2
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarwidget.cpp12
-rw-r--r--konq-plugins/sidebar/metabar/src/protocolplugin.cpp2
-rw-r--r--konq-plugins/sidebar/newsticker/norsswidget.cpp2
-rw-r--r--konq-plugins/sidebar/newsticker/nspanel.cpp2
-rw-r--r--konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp2
-rw-r--r--konq-plugins/uachanger/uachangerplugin.cpp2
-rw-r--r--ksig/ksig.cpp4
-rw-r--r--ksig/ksig.h2
-rw-r--r--ksig/standardtextbase.ui2
-rw-r--r--noatun-plugins/alarm/wakeup.cpp4
-rw-r--r--noatun-plugins/alsaplayer/AlsaPlayer.ui6
-rw-r--r--noatun-plugins/alsaplayer/userinterface.cpp2
-rw-r--r--noatun-plugins/dub/dub/fileselectorwidget.cpp4
-rw-r--r--noatun-plugins/lyrics/cmodule.cpp2
-rw-r--r--noatun-plugins/lyrics/lyrics.cpp2
-rw-r--r--noatun-plugins/nexscope/nex.h2
-rw-r--r--noatun-plugins/oblique/view.cpp2
-rw-r--r--noatun-plugins/pitchablespeed/speedtuner.ui2
-rw-r--r--noatun-plugins/tippercanoe/synaescope.cpp2
-rw-r--r--noatun-plugins/wavecapture/wavecapture.h4
-rw-r--r--renamedlgplugins/audio/audiopreview.cpp2
-rw-r--r--renamedlgplugins/images/imagevisualizer.cpp2
79 files changed, 250 insertions, 250 deletions
diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index 3f39fb6..9f05f61 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -76,10 +76,10 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
KConfig *config = kapp->config();
config->setGroup("General");
- TQColor defaultColor = tqcolorGroup().background();
+ TQColor defaultColor = colorGroup().background();
defaultBg = config->readColorEntry("alternateBackground", &defaultColor);
config->setGroup("WM");
- defaultColor = tqcolorGroup().dark();
+ defaultColor = colorGroup().dark();
defaultFg = config->readColorEntry("activeBackground", &defaultColor);
// these must match up to the ones in editor.cpp!
diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp
index b3da81f..679a4ac 100644
--- a/atlantikdesigner/designer/group.cpp
+++ b/atlantikdesigner/designer/group.cpp
@@ -38,16 +38,16 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
connect(groups, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, spacingHint());
- tqcolorGroupBox = new TQVGroupBox(i18n("&Colors"), page);
- vtqlayout->addWidget(tqcolorGroupBox);
+ colorGroupBox = new TQVGroupBox(i18n("&Colors"), page);
+ vtqlayout->addWidget(colorGroupBox);
- (void) new TQLabel(i18n("Foreground:"), tqcolorGroupBox);
- fgButton = new KColorButton(tqcolorGroupBox, "Foreground Button");
+ (void) new TQLabel(i18n("Foreground:"), colorGroupBox);
+ fgButton = new KColorButton(colorGroupBox, "Foreground Button");
connect(fgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(fgChanged(const TQColor &)));
connect(fgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed()));
- (void) new TQLabel(i18n("Background:"), tqcolorGroupBox);
- bgButton = new KColorButton(tqcolorGroupBox, "Background Button");
+ (void) new TQLabel(i18n("Background:"), colorGroupBox);
+ bgButton = new KColorButton(colorGroupBox, "Background Button");
connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(bgChanged(const TQColor &)));
connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed()));
@@ -233,7 +233,7 @@ void GroupEditor::slotOk()
void GroupEditor::selectionChanged()
{
bool issel = groups->currentItem() >= 0;
- tqcolorGroupBox->setEnabled(issel);
+ colorGroupBox->setEnabled(issel);
pricesGroupBox->setEnabled(issel);
dynamicGroupBox->setEnabled(issel);
removeB->setEnabled(issel);
diff --git a/atlantikdesigner/designer/group.h b/atlantikdesigner/designer/group.h
index 606189b..87086f0 100644
--- a/atlantikdesigner/designer/group.h
+++ b/atlantikdesigner/designer/group.h
@@ -86,7 +86,7 @@ class GroupEditor : public KDialogBase
TQWidget *mathWidget;
TQSpinBox *housePrice;
TQSpinBox *globalPrice;
- TQVGroupBox *tqcolorGroupBox;
+ TQVGroupBox *colorGroupBox;
TQVGroupBox *pricesGroupBox;
TQVGroupBox *dynamicGroupBox;
KPushButton *removeB;
diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
index c5909c4..ea3ab6e 100644
--- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
+++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
@@ -122,7 +122,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const
if (checkDateTime(strList[5],dt)) addr->setBirthday(dt);
addr->setNote(strList[6]);
if (checkDateTime(strList[7],dt)) addr->setRevision(dt);
- // addr->settqStatus(strList[8]); tqStatus
+ // addr->setStatus(strList[8]); Status
// addr->xxx(strList[9]); Address_link_id
// addr->setCategory(strList[10]); Categories
addrMap[strList[0]] = addr;
@@ -137,7 +137,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const
return addrList;
}
// Address_id,Record_id,Street,Country,Zipcode,City,Phone,Fax,Mobile,Mobile_type,Email,
- // Homepage,Position,Comments,Record_type_id,Record_type,Company,Department,Change_date,Preferred,tqStatus
+ // Homepage,Position,Comments,Record_type_id,Record_type,Company,Department,Change_date,Preferred,Status
line = gmxStream.readLine();
line = gmxStream.readLine();
@@ -181,7 +181,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const
"KADDRESSBOOK", "X-Department", strList[17]); // Department
if (checkDateTime(strList[18],dt)) addr->setRevision(dt); // Change_date
// strList[19]=Preferred (see above)
- // strList[20]=tqStatus (should always be "1")
+ // strList[20]=Status (should always be "1")
addr->insertAddress(adr);
} else {
kdWarning() << "unresolved line: " << line << endl;
@@ -243,7 +243,7 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
static const TQString dateString( const TQDateTime &dt )
{
if (!dt.isValid())
- return TQString::tqfromLatin1("1000-01-01 00:00:00");
+ return TQString::fromLatin1("1000-01-01 00:00:00");
TQString d(dt.toString(Qt::ISODate));
d[10] = ' '; // remove the "T" in the middle of the string
return d;
@@ -281,7 +281,7 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
<< dateString(addr->birthday()) << DELIM // Birthday
<< addr->note() /*.replace('\n',"\r\n")*/ << DELIM // Comments
<< dateString(addr->revision()) << DELIM // Change_date
- << "1##0\n"; // tqStatus, Address_link_id, Categories
+ << "1##0\n"; // Status, Address_link_id, Categories
}
t << "####\n";
@@ -333,7 +333,7 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
<< ((record_id==0)?addr->custom("KADDRESSBOOK", "X-Department"):TQString()) << DELIM // Department
<< dateString(addr->revision()) << DELIM // Change_date
<< 5 << DELIM // Preferred
- << 1 << endl; // tqStatus (should always be "1")
+ << 1 << endl; // Status (should always be "1")
}
++no;
diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp
index 882ff70..b98c308 100644
--- a/kate/filelistloader/katefll_initplugin.cpp
+++ b/kate/filelistloader/katefll_initplugin.cpp
@@ -83,7 +83,7 @@ int InitPluginKateFileListLoader::initKate()
updateInit();
disconnect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit()));
-/* int id = pl->tqmetaObject()->findSlot( TQT_SLOT(updateInit()) );
+/* int id = pl->metaObject()->findSlot( TQT_SLOT(updateInit()) );
if ( id != -1 )
{
kdDebug()<<"Action slot was found, it will be called now"<<endl;
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index 813b36a..f88f0ba 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -352,7 +352,7 @@ WaitDlg::WaitDlg(TQWidget* parent, const TQString& text, const TQString& title)
setMainWidget( page );
TQHBoxLayout *lo = new TQHBoxLayout( page, 0, spacingHint() );
- KAnimWidget *aw = new KAnimWidget( TQString::tqfromLatin1("kde"), 48, page );
+ KAnimWidget *aw = new KAnimWidget( TQString::fromLatin1("kde"), 48, page );
lo->addWidget(aw);
TQLabel *l = new TQLabel( text, page );
lo->addWidget( l );
diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp
index 3ee96e5..34c9167 100644
--- a/kate/kpybrowser/kpybrowser.cpp
+++ b/kate/kpybrowser/kpybrowser.cpp
@@ -359,7 +359,7 @@ KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str)
str = "";
return;
}
- r = tqitemRect (item);
+ r = itemRect (item);
//r.setY(r.y() + 10);
PyBrowseNode *browse_node = dynamic_cast < PyBrowseNode * >(item);
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index bda41f5..8b116f1 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -82,7 +82,7 @@ void PluginKateMake::addView(Kate::MainWindow *win)
Kate::ToolViewManager *viewmanager = win->toolViewManager();
TQWidget *w = viewmanager->createToolView("kate_plugin_make",
Kate::ToolViewManager::Bottom,
- SmallIcon(TQString::tqfromLatin1("misc")),
+ SmallIcon(TQString::fromLatin1("misc")),
i18n("Make Output"));
PluginKateMakeView *view = new PluginKateMakeView (w,win,
"katemakeview");
@@ -132,7 +132,7 @@ public:
(lineno > 0 ? TQString::number(lineno) : TQString()),
message)
{
- m_isError = !message.contains(TQString::tqfromLatin1("warning"));
+ m_isError = !message.contains(TQString::fromLatin1("warning"));
m_lineno = lineno;
m_serial = s_serial++;
}
@@ -192,22 +192,22 @@ protected:
TQString ErrorMessage::caption() const
{
- return TQString::tqfromLatin1("%1:%2").tqarg(text(COL_FILE)).tqarg(line());
+ return TQString::fromLatin1("%1:%2").tqarg(text(COL_FILE)).tqarg(line());
}
TQString ErrorMessage::fancyMessage() const
{
- TQString msg = TQString::tqfromLatin1("<qt>");
+ TQString msg = TQString::fromLatin1("<qt>");
if (isError())
{
- msg.append(TQString::tqfromLatin1("<font color=\"red\">"));
+ msg.append(TQString::fromLatin1("<font color=\"red\">"));
}
msg.append(message());
if (isError())
{
- msg.append(TQString::tqfromLatin1("</font>"));
+ msg.append(TQString::fromLatin1("</font>"));
}
- msg.append(TQString::tqfromLatin1("<qt>"));
+ msg.append(TQString::fromLatin1("<qt>"));
return msg;
}
@@ -350,7 +350,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent,
actionCollection(), "make_settings" );
setInstance(new KInstance("kate"));
- setXMLFile(TQString::tqfromLatin1("plugins/katemake/ui.rc"));
+ setXMLFile(TQString::fromLatin1("plugins/katemake/ui.rc"));
setFocusPolicy(TQ_NoFocus);
@@ -379,7 +379,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent,
// if (source_prefix.isEmpty())
{
filenameDetector = new TQRegExp(
- TQString::tqfromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:"));
+ TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:"));
}
// else
{
@@ -557,7 +557,7 @@ void PluginKateMakeView::slotClicked(TQListViewItem *item)
<< globalPos.x() << "," << globalPos.y() << endl;
#if 0
KPassivePopup::message(
- TQString::tqfromLatin1("%1:%2").tqarg(filename).tqarg(lineno),
+ TQString::fromLatin1("%1:%2").tqarg(filename).tqarg(lineno),
msg,
this);
#else
@@ -649,7 +649,7 @@ bool PluginKateMakeView::slotValidate()
}
document_dir = TQFileInfo(url.path()).dirPath(true) +
- TQString::tqfromLatin1("/");
+ TQString::fromLatin1("/");
if (document_dir.startsWith(source_prefix))
{
@@ -717,7 +717,7 @@ void PluginKateMakeView::slotConfigure()
if (!filenameDetector)
{
filenameDetector = new TQRegExp(
- TQString::tqfromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:"));
+ TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:"));
}
}
//else
diff --git a/kate/snippets/CWidgetSnippetsBase.ui b/kate/snippets/CWidgetSnippetsBase.ui
index 37c2aab..19d0170 100644
--- a/kate/snippets/CWidgetSnippetsBase.ui
+++ b/kate/snippets/CWidgetSnippetsBase.ui
@@ -156,7 +156,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>200</width>
<height>20</height>
diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp
index 649b45d..8212f47 100644
--- a/kate/snippets/plugin_katesnippets.cpp
+++ b/kate/snippets/plugin_katesnippets.cpp
@@ -171,7 +171,7 @@ void KatePluginSnippetsView::slot_lvSnippetsClicked (TQListViewItem * item) {
}
sText.replace( TQRegExp("<mark/>"), sSelection );
- sText.replace( TQRegExp("<date/>"), TQDate::tqcurrentDate().toString(Qt::LocalDate) );
+ sText.replace( TQRegExp("<date/>"), TQDate::currentDate().toString(Qt::LocalDate) );
sText.replace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) );
kv->insertText ( sText );
}
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index ce53476..734c257 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -468,7 +468,7 @@ void PluginKateXMLTools::getDTD()
"as a document of type \"%1\". The meta DTD for this document type "
"will now be loaded.").tqarg( doctype ),
i18n( "Loading XML Meta DTD" ),
- TQString::tqfromLatin1( "DTDAssigned") );
+ TQString::fromLatin1( "DTDAssigned") );
}
if( url.isEmpty() )
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index ebf7d59..6acd08b 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -290,7 +290,7 @@ void KBinaryClock::openContextMenu() {
menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) );
KLocale *loc = KGlobal::locale();
- TQDateTime dt = TQDateTime::tqcurrentDateTime();
+ TQDateTime dt = TQDateTime::currentDateTime();
KPopupMenu *copyMenu = new KPopupMenu( menu );
copyMenu->insertItem(loc->formatDateTime(dt), 201);
@@ -361,15 +361,15 @@ void KBinaryClock::toggleCalendar()
if (_calendar || _disableCalendar){
return;
}
- _calendar = new DatePicker(this, TQDateTime::tqcurrentDateTime().date());
+ _calendar = new DatePicker(this, TQDateTime::currentDateTime().date());
connect( _calendar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotCalendarDeleted() ));
// some extra spacing is included if aligned on a desktop edge
TQPoint c = mapToGlobal(TQPoint(0,0));
- int w = _calendar->tqsizeHint().width() + 28;
+ int w = _calendar->sizeHint().width() + 28;
// Added 28 px. to size poperly as said in API
- int h = _calendar->tqsizeHint().height();
+ int h = _calendar->sizeHint().height();
switch (position()) {
case KPanelApplet::pLeft: c.setX(c.x()+width()+2); break;
@@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock
void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
{
- tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::tqcurrentDateTime().date(), false));
+ tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false));
}
#include "kbinaryclock.moc"
diff --git a/kicker-applets/kbinaryclock/settings.ui b/kicker-applets/kbinaryclock/settings.ui
index 321f913..2ebb466 100644
--- a/kicker-applets/kbinaryclock/settings.ui
+++ b/kicker-applets/kbinaryclock/settings.ui
@@ -96,7 +96,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -169,7 +169,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -287,7 +287,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -332,7 +332,7 @@
<property name="name">
<cstring>kLed1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -346,7 +346,7 @@
<property name="name">
<cstring>kLed2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -357,7 +357,7 @@
<property name="name">
<cstring>kLed4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -368,7 +368,7 @@
<property name="name">
<cstring>kLed3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -382,7 +382,7 @@
<property name="name">
<cstring>kLed6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -396,7 +396,7 @@
<property name="name">
<cstring>kLed5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -415,7 +415,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -434,7 +434,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>84</height>
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index f232377..f5239bd 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -63,22 +63,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation)
update();
}
-TQSize SimpleButton::tqsizeHint() const
+TQSize SimpleButton::sizeHint() const
{
const TQPixmap* pm = pixmap();
if (!pm)
- return TQButton::tqsizeHint();
+ return TQButton::sizeHint();
else
return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint());
}
-TQSize SimpleButton::tqminimumSizeHint() const
+TQSize SimpleButton::minimumSizeHint() const
{
const TQPixmap* pm = pixmap();
if (!pm)
- return TQButton::tqminimumSizeHint();
+ return TQButton::minimumSizeHint();
else
return TQSize(pm->width(), pm->height());
}
@@ -200,7 +200,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, con
_inside = false;
}
-TQSize SimpleArrowButton::tqsizeHint() const
+TQSize SimpleArrowButton::sizeHint() const
{
return TQSize( 12, 12 );
}
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
if (isDown() || isOn()) flags |= TQStyle::Style_Down;
- tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags);
+ tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
}
void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h
index 0cf11e5..9c66f85 100644
--- a/kicker-applets/kolourpicker/simplebutton.h
+++ b/kicker-applets/kolourpicker/simplebutton.h
@@ -35,8 +35,8 @@ class KDE_EXPORT SimpleButton : public TQButton
SimpleButton(TQWidget *parent, const char *name = 0);
void setPixmap(const TQPixmap &pix);
void setOrientation(Qt::Orientation orientaton);
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
protected:
void drawButton( TQPainter *p );
@@ -69,7 +69,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
public:
SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0);
virtual ~SimpleArrowButton() {};
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
protected:
virtual void enterEvent( TQEvent *e );
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index 2c78031..f0cc61a 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -111,7 +111,7 @@ void KTimeMon::paintEvent(TQPaintEvent *)
b = r / 3; // bar width
r -= b;
- if (bgColour != tqcolorGroup().background())
+ if (bgColour != colorGroup().background())
{
paintRect(x, 0, b, h, bgColour, &painter);
}
@@ -125,7 +125,7 @@ void KTimeMon::paintEvent(TQPaintEvent *)
b = r / 2;
r -= b;
- if (bgColour != tqcolorGroup().background())
+ if (bgColour != colorGroup().background())
{
paintRect(x, 0, b, h, bgColour, &painter);
}
@@ -138,7 +138,7 @@ void KTimeMon::paintEvent(TQPaintEvent *)
x += b;
b = r;
- if (bgColour != tqcolorGroup().background())
+ if (bgColour != colorGroup().background())
{
paintRect(x, 0, b, h, bgColour, &painter);
}
@@ -192,7 +192,7 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions,
niceColour("yellow"), iowaitColour("darkgreen"),
usedColour("blue1"), buffersColour("yellow"),
cachedColour("darkgreen"), mkernelColour("red1"),
- swapColour("cyan3"), bgColour(tqcolorGroup().background())
+ swapColour("cyan3"), bgColour(colorGroup().background())
{
mouseAction[0] = NOTHING;
mouseAction[1] = NOTHING;
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index 772afeb..37e0bd6 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -157,14 +157,14 @@ void MathApplet::resizeEvent(TQResizeEvent*)
_input->reparent(this, TQPoint(0,0), true);
_label->setGeometry(0,0, width(), _label->height());
- if(height() >= _input->tqsizeHint().height() + _label->height())
+ if(height() >= _input->sizeHint().height() + _label->height())
{
- int inputVOffset = height() - _input->tqsizeHint().height() - 2;
- int labelHeight = _label->tqsizeHint().height();
+ int inputVOffset = height() - _input->sizeHint().height() - 2;
+ int labelHeight = _label->sizeHint().height();
_label->setGeometry(0, inputVOffset - labelHeight,
width(), labelHeight);
_input->setGeometry(0, inputVOffset,
- width(), _input->tqsizeHint().height());
+ width(), _input->sizeHint().height());
_label->show();
}
else
@@ -174,7 +174,7 @@ void MathApplet::resizeEvent(TQResizeEvent*)
// make it as high as the combobox naturally wants to be
// but no taller than the panel is!
// don't forget to center it vertically either.
- int newHeight = _input->tqsizeHint().height();
+ int newHeight = _input->sizeHint().height();
if (newHeight > height())
newHeight = height();
_input->setGeometry(0, (height() - newHeight) / 2,
diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp
index b77b5d2..e2265a7 100644
--- a/kicker-applets/mediacontrol/amarokInterface.cpp
+++ b/kicker-applets/mediacontrol/amarokInterface.cpp
@@ -146,7 +146,7 @@ void AmarokInterface::updateSlider ( )
time = 0;
}
emit newSliderPosition(len,time);
- emit playingStatusChanged(playingtqStatus());
+ emit playingStatusChanged(playingStatus());
}
// Drag-n-Drop stuff =================================================================
@@ -289,7 +289,7 @@ bool AmarokInterface::findRunningAmarok()
}
-int AmarokInterface::playingtqStatus()
+int AmarokInterface::playingStatus()
{
TQByteArray data, replyData;
TQCString replyType;
diff --git a/kicker-applets/mediacontrol/amarokInterface.h b/kicker-applets/mediacontrol/amarokInterface.h
index f863208..5e8c689 100644
--- a/kicker-applets/mediacontrol/amarokInterface.h
+++ b/kicker-applets/mediacontrol/amarokInterface.h
@@ -48,7 +48,7 @@ class AmarokInterface : public PlayerInterface
virtual void dragEnterEvent(TQDragEnterEvent* event);
virtual void dropEvent(TQDropEvent* event);
virtual const TQString getTrackTitle() const;
- virtual int playingtqStatus();
+ virtual int playingStatus();
private slots:
void myInit();
diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp
index b055424..27ce45e 100644
--- a/kicker-applets/mediacontrol/jukInterface.cpp
+++ b/kicker-applets/mediacontrol/jukInterface.cpp
@@ -148,7 +148,7 @@ void JuKInterface::updateSlider ()
time = 0;
}
emit ( newSliderPosition(len,time) );
- emit playingStatusChanged(playingtqStatus());
+ emit playingStatusChanged(playingStatus());
}
// Drag-n-Drop stuff =================================================================
@@ -291,7 +291,7 @@ bool JuKInterface::findRunningJuK()
return false;
}
-int JuKInterface::playingtqStatus()
+int JuKInterface::playingStatus()
{
TQByteArray data, replyData;
TQCString replyType;
diff --git a/kicker-applets/mediacontrol/jukInterface.h b/kicker-applets/mediacontrol/jukInterface.h
index fa74fba..51bd6de 100644
--- a/kicker-applets/mediacontrol/jukInterface.h
+++ b/kicker-applets/mediacontrol/jukInterface.h
@@ -49,7 +49,7 @@ class JuKInterface : public PlayerInterface
void dragEnterEvent(TQDragEnterEvent* event);
void dropEvent(TQDropEvent* event);
const TQString getTrackTitle() const;
- int playingtqStatus();
+ int playingStatus();
private slots:
void myInit();
diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index 67eb931..916c0e1 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -126,7 +126,7 @@ void KsCDInterface::updateSlider()
time = 0;
}
emit newSliderPosition(len,time);
- emit playingStatusChanged(playingtqStatus());
+ emit playingStatusChanged(playingStatus());
}
// Drag-n-Drop stuff =================================================================
@@ -305,7 +305,7 @@ bool KsCDInterface::findRunningKsCD()
return false;
}
-int KsCDInterface::playingtqStatus()
+int KsCDInterface::playingStatus()
{
TQByteArray data, replyData;
TQCString replyType;
diff --git a/kicker-applets/mediacontrol/kscdInterface.h b/kicker-applets/mediacontrol/kscdInterface.h
index 2d37e42..2448080 100644
--- a/kicker-applets/mediacontrol/kscdInterface.h
+++ b/kicker-applets/mediacontrol/kscdInterface.h
@@ -48,7 +48,7 @@ class KsCDInterface : public PlayerInterface
void dragEnterEvent(TQDragEnterEvent* event);
void dropEvent(TQDropEvent* event);
const TQString getTrackTitle() const;
- int playingtqStatus();
+ int playingStatus();
private slots:
void myInit();
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index a2bf77b..ac32064 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -226,10 +226,10 @@ void MediaControl::disableAll()
void MediaControl::slotPlayingStatusChanged(int status)
{
- if (mLasttqStatus == status)
+ if (mLastStatus == status)
return;
- mLasttqStatus = status;
+ mLastStatus = status;
TQString skindir = locate("data", "mediacontrol/"+_configFrontend->theme()+"/");
switch (status)
@@ -255,7 +255,7 @@ void MediaControl::slotIconChanged()
if(!_configFrontend->useCustomTheme())
{
prev_button->setIconSet(SmallIconSet("player_start"));
- if (_player->playingtqStatus() == PlayerInterface::Playing)
+ if (_player->playingStatus() == PlayerInterface::Playing)
playpause_button->setIconSet(SmallIconSet("player_pause"));
else
playpause_button->setIconSet(SmallIconSet("player_play"));
@@ -350,7 +350,7 @@ void MediaControl::reparseConfig()
mLastLen = -1;
mLastTime = -1;
- mLasttqStatus = -1;
+ mLastStatus = -1;
TQString playerString = _configFrontend->player();
@@ -413,7 +413,7 @@ void MediaControl::reparseConfig()
if (TQFile(skindir+"play.png").exists())
{
prev_button->setIconSet(SmallIconSet(locate("data",skindir+"prev.png")));
- if (_player->playingtqStatus() == PlayerInterface::Playing)
+ if (_player->playingStatus() == PlayerInterface::Playing)
playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"play.png")));
else
playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"pause.png")));
@@ -461,10 +461,10 @@ void MediaControl::reparseConfig()
int MediaControl::widthForHeight(int height) const
{
// kdDebug(90200) << "kicker height: " << height << endl;
-// kdDebug(90200) << "slider needs: " << time_slider->tqminimumSizeHint().height() << endl;
+// kdDebug(90200) << "slider needs: " << time_slider->minimumSizeHint().height() << endl;
// slider height + button height
- if ( height >= (time_slider->tqminimumSizeHint().height()+MC_BUTTONSIZE) )
+ if ( height >= (time_slider->minimumSizeHint().height()+MC_BUTTONSIZE) )
{ // slider UNDER buttons
// (5 * button width + spaces between them);
return (4*MC_BUTTONSIZE+10);
@@ -483,7 +483,7 @@ int MediaControl::heightForWidth(int width) const
// kdDebug(90200) << "kicker width: " << width << endl;
// slider height + button height
- if ( width >= (time_slider->tqminimumSizeHint().width()+MC_BUTTONSIZE) )
+ if ( width >= (time_slider->minimumSizeHint().width()+MC_BUTTONSIZE) )
{ // slider ASIDE icons
// (5 * button width + spaces between them);
return (4*MC_BUTTONSIZE+10);
@@ -535,7 +535,7 @@ void MediaControl::resizeEvent( TQResizeEvent* )
if ( orientation() ==Qt::Vertical )
{ // ====== VERTICAL =================================================
time_slider->setOrientation(Qt::Vertical);
- int slider_width = time_slider->tqminimumSizeHint().width();
+ int slider_width = time_slider->minimumSizeHint().width();
// some styles need more space for sliders than avilable in very small panels :(
if ( slider_width > w ) slider_width = w;
@@ -567,7 +567,7 @@ void MediaControl::resizeEvent( TQResizeEvent* )
else // ====== HORIZONTAL ===============================================
{
time_slider->setOrientation(Qt::Horizontal);
- int slider_height = time_slider->tqminimumSizeHint().height();
+ int slider_height = time_slider->minimumSizeHint().height();
// some styles need more space for sliders than avilable in very small panels :(
if ( slider_height > h ) slider_height = h;
diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h
index 161db39..15315c6 100644
--- a/kicker-applets/mediacontrol/mediacontrol.h
+++ b/kicker-applets/mediacontrol/mediacontrol.h
@@ -95,7 +95,7 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface
TrayButton *stop_button; // Stop the music
TrayButton *next_button; // GoTo Next Playlist-Item
MCSlider *time_slider;
- int mLastLen, mLastTime, mLasttqStatus;
+ int mLastLen, mLastTime, mLastStatus;
KPopupMenu *rmbMenu;
virtual void mousePressEvent(TQMouseEvent* e);
diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
index 36a3e0e..df36762 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
+++ b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
@@ -156,7 +156,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -199,13 +199,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
@@ -227,13 +227,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
@@ -255,13 +255,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
@@ -283,13 +283,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
@@ -311,13 +311,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
@@ -339,7 +339,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp
index ea350d2..b17afa3 100644
--- a/kicker-applets/mediacontrol/mpdInterface.cpp
+++ b/kicker-applets/mediacontrol/mpdInterface.cpp
@@ -118,7 +118,7 @@ void MpdInterface::connected()
{
//kdDebug(90200) << "Connected ok\n";
emit playerStarted();
- emit playingStatusChanged(playingtqStatus());
+ emit playingStatusChanged(playingStatus());
}
else
{
@@ -265,7 +265,7 @@ void MpdInterface::updateSlider()
}
else if (time_re.search(res)>=0)
{
- TQStringList timeinfo=time_re.tqcapturedTexts();
+ TQStringList timeinfo=time_re.capturedTexts();
timeinfo.pop_front();
int elapsed_seconds=timeinfo.first().toInt();
timeinfo.pop_front();
@@ -298,7 +298,7 @@ void MpdInterface::jumpToTime(int sec)
{
if (songid_re.search(res)>=0)
{
- TQStringList songidinfo=songid_re.tqcapturedTexts();
+ TQStringList songidinfo=songid_re.capturedTexts();
songidinfo.pop_front();
songid=songidinfo.first().toInt();
}
@@ -316,7 +316,7 @@ void MpdInterface::jumpToTime(int sec)
void MpdInterface::playpause()
{
reconnect();
- if (playingtqStatus()==Stopped ? dispatch("play\n") : dispatch("pause\n"))
+ if (playingStatus()==Stopped ? dispatch("play\n") : dispatch("pause\n"))
{
fetchOk();
}
@@ -355,7 +355,7 @@ void MpdInterface::changeVolume(int delta)
{
if (volume_re.search(res)>=0)
{
- TQStringList info=volume_re.tqcapturedTexts();
+ TQStringList info=volume_re.capturedTexts();
info.pop_front();
volume=info.first().toInt();
}
@@ -411,7 +411,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
TQRegExp id_re("Id: (.+)");
if (file.isEmpty() && file_re.search(res)>=0)
{
- TQStringList info=file_re.tqcapturedTexts();
+ TQStringList info=file_re.capturedTexts();
info.pop_front();
// if the dropped file ends with the same name, record it
if (list.front().path().endsWith(info.first()))
@@ -422,7 +422,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
else if (!file.isEmpty() && id_re.search(res)>=0)
{
// when we have the file, pick up the id (file scomes first)
- TQStringList info=id_re.tqcapturedTexts();
+ TQStringList info=id_re.capturedTexts();
info.pop_front();
songid=info.first().toInt();
fetchOk(); // skip to the end
@@ -483,7 +483,7 @@ const TQString MpdInterface::getTrackTitle() const
TQRegExp songid_re("songid: (\\d+)");
if (songid_re.search(res)>=0)
{
- TQStringList songidinfo=songid_re.tqcapturedTexts();
+ TQStringList songidinfo=songid_re.capturedTexts();
songidinfo.pop_front();
songid=songidinfo.first().toInt();
}
@@ -508,31 +508,31 @@ const TQString MpdInterface::getTrackTitle() const
TQRegExp file_re("file: (.+)");
if (artist_re.search(res)>=0)
{
- TQStringList info=artist_re.tqcapturedTexts();
+ TQStringList info=artist_re.capturedTexts();
info.pop_front();
artist=info.first();
}
else if (album_re.search(res)>=0)
{
- TQStringList info=album_re.tqcapturedTexts();
+ TQStringList info=album_re.capturedTexts();
info.pop_front();
album=info.first();
}
else if (title_re.search(res)>=0)
{
- TQStringList info=title_re.tqcapturedTexts();
+ TQStringList info=title_re.capturedTexts();
info.pop_front();
title=info.first();
}
else if (track_re.search(res)>=0)
{
- TQStringList info=track_re.tqcapturedTexts();
+ TQStringList info=track_re.capturedTexts();
info.pop_front();
track=info.first();
}
else if (file_re.search(res)>=0)
{
- TQStringList info=file_re.tqcapturedTexts();
+ TQStringList info=file_re.capturedTexts();
info.pop_front();
file=info.first();
}
@@ -562,12 +562,12 @@ const TQString MpdInterface::getTrackTitle() const
return i18n("No tags: %1").tqarg(file);
}
-int MpdInterface::playingtqStatus()
+int MpdInterface::playingStatus()
{
//kdDebug(90200) << "looking up playing status\n";
if (!dispatch("status\n")) return Stopped;
- PlayingtqStatus status=Stopped;
+ PlayingStatus status=Stopped;
TQString res;
while(fetchLine(res))
{
diff --git a/kicker-applets/mediacontrol/mpdInterface.h b/kicker-applets/mediacontrol/mpdInterface.h
index b7512b9..4ba2034 100644
--- a/kicker-applets/mediacontrol/mpdInterface.h
+++ b/kicker-applets/mediacontrol/mpdInterface.h
@@ -51,7 +51,7 @@ class MpdInterface
virtual void dragEnterEvent(TQDragEnterEvent* event);
virtual void dropEvent(TQDropEvent* event);
virtual const TQString getTrackTitle() const;
- virtual int playingtqStatus();
+ virtual int playingStatus();
void changeVolume(int delta);
diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp
index 4ba4333..397dc10 100644
--- a/kicker-applets/mediacontrol/noatunInterface.cpp
+++ b/kicker-applets/mediacontrol/noatunInterface.cpp
@@ -145,10 +145,10 @@ void NoatunInterface::updateSlider()
time = 0;
}
emit newSliderPosition(len/1000,time/1000);
- emit playingStatusChanged(playingtqStatus());
+ emit playingStatusChanged(playingStatus());
}
-int NoatunInterface::playingtqStatus()
+int NoatunInterface::playingStatus()
{
TQByteArray data, replyData;
TQCString replyType;
diff --git a/kicker-applets/mediacontrol/noatunInterface.h b/kicker-applets/mediacontrol/noatunInterface.h
index 64f9ab9..0349458 100644
--- a/kicker-applets/mediacontrol/noatunInterface.h
+++ b/kicker-applets/mediacontrol/noatunInterface.h
@@ -49,7 +49,7 @@ class NoatunInterface : public PlayerInterface
const TQString getTrackTitle() const;
void appRegistered(const TQCString &appId);
void appRemoved(const TQCString &appId);
- int playingtqStatus();
+ int playingStatus();
void myInit(void);
diff --git a/kicker-applets/mediacontrol/playerInterface.h b/kicker-applets/mediacontrol/playerInterface.h
index 916d387..1225290 100644
--- a/kicker-applets/mediacontrol/playerInterface.h
+++ b/kicker-applets/mediacontrol/playerInterface.h
@@ -29,7 +29,7 @@ class PlayerInterface : public TQObject
PlayerInterface();
virtual ~PlayerInterface();
- enum PlayingtqStatus { Stopped=0, Playing, Paused };
+ enum PlayingStatus { Stopped=0, Playing, Paused };
public slots:
virtual void updateSlider()=0; // gets called on timer-timeout
@@ -45,7 +45,7 @@ class PlayerInterface : public TQObject
virtual void dragEnterEvent(TQDragEnterEvent* event)=0;
virtual void dropEvent(TQDropEvent* event)=0;
virtual const TQString getTrackTitle() const=0;
- virtual int playingtqStatus()=0;
+ virtual int playingStatus()=0;
void startPlayer(const TQString &desktopname);
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index f232377..f5239bd 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -63,22 +63,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation)
update();
}
-TQSize SimpleButton::tqsizeHint() const
+TQSize SimpleButton::sizeHint() const
{
const TQPixmap* pm = pixmap();
if (!pm)
- return TQButton::tqsizeHint();
+ return TQButton::sizeHint();
else
return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint());
}
-TQSize SimpleButton::tqminimumSizeHint() const
+TQSize SimpleButton::minimumSizeHint() const
{
const TQPixmap* pm = pixmap();
if (!pm)
- return TQButton::tqminimumSizeHint();
+ return TQButton::minimumSizeHint();
else
return TQSize(pm->width(), pm->height());
}
@@ -200,7 +200,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, con
_inside = false;
}
-TQSize SimpleArrowButton::tqsizeHint() const
+TQSize SimpleArrowButton::sizeHint() const
{
return TQSize( 12, 12 );
}
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
if (isDown() || isOn()) flags |= TQStyle::Style_Down;
- tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags);
+ tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
}
void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/kicker-applets/mediacontrol/simplebutton.h b/kicker-applets/mediacontrol/simplebutton.h
index 0cf11e5..9c66f85 100644
--- a/kicker-applets/mediacontrol/simplebutton.h
+++ b/kicker-applets/mediacontrol/simplebutton.h
@@ -35,8 +35,8 @@ class KDE_EXPORT SimpleButton : public TQButton
SimpleButton(TQWidget *parent, const char *name = 0);
void setPixmap(const TQPixmap &pix);
void setOrientation(Qt::Orientation orientaton);
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
protected:
void drawButton( TQPainter *p );
@@ -69,7 +69,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
public:
SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0);
virtual ~SimpleArrowButton() {};
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
protected:
virtual void enterEvent( TQEvent *e );
diff --git a/kicker-applets/mediacontrol/xmmsInterface.cpp b/kicker-applets/mediacontrol/xmmsInterface.cpp
index 05fc2b0..7d8e236 100644
--- a/kicker-applets/mediacontrol/xmmsInterface.cpp
+++ b/kicker-applets/mediacontrol/xmmsInterface.cpp
@@ -79,7 +79,7 @@ void XmmsInterface::updateSlider ( void )
}
emit newSliderPosition(len,time);
- emit playingStatusChanged(playingtqStatus());
+ emit playingStatusChanged(playingStatus());
}
@@ -163,7 +163,7 @@ void XmmsInterface::volumeDown()
xmms_remote_set_main_volume(XMMS_SESSION, cur-1);
}
-int XmmsInterface::playingtqStatus()
+int XmmsInterface::playingStatus()
{
if (xmms_remote_is_paused(XMMS_SESSION))
return Paused;
diff --git a/kicker-applets/mediacontrol/xmmsInterface.h b/kicker-applets/mediacontrol/xmmsInterface.h
index 59bea23..d67f8df 100644
--- a/kicker-applets/mediacontrol/xmmsInterface.h
+++ b/kicker-applets/mediacontrol/xmmsInterface.h
@@ -49,7 +49,7 @@ class XmmsInterface : public PlayerInterface
virtual void dragEnterEvent(TQDragEnterEvent* event);
virtual void dropEvent(TQDropEvent* event);
virtual const TQString getTrackTitle() const;
- virtual int playingtqStatus();
+ virtual int playingStatus();
private:
TQTimer *xmms_timer;
diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index 57cf2cc..c18c061 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -95,7 +95,7 @@ void AdBlock::initLabel()
KIconLoader *loader = instance()->iconLoader();
m_label->setFixedHeight(loader->currentSize(KIcon::Small));
- m_label->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ m_label->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_label->setUseCursor(false);
m_label->setPixmap(loader->loadIcon("filter", KIcon::Small));
diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp
index 57bddf3..9350bb4 100644
--- a/konq-plugins/akregator/konqfeedicon.cpp
+++ b/konq-plugins/akregator/konqfeedicon.cpp
@@ -156,7 +156,7 @@ void KonqFeedIcon::addFeedIcon()
// from khtmlpart's ualabel
m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
- m_feedIcon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_feedIcon->setUseCursor(false);
//FIXME hackish
m_feedIcon->setPixmap(TQPixmap(locate("data", "akregator/pics/rss.png")));
diff --git a/konq-plugins/domtreeviewer/attributeeditdialog.ui b/konq-plugins/domtreeviewer/attributeeditdialog.ui
index c0abc0e..1a1eafa 100644
--- a/konq-plugins/domtreeviewer/attributeeditdialog.ui
+++ b/konq-plugins/domtreeviewer/attributeeditdialog.ui
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>20</height>
diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui
index 0d3a204..9d1c575 100644
--- a/konq-plugins/domtreeviewer/domtreeviewbase.ui
+++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui
@@ -12,7 +12,7 @@
<height>508</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>600</width>
<height>380</height>
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>10</width>
<height>20</height>
@@ -173,7 +173,7 @@
<property name="name">
<cstring>groupBox1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>400</height>
@@ -424,7 +424,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 11b6a1d..5fc3b87 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -248,7 +248,7 @@ void DOMTreeWindow::dropEvent(TQDropEvent *event)
void DOMTreeWindow::addMessage(int msg_id, const TQString &msg)
{
- TQDateTime t(TQDateTime::tqcurrentDateTime());
+ TQDateTime t(TQDateTime::currentDateTime());
TQString fullmsg = t.toString();
fullmsg += ":";
diff --git a/konq-plugins/domtreeviewer/elementeditdialog.ui b/konq-plugins/domtreeviewer/elementeditdialog.ui
index d703eeb..be8eaaf 100644
--- a/konq-plugins/domtreeviewer/elementeditdialog.ui
+++ b/konq-plugins/domtreeviewer/elementeditdialog.ui
@@ -145,7 +145,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>20</height>
diff --git a/konq-plugins/domtreeviewer/messagedialog.ui b/konq-plugins/domtreeviewer/messagedialog.ui
index c6d20bc..35a7b38 100644
--- a/konq-plugins/domtreeviewer/messagedialog.ui
+++ b/konq-plugins/domtreeviewer/messagedialog.ui
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>300</width>
<height>20</height>
diff --git a/konq-plugins/domtreeviewer/texteditdialog.ui b/konq-plugins/domtreeviewer/texteditdialog.ui
index b68a31e..250df1b 100644
--- a/konq-plugins/domtreeviewer/texteditdialog.ui
+++ b/konq-plugins/domtreeviewer/texteditdialog.ui
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>20</height>
diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp
index d4875c2..c84f5d5 100644
--- a/konq-plugins/fsview/inode.cpp
+++ b/konq-plugins/fsview/inode.cpp
@@ -284,7 +284,7 @@ TQColor Inode::backColor() const
if (id>0) n = TQString::number(id);
if (n.isEmpty())
- return widget()->tqcolorGroup().button();
+ return widget()->colorGroup().button();
const char* str = n.ascii();
int h = 0, s = 100;
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index fc83601..bcc5b3e 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -1491,11 +1491,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
if (DEBUG_DRAWING)
kdDebug(90100) << " Checking " << i->path(0).join("/") << " ("
- << i->tqitemRect().x() << "/" << i->tqitemRect().y()
- << "-" << i->tqitemRect().width()
- << "x" << i->tqitemRect().height() << ")" << endl;
+ << i->itemRect().x() << "/" << i->itemRect().y()
+ << "-" << i->itemRect().width()
+ << "x" << i->itemRect().height() << ")" << endl;
- if (i->tqitemRect().contains(x, y)) {
+ if (i->itemRect().contains(x, y)) {
if (DEBUG_DRAWING) kdDebug(90100) << " .. Got. Index " << idx << endl;
@@ -1513,7 +1513,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
if (DEBUG_DRAWING)
kdDebug(90100) << "item(" << x << "," << y << "): Got "
<< p->path(0).join("/") << " (Size "
- << p->tqitemRect().width() << "x" << p->tqitemRect().height()
+ << p->itemRect().width() << "x" << p->itemRect().height()
<< ", Val " << p->value() << ")" << endl;
}
@@ -1542,8 +1542,8 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const
{
if (i) {
/* Must have a visible area */
- while(i && ((i->tqitemRect().width() <1) ||
- (i->tqitemRect().height() <1))) {
+ while(i && ((i->itemRect().width() <1) ||
+ (i->itemRect().height() <1))) {
TreeMapItem* p = i->parent();
if (!p) break;
int idx = p->tqchildren()->findRef(i);
@@ -1772,7 +1772,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e )
e->accept();
if ( e->reason() == TQContextMenuEvent::Keyboard ) {
- TQRect r = (_current) ? _current->tqitemRect() : _base->tqitemRect();
+ TQRect r = (_current) ? _current->itemRect() : _base->itemRect();
TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2);
emit contextMenuRequested(_current, p);
}
@@ -1936,14 +1936,14 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e )
int nextVisible(TreeMapItem* i)
{
TreeMapItem* p = i->parent();
- if (!p || p->tqitemRect().isEmpty()) return -1;
+ if (!p || p->itemRect().isEmpty()) return -1;
int idx = p->tqchildren()->findRef(i);
if (idx<0) return -1;
while (idx < (int)p->tqchildren()->count()-1) {
idx++;
- TQRect r = p->tqchildren()->at(idx)->tqitemRect();
+ TQRect r = p->tqchildren()->at(idx)->itemRect();
if (r.width()>1 && r.height()>1)
return idx;
}
@@ -1954,14 +1954,14 @@ int nextVisible(TreeMapItem* i)
int prevVisible(TreeMapItem* i)
{
TreeMapItem* p = i->parent();
- if (!p || p->tqitemRect().isEmpty()) return -1;
+ if (!p || p->itemRect().isEmpty()) return -1;
int idx = p->tqchildren()->findRef(i);
if (idx<0) return -1;
while (idx > 0) {
idx--;
- TQRect r = p->tqchildren()->at(idx)->tqitemRect();
+ TQRect r = p->tqchildren()->at(idx)->itemRect();
if (r.width()>1 && r.height()>1)
return idx;
}
@@ -2136,7 +2136,7 @@ void TreeMapWidget::drawTreeMap()
}
else {
// only subitem
- if (!_needsRefresh->tqitemRect().isValid()) return;
+ if (!_needsRefresh->itemRect().isValid()) return;
}
// reset cached font object; it could have been changed
@@ -2154,7 +2154,7 @@ void TreeMapWidget::drawTreeMap()
TQPainter p(this);
tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
TQRect(0, 0, TQWidget::width(), TQWidget::height()),
- tqcolorGroup() );
+ colorGroup() );
}
}
@@ -2198,7 +2198,7 @@ void TreeMapWidget::drawItem(TQPainter* p,
bool isCurrent = _current && item->isChildOf(_current);
- RectDrawing d(item->tqitemRect());
+ RectDrawing d(item->itemRect());
item->setSelected(isSelected);
item->setCurrent(isCurrent);
item->setShaded(_shading);
@@ -2232,15 +2232,15 @@ void TreeMapWidget::drawItems(TQPainter* p,
{
if (DEBUG_DRAWING)
kdDebug(90100) << "+drawItems(" << item->path(0).join("/") << ", "
- << item->tqitemRect().x() << "/" << item->tqitemRect().y()
- << "-" << item->tqitemRect().width() << "x"
- << item->tqitemRect().height() << "), Val " << item->value()
+ << item->itemRect().x() << "/" << item->itemRect().y()
+ << "-" << item->itemRect().width() << "x"
+ << item->itemRect().height() << "), Val " << item->value()
<< ", Sum " << item->sum() << endl;
drawItem(p, item);
item->clearFreeRects();
- TQRect origRect = item->tqitemRect();
+ TQRect origRect = item->itemRect();
int bw = item->borderWidth();
TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw,
origRect.width()-2*bw, origRect.height()-2*bw);
@@ -2288,7 +2288,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
i->clearItemRect();
}
// tooltip apears on whole item rect
- item->addFreeRect(item->tqitemRect());
+ item->addFreeRect(item->itemRect());
// if we have space for text...
if ((r.height() < _fontHeight) || (r.width() < _fontHeight)) return;
diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h
index 0aa5a9d..6cb5edd 100644
--- a/konq-plugins/fsview/treemap.h
+++ b/konq-plugins/fsview/treemap.h
@@ -290,7 +290,7 @@ public:
*/
void setItemRect(const TQRect& r) { _rect = r; }
void clearItemRect();
- const TQRect& tqitemRect() const { return _rect; }
+ const TQRect& itemRect() const { return _rect; }
int width() const { return _rect.width(); }
int height() const { return _rect.height(); }
diff --git a/konq-plugins/imagerotation/exif.py b/konq-plugins/imagerotation/exif.py
index ea65c6e..1f71387 100755
--- a/konq-plugins/imagerotation/exif.py
+++ b/konq-plugins/imagerotation/exif.py
@@ -240,7 +240,7 @@ GPS_TAGS={
0x0006: ('GPSAltitude', ),
0x0007: ('GPSTimeStamp', ),
0x0008: ('GPSSatellites', ),
- 0x0009: ('GPStqStatus', ),
+ 0x0009: ('GPSStatus', ),
0x000A: ('GPSMeasureMode', ),
0x000B: ('GPSDOP', ),
0x000C: ('GPSSpeedRef', ),
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index 981eeb8..36092c7 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -163,7 +163,7 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi
{
int numOfImages = imageDir.count();
const TQString imgGalleryDir = url.directory();
- const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()));
+ const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate()));
stream << "<body>\n<h1>" << TQStyleSheet::escape(m_configDlg->getTitle()) << "</h1><p>" << endl;
stream << i18n("<i>Number of images</i>: %1").tqarg(numOfImages) << "<br/>" << endl;
@@ -293,12 +293,12 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName
kdDebug(90170) << "imgGalleryDir: " << imgGalleryDir << endl;
// Create the "thumbs" subdirectory if necessary
- TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/"));
+ TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/"));
if (createDirectory(thumb_dir, imgGalleryDir, "thumbs") == false)
return false;
// Create the "images" subdirectory if necessary
- TQDir images_dir( imgGalleryDir + TQString::tqfromLatin1("/images/"));
+ TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/"));
if (m_copyFiles) {
if (createDirectory(images_dir, imgGalleryDir, "images") == false)
return false;
@@ -344,8 +344,8 @@ void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const TQString& s
}
const TQString imgGalleryDir = url.directory();
- TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/"));
- TQDir images_dir( imgGalleryDir + TQString::tqfromLatin1("/images/"));
+ TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/"));
+ TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/"));
TQDir imageDir( sourceDirName, "*.png *.PNG *.gif *.GIF *.jpg *.JPG *.jpeg *.JPEG *.bmp *.BMP",
TQDir::Name|TQDir::IgnoreCase, TQDir::Files|TQDir::Readable);
TQFile file( url.path() );
@@ -424,18 +424,18 @@ bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sou
const TQString& imgGalleryDir, const TQString& imageFormat)
{
TQImage img;
- const TQString pixPath = sourceDirName + TQString::tqfromLatin1("/") + imgName;
+ const TQString pixPath = sourceDirName + TQString::fromLatin1("/") + imgName;
if (m_copyFiles) {
KURL srcURL = KURL::fromPathOrURL(pixPath);
//kdDebug(90170) << "srcURL: " << srcURL << endl;
- KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::tqfromLatin1("/images/") + imgName);
+ KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::fromLatin1("/images/") + imgName);
//kdDebug(90170) << "destURL: " << destURL << endl;
KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget());
}
const TQString imgNameFormat = imgName + extension(imageFormat);
- const TQString thumbDir = imgGalleryDir + TQString::tqfromLatin1("/thumbs/");
+ const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/");
int extent = m_configDlg->getThumbnailSize();
// this code is stolen from tdebase/kioslave/thumbnail/imagecreator.cpp
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui
index 1869438..5d2a239 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui
+++ b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -171,7 +171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp
index 341cc2e..6375363 100644
--- a/konq-plugins/microformat/konqmficon.cpp
+++ b/konq-plugins/microformat/konqmficon.cpp
@@ -275,7 +275,7 @@ void KonqMFIcon::addMFIcon() {
m_mfIcon = new KURLLabel(m_statusBarEx->statusBar());
m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
- m_mfIcon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ m_mfIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_mfIcon->setUseCursor(false);
//FIXME hackish
m_mfIcon->setPixmap(TQPixmap(locate("data", "microformat/pics/microformat.png")));
diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp
index 60eb724..6616e0e 100644
--- a/konq-plugins/minitools/minitoolsplugin.cpp
+++ b/konq-plugins/minitools/minitoolsplugin.cpp
@@ -133,8 +133,8 @@ void MinitoolsPlugin::endFolderCallback() {
}
TQString MinitoolsPlugin::minitoolsFilename(bool local) {
- return local ? locateLocal("data", TQString::tqfromLatin1("konqueror/minitools.xml"))
- : locateLocal("data", TQString::tqfromLatin1("konqueror/minitools-global.xml"));
+ return local ? locateLocal("data", TQString::fromLatin1("konqueror/minitools.xml"))
+ : locateLocal("data", TQString::fromLatin1("konqueror/minitools-global.xml"));
}
void MinitoolsPlugin::slotEditBookmarks() {
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index a820d87..d099e7e 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -281,7 +281,7 @@ void SearchBarPlugin::startSearch(const TQString &_search)
if(!service || !KURIFilter::self()->filterURI(data, list))
{
- data.setData( TQString::tqfromLatin1( "google" ) + delimiter() + search );
+ data.setData( TQString::fromLatin1( "google" ) + delimiter() + search );
KURIFilter::self()->filterURI( data, list );
}
@@ -364,7 +364,7 @@ void SearchBarPlugin::setIcon()
p.drawPixmap(0, 2, m_searchIcon);
TQStyle::SFlags arrowFlags = TQStyle::Style_Default;
m_searchCombo->tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6,
- arrowmap.height()-6, 6, 5), m_searchCombo->tqcolorGroup(), arrowFlags, TQStyleOption() );
+ arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, TQStyleOption() );
p.end();
m_searchIcon = arrowmap;
@@ -590,7 +590,7 @@ int SearchBarCombo::findHistoryItem(const TQString &searchText)
void SearchBarCombo::mousePressEvent(TQMouseEvent *e)
{
- int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
+ int x0 = TQStyle::visualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
if(e->x() > x0 + 2 && e->x() < lineEdit()->x())
{
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
index 4f07e62..14dc7b4 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
@@ -52,7 +52,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -71,7 +71,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -88,7 +88,7 @@
<property name="name">
<cstring>Pause</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -105,7 +105,7 @@
<property name="name">
<cstring>Stop</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -190,7 +190,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -266,7 +266,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
index 9027637..4acfca0 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
@@ -52,7 +52,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -71,7 +71,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -88,7 +88,7 @@
<property name="name">
<cstring>Pause</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -105,7 +105,7 @@
<property name="name">
<cstring>Stop</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -190,7 +190,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -266,7 +266,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index 2585c7b..63a62a6 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -58,7 +58,7 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const
ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name)
{
- topWidgetName = parent->tqtopLevelWidget()->name();
+ topWidgetName = parent->topLevelWidget()->name();
config = new KConfig("metabarrc");
iconConfig = new KConfig(locate("data", "metabar/iconsrc"));
@@ -78,7 +78,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
TQWidget *general = new TQWidget;
TQGroupBox *entries_group = new TQGroupBox(2, Qt::Horizontal, i18n("Items"), general);
- entries_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+ entries_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
TQLabel *entries_label = new TQLabel(i18n("Open with:"), entries_group);
max_entries = new KIntSpinBox(entries_group);
@@ -98,7 +98,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
TQGroupBox *appearance_group = new TQGroupBox(1, Qt::Horizontal, i18n("Appearance"), general);
- appearance_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+ appearance_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
animate = new TQCheckBox(i18n("Animate resize"), appearance_group);
animate->setChecked(config->readBoolEntry("AnimateResize", false));
@@ -110,13 +110,13 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
showframe->setChecked(config->readBoolEntry("ShowFrame", true));
TQGroupBox *theme_group = new TQGroupBox(2, Qt::Horizontal, i18n("Themes"), general);
- theme_group->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+ theme_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
themes = new KComboBox(theme_group);
- themes->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
+ themes->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
install_theme = new KPushButton(i18n("Install New Theme..."), theme_group);
- install_theme->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
+ install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred);
connect(install_theme, TQT_SIGNAL(clicked()), this, TQT_SLOT(installTheme()));
loadThemes();
@@ -144,7 +144,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown()));
link_list = new KListView(links);
- link_list->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
link_list->setSorting(-1);
link_list->setItemsMovable(TRUE);
link_list->addColumn(i18n("Name"));
@@ -320,7 +320,7 @@ void ConfigDialog::createLink()
TQLineEdit *url = new TQLineEdit("file:/", main);
KIconButton *icon = new KIconButton(main);
- icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+ icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
icon->setIconType(KIcon::Small, KIcon::Any);
icon->setStrictIconSize(true);
icon->setIcon("folder");
@@ -342,7 +342,7 @@ void ConfigDialog::createLink()
main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
main_layout->addLayout(bottom_layout);
- main->resize(300, main->tqsizeHint().height());
+ main->resize(300, main->sizeHint().height());
if(main->exec() == TQDialog::Accepted){
TQString name_str = name->text();
@@ -403,7 +403,7 @@ void ConfigDialog::editLink(TQListViewItem *item)
TQLineEdit *url = new TQLineEdit(linkList[item]->url, main);
KIconButton *icon = new KIconButton(main);
- icon->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+ icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
icon->setIconType(KIcon::Small, KIcon::Any);
icon->setStrictIconSize(true);
icon->setIcon(linkList[item]->icon);
@@ -425,7 +425,7 @@ void ConfigDialog::editLink(TQListViewItem *item)
main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
main_layout->addLayout(bottom_layout);
- main->resize(300, main->tqsizeHint().height());
+ main->resize(300, main->sizeHint().height());
if(main->exec() == TQDialog::Accepted){
TQString name_str = name->text();
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 3f2f7c9..e6c594c 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -104,7 +104,7 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node)
}
}
else{
- DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->tqtopLevelWidget()->name()).append("/action/").append((*it).utf8()));
+ DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8()));
if(!action.isNull()){
if(action.call("enabled()")){
@@ -364,7 +364,7 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix)
buffer.open(IO_WriteOnly);
pix.save(&buffer, "PNG");
- TQString src = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
+ TQString src = TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
bool media = item->mimetype().startsWith("video/");
DOM::DOMString innerHTML;
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index aa09cd3..bbfb9e2 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
@@ -107,7 +107,7 @@ bool HTTPPlugin::handleRequest(const KURL &url)
KURL url("http://www.google.com/search");
url.addQueryItem("q", keyword);
- DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->tqtopLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->topLevelWidget()->name());
DCOPReply reply = ref.call("openURL", url.url());
}
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 0439c98..700cb74 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -94,7 +94,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
html->setCaretVisible(false);
html->setDNDEnabled(false);
html->setJavaEnabled(false);
- html->view()->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ html->view()->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
html->view()->hide();
connect(html->browserExtension(), TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &)));
@@ -210,7 +210,7 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check)
TQString MetabarWidget::getCurrentURL()
{
- DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
DCOPReply reply = ref.call("currentURL()");
if (reply.isValid()) {
@@ -226,19 +226,19 @@ TQString MetabarWidget::getCurrentURL()
void MetabarWidget::openURL(const TQString &url)
{
- DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
DCOPReply reply = ref.call("openURL", url);
}
void MetabarWidget::openTab(const TQString &url)
{
- DCOPRef ref(kapp->dcopClient()->appId(), this->tqtopLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name());
DCOPReply reply = ref.call("newTab", url);
}
void MetabarWidget::callAction(const TQString &action)
{
- DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->tqtopLevelWidget()->name()).append("/action/").append(action)).utf8());
+ DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->topLevelWidget()->name()).append("/action/").append(action)).utf8());
if(ref.call("enabled()")){
ref.call("activate()");
}
@@ -475,7 +475,7 @@ TQString MetabarWidget::getIconPath(const TQString &name)
buffer.open(IO_WriteOnly);
icon.save(&buffer, "PNG");
- return TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
+ return TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
}
void MetabarWidget::slotShowSharingDialog()
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 333aab5..1779b37 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -71,7 +71,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
TQBuffer buffer(data);
buffer.open(IO_WriteOnly);
pix.save(&buffer, "PNG");
- TQString icondata = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
+ TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
icon.setSrc(icondata);
}
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index 99e8fb4..9af7e65 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -45,7 +45,7 @@ namespace KSB_News {
topLayout->addStretch();
KPushButton *btn = new KPushButton(i18n("&Configure"), this);
- btn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
+ btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnClicked()));
topLayout->addWidget(btn, 0, TQt::AlignHCenter);
diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp
index 56a7c52..a5c1261 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.cpp
+++ b/konq-plugins/sidebar/newsticker/nspanel.cpp
@@ -54,7 +54,7 @@ namespace KSB_News {
int textWidth = fm.width(text);
int widgetSpace = visibleWidth();
if ((textWidth > widgetSpace) || (contentsX() > 0))
- tip(tqitemRect(item), text);
+ tip(itemRect(item), text);
}
}
}
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 6bc6d1a..59e0e0d 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -115,7 +115,7 @@ namespace KSB_News {
button->setText(KStringHandler::rPixelSqueeze(nsp->title(),
button->fontMetrics(),
button->width() - 4 ));
- button->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+ button->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
TQSizePolicy::Preferred));
connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonClicked()));
TQToolTip::add(button, nsp->title());
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index d376d73..dbafc59 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutda
#define UA_PTOS(x) (*it)->property(x).toString()
-#define TQFL1(x) TQString::tqfromLatin1(x)
+#define TQFL1(x) TQString::fromLatin1(x)
UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name,
diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp
index 88fe29f..4d6938b 100644
--- a/ksig/ksig.cpp
+++ b/ksig/ksig.cpp
@@ -98,7 +98,7 @@ void KSig::setupLayout()
updateListLock = false;
connect(sigEdit, TQT_SIGNAL(textChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateList()));
connect(sigList, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateEdit()));
- connect(sigEdit, TQT_SIGNAL(cursorPositionChanged(int,int)), TQT_TQOBJECT(this), TQT_SLOT(updatetqStatus(int,int)));
+ connect(sigEdit, TQT_SIGNAL(cursorPositionChanged(int,int)), TQT_TQOBJECT(this), TQT_SLOT(updateStatus(int,int)));
}
void KSig::setupSearchLine()
@@ -259,7 +259,7 @@ void KSig::updateEdit()
updateListLock = false;
}
-void KSig::updatetqStatus(int line, int column)
+void KSig::updateStatus(int line, int column)
{
statusBar()->changeItem(i18n(" Line: %1 ").tqarg(line + 1), LineNumber);
statusBar()->changeItem(i18n(" Col: %1 ").tqarg(column + 1), ColumnNumber);
diff --git a/ksig/ksig.h b/ksig/ksig.h
index 3ed892d..ef0f68c 100644
--- a/ksig/ksig.h
+++ b/ksig/ksig.h
@@ -60,7 +60,7 @@ private slots:
void updateList();
void updateEdit();
- void updatetqStatus(int line, int column);
+ void updateStatus(int line, int column);
private:
TQString header;
diff --git a/ksig/standardtextbase.ui b/ksig/standardtextbase.ui
index 136e3ca..f2e4938 100644
--- a/ksig/standardtextbase.ui
+++ b/ksig/standardtextbase.ui
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index 6f5ff6c..6a9e7a8 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -104,7 +104,7 @@ void Wakeup::slotCheckTime()
TQDate d;
t=TQTime::currentTime();
- d=TQDate::tqcurrentDate();
+ d=TQDate::currentDate();
if (t.minute()!=minute[d.dayOfWeek()-1] || t.hour()!=hour[d.dayOfWeek()-1]) return;
@@ -209,7 +209,7 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) :
applyall = new TQPushButton (this,"applyall");
applyall->setPixmap( BarIcon("down", KIcon::SizeSmall) );
- applyall->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
+ applyall->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
TQSizePolicy::Fixed,
applyall->sizePolicy().hasHeightForWidth()) );
grid->addWidget (applyall,1,3,TQt::AlignLeft);
diff --git a/noatun-plugins/alsaplayer/AlsaPlayer.ui b/noatun-plugins/alsaplayer/AlsaPlayer.ui
index 73c4249..b602d5e 100644
--- a/noatun-plugins/alsaplayer/AlsaPlayer.ui
+++ b/noatun-plugins/alsaplayer/AlsaPlayer.ui
@@ -2205,7 +2205,7 @@
<property name="name">
<cstring>seeker</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>16</height>
@@ -2254,7 +2254,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -2394,7 +2394,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index cc53b06..ed5d576 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -155,7 +155,7 @@ AlsaPlayer::AlsaPlayer()
loadConfig();
- resize(tqsizeHint().width(), tqminimumSizeHint().height());
+ resize(sizeHint().width(), minimumSizeHint().height());
show();
}
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp
index c6d7d18..ae5c5d3 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.cpp
+++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp
@@ -66,7 +66,7 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent)
hlow->setMaximumHeight(up->height());
cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
- cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
KURLCompletion* cmpl = new KURLCompletion();
cmbPath->setCompletionObject( cmpl );
lo->addWidget(cmbPath);
@@ -80,7 +80,7 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent)
filterIcon = new TQLabel(filterBox);
filterIcon->setPixmap( BarIcon("filter") );
filter = new KHistoryCombo(filterBox, "filter");
- filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filterBox->setStretchFactor(filter, 2);
lo->addWidget(filterBox);
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 6f2183f..1d444c4 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -76,7 +76,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
/* ATTENTION to translators:
* The property names can't be translated. This means that $(author) must be kept as $(author), $(title) as $(title), etc, or it won't work.*/
TQLabel *textLabel = new TQLabel(i18n("For your query, you can use any property of your multimedia item, just enclosing it with a $(property).\n\nSome common properties used are $(title), $(author) and $(album). For example, to search in Google for the author, title and track, just use:\nhttp://www.google.com/search?q=$(author)+$(title)+$(track)"), propBox, "textLabel");
- textLabel->tqsetAlignment(TQt::WordBreak);
+ textLabel->setAlignment(TQt::WordBreak);
htqlayout->addWidget( propBox, 1 );
/* Signal/slots */
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index cbf6b63..99e91b7 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -59,7 +59,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
connect( history, TQT_SIGNAL(uiChanged(int, bool)), this, TQT_SLOT(changeUI(int, bool)) );
connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()) );
- /* tqStatus bar */
+ /* Status bar */
statusBar()->insertItem(i18n("Ready"), 0, 1);
statusBar()->setItemAlignment(0, TQt::AlignLeft);
diff --git a/noatun-plugins/nexscope/nex.h b/noatun-plugins/nexscope/nex.h
index 3a447f1..bbe3bf3 100644
--- a/noatun-plugins/nexscope/nex.h
+++ b/noatun-plugins/nexscope/nex.h
@@ -79,7 +79,7 @@ Q_OBJECT
public:
Spacer(TQWidget *parent) : TQWidget(parent)
{
- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
+ setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
TQSizePolicy::MinimumExpanding));
}
};
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 5f32b4d..aa7a79b 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -74,7 +74,7 @@ View::View(Oblique *oblique)
{
TQLabel *l = new TQLabel(i18n("&Jump:"), 0, "kde toolbar widget");
l->setBackgroundMode( TQt::PaletteButton );
- l->tqsetAlignment(
+ l->setAlignment(
(TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) |
TQt::AlignVCenter | TQt::ShowPrefix
);
diff --git a/noatun-plugins/pitchablespeed/speedtuner.ui b/noatun-plugins/pitchablespeed/speedtuner.ui
index c200860..81c64e3 100644
--- a/noatun-plugins/pitchablespeed/speedtuner.ui
+++ b/noatun-plugins/pitchablespeed/speedtuner.ui
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp
index b33b71d..9a0fb1b 100644
--- a/noatun-plugins/tippercanoe/synaescope.cpp
+++ b/noatun-plugins/tippercanoe/synaescope.cpp
@@ -81,7 +81,7 @@ void SynaeScope::scopeEvent(float *left, float *right, int size)
void SynaeScope::read(KProcess *, char *buf, int)
{
- TQString num = TQString::tqfromLatin1(buf);
+ TQString num = TQString::fromLatin1(buf);
num = num.left(num.find(TQRegExp("\\s")));
id = num.toInt();
embed->embed(id);
diff --git a/noatun-plugins/wavecapture/wavecapture.h b/noatun-plugins/wavecapture/wavecapture.h
index 78cbc5f..b1d459d 100644
--- a/noatun-plugins/wavecapture/wavecapture.h
+++ b/noatun-plugins/wavecapture/wavecapture.h
@@ -56,8 +56,8 @@ private:
int pluginMenuItem;
bool _enabled;
- enum tqStatus { PAUSED, STOPPED, PLAYING };
- tqStatus _status;
+ enum Status { PAUSED, STOPPED, PLAYING };
+ Status _status;
Arts::Effect_WAVECAPTURE _capture;
int _count;
diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp
index e0af544..94b36f3 100644
--- a/renamedlgplugins/audio/audiopreview.cpp
+++ b/renamedlgplugins/audio/audiopreview.cpp
@@ -125,7 +125,7 @@ void AudioPreview::initView( const TQString& mimeType )
void AudioPreview::downloadFile( const TQString& url )
{
- if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), m_localFile , tqtopLevelWidget()) )
+ if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), m_localFile , topLevelWidget()) )
{
m_isTempFile = true;
initView( KMimeType::findByPath( m_localFile )->name() );
diff --git a/renamedlgplugins/images/imagevisualizer.cpp b/renamedlgplugins/images/imagevisualizer.cpp
index e347dc4..684fefb 100644
--- a/renamedlgplugins/images/imagevisualizer.cpp
+++ b/renamedlgplugins/images/imagevisualizer.cpp
@@ -73,7 +73,7 @@ void ImageVisualizer::loadImage( const TQString& path )
void ImageVisualizer::downloadImage(const TQString& url)
{
TQString tmpFile;
- if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), tmpFile , tqtopLevelWidget()) )
+ if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), tmpFile , topLevelWidget()) )
{
loadImage( tmpFile );
KIO::NetAccess::removeTempFile( tmpFile );