Rename obsolete tq methods to standard names

pull/1/head
Timothy Pearson 11 years ago
parent cfc8e6815b
commit d150aff2e7
  1. 12
      amarok/src/Options1.ui
  2. 8
      amarok/src/Options2.ui
  3. 14
      amarok/src/Options4.ui
  4. 6
      amarok/src/Options5.ui
  5. 4
      amarok/src/Options8.ui
  6. 16
      amarok/src/amarokcore/crashhandler.cpp
  7. 10
      amarok/src/analyzers/blockanalyzer.cpp
  8. 4
      amarok/src/app.cpp
  9. 2
      amarok/src/atomicstring.cpp
  10. 12
      amarok/src/browserbar.cpp
  11. 4
      amarok/src/collectionbrowser.cpp
  12. 4
      amarok/src/covermanager.cpp
  13. 2
      amarok/src/covermanager.h
  14. 4
      amarok/src/dbsetup.ui
  15. 4
      amarok/src/deletedialogbase.ui
  16. 2
      amarok/src/directorylist.cpp
  17. 6
      amarok/src/engine/helix/helix-configdialog.cpp
  18. 4
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h
  19. 10
      amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h
  20. 6
      amarok/src/engine/nmm/nmm_configdialogbase.ui
  21. 20
      amarok/src/engine/xine/xineconfigbase.ui
  22. 4
      amarok/src/htmlview.cpp
  23. 2
      amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
  24. 4
      amarok/src/mediadevice/daap/addhostbase.ui
  25. 16
      amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
  26. 6
      amarok/src/metabundle.cpp
  27. 2
      amarok/src/metadata/m4a/mp4mvhdbox.cpp
  28. 2
      amarok/src/metadata/m4a/mp4mvhdbox.h
  29. 4
      amarok/src/multitabbar.cpp
  30. 6
      amarok/src/organizecollectiondialog.ui
  31. 2
      amarok/src/osd.cpp
  32. 2
      amarok/src/playerwindow.cpp
  33. 30
      amarok/src/playlist.cpp
  34. 2
      amarok/src/playlistbrowseritem.cpp
  35. 4
      amarok/src/playlistitem.cpp
  36. 2
      amarok/src/playlistselection.cpp
  37. 6
      amarok/src/prettypopupmenu.cpp
  38. 2
      amarok/src/qstringx.h
  39. 26
      amarok/src/scripts/databasescripts/databaseScripts.rb
  40. 6
      amarok/src/scripts/graphequalizer/eqdialog.ui
  41. 38
      amarok/src/sqlite/sqlite3.c
  42. 2
      amarok/src/statistics.cpp
  43. 8
      amarok/src/statusbar/popupMessage.cpp
  44. 2
      amarok/src/statusbar/popupMessage.h
  45. 20
      amarok/src/statusbar/statusBarBase.cpp
  46. 2
      amarok/src/statusbar/statusBarBase.h
  47. 12
      amarok/src/statusbar/statusbar.cpp
  48. 2
      amarok/src/tagdialog.cpp
  49. 10
      amarok/src/tagdialogbase.ui
  50. 12
      amarok/src/transferdialog.cpp

@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -132,7 +132,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -199,7 +199,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -265,7 +265,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -443,7 +443,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8_2_2</cstring>
<cstring>layout8_2_2</cstring>
</property>
<hbox>
<property name="name">
@ -527,7 +527,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7_2_2</cstring>
<cstring>layout7_2_2</cstring>
</property>
<hbox>
<property name="name">

@ -282,7 +282,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@ -528,7 +528,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -576,7 +576,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -616,7 +616,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">

@ -75,7 +75,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -158,7 +158,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@ -166,7 +166,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@ -232,7 +232,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -454,7 +454,7 @@
</spacer>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
<cstring>tqlayout9_2</cstring>
<cstring>layout9_2</cstring>
</property>
<hbox>
<property name="name">
@ -462,7 +462,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7_2</cstring>
<cstring>layout7_2</cstring>
</property>
<vbox>
<property name="name">
@ -500,7 +500,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8_2</cstring>
<cstring>layout8_2</cstring>
</property>
<vbox>
<property name="name">

@ -38,7 +38,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -142,7 +142,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -167,7 +167,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -30,7 +30,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -111,7 +111,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">

@ -265,10 +265,10 @@ namespace Amarok
Amarok::CrashHandlerWidget::CrashHandlerWidget()
{
TQBoxLayout *tqlayout = new TQHBoxLayout( this, 18, 12 );
TQBoxLayout *layout = new TQHBoxLayout( this, 18, 12 );
{
TQBoxLayout *lay = new TQVBoxLayout( tqlayout );
TQBoxLayout *lay = new TQVBoxLayout( layout );
TQLabel *label = new TQLabel( this );
label->setPixmap( locate( "data", "drkonqi/pics/konqi.png" ) );
label->setFrameStyle( TQFrame::Plain | TQFrame::Box );
@ -276,9 +276,9 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget()
lay->addItem( new TQSpacerItem( 3, 3, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
}
tqlayout = new TQVBoxLayout( tqlayout, 6 );
layout = new TQVBoxLayout( layout, 6 );
tqlayout->add( new TQLabel( /*i18n*/(
layout->add( new TQLabel( /*i18n*/(
"<p>" "Amarok has crashed! We are terribly sorry about this :("
"<p>" "However you now have an opportunity to help us fix this crash so that it doesn't "
"happen again! Click <b>Send Email</b> and Amarok will prepare an email that you "
@ -286,11 +286,11 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget()
"as soon as possible."
"<p>" "Thanks for choosing Amarok.<br>" ), this ) );
tqlayout = new TQHBoxLayout( tqlayout, 6 );
layout = new TQHBoxLayout( layout, 6 );
tqlayout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) );
tqlayout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) );
tqlayout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) );
layout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) );
layout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) );
layout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) );
static_cast<TQPushButton*>(child("email"))->setDefault( true );

@ -354,7 +354,7 @@ ensureContrast( const TQColor &bg, const TQColor &fg, uint _amount = 150 )
void
BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
{
const TQColor bg = tqpalette().active().background();
const TQColor bg = palette().active().background();
const TQColor fg = ensureContrast( bg, KGlobalSettings::activeTitleColor() );
m_topBarPixmap.fill( fg );
@ -372,11 +372,11 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
p.fillRect( 0, y*(HEIGHT+1), WIDTH, HEIGHT, TQColor( r+int(dr*y), g+int(dg*y), b+int(db*y) ) );
{
const TQColor bg = tqpalette().active().background().dark( 112 );
const TQColor bg = palette().active().background().dark( 112 );
//make a complimentary fadebar colour
//TODO dark is not always correct, dumbo!
int h,s,v; tqpalette().active().background().dark( 150 ).getHsv( &h, &s, &v );
int h,s,v; palette().active().background().dark( 150 ).getHsv( &h, &s, &v );
const TQColor fg( h + 120, s, v, TQColor::Hsv );
const double dr = fg.red() - bg.red();
@ -386,7 +386,7 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
// Precalculate all fade-bar pixmaps
for( uint y = 0; y < FADE_SIZE; ++y ) {
m_fade_bars[y].fill( tqpalette().active().background() );
m_fade_bars[y].fill( palette().active().background() );
TQPainter f( &m_fade_bars[y] );
for( int z = 0; (uint)z < m_rows; ++z ) {
const double Y = 1.0 - (log10( FADE_SIZE - y ) / log10( FADE_SIZE ));
@ -401,7 +401,7 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
void
BlockAnalyzer::drawBackground()
{
const TQColor bg = tqpalette().active().background();
const TQColor bg = palette().active().background();
const TQColor bgdark = bg.dark( 112 );
background()->fill( bg );

@ -871,7 +871,7 @@ App::applyColorScheme()
else if( AmarokConfig::schemeAmarok() )
{
group = TQApplication::tqpalette().active();
group = TQApplication::palette().active();
const TQColor bg( Amarok::blue );
AltBase.setRgb( 57, 64, 98 );
@ -916,7 +916,7 @@ App::applyColorScheme()
{
// we try to be smart: this code figures out contrasting colors for
// selection and alternate background rows
group = TQApplication::tqpalette().active();
group = TQApplication::palette().active();
const TQColor fg( AmarokConfig::playlistWindowFgColor() );
const TQColor bg( AmarokConfig::playlistWindowBgColor() );

@ -82,7 +82,7 @@ TQString AtomicString::string() const
TQString AtomicString::deepCopy() const
{
if (m_string)
return TQString( m_string->tqunicode(), m_string->length() );
return TQString( m_string->unicode(), m_string->length() );
return TQString();
}

@ -38,18 +38,18 @@ namespace Amarok
Splitter( BrowserBar *w ) : TQWidget( w, "divider" )
{
setCursor( TQCursor(SplitHCursor) );
styleChange( tqstyle() );
styleChange( style() );
}
virtual void paintEvent( TQPaintEvent* )
{
TQPainter p( this );
parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal );
parentWidget()->style().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal );
}
virtual void styleChange( TQStyle& )
{
setFixedWidth( tqstyle().pixelMetric( TQStyle::PM_SplitterWidth, this ) );
setFixedWidth( style().pixelMetric( TQStyle::PM_SplitterWidth, this ) );
}
virtual void mouseMoveEvent( TQMouseEvent *e )
@ -94,9 +94,9 @@ BrowserBar::BrowserBar( TQWidget *parent )
m_tabBar->setFixedWidth( m_pos );
m_tabBar->move( 0, 25 );
TQVBoxLayout *tqlayout = new TQVBoxLayout( m_browserBox );
tqlayout->addSpacing( 3 ); // aesthetics
tqlayout->setAutoAdd( true );
TQVBoxLayout *layout = new TQVBoxLayout( m_browserBox );
layout->addSpacing( 3 ); // aesthetics
layout->setAutoAdd( true );
m_browserBox->move( m_pos, 0 );
m_browserBox->hide();

@ -4133,7 +4133,7 @@ CollectionView::removeDuplicatedHeaders()
{
if ( !current->text(0).at(0).isLetterOrNumber()
|| ( last->text(0).at(0).isLetterOrNumber()
&& current->text(0).at(0).tqunicode() > last->text(0).at(0).tqunicode() ) )
&& current->text(0).at(0).unicode() > last->text(0).at(0).unicode() ) )
toDelete += current;
else
{
@ -4366,7 +4366,7 @@ CollectionItem::paintCell ( TQPainter * painter, const TQColorGroup & cg,
TQPixmap buf( width, height() );
TQPainter p( &buf, true );
const TQColorGroup _cg = listView()->tqpalette().active();
const TQColorGroup _cg = listView()->palette().active();
TQColor bg = isSelected() ? _cg.highlight()
: isAlternate() ? listView()->alternateBackground()

@ -278,8 +278,8 @@ CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album,
kapp->setTopWidget( this );
setCaption( kapp->makeStdCaption( i18n("%1 - %2").arg( artist, album ) ) );
m_tqlayout = new TQHBoxLayout( this );
m_tqlayout->setAutoAdd( true );
m_layout = new TQHBoxLayout( this );
m_layout->setAutoAdd( true );
m_pixmapViewer = new PixmapViewer( this, m_pixmap );
setFixedSize( m_pixmapViewer->maximalSize() );

@ -160,7 +160,7 @@ class CoverViewDialog : public TQDialog {
CoverViewDialog(const TQString& artist, const TQString& album, TQWidget *parent);
private:
TQHBoxLayout *m_tqlayout;
TQHBoxLayout *m_layout;
TQPixmap m_pixmap;
PixmapViewer *m_pixmapViewer;
TQLabel *m_label;

@ -164,7 +164,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -343,7 +343,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -51,7 +51,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">

@ -309,7 +309,7 @@ Item::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width,
p->setFont( font );
}
TQCheckListItem::paintCell( p, isDisabled() ? listView()->tqpalette().disabled() : _cg, column, width, align );
TQCheckListItem::paintCell( p, isDisabled() ? listView()->palette().disabled() : _cg, column, width, align );
p->setFont( f );
}

@ -53,7 +53,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
, m_valueChanged( false )
, m_stringValue( defaultvalue )
{
TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
TQGridLayout *grid = (TQGridLayout*)parent->layout();
m_w = new KLineEdit( m_stringValue, parent );
connect( (TQWidget *) m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) );
@ -79,7 +79,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
, m_valueChanged( false )
, m_stringValue( defaultvalue )
{
TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
TQGridLayout *grid = (TQGridLayout*)parent->layout();
m_key = str;
@ -110,7 +110,7 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent,
HelixEngine *engine )
: deviceComboBox(0), checkBox_outputDevice(0), lineEdit_outputDevice(0), m_changed(false), m_engine(engine)
{
TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
TQGridLayout *grid = (TQGridLayout*)parent->layout();
deviceComboBox = new KComboBox( false, parent, "deviceComboBox" );
deviceComboBox->insertItem("oss"); // I believe these are not subject to translation (they don't seem to be in xine,

@ -1129,7 +1129,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown)
* Method:
* IHXLayoutStream::GetProperty
* Purpose:
* Get tqlayout stream property
* Get layout stream property
*
*
*/
@ -1140,7 +1140,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown)
* Method:
* IHXLayoutStream::SetProperty
* Purpose:
* Set tqlayout stream property
* Set layout stream property
*
*/
STDTQT_METHOD(SetProperties) (THIS_

@ -614,9 +614,9 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown)
* Method:
* IHXSiteSupplier::BeginChangeLayout
* Purpose:
* Called to inform the site supplier a tqlayout change has beginning
* Called to inform the site supplier a layout change has beginning
* it can expect to receive SitesNeeded() and SitesNotNeeded() calls
* while a tqlayout change is in progress,
* while a layout change is in progress,
*/
STDTQT_METHOD(BeginChangeLayout) (THIS) PURE;
@ -624,7 +624,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown)
* Method:
* IHXSiteSupplier::DoneChangeLayout
* Purpose:
* Called to inform the site supplier the tqlayout change has been
* Called to inform the site supplier the layout change has been
* completed.
*/
STDTQT_METHOD(DoneChangeLayout) (THIS) PURE;
@ -642,7 +642,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown)
*
* Interface implemented by the client core. This interface is called
* by users of the client core to inform it of IHXSite's which are
* available for tqlayout of renderers
* available for layout of renderers
*
* IID_IHXSiteManager:
*
@ -923,7 +923,7 @@ DECLARE_INTERFACE_(IHXSiteFullScreen, IUnknown)
*
* Purpose:
*
* Allow tqlayout site groups to be added and removed
* Allow layout site groups to be added and removed
*
* IID_IHXLayoutSiteGroupManager:
*

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -130,7 +130,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -159,7 +159,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout13</cstring>
<cstring>layout13</cstring>
</property>
<vbox>
<property name="name">

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@ -82,7 +82,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@ -90,7 +90,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -241,7 +241,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -278,7 +278,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -318,7 +318,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -376,7 +376,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<vbox>
<property name="name">
@ -419,7 +419,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<vbox>
<property name="name">
@ -435,7 +435,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">

@ -83,8 +83,8 @@ HTMLView::copyText()
TQString text = selectedText();
// Copy both to clipboard and X11-selection
TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard );
TQApplication::tqclipboard()->setText( text, TQClipboard::Selection );
TQApplication::clipboard()->setText( text, TQClipboard::Clipboard );
TQApplication::clipboard()->setText( text, TQClipboard::Selection );
}
void HTMLView::paletteChange() {

@ -158,7 +158,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@ -95,7 +95,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">

@ -35,7 +35,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout88</cstring>
<cstring>layout88</cstring>
</property>
<vbox>
<property name="name">
@ -88,7 +88,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout24</cstring>
<cstring>layout24</cstring>
</property>
<hbox>
<property name="name">
@ -96,7 +96,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout23</cstring>
<cstring>layout23</cstring>
</property>
<vbox>
<property name="name">
@ -133,7 +133,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout19</cstring>
<cstring>layout19</cstring>
</property>
<vbox>
<property name="name">
@ -221,7 +221,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout120</cstring>
<cstring>layout120</cstring>
</property>
<vbox>
<property name="name">
@ -229,7 +229,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout119</cstring>
<cstring>layout119</cstring>
</property>
<grid>
<property name="name">
@ -277,7 +277,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout96</cstring>
<cstring>layout96</cstring>
</property>
<vbox>
<property name="name">
@ -293,7 +293,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout86</cstring>
<cstring>layout86</cstring>
</property>
<hbox>
<property name="name">

@ -1509,7 +1509,7 @@ MetaBundle::save( TagLib::FileRef* fileref )
// QT's version encodeAttr is 1) private to TQDom, and 2) a litte slow. This
// one can be made public if needed. It happens to be on a critical path
// (each char of playlist / undo save). TQStyleSheet::escape does not deal with
// tqunicode chars illegal for XML. There's a lot of junk in those tags
// unicode chars illegal for XML. There's a lot of junk in those tags
static inline void xmlEncode(TQTextStream &stream, const TQString &str)
{
TQString tmp;
@ -1517,7 +1517,7 @@ static inline void xmlEncode(TQTextStream &stream, const TQString &str)
uint i = 0;
while ( i < cur->length() )
{
uint uc = (*cur)[i].tqunicode();
uint uc = (*cur)[i].unicode();
// we try to accumulate unescaped chars before writing to stream
const char *escaped;
// careful about the order of tests, common before less common
@ -1530,7 +1530,7 @@ static inline void xmlEncode(TQTextStream &stream, const TQString &str)
else if ( uc == '"' ) escaped = "&quot;";
else
{
// see if it's a XML-valid tqunicode char at all
// see if it's a XML-valid unicode char at all
if ( (0x20 <= uc && uc <= 0xD7FF || 0xE000 <= uc && uc <= 0xFFFD
|| uc == 0x9 || uc == 0xA || uc == 0xD) )
// fairly common, other ascii chars

@ -39,7 +39,7 @@ public:
TagLib::uint timescale;
//! duration of presentation
TagLib::ulonglong duration;
//! ptqlayout speed
//! playout speed
TagLib::uint rate;
//! volume for entire presentation
TagLib::uint volume;

@ -44,7 +44,7 @@ namespace TagLib
uint timescale() const;
//! function to get the presentation duration in the mp4 file
ulonglong duration() const;
//! function to get the rate (ptqlayout speed) - typically 1.0;
//! function to get the rate (playout speed) - typically 1.0;
uint rate() const;
//! function to get volume level for presentation - typically 1.0;
uint volume() const;

@ -687,7 +687,7 @@ TQSize MultiTabBarButton::sizeHint() const
}
#endif
if ( isMenuButton() )
w += tqstyle().pixelMetric( TQStyle::PM_MenuButtonIndicator, this );
w += style().pixelMetric( TQStyle::PM_MenuButtonIndicator, this );
if ( pixmap() ) {
TQPixmap * pm = const_cast< TQPixmap * >( pixmap() );
@ -714,7 +714,7 @@ TQSize MultiTabBarButton::sizeHint() const
// h = ( parentWidget()->width() - 3 ) / NUM_TABS;
// }
return ( tqstyle().tqsizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ).
return ( style().tqsizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ).
expandedTo( TQApplication::globalStrut() ) );
}

@ -81,7 +81,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -305,7 +305,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -404,7 +404,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">

@ -580,7 +580,7 @@ OSDWidget::mousePressEvent( TQMouseEvent* )
void
OSDWidget::unsetColors()
{
const TQColorGroup c = TQApplication::tqpalette().active();
const TQColorGroup c = TQApplication::palette().active();
setPaletteForegroundColor( c.highlightedText() );
setPaletteBackgroundColor( c.highlight() );

@ -127,7 +127,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl
setFont( font );
{ //<NavButtons>
//NOTE we use a tqlayout for the buttons so resizing will be possible
//NOTE we use a layout for the buttons so resizing will be possible
m_pFrameButtons = createWidget<TQHBox>( TQRect(0, 118, 311, 22), this );
KActionCollection *ac =Amarok::actionCollection();

@ -3526,8 +3526,8 @@ Playlist::copyToClipboard( const TQListViewItem *item ) const //SLOT
text.append( " :: " + playlistItem->url().url() );
// Copy both to clipboard and X11-selection
TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard );
TQApplication::tqclipboard()->setText( text, TQClipboard::Selection );
TQApplication::clipboard()->setText( text, TQClipboard::Clipboard );
TQApplication::clipboard()->setText( text, TQClipboard::Selection );
Amarok::OSD::instance()->OSDWidget::show( i18n( "Copied: %1" ).arg( text ),
TQImage(CollectionDB::instance()->albumImage(*playlistItem )) );
@ -4579,7 +4579,7 @@ Playlist::slotMouseButtonPressed( int button, TQListViewItem *after, const TQPoi
{
case Qt::MidButton:
{
const TQString path = TQApplication::tqclipboard()->text( TQClipboard::Selection );
const TQString path = TQApplication::clipboard()->text( TQClipboard::Selection );
const KURL url = KURL::fromPathOrURL( path );
if( url.isValid() )
@ -4790,7 +4790,7 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items )
lineEdit2 = new TQLineEdit( this, "Command" );
groupBox1 = new TQGroupBox( 1, Qt::Vertical, i18n( "Examples" ), this );
groupBox1->tqlayout()->setMargin( 11 );
groupBox1->layout()->setMargin( 11 );
new KActiveLabel( i18n( "file --brief %f\n" "ls -sh %f\n" "basename %f\n" "dirname %f" ), groupBox1 );
// buddies
@ -4798,22 +4798,22 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items )
textLabel3->setBuddy( lineEdit2 );
// layouts
TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6 );
tqlayout1->addItem( new TQSpacerItem( 181, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
tqlayout1->addWidget( new KPushButton( KStdGuiItem::ok(), this, "OkButton" ) );
tqlayout1->addWidget( new KPushButton( KStdGuiItem::cancel(), this, "CancelButton" ) );
TQHBoxLayout *layout1 = new TQHBoxLayout( 0, 0, 6 );
layout1->addItem( new TQSpacerItem( 181, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
layout1->addWidget( new KPushButton( KStdGuiItem::ok(), this, "OkButton" ) );
layout1->addWidget( new KPushButton( KStdGuiItem::cancel(), this, "CancelButton" ) );
TQGridLayout *tqlayout2 = new TQGridLayout( 0, 2, 2, 0, 6 );
tqlayout2->TQLayout::add( textLabel2 );
tqlayout2->TQLayout::add( lineEdit1 );
tqlayout2->TQLayout::add( textLabel3 );
tqlayout2->TQLayout::add( lineEdit2 );
TQGridLayout *layout2 = new TQGridLayout( 0, 2, 2, 0, 6 );
layout2->TQLayout::add( textLabel2 );
layout2->TQLayout::add( lineEdit1 );
layout2->TQLayout::add( textLabel3 );
layout2->TQLayout::add( lineEdit2 );
TQVBoxLayout *Form1Layout = new TQVBoxLayout( this, 11, 6, "Form1Layout");
Form1Layout->addWidget( textLabel1 );
Form1Layout->addWidget( groupBox1 );
Form1Layout->addLayout( tqlayout2 );
Form1Layout->addLayout( tqlayout1 );
Form1Layout->addLayout( layout2 );
Form1Layout->addLayout( layout1 );
Form1Layout->addItem( new TQSpacerItem( 20, 231, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
// properties

@ -3147,7 +3147,7 @@ TQString SmartPlaylist::query()
{
if ( m_sqlForTags.isEmpty() ) m_sqlForTags = xmlToQuery( m_xml );
// duplicate string, thread-safely (TQDeepCopy is not thread-safe)
return TQString( m_sqlForTags.tqunicode(), m_sqlForTags.length() )
return TQString( m_sqlForTags.unicode(), m_sqlForTags.length() )
.replace( "(*CurrentTimeT*)" ,
TQString::number(TQDateTime::currentDateTime().toTime_t()) )
.replace( "(*ListOfFields*)" , QueryBuilder::dragSQLFields() )

@ -690,8 +690,8 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co
else
{
const TQColorGroup _cg = ( !exists() || !isEnabled() )
? listView()->tqpalette().disabled()
: listView()->tqpalette().active();
? listView()->palette().disabled()
: listView()->palette().active();
TQColor bg = isSelected() ? _cg.highlight()
: isAlternate() ? listView()->alternateBackground()

@ -123,7 +123,7 @@ namespace ConfigDynamic
else //if its a suggested song or a random mix...
{
nd->selectPlaylist->hide();
nd->tqlayout()->remove( nd->selectPlaylist );
nd->layout()->remove( nd->selectPlaylist );
// don't allow editing the name of the default random and suggested dynamics
nd->m_name->hide();
nd->m_playlistName_label->hide();

@ -75,8 +75,8 @@ PrettyPopupMenu::calcPixmapColor()
KConfig *config = KGlobal::config();
config->setGroup("WM");
TQColor color = TQApplication::tqpalette().active().highlight();
// TQColor activeTitle = TQApplication::tqpalette().active().background();
// TQColor inactiveTitle = TQApplication::tqpalette().inactive().background();
// TQColor activeTitle = TQApplication::palette().active().background();
// TQColor inactiveTitle = TQApplication::palette().inactive().background();
TQColor activeTitle = config->readColorEntry("activeBackground", &color);
TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color);
@ -174,7 +174,7 @@ PrettyPopupMenu::paintEvent( TQPaintEvent* e )
drawContents( &p );
tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
TQRect( 0, 0, width(), height() ),
colorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0 ) );

@ -21,7 +21,7 @@ public:
QStringx( TQChar ch ) : TQString( ch ) {};
QStringx( const TQString& s ) : TQString( s ) {};
QStringx( const TQByteArray& ba ) : TQString( ba ) {};
QStringx( const TQChar* tqunicode, uint length ) : TQString( tqunicode, length ) {};
QStringx( const TQChar* unicode, uint length ) : TQString( unicode, length ) {};
QStringx( const char* str ) : TQString( str ) {};
virtual ~QStringx() {};

@ -38,36 +38,36 @@ class DatabaseScriptChooser < Qt::Dialog
@Form1Layout = Qt::GridLayout.new(self, 1, 1, 2, 2, 'Form1Layout')
@tqlayout3 = Qt::VBoxLayout.new(nil, 0, 2, 'tqlayout3')
@layout3 = Qt::VBoxLayout.new(nil, 0, 2, 'layout3')
@m_optionCombo = Qt::ComboBox.new(false, self, "m_optionCombo")
@tqlayout3.addWidget(@m_optionCombo)
@layout3.addWidget(@m_optionCombo)
@tqlayout1 = Qt::HBoxLayout.new(nil, 0, 2, 'tqlayout1')
@layout1 = Qt::HBoxLayout.new(nil, 0, 2, 'layout1')
@m_saveText = Qt::Label.new(self, "m_saveText")
@tqlayout1.addWidget(@m_saveText)
@layout1.addWidget(@m_saveText)
@m_saveDir = KDE::URLRequester.new(self, "m_saveDir")
@m_saveDir.setMode( KDE::File::Directory | KDE::File::ExistingOnly );
@m_saveDir.setURL( ENV["HOME"] )
@tqlayout1.addWidget(@m_saveDir)
@tqlayout3.addLayout(@tqlayout1)
@layout1.addWidget(@m_saveDir)
@layout3.addLayout(@layout1)
@spacer1 = Qt::SpacerItem.new(20, 21, Qt::SizePolicy::Minimum, Qt::SizePolicy::Expanding)
@tqlayout3.addItem(@spacer1)
@layout3.addItem(@spacer1)
@tqlayout2 = Qt::HBoxLayout.new(nil, 0, 2, 'tqlayout2')
@layout2 = Qt::HBoxLayout.new(nil, 0, 2, 'layout2')
@m_cancelButton = Qt::PushButton.new(self, "@m_cancelButton")
@tqlayout2.addWidget(@m_cancelButton)
@layout2.addWidget(@m_cancelButton)
@spacer2 = Qt::SpacerItem.new(61, 20, Qt::SizePolicy::Expanding,