From 13c7c96214340d002f801f6c2a66c29529689b54 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 23:53:59 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- src/k3b.h | 2 +- src/k3bfiletreeview.cpp | 4 ++-- src/k3bmediacache.cpp | 2 +- src/k3bpassivepopup.cpp | 2 +- src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/k3b.h b/src/k3b.h index f5690c0..3bdc3d9 100644 --- a/src/k3b.h +++ b/src/k3b.h @@ -165,7 +165,7 @@ class K3bMainWindow : public KParts::DockMainWindow virtual bool queryExit(); /** saves the window properties for each open window during session end to the session config file, including saving the currently - * opened file by a temporary filename provided by KApplication. + * opened file by a temporary filename provided by TDEApplication. * @see KTMainWindow#saveProperties */ virtual void saveProperties(KConfig *_cfg); diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index 8e54cc4..a1f52d5 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -419,7 +419,7 @@ K3bFileTreeView::K3bFileTreeView( TQWidget *parent, const char *name ) this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem* , const TQPoint& )) ); // we always simulate the single click - slotSettingsChangedK3b(KApplication::SETTINGS_MOUSE); + slotSettingsChangedK3b(TDEApplication::SETTINGS_MOUSE); if( kapp ) connect( kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChangedK3b(int)) ); @@ -692,7 +692,7 @@ void K3bFileTreeView::slotSettingsChangedK3b(int category) { // we force single click like konqueror does. This really should be done in KFileTreeView - if( category == KApplication::SETTINGS_MOUSE ) { + if( category == TDEApplication::SETTINGS_MOUSE ) { disconnect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonClickedK3b(int, TQListViewItem*, const TQPoint &, int))); diff --git a/src/k3bmediacache.cpp b/src/k3bmediacache.cpp index 52195d0..270f7c0 100644 --- a/src/k3bmediacache.cpp +++ b/src/k3bmediacache.cpp @@ -184,7 +184,7 @@ int K3bMediaCache::blockDevice( K3bDevice::Device* dev ) e->mutex.lock(); // create (hopefully) unique id - e->blockedId = KApplication::random(); + e->blockedId = TDEApplication::random(); // let the info go e->mutex.unlock(); diff --git a/src/k3bpassivepopup.cpp b/src/k3bpassivepopup.cpp index a7ab856..ad217d4 100644 --- a/src/k3bpassivepopup.cpp +++ b/src/k3bpassivepopup.cpp @@ -72,7 +72,7 @@ static TQPixmap themedMessageBoxIcon( K3bPassivePopup::MessageType mt ) break; } - TQPixmap ret = KApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); + TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); if( ret.isNull() ) return TQMessageBox::standardIcon( qIcon ); diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp index 34af9c9..d3f1e72 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp @@ -193,7 +193,7 @@ protected: preW = h*16/9; p->drawRect( ( w - preW ) / 2, ( height() - h ) / 2, preW, h ); - TQPixmap noIcon = KApplication::kApplication()->iconLoader()->loadIcon( "no", KIcon::NoGroup, KIcon::SizeSmall, KIcon::DefaultState, 0, true ); + TQPixmap noIcon = TDEApplication::kApplication()->iconLoader()->loadIcon( "no", KIcon::NoGroup, KIcon::SizeSmall, KIcon::DefaultState, 0, true ); p->drawPixmap( ( w - noIcon.width() ) / 2, ( height() - noIcon.height() ) / 2, noIcon ); } else { -- cgit v1.2.3