Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 324094a18c
commit e8cac8c271

@ -691,7 +691,7 @@
<functions> <functions>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -755,7 +755,7 @@
<functions> <functions>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kfontrequester.h</includehint> <includehint>kfontrequester.h</includehint>
<includehint>kfontrequester.h</includehint> <includehint>kfontrequester.h</includehint>

@ -41,8 +41,8 @@
class AmarokThemeNewStuff : public KNewStuff class AmarokThemeNewStuff : public KNewStuff
{ {
public: public:
AmarokThemeNewStuff(const TQString &type, TQWidget *tqparentWidget=0) AmarokThemeNewStuff(const TQString &type, TQWidget *parentWidget=0)
: KNewStuff( type, tqparentWidget ) : KNewStuff( type, parentWidget )
{} {}
bool install( const TQString& fileName ) bool install( const TQString& fileName )

@ -618,5 +618,5 @@
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -523,7 +523,7 @@
<function access="protected">hideEvent( QHideEvent * )</function> <function access="protected">hideEvent( QHideEvent * )</function>
<function access="protected">showEvent( QShowEvent * )</function> <function access="protected">showEvent( QShowEvent * )</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>ktextedit.h</includehint> <includehint>ktextedit.h</includehint>
</includehints> </includehints>

@ -73,7 +73,7 @@
<data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data> <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
</image> </image>
</images> </images>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -294,7 +294,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot access="protected">updateServices( const QString &amp; s )</slot> <slot access="protected">updateServices( const QString &amp; s )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>

@ -44,7 +44,7 @@ namespace Amarok
virtual void paintEvent( TQPaintEvent* ) virtual void paintEvent( TQPaintEvent* )
{ {
TQPainter p( this ); TQPainter p( this );
tqparentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), TQStyle::Style_Horizontal ); parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), TQStyle::Style_Horizontal );
} }
virtual void styleChange( TQStyle& ) virtual void styleChange( TQStyle& )

@ -197,7 +197,7 @@ CollectionBrowser::CollectionBrowser( const char* name )
//m_tagfilterMenuButton->setEnabled( m_view->m_viewMode == CollectionView::modeTreeView ); //m_tagfilterMenuButton->setEnabled( m_view->m_viewMode == CollectionView::modeTreeView );
//connect ( m_treeViewAction, TQT_SIGNAL ( toggled(bool) ), m_tagfilterMenuButton, TQT_SLOT( setEnabled (bool) ) ); //connect ( m_treeViewAction, TQT_SIGNAL ( toggled(bool) ), m_tagfilterMenuButton, TQT_SLOT( setEnabled (bool) ) );
tqlayoutToolbar(); layoutToolbar();
m_categoryMenu = m_tagfilterMenuButton->popupMenu(); m_categoryMenu = m_tagfilterMenuButton->popupMenu();
m_categoryMenu->insertItem( i18n( "Artist" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdArtist ); m_categoryMenu->insertItem( i18n( "Artist" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdArtist );
@ -395,7 +395,7 @@ CollectionBrowser::eventFilter( TQObject *o, TQEvent *e )
} }
void void
CollectionBrowser::tqlayoutToolbar() CollectionBrowser::layoutToolbar()
{ {
if ( !m_toolbar ) return; if ( !m_toolbar ) return;
@ -784,23 +784,23 @@ CollectionView::slotEnsureSelectedItemVisible() //SLOT
if ( lastChild() ) if ( lastChild() )
ensureItemVisible( lastChild() ); ensureItemVisible( lastChild() );
//Create a reverse list of tqparents, grandtqparents etc. //Create a reverse list of parents, grandparents etc.
//Later we try to make the grandtqparents in view, then their tqchildren etc. //Later we try to make the grandparents in view, then their tqchildren etc.
//This means that the selected item has the most priority as it is done last. //This means that the selected item has the most priority as it is done last.
TQValueStack<TQListViewItem*> tqparents; TQValueStack<TQListViewItem*> parents;
while ( r ) while ( r )
{ {
tqparents.push( r ); parents.push( r );
r = r->tqparent(); r = r->tqparent();
} }
while ( !tqparents.isEmpty() ) while ( !parents.isEmpty() )
{ {
//We would prefer the next item to be visible. //We would prefer the next item to be visible.
if ( tqparents.top()->nextSibling() ) if ( parents.top()->nextSibling() )
ensureItemVisible( tqparents.top()->nextSibling() ); ensureItemVisible( parents.top()->nextSibling() );
//It's even more important the actual item is visible than the next one. //It's even more important the actual item is visible than the next one.
ensureItemVisible( tqparents.top() ); ensureItemVisible( parents.top() );
tqparents.pop(); parents.pop();
} }
} }
} }
@ -2378,7 +2378,7 @@ CollectionView::listSelected()
} }
//first pass: tqparents //first pass: parents
for ( item = firstChild(); item; item = item->nextSibling() ) for ( item = firstChild(); item; item = item->nextSibling() )
if ( item->isSelected() ) if ( item->isSelected() )
{ {

@ -80,7 +80,7 @@ class CollectionBrowser: public TQVBox
void slotEditFilter(); void slotEditFilter();
private: private:
void tqlayoutToolbar(); void layoutToolbar();
void ipodToolbar( bool activate ); void ipodToolbar( bool activate );
void appendSearchResults(); void appendSearchResults();
@ -315,8 +315,8 @@ class CollectionView : public KListView, public DropProxyTarget
void cacheView(); void cacheView();
void restoreView(); void restoreView();
//Used to store the name of an item (and its tqparents), so it can be recalled later //Used to store the name of an item (and its parents), so it can be recalled later
//even if the pointer to the item has been tqinvalidated. //even if the pointer to the item has been invalidated.
TQStringList makeStructuredNameList( TQListViewItem* ) const; TQStringList makeStructuredNameList( TQListViewItem* ) const;
TQListViewItem* findFromStructuredNameList( const TQStringList& ) const; TQListViewItem* findFromStructuredNameList( const TQStringList& ) const;

@ -2572,7 +2572,7 @@ CollectionDB::addPodcastChannel( const PodcastChannelBundle &pcb, const bool &tq
command += ( image.isEmpty() ? "NULL" : '\'' + escapeString( image.url() ) + '\'' ) + ','; command += ( image.isEmpty() ? "NULL" : '\'' + escapeString( image.url() ) + '\'' ) + ',';
command += ( description.isEmpty() ? "NULL" : '\'' + escapeString( description ) + '\'' ) + ','; command += ( description.isEmpty() ? "NULL" : '\'' + escapeString( description ) + '\'' ) + ',';
command += ( copyright.isEmpty() ? "NULL" : '\'' + escapeString( copyright ) + '\'' ) + ','; command += ( copyright.isEmpty() ? "NULL" : '\'' + escapeString( copyright ) + '\'' ) + ',';
command += TQString::number( pcb.tqparentId() ) + ",'"; command += TQString::number( pcb.parentId() ) + ",'";
command += escapeString( pcb.saveLocation() ) + "',"; command += escapeString( pcb.saveLocation() ) + "',";
command += pcb.autoscan() ? boolT() + ',' : boolF() + ','; command += pcb.autoscan() ? boolT() + ',' : boolF() + ',';
command += TQString::number( pcb.fetchType() ) + ','; command += TQString::number( pcb.fetchType() ) + ',';
@ -2812,17 +2812,17 @@ CollectionDB::getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *pc
// return newly created folder id // return newly created folder id
int int
CollectionDB::addPodcastFolder( const TQString &name, const int tqparent_id, const bool isOpen ) CollectionDB::addPodcastFolder( const TQString &name, const int parent_id, const bool isOpen )
{ {
TQString command = TQString( "INSERT INTO podcastfolders ( name, tqparent, isOpen ) VALUES ('" ); TQString command = TQString( "INSERT INTO podcastfolders ( name, tqparent, isOpen ) VALUES ('" );
command += escapeString( name ) + "',"; command += escapeString( name ) + "',";
command += TQString::number( tqparent_id ) + ","; command += TQString::number( parent_id ) + ",";
command += isOpen ? boolT() + ");" : boolF() + ");"; command += isOpen ? boolT() + ");" : boolF() + ");";
insert( command, NULL ); insert( command, NULL );
command = TQString( "SELECT id FROM podcastfolders WHERE name = '%1' AND tqparent = '%2';" ) command = TQString( "SELECT id FROM podcastfolders WHERE name = '%1' AND tqparent = '%2';" )
.tqarg( name, TQString::number(tqparent_id) ); .tqarg( name, TQString::number(parent_id) );
TQStringList values = query( command ); TQStringList values = query( command );
return values[0].toInt(); return values[0].toInt();
@ -2841,7 +2841,7 @@ CollectionDB::updatePodcastChannel( const PodcastChannelBundle &b )
<< escapeString( b.link().url() ) << escapeString( b.link().url() )
<< escapeString( b.description() ) << escapeString( b.description() )
<< escapeString( b.copyright() ) << escapeString( b.copyright() )
<< TQString::number( b.tqparentId() ) << TQString::number( b.parentId() )
<< escapeString( b.saveLocation() ) << escapeString( b.saveLocation() )
<< ( b.autoscan() ? boolT() : boolF() ) << ( b.autoscan() ? boolT() : boolF() )
<< TQString::number( b.fetchType() ) << TQString::number( b.fetchType() )
@ -2888,13 +2888,13 @@ CollectionDB::updatePodcastEpisode( const int id, const PodcastEpisodeBundle &b
} }
void void
CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, const int tqparent_id, const bool isOpen ) CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, const int parent_id, const bool isOpen )
{ {
if( getDbConnectionType() == DbConnection::postgresql ) { if( getDbConnectionType() == DbConnection::postgresql ) {
query( TQStringx( "UPDATE podcastfolders SET name='%1', tqparent=%2, isOpen=%3 WHERE id=%4;" ) query( TQStringx( "UPDATE podcastfolders SET name='%1', tqparent=%2, isOpen=%3 WHERE id=%4;" )
.args( TQStringList() .args( TQStringList()
<< escapeString(name) << escapeString(name)
<< TQString::number(tqparent_id) << TQString::number(parent_id)
<< ( isOpen ? boolT() : boolF() ) << ( isOpen ? boolT() : boolF() )
<< TQString::number(folder_id) << TQString::number(folder_id)
) )
@ -2906,7 +2906,7 @@ CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, co
.args( TQStringList() .args( TQStringList()
<< TQString::number(folder_id) << TQString::number(folder_id)
<< escapeString(name) << escapeString(name)
<< TQString::number(tqparent_id) << TQString::number(parent_id)
<< ( isOpen ? boolT() : boolF() ) << ( isOpen ? boolT() : boolF() )
) )
); );

@ -345,7 +345,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
/// Insert a podcast episode into the database. If @param idToUpdate is provided, replace the row /// Insert a podcast episode into the database. If @param idToUpdate is provided, replace the row
/// use updatePodcastEpisode() always in preference /// use updatePodcastEpisode() always in preference
int addPodcastEpisode( const PodcastEpisodeBundle &episode, const int idToUpdate=0 ); int addPodcastEpisode( const PodcastEpisodeBundle &episode, const int idToUpdate=0 );
int addPodcastFolder( const TQString &name, const int tqparent_id=0, const bool isOpen=false ); int addPodcastFolder( const TQString &name, const int parent_id=0, const bool isOpen=false );
TQValueList<PodcastChannelBundle> getPodcastChannels(); TQValueList<PodcastChannelBundle> getPodcastChannels();
PodcastEpisodeBundle getPodcastEpisodeById( int id ); PodcastEpisodeBundle getPodcastEpisodeById( int id );
TQValueList<PodcastEpisodeBundle> getPodcastEpisodes( const KURL &tqparent, bool newOnly=false, int limit=-1 ); TQValueList<PodcastEpisodeBundle> getPodcastEpisodes( const KURL &tqparent, bool newOnly=false, int limit=-1 );
@ -354,7 +354,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
void removePodcastFolder( const int id ); void removePodcastFolder( const int id );
void updatePodcastChannel( const PodcastChannelBundle &b ); void updatePodcastChannel( const PodcastChannelBundle &b );
void updatePodcastEpisode( const int id, const PodcastEpisodeBundle &b ); void updatePodcastEpisode( const int id, const PodcastEpisodeBundle &b );
void updatePodcastFolder( const int folder_id, const TQString &name, const int tqparent_id=0, const bool isOpen=false ); void updatePodcastFolder( const int folder_id, const TQString &name, const int parent_id=0, const bool isOpen=false );
// these return false when no bundle was available // these return false when no bundle was available
bool getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *channel ); bool getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *channel );
bool getPodcastEpisodeBundle( const KURL &url, PodcastEpisodeBundle *channel ); bool getPodcastEpisodeBundle( const KURL &url, PodcastEpisodeBundle *channel );
@ -494,7 +494,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
bool isConnected(); bool isConnected();
void releasePreviousConnection(TQThread *currThread); void releasePreviousConnection(TQThread *currThread);
void tqinvalidateArtistAlbumCache() { m_validArtistCache=false; m_validComposerCache=false; m_validAlbumCache=false; }; void invalidateArtistAlbumCache() { m_validArtistCache=false; m_validComposerCache=false; m_validAlbumCache=false; };
void vacuum(); void vacuum();

@ -132,7 +132,7 @@ CollectionScanner::doJob() //SLOT
else { else {
foreachType( TQStringList, m_folders ) { foreachType( TQStringList, m_folders ) {
if( (*it).isEmpty() ) if( (*it).isEmpty() )
//aptqparently somewhere empty strings get into the mix //apparently somewhere empty strings get into the mix
//which results in a full-system scan! Which we can't allow //which results in a full-system scan! Which we can't allow
continue; continue;

@ -455,7 +455,7 @@
<functions> <functions>
<function access="private">init()</function> <function access="private">init()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -128,7 +128,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot access="protected">slotShouldDelete(bool)</slot> <slot access="protected">slotShouldDelete(bool)</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistbox.h</includehint> <includehint>klistbox.h</includehint>
</includehints> </includehints>

@ -58,7 +58,7 @@ DeviceManager::DeviceManager()
else else
{ {
m_valid = true; m_valid = true;
//run the DCOP query here because aptqparently if you don't run KDE as a DM the first call will fail //run the DCOP query here because apparently if you don't run KDE as a DM the first call will fail
//...go figure //...go figure
TQByteArray data, replyData; TQByteArray data, replyData;
TQCString replyType; TQCString replyType;

@ -497,7 +497,7 @@ DECLARE_INTERFACE_(IHXSiteWatcher, IUnknown)
* *
* Purpose: * Purpose:
* *
* Interface implemented by renderers and objects with provide tqlayouts to * Interface implemented by renderers and objects with provide layouts to
* the client core. This interface is called by the core when it needs a * the client core. This interface is called by the core when it needs a
* new IHXSiteUser, or when it is done using an IHXSiteUser. * new IHXSiteUser, or when it is done using an IHXSiteUser.
* *
@ -1628,7 +1628,7 @@ DECLARE_INTERFACE_(IHXSubRectSite, IHXSite)
STDTQT_METHOD(SendSubRectMessages) (THIS_ HXBOOL bRet ) PURE; STDTQT_METHOD(SendSubRectMessages) (THIS_ HXBOOL bRet ) PURE;
/* /*
* New damage region call that takes the cross platfrom region * New damage region call that takes the cross platfrom region
* defined in hxwintyp.h and tqinvalidates the rects in it * defined in hxwintyp.h and invalidates the rects in it
*/ */
STDTQT_METHOD(SubRectDamageRegion) (THIS_ HXxBoxRegion* pRegion ) PURE; STDTQT_METHOD(SubRectDamageRegion) (THIS_ HXxBoxRegion* pRegion ) PURE;
/* /*

@ -160,7 +160,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
} }
if (!iamtqparent) // tqchildren stay here, tqparents return if (!iamtqparent) // tqchildren stay here, parents return
{ {
int rfd = m_tqchildren[m_index].m_pipeB[0]; int rfd = m_tqchildren[m_index].m_pipeB[0];
int wfd = m_tqchildren[m_index].m_pipeA[1]; int wfd = m_tqchildren[m_index].m_pipeA[1];

@ -223,5 +223,5 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -161,7 +161,7 @@ XineEngine::makeNewStream()
m_audioPort = xine_open_audio_driver( m_xine, XineCfg::outputPlugin().local8Bit(), NULL ); m_audioPort = xine_open_audio_driver( m_xine, XineCfg::outputPlugin().local8Bit(), NULL );
if( !m_audioPort ) { if( !m_audioPort ) {
//TODO make engine method that is the same but tqparents the dialog for us //TODO make engine method that is the same but parents the dialog for us
KMessageBox::error( 0, i18n("xine was unable to initialize any audio drivers.") ); KMessageBox::error( 0, i18n("xine was unable to initialize any audio drivers.") );
return false; return false;
} }

@ -502,5 +502,5 @@
<includes> <includes>
<include location="local" impldecl="in declaration">plugin/pluginconfig.h</include> <include location="local" impldecl="in declaration">plugin/pluginconfig.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -96,7 +96,7 @@ EqualizerSetup::EqualizerSetup()
m_groupBoxSliders->setInsideMargin( KDialog::marginHint() ); m_groupBoxSliders->setInsideMargin( KDialog::marginHint() );
connect( m_groupBoxSliders, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setEqualizerEnabled( bool ) ) ); connect( m_groupBoxSliders, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setEqualizerEnabled( bool ) ) );
// Helper widget for tqlayouting inside the groupbox // Helper widget for layouting inside the groupbox
TQWidget* slidersLayoutWidget = new TQWidget( m_groupBoxSliders ); TQWidget* slidersLayoutWidget = new TQWidget( m_groupBoxSliders );
slidersLayoutWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); slidersLayoutWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
TQGridLayout* slidersGridLayout = new TQGridLayout( slidersLayoutWidget, 1, 1, 0, KDialog::spacingHint() ); TQGridLayout* slidersGridLayout = new TQGridLayout( slidersLayoutWidget, 1, 1, 0, KDialog::spacingHint() );
@ -118,7 +118,7 @@ EqualizerSetup::EqualizerSetup()
const char *bandLabels[] = { "30", "60", "125", "250", "500", "1k", "2k", "4k", "8k", "16k" }; const char *bandLabels[] = { "30", "60", "125", "250", "500", "1k", "2k", "4k", "8k", "16k" };
int minWidth = 0; int minWidth = 0;
TQFontMetrics fm = fontMetrics(); //aptqparently it's an expensive call TQFontMetrics fm = fontMetrics(); //apparently it's an expensive call
for ( int i = 0; i < 10; i++ ) { for ( int i = 0; i < 10; i++ ) {
int w = fm.width( bandLabels[i] ); int w = fm.width( bandLabels[i] );
if ( w > minWidth ) if ( w > minWidth )

@ -117,7 +117,7 @@ private slots:
void activate( TQListViewItem* ); void activate( TQListViewItem* );
private: private:
KURL searchURL() const { return static_cast<FileBrowser*>(tqparentWidget())->url(); } KURL searchURL() const { return static_cast<FileBrowser*>(parentWidget())->url(); }
TQLineEdit *m_lineEdit; TQLineEdit *m_lineEdit;
KURLView *m_listView; KURLView *m_listView;

@ -290,7 +290,7 @@
<function specifier="non virtual">writeCollectionConfig()</function> <function specifier="non virtual">writeCollectionConfig()</function>
<function specifier="non virtual" returnType="FirstRunWizard::Interface">interface()</function> <function specifier="non virtual" returnType="FirstRunWizard::Interface">interface()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>

@ -27,8 +27,8 @@ KTempFile *HTMLView::m_headerGradientImage = 0;
KTempFile *HTMLView::m_shadowGradientImage = 0; KTempFile *HTMLView::m_shadowGradientImage = 0;
int HTMLView::m_instances = 0; int HTMLView::m_instances = 0;
HTMLView::HTMLView( TQWidget *tqparentWidget, const char *widgetname, const bool DNDEnabled, const bool JScriptEnabled ) HTMLView::HTMLView( TQWidget *parentWidget, const char *widgetname, const bool DNDEnabled, const bool JScriptEnabled )
: KHTMLPart( tqparentWidget, widgetname ) : KHTMLPart( parentWidget, widgetname )
{ {
m_instances++; m_instances++;
setJavaEnabled( false ); setJavaEnabled( false );

@ -19,7 +19,7 @@ class HTMLView : public KHTMLPart
TQ_OBJECT TQ_OBJECT
public: public:
HTMLView( TQWidget *tqparentWidget = 0, const char *widgetname = 0, const bool DNDEnabled = false, const bool JScriptEnabled = true ); HTMLView( TQWidget *parentWidget = 0, const char *widgetname = 0, const bool DNDEnabled = false, const bool JScriptEnabled = true );
~HTMLView(); ~HTMLView();
static TQString loadStyleSheet(); static TQString loadStyleSheet();

@ -73,7 +73,7 @@ struct inotify_event {
extern void inotify_inode_queue_event(struct inode *, __u32, __u32, extern void inotify_inode_queue_event(struct inode *, __u32, __u32,
const char *); const char *);
extern void inotify_dentry_tqparent_queue_event(struct dentry *, __u32, __u32, extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32,
const char *); const char *);
extern void inotify_unmount_inodes(struct list_head *); extern void inotify_unmount_inodes(struct list_head *);
extern void inotify_inode_is_dead(struct inode *); extern void inotify_inode_is_dead(struct inode *);
@ -87,7 +87,7 @@ static inline void inotify_inode_queue_event(struct inode *inode,
{ {
} }
static inline void inotify_dentry_tqparent_queue_event(struct dentry *dentry, static inline void inotify_dentry_parent_queue_event(struct dentry *dentry,
__u32 tqmask, __u32 cookie, __u32 tqmask, __u32 cookie,
const char *filename) const char *filename)
{ {

@ -25,8 +25,8 @@
#include <tqfile.h> #include <tqfile.h>
MagnatuneArtistInfoBox::MagnatuneArtistInfoBox( TQWidget *tqparentWidget, const char *widgetname ) MagnatuneArtistInfoBox::MagnatuneArtistInfoBox( TQWidget *parentWidget, const char *widgetname )
: KHTMLPart( tqparentWidget, widgetname ) : KHTMLPart( parentWidget, widgetname )
{} {}

@ -41,11 +41,11 @@ class MagnatuneArtistInfoBox : public KHTMLPart
public: public:
/** /**
* Constructor * Constructor
* @param tqparentWidget The tqparent TQWidget * @param parentWidget The tqparent TQWidget
* @param widgetname The name of this widget * @param widgetname The name of this widget
* @return New MagnatuneArtistInfoBox object * @return New MagnatuneArtistInfoBox object
*/ */
MagnatuneArtistInfoBox( TQWidget *tqparentWidget, const char *widgetname ); MagnatuneArtistInfoBox( TQWidget *parentWidget, const char *widgetname );
/** /**
* Destructor * Destructor

@ -111,7 +111,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot access="protected">downloadButtonClicked()</slot> <slot access="protected">downloadButtonClicked()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -59,7 +59,7 @@ void MagnatuneListViewArtistItem::setOpen( bool o )
} }
listView()->setUpdatesEnabled( true ); listView()->setUpdatesEnabled( true );
KListViewItem::setOpen( o ); KListViewItem::setOpen( o );
tqinvalidateHeight(); invalidateHeight();
listView()->repaintContents(); listView()->repaintContents();
@ -117,7 +117,7 @@ void MagnatuneListViewAlbumItem::setOpen( bool o )
listView()->setUpdatesEnabled( true ); listView()->setUpdatesEnabled( true );
KListViewItem::setOpen( o ); KListViewItem::setOpen( o );
tqinvalidateHeight(); invalidateHeight();
listView()->repaintContents(); listView()->repaintContents();

@ -702,5 +702,5 @@
<slot>purchase()</slot> <slot>purchase()</slot>
<slot>cancel()</slot> <slot>cancel()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -102,7 +102,7 @@
<slot access="protected">redownload()</slot> <slot access="protected">redownload()</slot>
<slot access="protected">selectionChanged()</slot> <slot access="protected">selectionChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
</includehints> </includehints>

@ -170,7 +170,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

File diff suppressed because one or more lines are too long

@ -403,37 +403,37 @@ DaapClient::createTree( const TQString& /*host*/, Daap::SongList bundles )
TQStringList artists = bundles.keys(); TQStringList artists = bundles.keys();
foreach( artists ) foreach( artists )
{ {
MediaItem* tqparentArtist = new MediaItem( root ); MediaItem* parentArtist = new MediaItem( root );
tqparentArtist->setType( MediaItem::ARTIST ); parentArtist->setType( MediaItem::ARTIST );
Daap::AlbumList albumMap = *( bundles.tqfind(*it) ); Daap::AlbumList albumMap = *( bundles.tqfind(*it) );
tqparentArtist->setText( 0, (*albumMap.begin()).getFirst()->artist() ); //map was made case insensitively parentArtist->setText( 0, (*albumMap.begin()).getFirst()->artist() ); //map was made case insensitively
//just get the displayed-case from //just get the displayed-case from
//the first track //the first track
TQStringList albums = albumMap.keys(); TQStringList albums = albumMap.keys();
for ( TQStringList::Iterator itAlbum = albums.begin(); itAlbum != albums.end(); ++itAlbum ) for ( TQStringList::Iterator itAlbum = albums.begin(); itAlbum != albums.end(); ++itAlbum )
{ {
MediaItem* tqparentAlbum = new MediaItem( tqparentArtist ); MediaItem* parentAlbum = new MediaItem( parentArtist );
tqparentAlbum->setType( MediaItem::ALBUM ); parentAlbum->setType( MediaItem::ALBUM );
MetaBundle* track; MetaBundle* track;
Daap::TrackList trackList = *albumMap.tqfind(*itAlbum); Daap::TrackList trackList = *albumMap.tqfind(*itAlbum);
tqparentAlbum->setText( 0, trackList.getFirst()->album() ); parentAlbum->setText( 0, trackList.getFirst()->album() );
for( track = trackList.first(); track; track = trackList.next() ) for( track = trackList.first(); track; track = trackList.next() )
{ {
if( m_removeDuplicates && trackExistsInCollection( track ) ) if( m_removeDuplicates && trackExistsInCollection( track ) )
continue; continue;
MediaItem* childTrack = new MediaItem( tqparentAlbum ); MediaItem* childTrack = new MediaItem( parentAlbum );
childTrack->setText( 0, track->title() ); childTrack->setText( 0, track->title() );
childTrack->setType( MediaItem::TRACK ); childTrack->setType( MediaItem::TRACK );
childTrack->setBundle( track ); childTrack->setBundle( track );
childTrack->m_order = track->track(); childTrack->m_order = track->track();
} }
if( !tqparentAlbum->childCount() ) if( !parentAlbum->childCount() )
delete tqparentAlbum; delete parentAlbum;
} }
if( !tqparentArtist->childCount() ) if( !parentArtist->childCount() )
delete tqparentArtist; delete parentArtist;
} }
root->resetTitle(); root->resetTitle();
root->stopAnimation(); root->stopAnimation();

@ -122,7 +122,7 @@ Reader::Reader(const TQString& host, TQ_UINT16 port, ServerItem* root, const TQS
s_codes["asda"] = Code( "daap.songdateadded", DATE ); s_codes["asda"] = Code( "daap.songdateadded", DATE );
s_codes["asbr"] = Code( "daap.songbitrate", SHORT ); s_codes["asbr"] = Code( "daap.songbitrate", SHORT );
s_codes["mcti"] = Code( "dmap.containeritemid", LONG ); s_codes["mcti"] = Code( "dmap.containeritemid", LONG );
s_codes["mpco"] = Code( "dmap.tqparentcontainerid", LONG ); s_codes["mpco"] = Code( "dmap.parentcontainerid", LONG );
s_codes["msdc"] = Code( "dmap.databasescount", LONG ); s_codes["msdc"] = Code( "dmap.databasescount", LONG );
s_codes["mlog"] = Code( "dmap.loginresponse", CONTAINER ); s_codes["mlog"] = Code( "dmap.loginresponse", CONTAINER );
s_codes["mlid"] = Code( "dmap.sessionid", LONG ); s_codes["mlid"] = Code( "dmap.sessionid", LONG );
@ -407,12 +407,12 @@ Reader::parse( TQDataStream &raw, uint containerLength, bool first )
} }
void void
Reader::addElement( Map &tqparentMap, char* tag, TQVariant element ) Reader::addElement( Map &parentMap, char* tag, TQVariant element )
{ {
if( !tqparentMap.tqcontains( tag ) ) if( !parentMap.tqcontains( tag ) )
tqparentMap[tag] = TQVariant( TQValueList<TQVariant>() ); parentMap[tag] = TQVariant( TQValueList<TQVariant>() );
tqparentMap[tag].asList().append(element); parentMap[tag].asList().append(element);
} }
void void

@ -92,7 +92,7 @@ namespace Daap
* @param containerLength length of the container (or entire result) being analyzed * @param containerLength length of the container (or entire result) being analyzed
*/ */
static Map parse( TQDataStream &raw, uint containerLength, bool first = false ); static Map parse( TQDataStream &raw, uint containerLength, bool first = false );
static void addElement( Map &tqparentMap, char* tag, TQVariant element ); //! supporter function for parse static void addElement( Map &parentMap, char* tag, TQVariant element ); //! supporter function for parse
static TQ_UINT32 getTagAndLength( TQDataStream &raw, char tag[5] ); static TQ_UINT32 getTagAndLength( TQDataStream &raw, char tag[5] );
static TQMap<TQString, Code> s_codes; static TQMap<TQString, Code> s_codes;

@ -614,8 +614,8 @@ GenericMediaDevice::buildPodcastDestination( const PodcastEpisodeBundle *bundle
{ {
TQString location = m_podcastLocation.endsWith("/") ? m_podcastLocation : m_podcastLocation + '/'; TQString location = m_podcastLocation.endsWith("/") ? m_podcastLocation : m_podcastLocation + '/';
// get info about the PodcastChannel // get info about the PodcastChannel
TQString tqparentUrl = bundle->tqparent().url(); TQString parentUrl = bundle->tqparent().url();
TQString sql = "SELECT title,tqparent FROM podcastchannels WHERE url='" + CollectionDB::instance()->escapeString( tqparentUrl ) + "';"; TQString sql = "SELECT title,tqparent FROM podcastchannels WHERE url='" + CollectionDB::instance()->escapeString( parentUrl ) + "';";
TQStringList values = CollectionDB::instance()->query( sql ); TQStringList values = CollectionDB::instance()->query( sql );
TQString channelTitle; TQString channelTitle;
int tqparent = 0; int tqparent = 0;
@ -854,9 +854,9 @@ GenericMediaDevice::addTrackToList( int type, KURL url, int /*size*/ )
TQString path = url.isLocalFile() ? url.path( -1 ) : url.prettyURL( -1 ); //no trailing slash TQString path = url.isLocalFile() ? url.path( -1 ) : url.prettyURL( -1 ); //no trailing slash
int index = path.tqfindRev( '/', -1 ); int index = path.tqfindRev( '/', -1 );
TQString baseName = path.right( path.length() - index - 1 ); TQString baseName = path.right( path.length() - index - 1 );
TQString tqparentName = path.left( index ); TQString parentName = path.left( index );
GenericMediaFile* tqparent = m_mfm[tqparentName]; GenericMediaFile* tqparent = m_mfm[parentName];
GenericMediaFile* newItem = new GenericMediaFile( tqparent, baseName, this ); GenericMediaFile* newItem = new GenericMediaFile( tqparent, baseName, this );
if( type == MediaItem::DIRECTORY ) //directory if( type == MediaItem::DIRECTORY ) //directory

@ -456,7 +456,7 @@
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>
<function access="private" specifier="non virtual">destroy()</function> <function access="private" specifier="non virtual">destroy()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>
</includehints> </includehints>

@ -87,7 +87,7 @@ class IfpMediaDevice : public MediaDevice
// miscellaneous methods // miscellaneous methods
static int filetransferCallback( void *pData, struct ifp_transfer_status *progress ); static int filetransferCallback( void *pData, struct ifp_transfer_status *progress );
int setProgressInfo( struct ifp_transfer_status *progress ); int setProgressInfo( struct ifp_transfer_status *progress );
// Will iterate over tqparents and add directory name to the item. // Will iterate over parents and add directory name to the item.
// getFilename = false will return only tqparent structure, as opposed to returning the filename as well // getFilename = false will return only tqparent structure, as opposed to returning the filename as well
TQString getFullPath( const TQListViewItem *item, const bool getFilename = true ); TQString getFullPath( const TQListViewItem *item, const bool getFilename = true );
TQString cleanPath( const TQString &component ); TQString cleanPath( const TQString &component );

@ -666,15 +666,15 @@ IpodMediaDevice::copyTrackToDevice(const MetaBundle &bundle)
while ( !dir.exists() ) while ( !dir.exists() )
{ {
TQString path = dir.absPath(); TQString path = dir.absPath();
TQDir tqparentdir; TQDir parentdir;
TQDir create; TQDir create;
do do
{ {
create.setPath(path); create.setPath(path);
path = path.section("/", 0, path.tqcontains('/')-1); path = path.section("/", 0, path.tqcontains('/')-1);
tqparentdir.setPath(path); parentdir.setPath(path);
} }
while( !path.isEmpty() && !(path==mountPoint()) && !tqparentdir.exists() ); while( !path.isEmpty() && !(path==mountPoint()) && !parentdir.exists() );
debug() << "trying to create \"" << path << "\"" << endl; debug() << "trying to create \"" << path << "\"" << endl;
if(!create.mkdir( create.absPath() )) if(!create.mkdir( create.absPath() ))
{ {

@ -372,11 +372,11 @@ uint32_t
MtpMediaDevice::getDefaultParentId( void ) MtpMediaDevice::getDefaultParentId( void )
{ {
// Decide which folder to send it to: // Decide which folder to send it to:
// If the device gave us a tqparent_folder setting, we use it // If the device gave us a parent_folder setting, we use it
uint32_t parent_id = 0; uint32_t parent_id = 0;
if( m_default_tqparent_folder ) if( m_default_parent_folder )
{ {
parent_id = m_default_tqparent_folder; parent_id = m_default_parent_folder;
} }
// Otherwise look for a folder called "Music" // Otherwise look for a folder called "Music"
else if( m_folders != 0 ) else if( m_folders != 0 )
@ -1120,8 +1120,8 @@ MtpMediaDevice::openDevice( bool silent )
if(! ownername.isEmpty() ) if(! ownername.isEmpty() )
m_name += " (" + ownername + ')'; m_name += " (" + ownername + ')';
m_default_tqparent_folder = m_device->default_music_folder; m_default_parent_folder = m_device->default_music_folder;
debug() << "setting default tqparent : " << m_default_tqparent_folder << endl; debug() << "setting default tqparent : " << m_default_parent_folder << endl;
MtpMediaDevice::readMtpMusic(); MtpMediaDevice::readMtpMusic();

@ -173,10 +173,10 @@ class MtpMediaDevice : public MediaDevice
void clearItems(); void clearItems();
int deleteObject( MtpMediaItem *deleteItem ); int deleteObject( MtpMediaItem *deleteItem );
uint32_t checkFolderStructure( const MetaBundle &bundle, bool create = true ); uint32_t checkFolderStructure( const MetaBundle &bundle, bool create = true );
uint32_t createFolder( const char *name, uint32_t tqparent_id ); uint32_t createFolder( const char *name, uint32_t parent_id );
uint32_t getDefaultParentId( void ); uint32_t getDefaultParentId( void );
uint32_t folderNameToID( char *name, LIBMTP_folder_t *folderlist ); uint32_t folderNameToID( char *name, LIBMTP_folder_t *folderlist );
uint32_t subfolderNameToID( const char *name, LIBMTP_folder_t *folderlist, uint32_t tqparent_id ); uint32_t subfolderNameToID( const char *name, LIBMTP_folder_t *folderlist, uint32_t parent_id );
void updateFolders( void ); void updateFolders( void );
void initView( void ); void initView( void );
void readPlaylists( void ); void readPlaylists( void );
@ -190,7 +190,7 @@ class MtpMediaDevice : public MediaDevice
TQMutex m_mutex; TQMutex m_mutex;
TQMutex m_critical_mutex; TQMutex m_critical_mutex;
LIBMTP_folder_t *m_folders; LIBMTP_folder_t *m_folders;
uint32_t m_default_tqparent_folder; uint32_t m_default_parent_folder;
TQString m_folderStructure; TQString m_folderStructure;
TQLineEdit *m_folderStructureBox; TQLineEdit *m_folderStructureBox;
TQLabel *m_folderLabel; TQLabel *m_folderLabel;

@ -363,7 +363,7 @@ MetaBundle::operator=( const MetaBundle& bundle )
} }
// delete m_podcastBundle; why does this crash Amarok? aptqparently m_podcastBundle isn't always initialized. // delete m_podcastBundle; why does this crash Amarok? apparently m_podcastBundle isn't always initialized.
m_podcastBundle = 0; m_podcastBundle = 0;
if( bundle.m_podcastBundle ) if( bundle.m_podcastBundle )
setPodcastBundle( *bundle.m_podcastBundle ); setPodcastBundle( *bundle.m_podcastBundle );

@ -103,7 +103,7 @@ public:
/** This is a bit vector for selecting columns. It's very fast to compare /** This is a bit vector for selecting columns. It's very fast to compare
in matchFast. It might be a good idea to replace the TQValue<int> in matchFast. It might be a good idea to replace the TQValue<int>
column tqmasks with this eventually. */ column masks with this eventually. */
typedef TQ_UINT32 ColumnMask; typedef TQ_UINT32 ColumnMask;
/** Returns the name of the column at \p index as a string -- not i18ned, for internal purposes. */ /** Returns the name of the column at \p index as a string -- not i18ned, for internal purposes. */

@ -802,7 +802,7 @@ Moodbar::detach( void )
m_data = TQDeepCopy<ColorList>(m_data); m_data = TQDeepCopy<ColorList>(m_data);
m_pixmap.detach(); m_pixmap.detach();
// Aptqparently this is the wrong hack -- don't detach urls // Apparently this is the wrong hack -- don't detach urls
//TQString url( TQDeepCopy<TQString>( m_url.url() ) ); //TQString url( TQDeepCopy<TQString>( m_url.url() ) );
//m_url = KURL::fromPathOrURL( url ); //m_url = KURL::fromPathOrURL( url );

@ -596,14 +596,14 @@ void MultiTabBarButton::setStyle( MultiTabBar::MultiTabBarStyle style )
void MultiTabBarButton::hideEvent( TQHideEvent* he ) void MultiTabBarButton::hideEvent( TQHideEvent* he )
{ {
TQPushButton::hideEvent( he ); TQPushButton::hideEvent( he );
MultiTabBar *tb = dynamic_cast<MultiTabBar*>( tqparentWidget() ); MultiTabBar *tb = dynamic_cast<MultiTabBar*>( parentWidget() );
if ( tb ) tb->updateSeparator(); if ( tb ) tb->updateSeparator();
} }
void MultiTabBarButton::showEvent( TQShowEvent* he ) void MultiTabBarButton::showEvent( TQShowEvent* he )
{ {
TQPushButton::showEvent( he ); TQPushButton::showEvent( he );
MultiTabBar *tb = dynamic_cast<MultiTabBar*>( tqparentWidget() ); MultiTabBar *tb = dynamic_cast<MultiTabBar*>( parentWidget() );
if ( tb ) tb->updateSeparator(); if ( tb ) tb->updateSeparator();
} }
@ -709,9 +709,9 @@ TQSize MultiTabBarButton::tqsizeHint() const
// //PATCH by markey // //PATCH by markey
// if ( ( m_style == MultiTabBar::AMAROK ) ) { // if ( ( m_style == MultiTabBar::AMAROK ) ) {
// if( m_position == MultiTabBar::Left || m_position == MultiTabBar::Right ) // if( m_position == MultiTabBar::Left || m_position == MultiTabBar::Right )
// w = ( tqparentWidget()->height() - 3 ) / NUM_TABS; // w = ( parentWidget()->height() - 3 ) / NUM_TABS;
// else // else
// h = ( tqparentWidget()->width() - 3 ) / NUM_TABS; // h = ( parentWidget()->width() - 3 ) / NUM_TABS;
// } // }
return ( tqstyle().tqsizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ). return ( tqstyle().tqsizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ).

@ -351,7 +351,7 @@
<tabstop>m_previousIntSpinBox</tabstop> <tabstop>m_previousIntSpinBox</tabstop>
<tabstop>m_upcomingIntSpinBox</tabstop> <tabstop>m_upcomingIntSpinBox</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

@ -585,7 +585,7 @@
<function returnType="TQString">cleanPath( const QString &amp; component )</function> <function returnType="TQString">cleanPath( const QString &amp; component )</function>
<function>init()</function> <function>init()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="0"/> <layoutdefaults spacing="6" margin="0"/>
<includehints> <includehints>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -668,7 +668,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot
{ {
TQString tag; TQString tag;
TQValueVector<int> availableTags; //eg, ones that aren't empty TQValueVector<int> availableTags; //eg, ones that aren't empty
static const TQValueList<int> parens = //display these in tqparentheses static const TQValueList<int> parens = //display these in parentheses
TQValueList<int>() << PlaylistItem::PlayCount << PlaylistItem::Year << PlaylistItem::Comment TQValueList<int>() << PlaylistItem::PlayCount << PlaylistItem::Year << PlaylistItem::Comment
<< PlaylistItem::Genre << PlaylistItem::Length << PlaylistItem::Bitrate << PlaylistItem::Genre << PlaylistItem::Length << PlaylistItem::Bitrate
<< PlaylistItem::LastPlayed << PlaylistItem::Score << PlaylistItem::Filesize; << PlaylistItem::LastPlayed << PlaylistItem::Score << PlaylistItem::Filesize;

@ -578,7 +578,7 @@ bool PlayerWidget::event( TQEvent *e )
//create! If you have an issue with the behaviour bring it up on the mailing //create! If you have an issue with the behaviour bring it up on the mailing
//list before you even think about committing. Thanks! (includes case Hide) //list before you even think about committing. Thanks! (includes case Hide)
const WId id = tqparentWidget()->winId(); const WId id = parentWidget()->winId();
const uint desktop = KWin::windowInfo( winId() ).desktop(); const uint desktop = KWin::windowInfo( winId() ).desktop();
const KWin::WindowInfo info = KWin::windowInfo( id ); const KWin::WindowInfo info = KWin::windowInfo( id );
@ -594,8 +594,8 @@ bool PlayerWidget::event( TQEvent *e )
//XDeleteProperty( qt_xdisplay(), id, qt_wm_state ); //XDeleteProperty( qt_xdisplay(), id, qt_wm_state );
//tqparentWidget()->show(); //parentWidget()->show();
//if( !tqparentWidget()->isShown() ) XMapWindow( qt_xdisplay(), id ); //if( !parentWidget()->isShown() ) XMapWindow( qt_xdisplay(), id );
// unsigned long data[2]; // unsigned long data[2];
// data[0] = (unsigned long) NormalState; // data[0] = (unsigned long) NormalState;
// data[1] = (unsigned long) None; // data[1] = (unsigned long) None;
@ -608,7 +608,7 @@ bool PlayerWidget::event( TQEvent *e )
// XMapWindow( qt_xdisplay(), id ); // XMapWindow( qt_xdisplay(), id );
// //
//KWin::deIconifyWindow( id, false ); //KWin::deIconifyWindow( id, false );
tqparentWidget()->show(); parentWidget()->show();
} }
@ -630,7 +630,7 @@ bool PlayerWidget::event( TQEvent *e )
//this prevents the PlaylistButton being set to off (see the eventFilter) //this prevents the PlaylistButton being set to off (see the eventFilter)
//by leaving it on we ensure that we show the Playlist Window again when //by leaving it on we ensure that we show the Playlist Window again when
//we are next shown (see Show event handler above) //we are next shown (see Show event handler above)
if( tqparentWidget()->isShown() ) dontChangeButtonState = true; if( parentWidget()->isShown() ) dontChangeButtonState = true;
if( e->spontaneous() ) //the window system caused the event if( e->spontaneous() ) //the window system caused the event
{ {
@ -640,7 +640,7 @@ bool PlayerWidget::event( TQEvent *e )
const KWin::WindowInfo info = KWin::windowInfo( winId() ); const KWin::WindowInfo info = KWin::windowInfo( winId() );
if( info.isMinimized() ) KWin::iconifyWindow( tqparentWidget()->winId(), false ); if( info.isMinimized() ) KWin::iconifyWindow( parentWidget()->winId(), false );
else else
//this may seem strange, but it is correct //this may seem strange, but it is correct
//we have a handler in eventFilter for all other eventualities //we have a handler in eventFilter for all other eventualities
@ -651,7 +651,7 @@ bool PlayerWidget::event( TQEvent *e )
//we caused Amarok to hide, so we should hide the Playlist Window //we caused Amarok to hide, so we should hide the Playlist Window
//NOTE we "override" closeEvents and thus they count as non-spontaneous //NOTE we "override" closeEvents and thus they count as non-spontaneous
//hideEvents; which frankly is a huge relief! //hideEvents; which frankly is a huge relief!
tqparentWidget()->hide(); parentWidget()->hide();
} }
return false; return false;
@ -712,7 +712,7 @@ PlayerWidget::eventFilter( TQObject *o, TQEvent *e )
//we want to avoid setting the button for most spontaneous events //we want to avoid setting the button for most spontaneous events
//since they are not user driven, two are however: //since they are not user driven, two are however:
KWin::WindowInfo info = KWin::windowInfo( tqparentWidget()->winId() ); KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() );
if( !info.isMinimized() ) break; if( !info.isMinimized() ) break;
} }

@ -134,7 +134,7 @@ class PlayerWidget : public TQWidget, public EngineObserver
virtual void mouseMoveEvent( TQMouseEvent* ); virtual void mouseMoveEvent( TQMouseEvent* );
///to make the code clearer to n00bies ;) ///to make the code clearer to n00bies ;)
TQWidget *playlistWindow() { return tqparentWidget(); } TQWidget *playlistWindow() { return parentWidget(); }
static const int SCROLL_RATE = 1; static const int SCROLL_RATE = 1;
static const int ANIM_TIMER = 30; static const int ANIM_TIMER = 30;

@ -1833,7 +1833,7 @@ Playlist::setCurrentTrack( PlaylistItem *item )
if ( prev ) { if ( prev ) {
//reset to normal height //reset to normal height
prev->tqinvalidateHeight(); prev->invalidateHeight();
prev->setup(); prev->setup();
//remove pixmap in first column //remove pixmap in first column
prev->setPixmap( m_firstColumn, TQPixmap() ); prev->setPixmap( m_firstColumn, TQPixmap() );
@ -2094,7 +2094,7 @@ Playlist::engineStateChanged( Engine::State state, Engine::State /*oldState*/ )
} }
//POSSIBLYAHACK //POSSIBLYAHACK
//aptqparently you can't rely on EngineController::engine()->state() == state here, so pass it explicitly //apparently you can't rely on EngineController::engine()->state() == state here, so pass it explicitly
setCurrentTrackPixmap( state ); setCurrentTrackPixmap( state );
} }
@ -2371,7 +2371,7 @@ Playlist::paletteChange( const TQPalette &p )
KListView::paletteChange( p ); KListView::paletteChange( p );
counter = 0; // reset the counter or aptqparently the text lacks contrast counter = 0; // reset the counter or apparently the text lacks contrast
slotGlowTimer(); // tqrepaint currentTrack marker slotGlowTimer(); // tqrepaint currentTrack marker
} }
@ -4402,7 +4402,7 @@ void Playlist::ensureItemCentered( TQListViewItem *item )
if( !item ) if( !item )
return; return;
//HACK -- aptqparently the various metrics aren't reliable while the UI is still updating & stuff //HACK -- apparently the various metrics aren't reliable while the UI is still updating & stuff
m_itemToReallyCenter = item; m_itemToReallyCenter = item;
TQTimer::singleShot( 0, this, TQT_SLOT( reallyEnsureItemCentered() ) ); TQTimer::singleShot( 0, this, TQT_SLOT( reallyEnsureItemCentered() ) );
} }
@ -4797,7 +4797,7 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items )
textLabel2->setBuddy( lineEdit1 ); textLabel2->setBuddy( lineEdit1 );
textLabel3->setBuddy( lineEdit2 ); textLabel3->setBuddy( lineEdit2 );
// tqlayouts // layouts
TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6 ); TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6 );
tqlayout1->addItem( new TQSpacerItem( 181, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); tqlayout1->addItem( new TQSpacerItem( 181, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
tqlayout1->addWidget( new KPushButton( KStdGuiItem::ok(), this, "OkButton" ) ); tqlayout1->addWidget( new KPushButton( KStdGuiItem::ok(), this, "OkButton" ) );

@ -1172,9 +1172,9 @@ DEBUG_BLOCK
foreachType( TQValueList<PodcastChannelBundle>, channels ) foreachType( TQValueList<PodcastChannelBundle>, channels )
{ {
PlaylistCategory *tqparent = p; PlaylistCategory *tqparent = p;
const int tqparentId = (*it).tqparentId(); const int parentId = (*it).parentId();
if( tqparentId > 0 && folderMap.tqfind( tqparentId ) != folderMap.end() ) if( parentId > 0 && folderMap.tqfind( parentId ) != folderMap.end() )
tqparent = folderMap[tqparentId]; tqparent = folderMap[parentId];
channel = new PodcastChannel( tqparent, channel, *it ); channel = new PodcastChannel( tqparent, channel, *it );
@ -1206,12 +1206,12 @@ DEBUG_BLOCK
{ {
const int id = (*it).toInt(); const int id = (*it).toInt();
const TQString t = *++it; const TQString t = *++it;
const int tqparentId = (*++it).toInt(); const int parentId = (*++it).toInt();
const bool isOpen = ( (*++it) == CollectionDB::instance()->boolT() ? true : false ); const bool isOpen = ( (*++it) == CollectionDB::instance()->boolT() ? true : false );
PlaylistCategory *tqparent = p; PlaylistCategory *tqparent = p;
if( tqparentId > 0 && folderMap.tqfind( tqparentId ) != folderMap.end() ) if( parentId > 0 && folderMap.tqfind( parentId ) != folderMap.end() )
tqparent = folderMap[tqparentId]; tqparent = folderMap[parentId];
folder = new PlaylistCategory( tqparent, folder, t, id ); folder = new PlaylistCategory( tqparent, folder, t, id );
folder->setOpen( isOpen ); folder->setOpen( isOpen );
@ -1242,14 +1242,14 @@ void PlaylistBrowser::savePodcastFolderStates( PlaylistCategory *folder )
{ {
if( folder->id() < 0 ) // probably due to a 1.3->1.4 migration if( folder->id() < 0 ) // probably due to a 1.3->1.4 migration
{ // we add the folder to the db, set the id and then update all the tqchildren { // we add the folder to the db, set the id and then update all the tqchildren
int tqparentId = static_cast<PlaylistCategory*>(folder->tqparent())->id(); int parentId = static_cast<PlaylistCategory*>(folder->tqparent())->id();
int newId = CollectionDB::instance()->addPodcastFolder( folder->text(0), tqparentId, folder->isOpen() ); int newId = CollectionDB::instance()->addPodcastFolder( folder->text(0), parentId, folder->isOpen() );
folder->setId( newId ); folder->setId( newId );
PodcastChannel *chan = static_cast<PodcastChannel*>(folder->firstChild()); PodcastChannel *chan = static_cast<PodcastChannel*>(folder->firstChild());
while( chan ) while( chan )
{ {
if( isPodcastChannel( chan ) ) if( isPodcastChannel( chan ) )
// will update the database so child has correct tqparentId. // will update the database so child has correct parentId.
chan->setParent( folder ); chan->setParent( folder );
chan = static_cast<PodcastChannel*>(chan->nextSibling()); chan = static_cast<PodcastChannel*>(chan->nextSibling());
} }
@ -3168,7 +3168,7 @@ InfoPane::getHeight()
if( TQT_TQWIDGET( child( "container" ) )->isShown() ) if( TQT_TQWIDGET( child( "container" ) )->isShown() )
{ {
//If the InfoPane is shown, return true height. //If the InfoPane is shown, return true height.
return static_cast<TQSplitter*>( tqparentWidget() )->sizes().last(); return static_cast<TQSplitter*>( parentWidget() )->sizes().last();
} }
return m_storedHeight; return m_storedHeight;
@ -3182,7 +3182,7 @@ InfoPane::setStoredHeight( const int newHeight ) {
void void
InfoPane::toggle( bool toggled ) InfoPane::toggle( bool toggled )
{ {
TQSplitter *splitter = static_cast<TQSplitter*>( tqparentWidget() ); TQSplitter *splitter = static_cast<TQSplitter*>( parentWidget() );
if ( !toggled ) if ( !toggled )
{ {
@ -3196,7 +3196,7 @@ InfoPane::toggle( bool toggled )
m_pushButton->setEnabled( m_enable ); m_pushButton->setEnabled( m_enable );
} }
else { else {
setMaximumHeight( ( int )( tqparentWidget()->height() / 1.5 ) ); setMaximumHeight( ( int )( parentWidget()->height() / 1.5 ) );
//Restore the height of the InfoPane (change the splitter properties) //Restore the height of the InfoPane (change the splitter properties)
//Done every time since the pane forgets its height if you try to resize it while the info is hidden. //Done every time since the pane forgets its height if you try to resize it while the info is hidden.

@ -249,8 +249,8 @@ void PlaylistCategory::okRename( int col )
if( m_id < 0 ) return; if( m_id < 0 ) return;
// update the database entry to have the correct name // update the database entry to have the correct name
const int tqparentId = tqparent() ? static_cast<PlaylistCategory*>(tqparent())->id() : 0; const int parentId = tqparent() ? static_cast<PlaylistCategory*>(tqparent())->id() : 0;
CollectionDB::instance()->updatePodcastFolder( m_id, text(0), tqparentId, isOpen() ); CollectionDB::instance()->updatePodcastFolder( m_id, text(0), parentId, isOpen() );
} }
void PlaylistCategory::setXml( const TQDomElement &xml ) void PlaylistCategory::setXml( const TQDomElement &xml )
@ -399,10 +399,10 @@ PlaylistCategory::showContextMenu( const TQPoint &position )
enum Actions { RENAME, REMOVE, CREATE, PLAYLIST, PLAYLIST_IMPORT, SMART, STREAM, DYNAMIC, enum Actions { RENAME, REMOVE, CREATE, PLAYLIST, PLAYLIST_IMPORT, SMART, STREAM, DYNAMIC,
LASTFM, LASTFMCUSTOM, PODCAST, REFRESH, CONFIG, INTERVAL }; LASTFM, LASTFMCUSTOM, PODCAST, REFRESH, CONFIG, INTERVAL };
TQListViewItem *tqparentCat = this; TQListViewItem *parentCat = this;
while( tqparentCat->tqparent() ) while( parentCat->tqparent() )
tqparentCat = tqparentCat->tqparent(); parentCat = parentCat->tqparent();
bool isPodcastFolder = false; bool isPodcastFolder = false;
@ -412,37 +412,37 @@ PlaylistCategory::showContextMenu( const TQPoint &position )
menu.insertSeparator(); menu.insertSeparator();
} }
if( tqparentCat == static_cast<TQListViewItem*>( PlaylistBrowser::instance()->m_playlistCategory) ) if( parentCat == static_cast<TQListViewItem*>( PlaylistBrowser::instance()->m_playlistCategory) )
{ {
menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Create Playlist..."), PLAYLIST ); menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Create Playlist..."), PLAYLIST );
menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Import Playlist..."), PLAYLIST_IMPORT ); menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Import Playlist..."), PLAYLIST_IMPORT );
} }
else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_smartCategory) ) else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_smartCategory) )
menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("New Smart Playlist..."), SMART ); menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("New Smart Playlist..."), SMART );
else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_dynamicCategory) ) else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_dynamicCategory) )
menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("New Dynamic Playlist..."), DYNAMIC ); menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("New Dynamic Playlist..."), DYNAMIC );
else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_streamsCategory) ) else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_streamsCategory) )
menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Radio Stream..."), STREAM ); menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Radio Stream..."), STREAM );
else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_lastfmCategory) ) else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_lastfmCategory) )
{ {
menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Last.fm Radio..."), LASTFM ); menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Last.fm Radio..."), LASTFM );
menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Custom Last.fm Radio..."), LASTFMCUSTOM ); menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Custom Last.fm Radio..."), LASTFMCUSTOM );
} }
else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_podcastCategory) ) else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_podcastCategory) )
{ {
isPodcastFolder = true; isPodcastFolder = true;
menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n("Add Podcast..."), PODCAST ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n("Add Podcast..."), PODCAST );
menu.insertItem( SmallIconSet( Amarok::icon( "refresh" ) ), i18n("Refresh All Podcasts"), REFRESH ); menu.insertItem( SmallIconSet( Amarok::icon( "refresh" ) ), i18n("Refresh All Podcasts"), REFRESH );
menu.insertSeparator(); menu.insertSeparator();
menu.insertItem( SmallIconSet( Amarok::icon( "configure" ) ), i18n( "&Configure Podcasts..." ), CONFIG ); menu.insertItem( SmallIconSet( Amarok::icon( "configure" ) ), i18n( "&Configure Podcasts..." ), CONFIG );
if( tqparentCat->childCount() == 0 ) if( parentCat->childCount() == 0 )
menu.setItemEnabled( CONFIG, false ); menu.setItemEnabled( CONFIG, false );
if( tqparentCat == this ) if( parentCat == this )
menu.insertItem( SmallIconSet( Amarok::icon( "configure" ) ), i18n("Scan Interval..."), INTERVAL ); menu.insertItem( SmallIconSet( Amarok::icon( "configure" ) ), i18n("Scan Interval..."), INTERVAL );
} }
@ -2428,10 +2428,10 @@ PodcastEpisode::PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after,
if( title.isEmpty() ) if( title.isEmpty() )
title = link.fileName(); title = link.fileName();
KURL tqparentUrl = static_cast<PodcastChannel*>(tqparent)->url(); KURL parentUrl = static_cast<PodcastChannel*>(tqparent)->url();
m_bundle.setDBId( -1 ); m_bundle.setDBId( -1 );
m_bundle.setURL( link ); m_bundle.setURL( link );
m_bundle.setParent( tqparentUrl ); m_bundle.setParent( parentUrl );
m_bundle.setTitle( title ); m_bundle.setTitle( title );
m_bundle.setSubtitle( subtitle ); m_bundle.setSubtitle( subtitle );
m_bundle.setAuthor( author ); m_bundle.setAuthor( author );
@ -2587,8 +2587,8 @@ void PodcastEpisode::createLocalDir( const KURL &localDir )
TQString localDirString = localDir.path(); TQString localDirString = localDir.path();
if( !TQFile::exists( localDirString ) ) if( !TQFile::exists( localDirString ) )
{ {
TQString tqparentDirString = localDir.directory( true, true ); TQString parentDirString = localDir.directory( true, true );
createLocalDir( tqparentDirString ); createLocalDir( parentDirString );
TQDir dir( localDirString ); TQDir dir( localDirString );
dir.mkdir( localDirString ); dir.mkdir( localDirString );
} }

@ -13,7 +13,7 @@ class PodcastChannelBundle
{ {
public: public:
PodcastChannelBundle() PodcastChannelBundle()
: m_tqparentId( -1 ) : m_parentId( -1 )
, m_autoscan( false ) , m_autoscan( false )
, m_fetchType( -1 ) , m_fetchType( -1 )
, m_autotransfer( false ) , m_autotransfer( false )
@ -28,7 +28,7 @@ class PodcastChannelBundle
m_link = link; m_link = link;
m_description = desc; m_description = desc;
m_copyright = copy; m_copyright = copy;
m_tqparentId = -1; m_parentId = -1;
setSettings( settings ); setSettings( settings );
} }
@ -61,7 +61,7 @@ class PodcastChannelBundle
const TQString &description() const; const TQString &description() const;
const TQString &copyright() const; const TQString &copyright() const;
/// The id which the tqparent folder has in the database /// The id which the tqparent folder has in the database
int tqparentId() const; int parentId() const;
void setURL( const KURL &u ); void setURL( const KURL &u );
void setTitle( const TQString &t ); void setTitle( const TQString &t );
@ -95,7 +95,7 @@ class PodcastChannelBundle
KURL m_imageUrl; KURL m_imageUrl;
TQString m_description; TQString m_description;
TQString m_copyright; TQString m_copyright;
int m_tqparentId; int m_parentId;
TQString m_saveLocation; TQString m_saveLocation;
bool m_autoscan; bool m_autoscan;
@ -112,7 +112,7 @@ inline const KURL &PodcastChannelBundle::link() const { return m_link;
inline const KURL &PodcastChannelBundle::imageURL() const { return m_imageUrl; } inline const KURL &PodcastChannelBundle::imageURL() const { return m_imageUrl; }
inline const TQString &PodcastChannelBundle::description() const { return m_description; } inline const TQString &PodcastChannelBundle::description() const { return m_description; }
inline const TQString &PodcastChannelBundle::copyright() const { return m_copyright; } inline const TQString &PodcastChannelBundle::copyright() const { return m_copyright; }
inline int PodcastChannelBundle::tqparentId() const { return m_tqparentId; } inline int PodcastChannelBundle::parentId() const { return m_parentId; }
inline void PodcastChannelBundle::setURL ( const KURL &u ) { m_url = u; } inline void PodcastChannelBundle::setURL ( const KURL &u ) { m_url = u; }
inline void PodcastChannelBundle::setTitle ( const TQString &t ) { m_title = t; } inline void PodcastChannelBundle::setTitle ( const TQString &t ) { m_title = t; }
@ -121,7 +121,7 @@ inline void PodcastChannelBundle::setLink ( const KURL &l ) { m_lin
inline void PodcastChannelBundle::setImageURL ( const KURL &i ) { m_imageUrl = i; } inline void PodcastChannelBundle::setImageURL ( const KURL &i ) { m_imageUrl = i; }
inline void PodcastChannelBundle::setDescription ( const TQString &d ) { m_description = d; } inline void PodcastChannelBundle::setDescription ( const TQString &d ) { m_description = d; }
inline void PodcastChannelBundle::setCopyright ( const TQString &c ) { m_copyright = c; } inline void PodcastChannelBundle::setCopyright ( const TQString &c ) { m_copyright = c; }
inline void PodcastChannelBundle::setParentId ( const int p ) { m_tqparentId = p; } inline void PodcastChannelBundle::setParentId ( const int p ) { m_parentId = p; }
inline void PodcastChannelBundle::setSaveLocation( const TQString &s ) { m_saveLocation = s; } inline void PodcastChannelBundle::setSaveLocation( const TQString &s ) { m_saveLocation = s; }
inline void PodcastChannelBundle::setAutoScan( const bool b ) { m_autoscan = b; } inline void PodcastChannelBundle::setAutoScan( const bool b ) { m_autoscan = b; }

@ -22,7 +22,7 @@ class PodcastSettings
{ {
public: public:
PodcastSettings( const TQDomNode &channelSettings, const TQString &title ); PodcastSettings( const TQDomNode &channelSettings, const TQString &title );
PodcastSettings( const PodcastSettings *tqparentSettings, const TQString &title ); PodcastSettings( const PodcastSettings *parentSettings, const TQString &title );
PodcastSettings( const TQString &title ); // standard settings PodcastSettings( const TQString &title ); // standard settings
PodcastSettings( const TQString &title, const TQString &save, const bool autoScan, PodcastSettings( const TQString &title, const TQString &save, const bool autoScan,
const int fetchType, const bool autotransfer, const bool purge, const int purgecount ); const int fetchType, const bool autotransfer, const bool purge, const int purgecount );

@ -210,7 +210,7 @@
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -248,7 +248,7 @@ ScanController::doJob()
//in), so preserve the necessary other tables (eg artist) //in), so preserve the necessary other tables (eg artist)
CollectionDB::instance()->prepareTempTables(); CollectionDB::instance()->prepareTempTables();
CollectionDB::instance()->tqinvalidateArtistAlbumCache(); CollectionDB::instance()->invalidateArtistAlbumCache();
main_loop: main_loop:
uint delayCount = 100; uint delayCount = 100;

@ -114,8 +114,8 @@ namespace Amarok {
class AmarokScriptNewStuff : public KNewStuff class AmarokScriptNewStuff : public KNewStuff
{ {
public: public:
AmarokScriptNewStuff(const TQString &type, TQWidget *tqparentWidget=0) AmarokScriptNewStuff(const TQString &type, TQWidget *parentWidget=0)
: KNewStuff( type, tqparentWidget ) : KNewStuff( type, parentWidget )
{} {}
bool install( const TQString& fileName ) bool install( const TQString& fileName )

@ -130,6 +130,6 @@
<includes> <includes>
<include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kdialog.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="0"/> <layoutdefaults spacing="6" margin="0"/>
<tqlayoutfunctions spacing="KDialog::spacingHint"/> <layoutfunctions spacing="KDialog::spacingHint"/>
</UI> </UI>

@ -205,7 +205,7 @@
<functions> <functions>
<function specifier="non virtual">init()</function> <function specifier="non virtual">init()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>equalizercanvasview.h</includehint> <includehint>equalizercanvasview.h</includehint>
</includehints> </includehints>

@ -217,7 +217,7 @@ Amarok::PrettySlider::paintEvent( TQPaintEvent *e )
TQPixmap buf( size() ); TQPixmap buf( size() );
TQPainter p( &buf, this ); TQPainter p( &buf, this );
buf.fill( tqparentWidget()->backgroundColor() ); buf.fill( parentWidget()->backgroundColor() );
if ( orientation() == Qt::Vertical ) if ( orientation() == Qt::Vertical )
{ {
@ -470,8 +470,8 @@ Amarok::VolumeSlider::paintEvent( TQPaintEvent * )
TQPixmap buf( size() ); TQPixmap buf( size() );
// Erase background // Erase background
if( tqparentWidget()->backgroundPixmap() ) if( parentWidget()->backgroundPixmap() )
buf.fill( tqparentWidget(), pos() ); buf.fill( parentWidget(), pos() );
else { else {
buf.fill( tqcolorGroup().background() ); buf.fill( tqcolorGroup().background() );
// TQPainter p( &buf ); // TQPainter p( &buf );

@ -189,7 +189,7 @@ Vis::Selector::Selector( TQWidget *tqparent )
resize( tqsizeHint() + TQSize(20,0) ); resize( tqsizeHint() + TQSize(20,0) );
// Center the widget on screen // Center the widget on screen
move( tqparentWidget()->width()/2 - width()/2, tqparentWidget()->height()/2 - height()/2 ); move( parentWidget()->width()/2 - width()/2, parentWidget()->height()/2 - height()/2 );
} }
void void

@ -317,7 +317,7 @@ STQLITE_API int sqlite3_exec(
** primary result code as a prefix. Primary result codes contain a single ** primary result code as a prefix. Primary result codes contain a single
** "_" character. Extended result codes contain two or more "_" characters. ** "_" character. Extended result codes contain two or more "_" characters.
** The numeric value of an extended result code can be converted to its ** The numeric value of an extended result code can be converted to its
** corresponding primary result code by tqmasking off the lower 8 bytes. ** corresponding primary result code by masking off the lower 8 bytes.
** **
** The STQLITE_OK result code will never be extended. It will always ** The STQLITE_OK result code will never be extended. It will always
** be exactly zero. ** be exactly zero.
@ -1532,7 +1532,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt);
** **
** Note that when type conversions occur, pointers returned by prior ** Note that when type conversions occur, pointers returned by prior
** calls to sqlite3_column_blob(), sqlite3_column_text(), and/or ** calls to sqlite3_column_blob(), sqlite3_column_text(), and/or
** sqlite3_column_text16() may be tqinvalidated. ** sqlite3_column_text16() may be invalidated.
** Type conversions and pointer invalidations might occur ** Type conversions and pointer invalidations might occur
** in the following cases: ** in the following cases:
** **
@ -1554,7 +1554,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt);
** not tqinvalidate a prior pointer, though of course the content of the buffer ** not tqinvalidate a prior pointer, though of course the content of the buffer
** that the prior pointer points to will have been modified. Other kinds ** that the prior pointer points to will have been modified. Other kinds
** of conversion are done in place when it is possible, but sometime it is ** of conversion are done in place when it is possible, but sometime it is
** not possible and in those cases prior pointers are tqinvalidated. ** not possible and in those cases prior pointers are invalidated.
** **
** The safest and easiest to remember policy is to invoke these routines ** The safest and easiest to remember policy is to invoke these routines
** in one of the following ways: ** in one of the following ways:
@ -1757,7 +1757,7 @@ int sqlite3_global_recover(void);
** **
** Please pay particular attention to the fact that the pointer that ** Please pay particular attention to the fact that the pointer that
** is returned from [sqlite3_value_blob()], [sqlite3_value_text()], or ** is returned from [sqlite3_value_blob()], [sqlite3_value_text()], or
** [sqlite3_value_text16()] can be tqinvalidated by a subsequent call to ** [sqlite3_value_text16()] can be invalidated by a subsequent call to
** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite_value_text()], ** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite_value_text()],
** or [sqlite3_value_text16()]. ** or [sqlite3_value_text16()].
*/ */
@ -18824,7 +18824,7 @@ static void pagerUnlockAndRollback(Pager *p){
/* /*
** Clear the in-memory cache. This routine ** Clear the in-memory cache. This routine
** sets the state of the pager back to what it was when it was first ** sets the state of the pager back to what it was when it was first
** opened. Any outstanding pages are tqinvalidated and subsequent attempts ** opened. Any outstanding pages are invalidated and subsequent attempts
** to access those pages will likely result in a coredump. ** to access those pages will likely result in a coredump.
*/ */
static void pager_reset(Pager *pPager){ static void pager_reset(Pager *pPager){
@ -20061,7 +20061,7 @@ STQLITE_PRIVATE int sqlite3PagerTruncate(Pager *pPager, Pgno nPage){
** Shutdown the page cache. Free all memory and close all files. ** Shutdown the page cache. Free all memory and close all files.
** **
** If a transaction was in progress when this routine is called, that ** If a transaction was in progress when this routine is called, that
** transaction is rolled back. All outstanding pages are tqinvalidated ** transaction is rolled back. All outstanding pages are invalidated
** and their memory is freed. Any attempt to use a page associated ** and their memory is freed. Any attempt to use a page associated
** with this page cache after this function returns will likely ** with this page cache after this function returns will likely
** result in a coredump. ** result in a coredump.
@ -23114,7 +23114,7 @@ static void releasePage(MemPage *pPage); /* Forward reference */
/* /*
** Invalidate the overflow page-list cache for cursor pCur, if any. ** Invalidate the overflow page-list cache for cursor pCur, if any.
*/ */
static void tqinvalidateOverflowCache(BtCursor *pCur){ static void invalidateOverflowCache(BtCursor *pCur){
sqliteFree(pCur->aOverflow); sqliteFree(pCur->aOverflow);
pCur->aOverflow = 0; pCur->aOverflow = 0;
} }
@ -23123,15 +23123,15 @@ static void tqinvalidateOverflowCache(BtCursor *pCur){
** Invalidate the overflow page-list cache for all cursors opened ** Invalidate the overflow page-list cache for all cursors opened
** on the shared btree structure pBt. ** on the shared btree structure pBt.
*/ */
static void tqinvalidateAllOverflowCache(BtShared *pBt){ static void invalidateAllOverflowCache(BtShared *pBt){
BtCursor *p; BtCursor *p;
for(p=pBt->pCursor; p; p=p->pNext){ for(p=pBt->pCursor; p; p=p->pNext){
tqinvalidateOverflowCache(p); invalidateOverflowCache(p);
} }
} }
#else #else
#define tqinvalidateOverflowCache(x) #define invalidateOverflowCache(x)
#define tqinvalidateAllOverflowCache(x) #define invalidateAllOverflowCache(x)
#endif #endif
/* /*
@ -23173,7 +23173,7 @@ static int saveCursorPosition(BtCursor *pCur){
pCur->eState = CURSOR_RETQUIRESEEK; pCur->eState = CURSOR_RETQUIRESEEK;
} }
tqinvalidateOverflowCache(pCur); invalidateOverflowCache(pCur);
return rc; return rc;
} }
@ -24872,7 +24872,7 @@ STQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *p){
if( !pBt->autoVacuum ){ if( !pBt->autoVacuum ){
return STQLITE_DONE; return STQLITE_DONE;
} }
tqinvalidateAllOverflowCache(pBt); invalidateAllOverflowCache(pBt);
return incrVacuumStep(pBt, 0); return incrVacuumStep(pBt, 0);
} }
@ -24892,7 +24892,7 @@ static int autoVacuumCommit(BtShared *pBt, Pgno *pnTrunc){
int nRef = sqlite3PagerRefcount(pPager); int nRef = sqlite3PagerRefcount(pPager);
#endif #endif
tqinvalidateAllOverflowCache(pBt); invalidateAllOverflowCache(pBt);
assert(pBt->autoVacuum); assert(pBt->autoVacuum);
if( !pBt->incrVacuum ){ if( !pBt->incrVacuum ){
Pgno nFin = 0; Pgno nFin = 0;
@ -25199,7 +25199,7 @@ STQLITE_PRIVATE int sqlite3BtreeCommitStmt(Btree *p){
** Rollback the active statement subtransaction. If no subtransaction ** Rollback the active statement subtransaction. If no subtransaction
** is active this routine is a no-op. ** is active this routine is a no-op.
** **
** All cursors will be tqinvalidated by this operation. Any attempt ** All cursors will be invalidated by this operation. Any attempt
** to use a cursor that was open at the beginning of this operation ** to use a cursor that was open at the beginning of this operation
** will result in an error. ** will result in an error.
*/ */
@ -25355,7 +25355,7 @@ STQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){
} }
releasePage(pCur->pPage); releasePage(pCur->pPage);
unlockBtreeIfUnused(pBt); unlockBtreeIfUnused(pBt);
tqinvalidateOverflowCache(pCur); invalidateOverflowCache(pCur);
sqliteFree(pCur); sqliteFree(pCur);
return STQLITE_OK; return STQLITE_OK;
} }
@ -25609,7 +25609,7 @@ static int copyPayload(
** cache to make seeking to the supplied offset more efficient. ** cache to make seeking to the supplied offset more efficient.
** **
** Once an overflow page-list cache has been allocated, it may be ** Once an overflow page-list cache has been allocated, it may be
** tqinvalidated if some other cursor writes to the same table, or if ** invalidated if some other cursor writes to the same table, or if
** the cursor is moved to a different row. Additionally, in auto-vacuum ** the cursor is moved to a different row. Additionally, in auto-vacuum
** mode, the following events may tqinvalidate an overflow page-list cache. ** mode, the following events may tqinvalidate an overflow page-list cache.
** **
@ -27133,9 +27133,9 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
int szCell; int szCell;
CellInfo info; CellInfo info;
BtShared *pBt = pPage->pBt; BtShared *pBt = pPage->pBt;
int tqparentIdx = pParent->nCell; /* pParent new divider cell index */ int parentIdx = pParent->nCell; /* pParent new divider cell index */
int tqparentSize; /* Size of new divider cell */ int parentSize; /* Size of new divider cell */
u8 tqparentCell[64]; /* Space for the new divider cell */ u8 parentCell[64]; /* Space for the new divider cell */
/* Allocate a new page. Insert the overflow cell from pPage /* Allocate a new page. Insert the overflow cell from pPage
** into it. Then remove the overflow cell from pPage. ** into it. Then remove the overflow cell from pPage.
@ -27161,16 +27161,16 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
assert( pPage->nCell>0 ); assert( pPage->nCell>0 );
pCell = findCell(pPage, pPage->nCell-1); pCell = findCell(pPage, pPage->nCell-1);
sqlite3BtreeParseCellPtr(pPage, pCell, &info); sqlite3BtreeParseCellPtr(pPage, pCell, &info);
rc = fillInCell(pParent, tqparentCell, 0, info.nKey, 0, 0, 0, &tqparentSize); rc = fillInCell(pParent, parentCell, 0, info.nKey, 0, 0, 0, &parentSize);
if( rc!=STQLITE_OK ){ if( rc!=STQLITE_OK ){
return rc; return rc;
} }
assert( tqparentSize<64 ); assert( parentSize<64 );
rc = insertCell(pParent, tqparentIdx, tqparentCell, tqparentSize, 0, 4); rc = insertCell(pParent, parentIdx, parentCell, parentSize, 0, 4);
if( rc!=STQLITE_OK ){ if( rc!=STQLITE_OK ){
return rc; return rc;
} }
put4byte(findOverflowCell(pParent,tqparentIdx), pPage->pgno); put4byte(findOverflowCell(pParent,parentIdx), pPage->pgno);
put4byte(&pParent->aData[pParent->hdrOffset+8], pgnoNew); put4byte(&pParent->aData[pParent->hdrOffset+8], pgnoNew);
#ifndef STQLITE_OMIT_AUTOVACUUM #ifndef STQLITE_OMIT_AUTOVACUUM
@ -28249,7 +28249,7 @@ STQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree *p, int *piTable, int flags){
** out to be an overflow page, delete all overflow page-map caches ** out to be an overflow page, delete all overflow page-map caches
** held by open cursors. ** held by open cursors.
*/ */
tqinvalidateAllOverflowCache(pBt); invalidateAllOverflowCache(pBt);
/* Read the value of meta[3] from the database to determine where the /* Read the value of meta[3] from the database to determine where the
** root page of the new table should go. meta[3] is the largest root-page ** root page of the new table should go. meta[3] is the largest root-page
@ -29591,7 +29591,7 @@ STQLITE_PRIVATE int sqlite3VdbeMemNulTerminate(Mem *pMem){
** are converted using sqlite3_snprintf(). Converting a BLOB to a string ** are converted using sqlite3_snprintf(). Converting a BLOB to a string
** is a no-op. ** is a no-op.
** **
** Existing representations MEM_Int and MEM_Real are *not* tqinvalidated. ** Existing representations MEM_Int and MEM_Real are *not* invalidated.
** **
** A MEM_Null value will never be passed to this function. This function is ** A MEM_Null value will never be passed to this function. This function is
** used for converting values to text for returning to the user (i.e. via ** used for converting values to text for returning to the user (i.e. via
@ -30630,13 +30630,13 @@ static int opcodeNoPush(u8 op){
** NOPUSH_MASK_0 corresponds to opcodes 0 to 15. NOPUSH_MASK_1 tqcontains ** NOPUSH_MASK_0 corresponds to opcodes 0 to 15. NOPUSH_MASK_1 tqcontains
** one bit for opcodes 16 to 31, and so on. ** one bit for opcodes 16 to 31, and so on.
** **
** 16-bit bittqmasks (rather than 32-bit) are specified in opcodes.h ** 16-bit bitmasks (rather than 32-bit) are specified in opcodes.h
** because the file is generated by an awk program. Awk manipulates ** because the file is generated by an awk program. Awk manipulates
** all numbers as floating-point and we don't want to risk a rounding ** all numbers as floating-point and we don't want to risk a rounding
** error if someone builds with an awk that uses (for example) 32-bit ** error if someone builds with an awk that uses (for example) 32-bit
** IEEE floats. ** IEEE floats.
*/ */
static const u32 tqmasks[5] = { static const u32 masks[5] = {
NOPUSH_MASK_0 + (((unsigned)NOPUSH_MASK_1)<<16), NOPUSH_MASK_0 + (((unsigned)NOPUSH_MASK_1)<<16),
NOPUSH_MASK_2 + (((unsigned)NOPUSH_MASK_3)<<16), NOPUSH_MASK_2 + (((unsigned)NOPUSH_MASK_3)<<16),
NOPUSH_MASK_4 + (((unsigned)NOPUSH_MASK_5)<<16), NOPUSH_MASK_4 + (((unsigned)NOPUSH_MASK_5)<<16),
@ -30644,7 +30644,7 @@ static int opcodeNoPush(u8 op){
NOPUSH_MASK_8 + (((unsigned)NOPUSH_MASK_9)<<16) NOPUSH_MASK_8 + (((unsigned)NOPUSH_MASK_9)<<16)
}; };
assert( op<32*5 ); assert( op<32*5 );
return (tqmasks[op>>5] & (1<<(op&0x1F))); return (masks[op>>5] & (1<<(op&0x1F)));
} }
#ifndef NDEBUG #ifndef NDEBUG
@ -36150,7 +36150,7 @@ case OP_VerifyCookie: { /* no-push */
** prepared queries. If such a query is out-of-date, we do not want to ** prepared queries. If such a query is out-of-date, we do not want to
** discard the database schema, as the user code implementing the ** discard the database schema, as the user code implementing the
** v-table would have to be ready for the sqlite3_vtab structure itself ** v-table would have to be ready for the sqlite3_vtab structure itself
** to be tqinvalidated whenever sqlite3_step() is called from within ** to be invalidated whenever sqlite3_step() is called from within
** a v-table method. ** a v-table method.
*/ */
if( db->aDb[pOp->p1].pSchema->schema_cookie!=iMeta ){ if( db->aDb[pOp->p1].pSchema->schema_cookie!=iMeta ){
@ -39004,7 +39004,7 @@ static int blobReadWrite(
sqlite3 *db; sqlite3 *db;
/* If there is no statement handle, then the blob-handle has /* If there is no statement handle, then the blob-handle has
** already been tqinvalidated. Return STQLITE_ABORT in this case. ** already been invalidated. Return STQLITE_ABORT in this case.
*/ */
if( !v ) return STQLITE_ABORT; if( !v ) return STQLITE_ABORT;
@ -41690,7 +41690,7 @@ static void renameTableFunc(
/* The principle used to locate the table name in the CREATE TABLE /* The principle used to locate the table name in the CREATE TABLE
** statement is that the table name is the first token that is immediatedly ** statement is that the table name is the first token that is immediatedly
** followed by a left tqparenthesis - TK_LP - or "USING" TK_USING. ** followed by a left parenthesis - TK_LP - or "USING" TK_USING.
*/ */
if( zSql ){ if( zSql ){
do { do {
@ -51963,7 +51963,7 @@ static int getTempStore(const char *z){
** Invalidate temp storage, either when the temp storage is changed ** Invalidate temp storage, either when the temp storage is changed
** from default, or when 'file' and the temp_store_directory has changed ** from default, or when 'file' and the temp_store_directory has changed
*/ */
static int tqinvalidateTempStorage(Parse *pParse){ static int invalidateTempStorage(Parse *pParse){
sqlite3 *db = pParse->db; sqlite3 *db = pParse->db;
if( db->aDb[1].pBt!=0 ){ if( db->aDb[1].pBt!=0 ){
if( !db->autoCommit ){ if( !db->autoCommit ){
@ -51989,7 +51989,7 @@ static int changeTempStorage(Parse *pParse, const char *zStorageType){
int ts = getTempStore(zStorageType); int ts = getTempStore(zStorageType);
sqlite3 *db = pParse->db; sqlite3 *db = pParse->db;
if( db->temp_store==ts ) return STQLITE_OK; if( db->temp_store==ts ) return STQLITE_OK;
if( tqinvalidateTempStorage( pParse ) != STQLITE_OK ){ if( invalidateTempStorage( pParse ) != STQLITE_OK ){
return STQLITE_ERROR; return STQLITE_ERROR;
} }
db->temp_store = ts; db->temp_store = ts;
@ -52393,7 +52393,7 @@ STQLITE_PRIVATE void sqlite3Pragma(
** Return or set the local value of the temp_store_directory flag. Changing ** Return or set the local value of the temp_store_directory flag. Changing
** the value sets a specific directory to be used for temporary files. ** the value sets a specific directory to be used for temporary files.
** Setting to a null string reverts to the default temporary directory search. ** Setting to a null string reverts to the default temporary directory search.
** If temporary directory is changed, then tqinvalidateTempStorage. ** If temporary directory is changed, then invalidateTempStorage.
** **
*/ */
if( sqlite3StrICmp(zLeft, "temp_store_directory")==0 ){ if( sqlite3StrICmp(zLeft, "temp_store_directory")==0 ){
@ -52414,7 +52414,7 @@ STQLITE_PRIVATE void sqlite3Pragma(
|| (TEMP_STORE==1 && db->temp_store<=1) || (TEMP_STORE==1 && db->temp_store<=1)
|| (TEMP_STORE==2 && db->temp_store==1) || (TEMP_STORE==2 && db->temp_store==1)
){ ){
tqinvalidateTempStorage(pParse); invalidateTempStorage(pParse);
} }
sqliteFree(sqlite3_temp_directory); sqliteFree(sqlite3_temp_directory);
if( zRight[0] ){ if( zRight[0] ){
@ -56578,7 +56578,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
** This routine does NOT free the Select structure passed in. The ** This routine does NOT free the Select structure passed in. The
** calling function needs to do that. ** calling function needs to do that.
** **
** The pParent, tqparentTab, and *pParentAgg fields are filled in if this ** The pParent, parentTab, and *pParentAgg fields are filled in if this
** SELECT is a subquery. This routine may try to combine this SELECT ** SELECT is a subquery. This routine may try to combine this SELECT
** with its tqparent to form a single flat query. In so doing, it might ** with its tqparent to form a single flat query. In so doing, it might
** change the tqparent query from a non-aggregate to an aggregate query. ** change the tqparent query from a non-aggregate to an aggregate query.
@ -56596,7 +56596,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
** pParent will be NULL. During the processing of the outer query, this ** pParent will be NULL. During the processing of the outer query, this
** routine is called recursively to handle the subquery. For the recursive ** routine is called recursively to handle the subquery. For the recursive
** call, pParent will point to the outer query. Because the subquery is ** call, pParent will point to the outer query. Because the subquery is
** the second element in a three-way join, the tqparentTab parameter will ** the second element in a three-way join, the parentTab parameter will
** be 1 (the 2nd value of a 0-indexed array.) ** be 1 (the 2nd value of a 0-indexed array.)
*/ */
STQLITE_PRIVATE int sqlite3Select( STQLITE_PRIVATE int sqlite3Select(
@ -56605,7 +56605,7 @@ STQLITE_PRIVATE int sqlite3Select(
int eDest, /* How to dispose of the results */ int eDest, /* How to dispose of the results */
int iParm, /* A parameter used by the eDest disposal method */ int iParm, /* A parameter used by the eDest disposal method */
Select *pParent, /* Another SELECT for which this is a sub-query */ Select *pParent, /* Another SELECT for which this is a sub-query */
int tqparentTab, /* Index in pParent->pSrc of this query */ int parentTab, /* Index in pParent->pSrc of this query */
int *pParentAgg, /* True if pParent uses aggregate functions */ int *pParentAgg, /* True if pParent uses aggregate functions */
char *aff /* If eDest is SRT_Union, the affinity string */ char *aff /* If eDest is SRT_Union, the affinity string */
){ ){
@ -56755,7 +56755,7 @@ STQLITE_PRIVATE int sqlite3Select(
*/ */
#ifndef STQLITE_OMIT_VIEW #ifndef STQLITE_OMIT_VIEW
if( pParent && pParentAgg && if( pParent && pParentAgg &&
flattenSubquery(pParent, tqparentTab, *pParentAgg, isAgg) ){ flattenSubquery(pParent, parentTab, *pParentAgg, isAgg) ){
if( isAgg ) *pParentAgg = 1; if( isAgg ) *pParentAgg = 1;
goto select_end; goto select_end;
} }
@ -57104,9 +57104,9 @@ STQLITE_PRIVATE int sqlite3Select(
** the temporary table. ** the temporary table.
*/ */
if( pParent ){ if( pParent ){
assert( pParent->pSrc->nSrc>tqparentTab ); assert( pParent->pSrc->nSrc>parentTab );
assert( pParent->pSrc->a[tqparentTab].pSelect==p ); assert( pParent->pSrc->a[parentTab].pSelect==p );
pParent->pSrc->a[tqparentTab].isPopulated = 1; pParent->pSrc->a[parentTab].isPopulated = 1;
} }
#endif #endif
@ -60040,7 +60040,7 @@ struct WhereTerm {
*/ */
struct WhereClause { struct WhereClause {
Parse *pParse; /* The parser context */ Parse *pParse; /* The parser context */
ExprMaskSet *pMaskSet; /* Mapping of table indices to bittqmasks */ ExprMaskSet *pMaskSet; /* Mapping of table indices to bitmasks */
int nTerm; /* Number of terms */ int nTerm; /* Number of terms */
int nSlot; /* Number of entries in a[] */ int nSlot; /* Number of entries in a[] */
WhereTerm *a; /* Each a[] describes a term of the WHERE cluase */ WhereTerm *a; /* Each a[] describes a term of the WHERE cluase */
@ -60049,13 +60049,13 @@ struct WhereClause {
/* /*
** An instance of the following structure keeps track of a mapping ** An instance of the following structure keeps track of a mapping
** between VDBE cursor numbers and bits of the bittqmasks in WhereTerm. ** between VDBE cursor numbers and bits of the bitmasks in WhereTerm.
** **
** The VDBE cursor numbers are small integers contained in ** The VDBE cursor numbers are small integers contained in
** SrcList_item.iCursor and Expr.iTable fields. For any given WHERE ** SrcList_item.iCursor and Expr.iTable fields. For any given WHERE
** clause, the cursor numbers might not begin with 0 and they might ** clause, the cursor numbers might not begin with 0 and they might
** contain gaps in the numbering sequence. But we want to make maximum ** contain gaps in the numbering sequence. But we want to make maximum
** use of the bits in our bittqmasks. This structure provides a mapping ** use of the bits in our bitmasks. This structure provides a mapping
** from the sparse cursor numbers into consecutive integers beginning ** from the sparse cursor numbers into consecutive integers beginning
** with 0. ** with 0.
** **
@ -60080,7 +60080,7 @@ struct ExprMaskSet {
/* /*
** Bittqmasks for the operators that indices are able to exploit. An ** Bitmasks for the operators that indices are able to exploit. An
** OR-ed combination of these values can be used when searching for ** OR-ed combination of these values can be used when searching for
** terms in the where clause. ** terms in the where clause.
*/ */
@ -60123,7 +60123,7 @@ struct ExprMaskSet {
static void whereClauseInit( static void whereClauseInit(
WhereClause *pWC, /* The WhereClause to be initialized */ WhereClause *pWC, /* The WhereClause to be initialized */
Parse *pParse, /* The parsing context */ Parse *pParse, /* The parsing context */
ExprMaskSet *pMaskSet /* Mapping from table indices to bittqmasks */ ExprMaskSet *pMaskSet /* Mapping from table indices to bitmasks */
){ ){
pWC->pParse = pParse; pWC->pParse = pParse;
pWC->pMaskSet = pMaskSet; pWC->pMaskSet = pMaskSet;
@ -60259,7 +60259,7 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){
** sets their opcodes to TK_COLUMN and their Expr.iTable fields to ** sets their opcodes to TK_COLUMN and their Expr.iTable fields to
** the VDBE cursor number of the table. This routine just has to ** the VDBE cursor number of the table. This routine just has to
** translate the cursor numbers into bittqmask values and OR all ** translate the cursor numbers into bittqmask values and OR all
** the bittqmasks together. ** the bitmasks together.
*/ */
static Bittqmask exprListTableUsage(ExprMaskSet*, ExprList*); static Bittqmask exprListTableUsage(ExprMaskSet*, ExprList*);
static Bittqmask exprSelectTableUsage(ExprMaskSet*, Select*); static Bittqmask exprSelectTableUsage(ExprMaskSet*, Select*);
@ -61889,7 +61889,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
int brk, cont = 0; /* Addresses used during code generation */ int brk, cont = 0; /* Addresses used during code generation */
Bittqmask notReady; /* Cursors that are not yet positioned */ Bittqmask notReady; /* Cursors that are not yet positioned */
WhereTerm *pTerm; /* A single term in the WHERE clause */ WhereTerm *pTerm; /* A single term in the WHERE clause */
ExprMaskSet tqmaskSet; /* The expression tqmask set */ ExprMaskSet maskSet; /* The expression tqmask set */
WhereClause wc; /* The WHERE clause is divided into these terms */ WhereClause wc; /* The WHERE clause is divided into these terms */
struct SrcList_item *pTabItem; /* A single entry from pTabList */ struct SrcList_item *pTabItem; /* A single entry from pTabList */
WhereLevel *pLevel; /* A single level in the pWInfo list */ WhereLevel *pLevel; /* A single level in the pWInfo list */
@ -61907,8 +61907,8 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
/* Split the WHERE clause into separate subexpressions where each /* Split the WHERE clause into separate subexpressions where each
** subexpression is separated by an AND operator. ** subexpression is separated by an AND operator.
*/ */
initMaskSet(&tqmaskSet); initMaskSet(&maskSet);
whereClauseInit(&wc, pParse, &tqmaskSet); whereClauseInit(&wc, pParse, &maskSet);
whereSplit(&wc, pWhere, TK_AND); whereSplit(&wc, pWhere, TK_AND);
/* Allocate and initialize the WhereInfo structure that will become the /* Allocate and initialize the WhereInfo structure that will become the
@ -61937,7 +61937,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
** and work forward so that the added virtual terms are never processed. ** and work forward so that the added virtual terms are never processed.
*/ */
for(i=0; i<pTabList->nSrc; i++){ for(i=0; i<pTabList->nSrc; i++){
createMask(&tqmaskSet, pTabList->a[i].iCursor); createMask(&maskSet, pTabList->a[i].iCursor);
} }
exprAnalyzeAll(pTabList, &wc); exprAnalyzeAll(pTabList, &wc);
if( sqlite3MallocFailed() ){ if( sqlite3MallocFailed() ){
@ -61984,7 +61984,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
doNotReorder = (pTabItem->jointype & (JT_LEFT|JT_CROSS))!=0; doNotReorder = (pTabItem->jointype & (JT_LEFT|JT_CROSS))!=0;
if( once && doNotReorder ) break; if( once && doNotReorder ) break;
m = getMask(&tqmaskSet, pTabItem->iCursor); m = getMask(&maskSet, pTabItem->iCursor);
if( (m & notReady)==0 ){ if( (m & notReady)==0 ){
if( j==iFrom ) iFrom++; if( j==iFrom ) iFrom++;
continue; continue;
@ -62046,7 +62046,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
}else{ }else{
pLevel->iIdxCur = -1; pLevel->iIdxCur = -1;
} }
notReady &= ~getMask(&tqmaskSet, pTabList->a[bestJ].iCursor); notReady &= ~getMask(&maskSet, pTabList->a[bestJ].iCursor);
pLevel->iFrom = bestJ; pLevel->iFrom = bestJ;
} }
WHERETRACE(("*** Optimizer Finished ***\n")); WHERETRACE(("*** Optimizer Finished ***\n"));
@ -62494,7 +62494,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
pLevel->p1 = iCur; pLevel->p1 = iCur;
pLevel->p2 = 1 + sqlite3VdbeAddOp(v, OP_Rewind, iCur, brk); pLevel->p2 = 1 + sqlite3VdbeAddOp(v, OP_Rewind, iCur, brk);
} }
notReady &= ~getMask(&tqmaskSet, iCur); notReady &= ~getMask(&maskSet, iCur);
/* Insert code to test every subexpression that can be completely /* Insert code to test every subexpression that can be completely
** computed using the current set of tables. ** computed using the current set of tables.
@ -67305,7 +67305,7 @@ static int createCollation(
/* If collation sequence pColl was created directly by a call to /* If collation sequence pColl was created directly by a call to
** sqlite3_create_collation, and not generated by synthCollSeq(), ** sqlite3_create_collation, and not generated by synthCollSeq(),
** then any copies made by synthCollSeq() need to be tqinvalidated. ** then any copies made by synthCollSeq() need to be invalidated.
** Also, collation destructor - CollSeq.xDel() - function may need ** Also, collation destructor - CollSeq.xDel() - function may need
** to be called. ** to be called.
*/ */

@ -288,7 +288,7 @@ int sqlite3_exec(
** primary result code as a prefix. Primary result codes contain a single ** primary result code as a prefix. Primary result codes contain a single
** "_" character. Extended result codes contain two or more "_" characters. ** "_" character. Extended result codes contain two or more "_" characters.
** The numeric value of an extended result code can be converted to its ** The numeric value of an extended result code can be converted to its
** corresponding primary result code by tqmasking off the lower 8 bytes. ** corresponding primary result code by masking off the lower 8 bytes.
** **
** The STQLITE_OK result code will never be extended. It will always ** The STQLITE_OK result code will never be extended. It will always
** be exactly zero. ** be exactly zero.
@ -1503,7 +1503,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt);
** **
** Note that when type conversions occur, pointers returned by prior ** Note that when type conversions occur, pointers returned by prior
** calls to sqlite3_column_blob(), sqlite3_column_text(), and/or ** calls to sqlite3_column_blob(), sqlite3_column_text(), and/or
** sqlite3_column_text16() may be tqinvalidated. ** sqlite3_column_text16() may be invalidated.
** Type conversions and pointer invalidations might occur ** Type conversions and pointer invalidations might occur
** in the following cases: ** in the following cases:
** **
@ -1525,7 +1525,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt);
** not tqinvalidate a prior pointer, though of course the content of the buffer ** not tqinvalidate a prior pointer, though of course the content of the buffer
** that the prior pointer points to will have been modified. Other kinds ** that the prior pointer points to will have been modified. Other kinds
** of conversion are done in place when it is possible, but sometime it is ** of conversion are done in place when it is possible, but sometime it is
** not possible and in those cases prior pointers are tqinvalidated. ** not possible and in those cases prior pointers are invalidated.
** **
** The safest and easiest to remember policy is to invoke these routines ** The safest and easiest to remember policy is to invoke these routines
** in one of the following ways: ** in one of the following ways:
@ -1728,7 +1728,7 @@ int sqlite3_global_recover(void);
** **
** Please pay particular attention to the fact that the pointer that ** Please pay particular attention to the fact that the pointer that
** is returned from [sqlite3_value_blob()], [sqlite3_value_text()], or ** is returned from [sqlite3_value_blob()], [sqlite3_value_text()], or
** [sqlite3_value_text16()] can be tqinvalidated by a subsequent call to ** [sqlite3_value_text16()] can be invalidated by a subsequent call to
** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite_value_text()], ** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite_value_text()],
** or [sqlite3_value_text16()]. ** or [sqlite3_value_text16()].
*/ */

@ -27,7 +27,7 @@ namespace KDE {
OverlayWidget::OverlayWidget( TQWidget *tqparent, TQWidget *anchor, const char* name ) OverlayWidget::OverlayWidget( TQWidget *tqparent, TQWidget *anchor, const char* name )
: TQFrame( tqparent->tqparentWidget(), name ) : TQFrame( tqparent->parentWidget(), name )
, m_anchor( anchor ) , m_anchor( anchor )
, m_tqparent( tqparent ) , m_tqparent( tqparent )
{ {
@ -39,7 +39,7 @@ OverlayWidget::OverlayWidget( TQWidget *tqparent, TQWidget *anchor, const char*
void void
OverlayWidget::reposition() OverlayWidget::reposition()
{ {
setMaximumSize( tqparentWidget()->size() ); setMaximumSize( parentWidget()->size() );
adjustSize(); adjustSize();
// p is in the alignWidget's coordinates // p is in the alignWidget's coordinates
@ -51,8 +51,8 @@ OverlayWidget::reposition()
// Position in the toplevelwidget's coordinates // Position in the toplevelwidget's coordinates
TQPoint pTopLevel = m_anchor->mapTo( tqtopLevelWidget(), p ); TQPoint pTopLevel = m_anchor->mapTo( tqtopLevelWidget(), p );
// Position in the widget's tqparentWidget coordinates // Position in the widget's parentWidget coordinates
TQPoint pParent = tqparentWidget() ->mapFrom( tqtopLevelWidget(), pTopLevel ); TQPoint pParent = parentWidget() ->mapFrom( tqtopLevelWidget(), pTopLevel );
// keep it on the screen // keep it on the screen
if( pParent.x() < 0 ) if( pParent.x() < 0 )
pParent.rx() = 0; pParent.rx() = 0;

@ -28,7 +28,7 @@ namespace KDE
{ {
public: public:
/** /**
* The widget is tqparented to the toplevelwidget of alignWidget, * The widget is parented to the toplevelwidget of alignWidget,
* this could be an issue if that widget has an autoAdd Layout * this could be an issue if that widget has an autoAdd Layout
*/ */
OverlayWidget( TQWidget *tqparent, TQWidget *anchor, const char *name = 0 ); OverlayWidget( TQWidget *tqparent, TQWidget *anchor, const char *name = 0 );

@ -42,7 +42,7 @@ PopupMessage::PopupMessage( TQWidget *tqparent, TQWidget *anchor, int timeout, c
: OverlayWidget( tqparent, anchor, name ) : OverlayWidget( tqparent, anchor, name )
, m_anchor( anchor ) , m_anchor( anchor )
, m_tqparent( tqparent ) , m_tqparent( tqparent )
, m_tqmaskEffect( Slide ) , m_maskEffect( Slide )
, m_dissolveSize( 0 ) , m_dissolveSize( 0 )
, m_dissolveDelta( -1 ) , m_dissolveDelta( -1 )
, m_offset( 0 ) , m_offset( 0 )
@ -143,7 +143,7 @@ void PopupMessage::display() //SLOT
m_dissolveSize = 24; m_dissolveSize = 24;
m_dissolveDelta = -1; m_dissolveDelta = -1;
if( m_tqmaskEffect == Dissolve ) if( m_maskEffect == Dissolve )
{ {
// necessary to create the tqmask // necessary to create the tqmask
m_tqmask.resize( width(), height() ); m_tqmask.resize( width(), height() );
@ -164,7 +164,7 @@ void PopupMessage::display() //SLOT
void PopupMessage::timerEvent( TQTimerEvent* ) void PopupMessage::timerEvent( TQTimerEvent* )
{ {
switch( m_tqmaskEffect ) switch( m_maskEffect )
{ {
case Plain: case Plain:
plainMask(); plainMask();
@ -214,19 +214,19 @@ void PopupMessage::dissolveMask()
if( m_stage == 1 ) if( m_stage == 1 )
{ {
tqrepaint( false ); tqrepaint( false );
TQPainter tqmaskPainter(&m_tqmask); TQPainter maskPainter(&m_tqmask);
m_tqmask.fill(TQt::black); m_tqmask.fill(TQt::black);
tqmaskPainter.setBrush(TQt::white); maskPainter.setBrush(TQt::white);
tqmaskPainter.setPen(TQt::white); maskPainter.setPen(TQt::white);
tqmaskPainter.drawRect( m_tqmask.rect() ); maskPainter.drawRect( m_tqmask.rect() );
m_dissolveSize += m_dissolveDelta; m_dissolveSize += m_dissolveDelta;
if( m_dissolveSize > 0 ) if( m_dissolveSize > 0 )
{ {
tqmaskPainter.setRasterOp( TQt::EraseROP ); maskPainter.setRasterOp( TQt::EraseROP );
int x, y, s; int x, y, s;
const int size = 16; const int size = 16;
@ -241,7 +241,7 @@ void PopupMessage::dissolveMask()
if (s < 0) if (s < 0)
break; break;
tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s);
} }
} }
} }

@ -57,7 +57,7 @@ namespace KDE
void setShowCounter( const bool show ); void setShowCounter( const bool show );
void setImage( const TQString &location ); void setImage( const TQString &location );
void setImage( const TQPixmap &pix ); void setImage( const TQPixmap &pix );
void setMaskEffect( const MaskEffect type ) { m_tqmaskEffect = type; } void setMaskEffect( const MaskEffect type ) { m_maskEffect = type; }
void setText( const TQString &text ); void setText( const TQString &text );
void setTimeout( const int time ) { m_timeout = time; } void setTimeout( const int time ) { m_timeout = time; }
@ -90,7 +90,7 @@ namespace KDE
TQWidget *m_anchor; TQWidget *m_anchor;
TQWidget *m_tqparent; TQWidget *m_tqparent;
TQBitmap m_tqmask; TQBitmap m_tqmask;
MaskEffect m_tqmaskEffect; MaskEffect m_maskEffect;
int m_dissolveSize; int m_dissolveSize;
int m_dissolveDelta; int m_dissolveDelta;

@ -69,7 +69,7 @@ ProgressBar::settqStatus( const TQString &text )
s += ']'; s += ']';
m_label->setText( s ); m_label->setText( s );
tqparentWidget()->adjustSize(); parentWidget()->adjustSize();
return *this; return *this;
} }
@ -81,7 +81,7 @@ ProgressBar::setAbortSlot( TQObject *receiver, const char *slot )
connect( m_abort, TQT_SIGNAL(clicked()), this, TQT_SLOT(hide()) ); connect( m_abort, TQT_SIGNAL(clicked()), this, TQT_SLOT(hide()) );
m_abort->show(); m_abort->show();
tqparentWidget()->adjustSize(); parentWidget()->adjustSize();
return *this; return *this;
} }

@ -270,7 +270,7 @@ void QueueLabel::showToolTip()
text += i18n( "Next: %1" ).tqarg( veryNiceTitle( item, true /*bold*/ ) ); text += i18n( "Next: %1" ).tqarg( veryNiceTitle( item, true /*bold*/ ) );
m_tooltip = new KDE::PopupMessage( tqparentWidget()->tqparentWidget(), this, 0 ); m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), this, 0 );
m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCloseButton( false );
m_tooltip->setShowCounter( false ); m_tooltip->setShowCounter( false );
m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); m_tooltip->setMaskEffect( KDE::PopupMessage::Plain );

@ -141,7 +141,7 @@ class SelectLabel : public TQLabel
tip += "&nbsp;"; tip += "&nbsp;";
m_tooltip = new KDE::PopupMessage( tqparentWidget()->tqparentWidget(), tqparentWidget(), 0 /*timeout*/ ); m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), parentWidget(), 0 /*timeout*/ );
m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCloseButton( false );
m_tooltip->setShowCounter( false ); m_tooltip->setShowCounter( false );
m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); m_tooltip->setMaskEffect( KDE::PopupMessage::Plain );

@ -119,7 +119,7 @@ class ToggleLabel : public TQLabel
const TQString path = KGlobal::iconLoader()->iconPath( m_action->icon(), -KIcon::SizeHuge ); const TQString path = KGlobal::iconLoader()->iconPath( m_action->icon(), -KIcon::SizeHuge );
m_tooltip = new KDE::PopupMessage( tqparentWidget()->tqparentWidget(), tqparentWidget(), 0 /*timeout*/ ); m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), parentWidget(), 0 /*timeout*/ );
m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCloseButton( false );
m_tooltip->setShowCounter( false ); m_tooltip->setShowCounter( false );
m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); m_tooltip->setMaskEffect( KDE::PopupMessage::Plain );

@ -820,7 +820,7 @@
<tabstop>pushButton_cancel</tabstop> <tabstop>pushButton_cancel</tabstop>
</tabstops> </tabstops>
<pixmapinproject/> <pixmapinproject/>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>ktabwidget.h</includehint> <includehint>ktabwidget.h</includehint>

@ -205,8 +205,8 @@ Note that the order in which the schemes appear in the list is relevant, since t
<functions> <functions>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="0"/> <layoutdefaults spacing="6" margin="0"/>
<tqlayoutfunctions spacing="KDialog::spacingHint"/> <layoutfunctions spacing="KDialog::spacingHint"/>
<includehints> <includehints>
<includehint>kdialog.h</includehint> <includehint>kdialog.h</includehint>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>

@ -268,7 +268,7 @@ void
ThreadManager::Thread::runJob( Job *job ) ThreadManager::Thread::runJob( Job *job )
{ {
job->m_thread = this; job->m_thread = this;
job->m_tqparentThreadId = m_threadId; job->m_parentThreadId = m_threadId;
if ( job->isAborted() ) if ( job->isAborted() )
TQApplication::postEvent( ThreadManager::instance(), job ); TQApplication::postEvent( ThreadManager::instance(), job );

@ -313,7 +313,7 @@ public:
*/ */
//void setVisible( bool ); //void setVisible( bool );
uint tqparentThreadId() { return m_tqparentThreadId; } uint parentThreadId() { return m_parentThreadId; }
protected: protected:
/** /**
@ -341,7 +341,7 @@ public:
uint m_percentDone; uint m_percentDone;
uint m_progressDone; uint m_progressDone;
uint m_totalSteps; uint m_totalSteps;
uint m_tqparentThreadId; uint m_parentThreadId;
TQString m_description; TQString m_description;
TQString m_status; TQString m_status;

@ -79,7 +79,7 @@ void Amarok::ToolTip::add( ToolTipClient *client, TQWidget *tqparent ) //static
void Amarok::ToolTip::remove( TQWidget *widget ) //static void Amarok::ToolTip::remove( TQWidget *widget ) //static
{ {
for( int i = s_tooltips.count() - 1; i >= 0; --i ) for( int i = s_tooltips.count() - 1; i >= 0; --i )
if( s_tooltips[i]->TQToolTip::tqparentWidget() == widget ) if( s_tooltips[i]->TQToolTip::parentWidget() == widget )
delete s_tooltips[i]; delete s_tooltips[i];
} }
@ -93,7 +93,7 @@ void Amarok::ToolTip::hideTips() //static
TQString Amarok::ToolTip::textFor( TQWidget *widget, const TQPoint &pos ) //static TQString Amarok::ToolTip::textFor( TQWidget *widget, const TQPoint &pos ) //static
{ {
for( int i = 0, n = s_tooltips.count(); i < n; ++i ) for( int i = 0, n = s_tooltips.count(); i < n; ++i )
if( s_tooltips[i]->TQToolTip::tqparentWidget() == widget ) if( s_tooltips[i]->TQToolTip::parentWidget() == widget )
return s_tooltips[i]->m_client->toolTipText( widget, pos ).first; return s_tooltips[i]->m_client->toolTipText( widget, pos ).first;
return TQToolTip::textFor( widget, pos ); return TQToolTip::textFor( widget, pos );
} }
@ -103,7 +103,7 @@ void Amarok::ToolTip::updateTip() //static
for( int i = 0, n = s_tooltips.count(); i < n; ++i ) for( int i = 0, n = s_tooltips.count(); i < n; ++i )
if( s_tooltips[i]->isVisible() ) if( s_tooltips[i]->isVisible() )
{ {
TQWidget* const w = s_tooltips[i]->TQToolTip::tqparentWidget(); TQWidget* const w = s_tooltips[i]->TQToolTip::parentWidget();
TQPair<TQString, TQRect> p = s_tooltips[i]->m_client->toolTipText( w, w->mapFromGlobal( s_pos ) ); TQPair<TQString, TQRect> p = s_tooltips[i]->m_client->toolTipText( w, w->mapFromGlobal( s_pos ) );
TQString prev = s_text; TQString prev = s_text;
if( prev != p.first ) if( prev != p.first )
@ -133,12 +133,12 @@ Amarok::ToolTip::~ToolTip()
void Amarok::ToolTip::maybeTip( const TQPoint &pos ) void Amarok::ToolTip::maybeTip( const TQPoint &pos )
{ {
s_pos = TQToolTip::tqparentWidget()->mapToGlobal( pos ); s_pos = TQToolTip::parentWidget()->mapToGlobal( pos );
TQString prev = s_text; TQString prev = s_text;
TQPair<TQString, TQRect> p = m_client->toolTipText( TQToolTip::tqparentWidget(), pos ); TQPair<TQString, TQRect> p = m_client->toolTipText( TQToolTip::parentWidget(), pos );
s_text = p.first; s_text = p.first;
s_rect = p.second; s_rect = p.second;
if( TQToolTip::tqparentWidget() && !s_text.isEmpty() ) if( TQToolTip::parentWidget() && !s_text.isEmpty() )
{ {
if( s_text != prev ) if( s_text != prev )
hideTips(); hideTips();
@ -167,7 +167,7 @@ void Amarok::ToolTip::hideTip()
if( !isVisible() ) if( !isVisible() )
return; return;
TQFrame::hide(); TQFrame::hide();
TQToolTip::tqparentWidget()->update(); TQToolTip::parentWidget()->update();
m_timer.stop(); m_timer.stop();
s_hack = 0; s_hack = 0;
} }
@ -181,13 +181,13 @@ void Amarok::ToolTip::drawContents( TQPainter *painter )
p.setPen( tqcolorGroup().foreground() ); p.setPen( tqcolorGroup().foreground() );
p.drawRect( buf.rect() ); p.drawRect( buf.rect() );
TQSimpleRichText text( s_text, TQToolTip::tqparentWidget()->font() ); TQSimpleRichText text( s_text, TQToolTip::parentWidget()->font() );
text.setWidth( width() ); text.setWidth( width() );
p.translate( 0, height() / 2 - text.height() / 2); p.translate( 0, height() / 2 - text.height() / 2);
TQPoint pos = s_rect.isNull() ? TQPoint(2, -1) TQPoint pos = s_rect.isNull() ? TQPoint(2, -1)
: s_hack == 1 ? TQPoint(4, -2) : s_hack == 1 ? TQPoint(4, -2)
: TQPoint(2, -2); //HACK positioning : TQPoint(2, -2); //HACK positioning
p.setFont( TQToolTip::tqparentWidget()->font() ); p.setFont( TQToolTip::parentWidget()->font() );
text.draw( &p, pos.x(), pos.y(), rect(), tqcolorGroup() ); text.draw( &p, pos.x(), pos.y(), rect(), tqcolorGroup() );
painter->drawPixmap( 0, 0, buf ); painter->drawPixmap( 0, 0, buf );
@ -199,7 +199,7 @@ TQSize Amarok::ToolTip::tqsizeHint() const
return s_rect.size(); return s_rect.size();
else else
{ {
TQSimpleRichText text( s_text, TQToolTip::tqparentWidget()->font() ); TQSimpleRichText text( s_text, TQToolTip::parentWidget()->font() );
text.setWidth( 500 ); //is this reasonable? text.setWidth( 500 ); //is this reasonable?
return TQSize( text.widthUsed() - 2, text.height() ); return TQSize( text.widthUsed() - 2, text.height() );
} }
@ -207,7 +207,7 @@ TQSize Amarok::ToolTip::tqsizeHint() const
void Amarok::ToolTip::position() void Amarok::ToolTip::position()
{ {
const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::tqparentWidget() ); const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() );
const TQSize size = tqsizeHint(); const TQSize size = tqsizeHint();
const int width = size.width(), height = size.height(); const int width = size.width(), height = size.height();
TQPoint pos; TQPoint pos;
@ -221,7 +221,7 @@ void Amarok::ToolTip::position()
} }
else else
{ {
const TQRect r = TQRect( TQToolTip::tqparentWidget()->mapToGlobal( TQToolTip::tqparentWidget()->pos() ), TQToolTip::tqparentWidget()->size() ); const TQRect r = TQRect( TQToolTip::parentWidget()->mapToGlobal( TQToolTip::parentWidget()->pos() ), TQToolTip::parentWidget()->size() );
pos = r.bottomRight(); pos = r.bottomRight();
if( pos.y() + height > drect.bottom() ) if( pos.y() + height > drect.bottom() )
pos.setY( kMax( drect.top(), r.top() - height ) ); pos.setY( kMax( drect.top(), r.top() - height ) );

@ -175,7 +175,7 @@
<tabstops> <tabstops>
<tabstop>trackList</tabstop> <tabstop>trackList</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
</includehints> </includehints>

Loading…
Cancel
Save