diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:52:34 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:52:34 -0600 |
commit | 75112ed8e227f656f98523b7ffdad5422d9a6f11 (patch) | |
tree | 23041ac1bbe364dcc39dbbd0e86ff6930494e036 /noatun-plugins | |
parent | b88830e9111dc4375bc1461c3f7b3e7b3e73f733 (diff) | |
download | tdeaddons-75112ed8e227f656f98523b7ffdad5422d9a6f11.tar.gz tdeaddons-75112ed8e227f656f98523b7ffdad5422d9a6f11.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'noatun-plugins')
-rw-r--r-- | noatun-plugins/alarm/kminutespinbox.cpp | 2 | ||||
-rw-r--r-- | noatun-plugins/alsaplayer/AlsaPlayer.ui | 4 | ||||
-rw-r--r-- | noatun-plugins/alsaplayer/userinterface.cpp | 4 | ||||
-rw-r--r-- | noatun-plugins/blurscope/scopedisplayer.cpp | 4 | ||||
-rw-r--r-- | noatun-plugins/blurscope/sdlscope.h | 2 | ||||
-rw-r--r-- | noatun-plugins/charlatan/userinterface.cpp | 2 | ||||
-rw-r--r-- | noatun-plugins/dub/dub/dub.cpp | 4 | ||||
-rw-r--r-- | noatun-plugins/lyrics/lyrics.cpp | 10 | ||||
-rw-r--r-- | noatun-plugins/nexscope/nex.h | 4 | ||||
-rw-r--r-- | noatun-plugins/oblique/cmodule.cpp | 2 | ||||
-rw-r--r-- | noatun-plugins/oblique/query.cpp | 4 | ||||
-rw-r--r-- | noatun-plugins/oblique/tree.cpp | 24 | ||||
-rw-r--r-- | noatun-plugins/oblique/tree.h | 2 | ||||
-rw-r--r-- | noatun-plugins/oblique/view.cpp | 2 | ||||
-rw-r--r-- | noatun-plugins/pitchablespeed/speedtuner.ui | 2 |
15 files changed, 36 insertions, 36 deletions
diff --git a/noatun-plugins/alarm/kminutespinbox.cpp b/noatun-plugins/alarm/kminutespinbox.cpp index 862eb0c..72b6d9d 100644 --- a/noatun-plugins/alarm/kminutespinbox.cpp +++ b/noatun-plugins/alarm/kminutespinbox.cpp @@ -33,7 +33,7 @@ KMinuteSpinBox::KMinuteSpinBox(int _step, TQWidget *_parent, const char *_name) TQString KMinuteSpinBox::mapValueToText(int v) { if(v < 10) - return TQString("0%1").tqarg(v); + return TQString("0%1").arg(v); else return TQString::number(v); } diff --git a/noatun-plugins/alsaplayer/AlsaPlayer.ui b/noatun-plugins/alsaplayer/AlsaPlayer.ui index b602d5e..3280242 100644 --- a/noatun-plugins/alsaplayer/AlsaPlayer.ui +++ b/noatun-plugins/alsaplayer/AlsaPlayer.ui @@ -574,7 +574,7 @@ <property name="text"> <string>Speed:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -1924,7 +1924,7 @@ <property name="text"> <string>Volume:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp index ed5d576..9e13f12 100644 --- a/noatun-plugins/alsaplayer/userinterface.cpp +++ b/noatun-plugins/alsaplayer/userinterface.cpp @@ -273,7 +273,7 @@ void AlsaPlayer::slotConfigChanged() void AlsaPlayer::slotVolumeChanged(int i) { TQString text("%1%"); - volumeLabel->setText(text.tqarg(i)); + volumeLabel->setText(text.arg(i)); volumeSlider->setValue(i); } @@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed) speed_ = newSpeed; pauseButton->setEnabled(0 != speed_); - speedLabel->setText(TQString("%1%").tqarg(speed_)); + speedLabel->setText(TQString("%1%").arg(speed_)); Arts::PlayObject playobject(napp->player()->engine()->playObject()); Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject); diff --git a/noatun-plugins/blurscope/scopedisplayer.cpp b/noatun-plugins/blurscope/scopedisplayer.cpp index 6b10732..42b375a 100644 --- a/noatun-plugins/blurscope/scopedisplayer.cpp +++ b/noatun-plugins/blurscope/scopedisplayer.cpp @@ -130,7 +130,7 @@ SDLView::SDLView(int in) : mFd(in), outputBmp(0), fullscreen(false) d++; x++; } - tqrepaint(); + repaint(); } } @@ -233,7 +233,7 @@ void SDLView::checkInput() #define output2 ((unsigned char*)outputBmp.data) -void SDLView::tqrepaint() +void SDLView::repaint() { SDL_LockSurface(surface); TEST(); diff --git a/noatun-plugins/blurscope/sdlscope.h b/noatun-plugins/blurscope/sdlscope.h index 73e6d6d..45c734c 100644 --- a/noatun-plugins/blurscope/sdlscope.h +++ b/noatun-plugins/blurscope/sdlscope.h @@ -94,7 +94,7 @@ protected: void checkInput(); void setupPalette(double dummy=0.0); - void tqrepaint(); + void repaint(); private: int mFd; diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp index 8e67516..542b527 100644 --- a/noatun-plugins/charlatan/userinterface.cpp +++ b/noatun-plugins/charlatan/userinterface.cpp @@ -366,7 +366,7 @@ void Charlatan::slotConfigChanged() void Charlatan::slotVolumeChanged(int i) { - TQString message(i18n("Volume: %1").tqarg(i)); + TQString message(i18n("Volume: %1").arg(i)); showingVolumeTimer_->start(2000, true); titleLabel_->setText(message); diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp index 046ba17..5322ae6 100644 --- a/noatun-plugins/dub/dub/dub.cpp +++ b/noatun-plugins/dub/dub/dub.cpp @@ -245,7 +245,7 @@ KFileItem* Dub::Linear_OneDir::first() if (first) set_file(&first_file, first); else { - if (first_file) { // tqinvalidate first + if (first_file) { // invalidate first delete first_file; first_file = 0; } @@ -451,7 +451,7 @@ void Dub::Recursive_Seq::prev_preorder() } else { TQString subdir = *top->current_subdir; - kdDebug(90010) << "we have tqchildren, pushing now " << subdir << endl; + kdDebug(90010) << "we have children, pushing now " << subdir << endl; push_dir(subdir, false); // push directory w/ backward iterators } } diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index 99e91b7..30d7703 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -122,7 +122,7 @@ void Lyrics::loadedURL() if ( !napp->player()->current() ) return; statusBar()->changeItem(i18n("Loaded"), 0); - setCaption(i18n("Lyrics: %1").tqarg(napp->player()->current().property("title"))); + setCaption(i18n("Lyrics: %1").arg(napp->player()->current().property("title"))); if (!htmlpart->url().url().isEmpty() && napp->player()->current() && !napp->player()->current().property("Lyrics::URL").isEmpty()) { kdDebug(90020) << "Setting URL for (loaded)" << napp->player()->current().title() << endl; napp->player()->current().setProperty("Lyrics::URL", htmlpart->url().url()); @@ -196,7 +196,7 @@ void Lyrics::viewLyrics(int index) pos = props_regexp.search(url); } TQString title(napp->player()->current().property("title")); - setCaption(i18n("Loading Lyrics for %1").tqarg(title)); + setCaption(i18n("Loading Lyrics for %1").arg(title)); // Check if we have a music playing if (napp->player()->current()) { htmlpart->begin(); @@ -207,7 +207,7 @@ void Lyrics::viewLyrics(int index) "<TR><TD BGCOLOR=\"#707671\"><strong>Title</strong></TD><TD>%1</TD></TR>" "<TR><TD BGCOLOR=\"#707671\"><strong>Author</strong></TD><TD>%2</TD></TR>" "<TR><TD BGCOLOR=\"#707671\"><strong>Album</strong></TD><TD>%3</TD></TR>" - "</TABLE>").tqarg( napp->player()->current().property( "title" ) ).tqarg( napp->player()->current().property( "author" ) ).tqarg( napp->player()->current().property( "album" ) ) ); + "</TABLE>").arg( napp->player()->current().property( "title" ) ).arg( napp->player()->current().property( "author" ) ).arg( napp->player()->current().property( "album" ) ) ); KURL _url; /* Check if we should use the store url or the query one */ if (napp->player()->current().property("Lyrics::URL").isEmpty()) { @@ -218,7 +218,7 @@ void Lyrics::viewLyrics(int index) attach_act->setChecked(false); site_act->setEnabled(true); actionCollection()->action("search_label")->setEnabled(true); - htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).tqarg( name ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) ); + htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).arg( name ).arg( _url.prettyURL() ).arg( _url.url() ) ); } else { _url = napp->player()->current().property("Lyrics::URL"); _url.setQuery(_url.query().replace(TQRegExp("%20"), "+")); @@ -226,7 +226,7 @@ void Lyrics::viewLyrics(int index) attach_act->setChecked(true); site_act->setEnabled(false); actionCollection()->action("search_label")->setEnabled(false); - htmlpart->write( i18n( "<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</a></small>)</p>" ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) ); + htmlpart->write( i18n( "<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</a></small>)</p>" ).arg( _url.prettyURL() ).arg( _url.url() ) ); } htmlpart->write( "</BODY></HTML>" ); htmlpart->end(); diff --git a/noatun-plugins/nexscope/nex.h b/noatun-plugins/nexscope/nex.h index bbe3bf3..3d16762 100644 --- a/noatun-plugins/nexscope/nex.h +++ b/noatun-plugins/nexscope/nex.h @@ -20,8 +20,8 @@ typedef uint8_t Byte; #define COLOR(r,g,b) ((r<<16) | (g<<8) | (b)) #define COLORSTR(pixel) \ - TQString("#%1%2%3").tqarg(TQString::number((pixel>>16) & 8, 16)) \ - .tqarg(TQString::number((pixel>>8) & 8, 16)).tqarg(TQString::number(pixel& 8, 16)) + TQString("#%1%2%3").arg(TQString::number((pixel>>16) & 8, 16)) \ + .arg(TQString::number((pixel>>8) & 8, 16)).arg(TQString::number(pixel& 8, 16)) #define STRCOLOR(pixel) \ Pixel(((pixel.mid(1,2).toInt(0, 16)) <<16) \ diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index a43f0a2..8267865 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -159,7 +159,7 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) connect(mOptionPlayable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); mOptionChildrenVisible = new TQCheckBox(i18n("&Children visible"), groupbox); - TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes tqchildren become direct tqchildren of this node's parent")); + TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes children become direct children of this node's parent")); connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox); diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp index d53437e..34ebe72 100644 --- a/noatun-plugins/oblique/query.cpp +++ b/noatun-plugins/oblique/query.cpp @@ -487,7 +487,7 @@ void Query::loadGroup(TQDomElement element, QueryGroup *parent) group->setOption(QueryGroup::Playable, true); else if (e.tagName().lower() == "playable") group->setOption(QueryGroup::Playable, true); - else if (e.tagName().lower() == "tqchildrenvisible") + else if (e.tagName().lower() == "childrenvisible") group->setOption(QueryGroup::ChildrenVisible, true); else if (e.tagName().lower() == "autoopen") group->setOption(QueryGroup::AutoOpen, true); @@ -534,7 +534,7 @@ void Query::saveGroup(TQDomElement &parent, QueryGroup *group) if (group->option(QueryGroup::Playable)) childe.appendChild(doc.createElement("playable")); if (group->option(QueryGroup::ChildrenVisible)) - childe.appendChild(doc.createElement("tqchildrenvisible")); + childe.appendChild(doc.createElement("childrenvisible")); if (group->option(QueryGroup::AutoOpen)) childe.appendChild(doc.createElement("autoopen")); } diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index 7f3415c..0087b99 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -180,7 +180,7 @@ TreeItem::~TreeItem() tree()->mPlayableItemCount--; } - // I have to remove my tqchildren, because they need their parent + // I have to remove my children, because they need their parent // in tact for the below code while (TreeItem *c = firstChild()) delete c; @@ -750,36 +750,36 @@ TreeItem *Tree::collate(TreeItem *fix, QueryGroup *group, const File &file, Tree TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf) { - // search childOf's immediate tqchildren - TreeItem *tqchildren; + // search childOf's immediate children + TreeItem *children; if (childOf) - tqchildren = childOf->firstChild(); + children = childOf->firstChild(); else - tqchildren = firstChild(); + children = firstChild(); TQString presentation = group->presentation(file); - while (tqchildren) + while (children) { // merging would be done here bool matches=false; if (group->fuzzyness(QueryGroup::Case)) { - matches = (tqchildren->text(0).lower() == presentation.lower()); + matches = (children->text(0).lower() == presentation.lower()); } else { - matches = (tqchildren->text(0) == presentation); + matches = (children->text(0) == presentation); } - matches = matches && !tqchildren->group()->option(QueryGroup::Playable); + matches = matches && !children->group()->option(QueryGroup::Playable); if (matches) { - tqchildren->setFile(File()); - return tqchildren; + children->setFile(File()); + return children; } - tqchildren = tqchildren->nextSibling(); + children = children->nextSibling(); } TreeItem *item; diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h index c8e545e..4e5ca83 100644 --- a/noatun-plugins/oblique/tree.h +++ b/noatun-plugins/oblique/tree.h @@ -182,7 +182,7 @@ private: TreeItem *node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf); /** - * remove the siblings and tqchildren of the treeitem + * remove the siblings and children of the treeitem **/ void remove(TreeItem *, const File &file); diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index aa7a79b..073873c 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -138,7 +138,7 @@ View::~View() int slice = tree->slice()->id(); TQString query = tree->fileOfQuery(); - TQString t = TQString("%1:%2").tqarg(slice).tqarg(query); + TQString t = TQString("%1:%2").arg(slice).arg(query); tabids.append(t); } diff --git a/noatun-plugins/pitchablespeed/speedtuner.ui b/noatun-plugins/pitchablespeed/speedtuner.ui index 81c64e3..68cdbe9 100644 --- a/noatun-plugins/pitchablespeed/speedtuner.ui +++ b/noatun-plugins/pitchablespeed/speedtuner.ui @@ -68,7 +68,7 @@ <property name="frame"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignHCenter</set> </property> <property name="hAlign" stdset="0"> |